leon 1 vuosi sitten
vanhempi
commit
7870315780

+ 2 - 1
src/context/locales/en.js

@@ -365,7 +365,8 @@ export default {
                 current: 'Current',
                 longest: 'Longest',
                 no_data:'Start a new streak today!',
-                countdown_title:'Don\'t lose your {{name}}. Keep it going!',
+                countdown_title:'Don\'t lose your streak. Keep it going!',
+                countdown_titles:'Don\'t lose your streaks. Keep them going!',
                 countdown_fast:'Current fast streak will reset to zero in {{time}}.',
                 countdown_sleep:'Current sleep streak will reset to zero in {{time}}.'
             },

+ 1 - 0
src/context/locales/zh.js

@@ -369,6 +369,7 @@ export default {
                 longest: '最长保持',
                 no_data:'从今天开始新的连续纪录吧!',
                 countdown_title:'别让连续纪录终止, 将它一直保持下去!',
+                countdown_titles:'别让连续纪录终止, 将它们一直保持下去!',
                 countdown_fast:'当前断食连续天数将在 {{time}} 后重置归零。',
                 countdown_sleep:'当前睡眠连续天数将在 {{time}} 后重置归零。'
             },

+ 6 - 1
src/features/trackTimeDuration/components/Streaks.tsx

@@ -68,10 +68,15 @@ export default function Streaks(props: { count: number }) {
             (fastStreaks.current.reset_ts || sleepStreaks.current.reset_ts) &&
             <View className='streaks_countdown_bg'>
                 <View className='streak_countdown_item'>
-                    {
+                    {/* {
                         process.env.TARO_ENV == 'weapp' ? <Text className='streak_countdown_title'>{t('feature.track_time_duration.streaks.countdown_title', { name: (fastStreaks.current.reset_ts && sleepStreaks.current.reset_ts) ? 'streaks' : 'streak' })}</Text> :
                             <GradientText style={{ fontSize: rpxToPx(18), fontWeight: 'bold' }}>{t('feature.track_time_duration.streaks.countdown_title', { name: (fastStreaks.current.reset_ts && sleepStreaks.current.reset_ts) ? 'streaks' : 'streak' })}</GradientText>
 
+                    } */}
+                    {
+                        process.env.TARO_ENV == 'weapp' ? <Text className='streak_countdown_title'>{(fastStreaks.current.reset_ts && sleepStreaks.current.reset_ts)?t('feature.track_time_duration.streaks.countdown_titles'):t('feature.track_time_duration.streaks.countdown_title')}</Text> :
+                            <GradientText style={{ fontSize: rpxToPx(18), fontWeight: 'bold' }}>{(fastStreaks.current.reset_ts && sleepStreaks.current.reset_ts)?t('feature.track_time_duration.streaks.countdown_titles'):t('feature.track_time_duration.streaks.countdown_title')}</GradientText>
+
                     }
                 </View>
                 {

+ 3 - 3
src/pages/clock/Clock.tsx

@@ -245,16 +245,16 @@ export default function Page() {
             return;
         }
 
-        const showAlert1 = await getStorage('119alert') || false;
+        const showAlert1 = await getStorage('120alert') || false;
         if (!showAlert1) {
             showAlert({
                 title: '版本更新提示',
-                content: '此次升级我们推出了「连续纪录」统计:\n🔥 目前连续纪录保持天数;\n🔥 最长连续纪录保持天数;\n\n无论您的目标是瘦身还是追求最佳健康状态, 坚持行动是成功的关键, 我们会在您成功的路上全力支持、持续陪伴。',
+                content: '「连续纪录」新增归零倒计时提示⏳\n别让连续记录终止, 将它们一直保持下去!',
                 showCancel: false,
                 confirmText: '我知道了'
             })
         }
-        Taro.setStorage({ key: '119alert', data: true })
+        Taro.setStorage({ key: '120alert', data: true })
 
     }
 

+ 0 - 2
src/pages/common/H5.tsx

@@ -30,8 +30,6 @@ export default function Page() {
 
 
     useEffect(() => {
-        
-
         if (process.env.TARO_ENV == 'rn') {
             navigation.setOptions({ title: router.params.title ?? '' });
         }

+ 1 - 1
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' ? false : true;
 
 import { WX_VERSION as _WX_VERSION, APP_VERSION as _APP_VERSION } from "../../../config/env";