leon 1 рік тому
батько
коміт
0c5f47b0d9

BIN
src/assets/images/home_nonfocus.png


BIN
src/assets/images/metric_focus.png


BIN
src/assets/images/metric_nonfocus.png


BIN
src/assets/images/notification_focus.png


BIN
src/assets/images/notification_nonfocus.png


BIN
src/assets/images/profile_nonfocus.png


+ 2 - 1
src/pages/clock/ClockMain.tsx

@@ -54,6 +54,7 @@ import NoData from "@/components/view/NoData";
 import { getLocalPush } from "@/features/trackTimeDuration/actions/TrackTimeActions";
 import { TimeFormatter } from "@/utils/time_format";
 import { userAccess } from "@/services/user";
+import { setAccessData } from "@/store/access";
 
 const utc = require('dayjs/plugin/utc')
 const timezone = require('dayjs/plugin/timezone')
@@ -540,7 +541,7 @@ export default function Page() {
         if (user.isLogin) {
             getHistory()
             userAccess().then(res => {
-                console.log('useraccess', res)
+                dispatch(setAccessData(res))
                 setAccess(res)
             })
         }

+ 8 - 9
src/pages/notification/setting.tsx

@@ -34,8 +34,8 @@ export default function Page() {
     const [systemFast, setSystemFast] = useState(true)
     const [systemExtra, setSystemExtra] = useState(true)
     const [systemSun, setSystemSun] = useState(true)
-    const [access, setAccess] = useState<any>(null)
     const user = useSelector((state: any) => state.user);
+    const accessObj = useSelector((state: any) => state.access);
 
     let navigation;
     if (useNavigation) {
@@ -90,10 +90,9 @@ export default function Page() {
     };
 
     function getMemberStatus() {
-        userAccess().then(res => {
-            setAccess(res)
-            console.log(res)
-            if ((res as any).member.status == 'NON_MEMBER') {
+        const {access} = accessObj
+        if (access && access.member) {
+            if (access.member.status == 'NON_MEMBER') {
                 postNotifySettings({
                     notification: {
                         follow_sun: {
@@ -115,7 +114,7 @@ export default function Page() {
                     global.swiperDayNightRefresh()
                 })
             }
-        })
+        }
     }
 
     useDidShow(() => {
@@ -266,7 +265,7 @@ export default function Page() {
                             // setIsMulti(e.nativeEvent.value)
                             const value = e.nativeEvent.value
                             if (e.nativeEvent.value) {
-                                if (access.member.status == 'NON_MEMBER') {
+                                if (accessObj && accessObj.access && accessObj.access.member.status == 'NON_MEMBER') {
                                     setTimeout(() => {
                                         setIsSunrise(false)
                                     }, 1000)
@@ -297,7 +296,7 @@ export default function Page() {
                             // setIsMulti(e.nativeEvent.value)
                             const value = e.nativeEvent.value
                             if (e.nativeEvent.value) {
-                                if (access.member.status == 'NON_MEMBER') {
+                                if (accessObj && accessObj.access && accessObj.member.status == 'NON_MEMBER') {
                                     setTimeout(() => {
                                         setIsSunset(false)
                                     }, 1000)
@@ -327,7 +326,7 @@ export default function Page() {
                             // setIsMulti(e.nativeEvent.value)
                             const value = e.nativeEvent.value
                             if (e.nativeEvent.value) {
-                                if (access.member.status == 'NON_MEMBER') {
+                                if (accessObj && accessObj.access && accessObj.member.status == 'NON_MEMBER') {
                                     setTimeout(() => {
                                         setIsSolarNoon(false)
                                     }, 1000)

+ 2 - 2
src/pages/rn/RNMain.tsx

@@ -107,7 +107,7 @@ export default function RNMain() {
               <Image
                 resizeMode='contain'
                 style={{ width: size, height: size }}
-                source={focused ? require('@assets/images/home_focus.png') : require('@assets/images/home_nonfocus.png')}
+                source={focused ? require('@assets/images/notification_focus.png') : require('@assets/images/notification_nonfocus.png')}
               />
             );
           },
@@ -118,7 +118,7 @@ export default function RNMain() {
               <Image
                 resizeMode='contain'
                 style={{ width: size, height: size }}
-                source={require('@assets/images/camera.png')}
+                source={focused ? require('@assets/images/metric_focus.png') : require('@assets/images/metric_nonfocus.png')}
               />
             );
           },

+ 29 - 0
src/store/access.tsx

@@ -0,0 +1,29 @@
+
+import { createSlice } from "@reduxjs/toolkit";
+
+
+interface AccessState {
+    // scenario: null,
+    access: any
+}
+
+const initialState: AccessState = {
+    // scenario: null,
+    access: null,
+}
+
+const accessSlice = createSlice({
+    name: 'access',
+    initialState,
+    reducers: {
+
+        setAccessData(state, action) {
+            state.access = action.payload
+        },
+
+
+    }
+});
+
+export default accessSlice.reducer;
+export const { setAccessData } = accessSlice.actions;

+ 2 - 0
src/store/store.tsx

@@ -12,6 +12,7 @@ import dayReducer from './day';
 import nightReducer from './night';
 import ringReducer from './ring';
 import targetReducer from './set_target';
+import accessReducer from './access';
 
 const store = configureStore({
   reducer: {
@@ -30,6 +31,7 @@ const store = configureStore({
     day: dayReducer,
     ring: ringReducer,
     target: targetReducer,
+    access: accessReducer
   },
 });