update

ios/AppDelegate.mm

@@ -132,7 +132,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 //  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#if DEBUGaa
+#if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];

ios/hola.xcodeproj/project.pbxproj

@@ -576,7 +576,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 86;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -609,7 +609,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 86;
+				CURRENT_PROJECT_VERSION = 89;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				INFOPLIST_FILE = hola/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/hola/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>86</string>
+	<string>89</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

src/app.tsx

@@ -35,7 +35,7 @@ const App: React.FC<PropsWithChildren> = ({ children }) => {
 
   // const dispatch = useDispatch();
 
-
+  Taro.setStorage({ key: 'showedDisqualifiedAlert', data: false })
 
 
   // if (process.env.TARO_ENV == 'rn') {

src/features/trackSomething/components/Metric.tsx

@@ -17,7 +17,7 @@ import MetricModalChoose from "./MetricModalChoose";
 import MetricModalOrder from './MetricModalOrder';
 import MetricModalAdd from "./MetricModalAdd";
 import MetricModalTime from "./MetricModalTime";
-import Modal from "@/components/layout/Modal";
+import Modal from "@/components/layout/Modal.weapp";
 import { rpxToPx } from "@/utils/tools";
 import { AtActivityIndicator } from "taro-ui";
 

src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -66,7 +66,6 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
                 currentStatus == 'PENDING' &&
                 global.ring.current_record.scenario != 'FAST' &&
                 obj.current_record.status == 'WAIT_FOR_START') {
-                debugger
                 loseGain(props.access.fast_sleep)
             }
             else if (currentStatus == 'PROVISIONAL_QUALIFIED') {
@@ -85,6 +84,7 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
 
             }
             else if (currentStatus == 'QUALIFIED_UNTIL_EXPIRE') {
+                
                 Taro.setStorage({ key: 'showedDisqualifiedAlert', data: false })
                 const member_expire = props.access.member.expire
                 if (member_expire && new Date().getTime() > member_expire && obj.current_record.status == 'WAIT_FOR_START' &&
@@ -382,7 +382,6 @@ const CheckAccess = memo((props: { record: any, count: number, access: any }) =>
         // setShowCancel(false)
         // setConfirmText(`I got this!`)
         // timer = setInterval(() => {
-        //     debugger
         //     if (new Date().getTime() > expire) {
         //         cancel()
         //         return

src/features/trackTimeDuration/components/IndexConsole.tsx

@@ -40,7 +40,7 @@ let isTimeout = false
 let stageIndex = 0
 
 let nativePushListener = null
-export default function IndexConsole(props: { record: any, count: number,access:any }) {
+export default function IndexConsole(props: { record: any, count: number, access: any }) {
     const user = useSelector((state: any) => state.user);
     const { status } = props.record.current_record;
     const currentRecord = props.record.current_record;
@@ -398,10 +398,6 @@ export default function IndexConsole(props: { record: any, count: number,access:
         if (now - real_start_time >= dayMilliSeconds) {
             //严重超时
             isTimeout = true
-            // defaultTimestamp = Math.min(props.record.current_record.fast.target_end_time, now)
-            // min = Math.max(last_check_time, defaultTimestamp - 3 * dayMillionSeconds)
-            // max = Math.min(now, defaultTimestamp + 3 * dayMillionSeconds)
-            // debugger
             defaultTimestamp = now
             min = Math.max(last_check_time, defaultTimestamp - 6 * dayMilliSeconds)
             max = defaultTimestamp
@@ -577,13 +573,6 @@ export default function IndexConsole(props: { record: any, count: number,access:
 
         t1 = date.getTime();
 
-        // if (process.env.TARO_ENV=='rn'){
-        //     debugger
-        //     JPush.isNotificationEnabled((res)=>{
-        //         console.log(res)
-        //         debugger
-        //     })
-        // }
 
 
         switch (operateType) {
@@ -596,7 +585,6 @@ export default function IndexConsole(props: { record: any, count: number,access:
                     refreshDayNight()
 
                     if (process.env.TARO_ENV == 'weapp') {
-                        debugger
                         if (permission.wxPubFollow) {
                             // showAlert({
                             //     title: t('feature.track_time_duration.reminders.fast_end_title'),
@@ -860,9 +848,9 @@ export default function IndexConsole(props: { record: any, count: number,access:
                         }
                     </View>
                 }
-                {expand && <View className='btn_line' />}
+                {status == 'WAIT_FOR_START' && expand && <View className='btn_line' />}
                 {
-                    expand && <View onClick={tapEndFast} className={status == 'ONGOING3' ? 'console_btn' : 'console_btn btn_disable'}>
+                    status == 'WAIT_FOR_START' && expand && <View onClick={tapEndFast} className={status == 'ONGOING3' ? 'console_btn' : 'console_btn btn_disable'}>
                         <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32), color: ColorType.black }}>{t('feature.track_time_duration.common.end_fast')}</Text>
                     </View>
                 }
@@ -1017,7 +1005,7 @@ export default function IndexConsole(props: { record: any, count: number,access:
         {
             props.record.scenario.name == 'FAST_SLEEP' ? mixed() : single()
         }
-        <CheckAccess record={props.record} count={props.count} access={props.access}/>
+        <CheckAccess record={props.record} count={props.count} access={props.access} />
     </View>
 
 }

src/features/trackTimeDuration/components/WeekCalendar.tsx

@@ -36,8 +36,6 @@ const WeekCalendar = memo((props: { isFastSleep: boolean }) => {
     const ref = useRef(null)
     const pageSize = 40
 
-    console.log('aaaaa')
-
     useEffect(() => {
         // pageIndex = -1
         getRecords()

src/pages/clock/Clock.tsx

@@ -5,12 +5,24 @@ import { View } from "@tarojs/components";
 import Taro, { useDidHide, useShareAppMessage } from "@tarojs/taro";
 import { useEffect, useState } from "react";
 import { useDispatch } from "react-redux";
-import Clock from "./ClockMain";
+import ClockMain from "./ClockMain";
 import { useTranslation } from "react-i18next";
-export default function ClockMain() {
+
+let useNavigation;
+
+if (process.env.TARO_ENV == 'rn') {
+    useNavigation = require("@react-navigation/native").useNavigation
+}
+
+export default function Clock() {
     const dispatch = useDispatch();
     const [loaded, setLoaded] = useState(false)
-    const {t} = useTranslation()
+    const { t } = useTranslation()
+    let navigation;
+    if (useNavigation) {
+        navigation = useNavigation()
+    }
+    
 
     if (process.env.TARO_ENV == 'weapp') {
         useShareAppMessage((e) => {
@@ -20,8 +32,13 @@ export default function ClockMain() {
             }
         })
     }
-    
+
     useEffect(() => {
+        if (navigation) {
+            navigation.setOptions({
+                headerTitle: '',
+            });
+        }
         if (process.env.TARO_ENV == 'weapp') {
             loadWXCache()
         }
@@ -62,11 +79,6 @@ export default function ClockMain() {
         }
 
         setLoaded(true)
-        // //测试直接登录
-        // else {
-        //     userData = '{"metrics_times":0,"ongoing":false,"id":"fe6641e66a0e411937a52511e19851cd","mobile_bind":false,"mobile":"","avatar":"https://api.fast.dev.liveplus.fun/api/avatars/fast_441b5a21.svg","nickname":"fast_441b5a21","type":"GENERAL","lv":1,"invite_code":"LVQ5","input_invite_code":true,"reg_time":1712838856000,"login_bind":{"wx":false,"wx_mp":false,"wx_pub":false,"qq":false,"weibo":false},"test_user":true,"manager_user":false,"web_user":false,"rjv_balance":0,"day_level":1,"scenario_select_count":77,"push_enabled":false,"is_new_user":true,"lang":"en","timezone":{},"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZmU2NjQxZTY2YTBlNDExOTM3YTUyNTExZTE5ODUxY2QiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJmYXN0XzQ0MWI1YTIxIiwidHlwIjoiQmVhcmVyIiwic2Vzc2lvbl9zdGF0ZSI6IjA0NTcxOGYzN2Y5NTYzYjcxMTNkMWZhODI5NmE2MjQ2IiwiZXhwIjoxNzQ2Njg4NTYxLCJpYXQiOjE3MTUxNTI1NjF9.x1CguOILCTjT8lKcEdSEeuS9ACc5QK2G4Rxmcz9OMLQ","need_improve":false}'
-        //     dispatch(getInfoSuccess(JSON.parse(userData)));
-        // }
     }
 
     async function getStorage(key: string) {
@@ -79,7 +91,7 @@ export default function ClockMain() {
     }
 
     if (loaded) {
-        return <Clock />
+        return <ClockMain />
     }
 
 

src/pages/clock/ClockMain.tsx

@@ -140,8 +140,6 @@ export default function Page() {
 
         if (process.env.TARO_ENV == 'rn') {
             NativeAppEventEmitter.addListener('openNotificationSetting', (data) => {
-                console.log('aaaa')
-                debugger
                 jumpPage('/pages/account/ChooseAuth', 'NotificationSetting', navigation)
             })
         }
@@ -180,9 +178,6 @@ export default function Page() {
 
     useEffect(() => {
         getCheckData()
-
-
-
         if (user.isLogin) {
             uploadUserClient();
             checkAuthorized();
@@ -510,7 +505,6 @@ export default function Page() {
                     }, 100)
                 }
                 else {
-                    // debugger
                     // (scrollRef.current as any).scrollTo({ y: rpxToPx(400), animated: true })
                 }
             }

src/pages/rn/RNMain.tsx

@@ -3,7 +3,7 @@ import { NavigationContainer } from '@react-navigation/native';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
 import { createStackNavigator } from '@react-navigation/stack';
 
-import Clock from '../clock/ClockMain'
+import Clock from '../clock/Clock'
 import Metric from '../metric/Metric'
 import Workout from '../workout/Workout'
 import Profile from '../account/Profile'