Leon 1 년 전
부모
커밋
e90f0c787a
2개의 변경된 파일25개의 추가작업 그리고 16개의 파일을 삭제
  1. 8 2
      src/features/trackTimeDuration/components/CheckAccess.tsx
  2. 17 14
      src/pages/clock/ChooseScenario.tsx

+ 8 - 2
src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -59,6 +59,9 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
     useEffect(() => {
         var obj = props.record
         if (props.access) {
+            if (!user.test_user) {
+                return
+            }
             global.ring = ring;
             const currentStatus = props.access.fast_sleep.current.qualification.status
             const preStatus = props.access.fast_sleep.previous.qualification.status
@@ -167,6 +170,9 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
 
         }
         global.checkAccess = (acccessData: any) => {
+            if (!user.test_user) {
+                return
+            }
             const currentStatus = acccessData.current.qualification.status
             const preStatus = acccessData.previous.qualification.status
             access = acccessData
@@ -536,10 +542,10 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
     }
     return <View>
         {
-            showFastAlert && process.env.TARO_ENV == 'weapp' && alertPop()
+            user.test_user && showFastAlert && process.env.TARO_ENV == 'weapp' && alertPop()
         }
         {
-            showFastAlert && isFocused && process.env.TARO_ENV == 'rn' && <Modal transparent={true}>
+            user.test_user && showFastAlert && isFocused && process.env.TARO_ENV == 'rn' && <Modal transparent={true}>
                 <View style={{ backgroundColor: 'rgba(0,0,0,0.95)', width: '100%', height: '100%', alignItems: 'center', justifyContent: 'center' }}>
                     {alertPop()}
                 </View>

+ 17 - 14
src/pages/clock/ChooseScenario.tsx

@@ -28,6 +28,7 @@ export default function ChooseScenario() {
     const [selected, setSelected] = useState(-1);
     const ring = useSelector((state: any) => state.ring);
     const [access, setAccess] = useState<any>(null);
+    const user = useSelector((state: any) => state.user);
     const { t } = useTranslation();
     const [count, setCount] = useState(0)
     const dispatch = useDispatch();
@@ -114,21 +115,23 @@ export default function ChooseScenario() {
     }
 
     function chooseType(index: number) {
-        debugger
-        const { qualification } = access.fast_sleep.current
-        if (qualification.status != "PROVISIONAL_QUALIFIED" && qualification.status != 'QUALIFIED_UNTIL_EXPIRE' && index == 1) {
-            const { streak_fast_min_required } = qualification.condition;
-            showAlert({
-                title: t('feature.choose_scenario.alert_title'),
-                content: t('feature.choose_scenario.alert_content', { day: streak_fast_min_required, day_unit: streak_fast_min_required == 1 ? 'day' : 'days' }),
-                showCancel: false,
-                confirmText: t('feature.choose_scenario.alert_btn'),
-                confirm: () => {
-                    jumpPage('', 'ProductList', navigation)
-                }
-            })
-            return;
+        if (user.test_user) {
+            const { qualification } = access.fast_sleep.current
+            if (qualification.status != "PROVISIONAL_QUALIFIED" && qualification.status != 'QUALIFIED_UNTIL_EXPIRE' && index == 1) {
+                const { streak_fast_min_required } = qualification.condition;
+                showAlert({
+                    title: t('feature.choose_scenario.alert_title'),
+                    content: t('feature.choose_scenario.alert_content', { day: streak_fast_min_required, day_unit: streak_fast_min_required == 1 ? 'day' : 'days' }),
+                    showCancel: false,
+                    confirmText: t('feature.choose_scenario.alert_btn'),
+                    confirm: () => {
+                        jumpPage('', 'ProductList', navigation)
+                    }
+                })
+                return;
+            }
         }
+
         setSelected(index)
         dispatch(chooseMode({ isMixed: index == 1 }))
     }