update

ios/hola.xcodeproj/project.pbxproj

@@ -572,7 +572,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -580,7 +580,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -605,14 +605,14 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 45;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				INFOPLIST_FILE = hola/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

ios/hola/Info.plist

@@ -63,13 +63,13 @@
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Allow $(PRODUCT_NAME) to access your microphone</string>
 	<key>NSMotionUsageDescription</key>
-	<string>Allow $(PRODUCT_NAME) to access your device's accelerometer</string>
+	<string>Allow $(PRODUCT_NAME) to access your device&apos;s accelerometer</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>So you can add or update your profile picture, which helps you stand out on the upcoming Community Leaderboard.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>So you can add or update your profile picture, which helps you stand out on the upcoming Community Leaderboard.</string>
 	<key>NSUserNotificationsUsageDescription</key>
-	<string>You'll get reminders at scheduled times.</string>
+	<string>You&apos;ll get reminders at scheduled times.</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>

src/context/locales/en.js

@@ -36,8 +36,8 @@ export default {
         more: {
             title: 'Profile',
             un_login: 'Not logged in',
-            stone: 'Reverse aging stone',
-            stone_desc: 'Member system upgrading, during which metric recording is temporarily exempt from reverse aging stone recording. Please stay tuned.',
+            stone: 'Become Pro',
+            stone_desc: 'More exclusive features for our Pro members are coming up. Stay tuned.',
             setting: 'Settings',
             reset_session: 'Reset session',
             debug_mode: 'Debug mode'
@@ -385,7 +385,7 @@ export default {
             }
         },
         day_night: {
-            night_popover: "Overnight",
+            night_popover: "Night",
             day_popover: "Day",
             limited_free: 'Limited Offer',
             tonight: 'Tonight',

src/context/locales/zh.js

@@ -36,8 +36,8 @@ export default {
         more: {
             title: '我',
             un_login: '未登录',
-            stone: '逆龄石',
-            stone_desc: '会员体系升级中, 期间指标记录限时免逆龄石记录\n敬请期待',
+            stone: '成为 Pro 会员',
+            stone_desc: '更多高级会员专属功能，敬请期待！',
             setting: '设置',
             reset_session: '重置session',
             debug_mode: '走查模式'

src/features/trackTimeDuration/components/Streaks.tsx

@@ -7,6 +7,7 @@ import { getStreaks } from '@/services/trackTimeDuration'
 import dayjs from 'dayjs'
 import { TimeFormatter } from '@/utils/time_format'
 import { rpxToPx } from '@/utils/tools'
+import '../../../pages/clock/Clock.scss'
 
 let GradientText
 let useNavigation;

src/features/trackTimeDuration/components/WeekCalendar.scss

@@ -33,7 +33,7 @@
     margin-left: 8px;
     color: #fff;
     opacity: 0.6;
-    letter-spacing: 0;
+    letter-spacing: -0.5;
 }
 
 .calendar_this_week {

src/pages/clock/Clock.scss

@@ -52,7 +52,9 @@
 }
 
 .index_section {
-    height: 120px;
+    display: flex;
+    margin-top: 12px;
+    height: 92px;
     display: flex;
     flex-direction: row;
     padding-left: 46px;
@@ -70,6 +72,7 @@
 }
 
 .index_section_title {
+    // background-color: red;
     color: #fff;
     opacity: 0.6;
     font-size: 48px;

src/pages/clock/ClockMain.tsx

@@ -135,6 +135,10 @@ export default function Page() {
         dispatch(staticResources() as any);
         console.log('计时器开始')
         pauseTimer = false;
+        mainTimer()
+    }, [])
+
+    function mainTimer(){
         if (timer) {
             clearInterval(timer)
             timer = null
@@ -146,13 +150,15 @@ export default function Page() {
                     global.refrehWeekly()
                 }
             }
+            console.log('9527')
             if (global.pauseIndexTimer || pauseTimer) {
+                console.log('pause')
                 return
             }
             setCount((prevCounter) => prevCounter + 1)
 
         }, 1000)
-    }, [])
+    }
 
 
 
@@ -344,6 +350,7 @@ export default function Page() {
         if (nextAppState == 'active') {
             checkTimeZone()
             updateNotificationStatus()
+            mainTimer()
         }
 
     };
@@ -816,7 +823,7 @@ export default function Page() {
                 </Box>
 
                 {
-                    user.isLogin && records.length > 0 && <View className="index_section" style={{ marginTop: -rpxToPx(25), marginBottom: -rpxToPx(20) }}>
+                    user.isLogin && records.length > 0 && <View className="index_section" style={{ marginTop: -rpxToPx(25-12), marginBottom: -rpxToPx(20) }}>
                         <Text className="index_section_title">{t('feature.track_time_duration.record_fast_sleep.header.latest_record')}</Text>
                         {
                             process.env.TARO_ENV == 'weapp' && <Text className="fast_sleep_more index_more" onClick={more}>{t('feature.track_time_duration.record_fast_sleep.header.btn_show_all')}</Text>
@@ -828,6 +835,9 @@ export default function Page() {
                         }
                     </View>
                 }
+                {
+                    user.isLogin && records.length==0 && <View  style={{ marginTop: -rpxToPx(25) }}/>
+                }
 
                 {
                     user.isLogin && records.length > 0 && <View id="latest" className="fast_sleep_item_bg">
@@ -859,13 +869,13 @@ export default function Page() {
 
 
                 {
-                    user.isLogin && !showErrorPage && <View className="index_section" style={{height:rpxToPx(120)}}>
+                    user.isLogin && !showErrorPage && <View className="index_section" style={{height:rpxToPx(120),marginTop:rpxToPx(40)}}>
                         <Text className="index_main_title">{t('feature.pro.for_pro')}</Text>
                     </View>
                 }
 
                 {
-                    user.isLogin && !showErrorPage && <View className="index_section">
+                    user.isLogin && !showErrorPage && <View className="index_section" style={{marginBottom:-rpxToPx(10),marginTop:-rpxToPx(40)}}>
                         <Text className="index_section_title">{t('feature.day_night.group_title')}</Text>
                     </View>
                 }
@@ -874,13 +884,13 @@ export default function Page() {
                 }
 
                 {
-                    user.isLogin && (process.env.TARO_ENV == 'weapp'||true) && <View className="index_section">
+                    user.isLogin && (process.env.TARO_ENV == 'weapp') && <View className="index_section">
                         <Text className="index_section_title">{t('page.explore.title')}</Text>
                     </View>
                 }
 
                 {
-                    user.isLogin && (process.env.TARO_ENV == 'weapp'||true) && <Discovery />
+                    user.isLogin && (process.env.TARO_ENV == 'weapp') && <Discovery />
                 }
 
                 

src/services/http/api.js

@@ -1,4 +1,4 @@
-const online = process.env.TARO_ENV == 'rn' ? false : false;
+const online = process.env.TARO_ENV == 'rn' ? true : false;
 
 import { WX_VERSION as _WX_VERSION, APP_VERSION as _APP_VERSION } from "../../../config/env";