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 = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -605,7 +605,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 105;
+				CURRENT_PROJECT_VERSION = 106;
 				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>105</string>
+	<string>106</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

src/app.config.ts

@@ -6,7 +6,6 @@ const appConfig = defineAppConfig({
     'pages/clock/SetGoal',
     'pages/demo',
     'pages/food/Food',
-    'pages/index/index',
     'pages/account/Login',
     'pages/account/Auth',
     'pages/account/ChooseAuth',

src/context/locales/en.js

@@ -14,7 +14,7 @@ export default {
     },
     page: {
         clock: {
-            title: 'Today',
+            title: 'Circadian',
         },
         reminders:{
             title:'Reminders',
@@ -45,7 +45,7 @@ export default {
             reset_session: 'Reset session',
             debug_mode: 'Debug mode',
             pro_member:'Pro Member',
-            member_desc:'Premium access to Pro features till {{time}}',
+            member_desc:'Premium access to Pro features till {{time}}.',
         },
         choose_scenario: {
             title: 'Select Circadian Clock',
@@ -468,13 +468,13 @@ export default {
                 schedule: 'Schedule',
                 current_schedule: 'Current Schedule',
                 share_title: 'My Fasting Sleep Diary',
-                start_fast: 'Start fasting',//正常态
+                start_fast: 'Start fast',//正常态
                 started_fasting: 'Started fasting',//完成时
-                end_fast: 'End fasting',
+                end_fast: 'End fast',
                 ended_fasting: 'Ended fasting',
-                start_sleep: 'Start sleeping',
+                start_sleep: 'Go to bed',
                 started_sleeping: 'Started sleeping',
-                end_sleep: 'End sleeping',
+                end_sleep: 'Wake up',
                 ended_sleeping: 'Ended sleeping',
                 start_fasting_first: 'Start fasting first.',
                 okay: 'Okay',
@@ -580,8 +580,8 @@ export default {
 
             },
             console: {
-                fast_start: 'Start fasting',
-                fast_end: 'End fasting',
+                fast_start: 'Start fast',
+                fast_end: 'End fast',
                 sleep_start: 'Start sleeping',
                 sleep_end: 'End sleeping',
                 total_duration: 'Total duration',
@@ -591,13 +591,13 @@ export default {
                 real_duration: 'Actual',
                 fast_duration: 'Fasting target duration',
                 sleep_duration: 'Sleep target duration',
-                real_fast_start_dt: 'Start time for fasting',
+                real_fast_start_dt: 'Start Time for Fasting',
                 real_fast_start_tip: 'Expected end time: {{time}}',
-                real_fast_end_dt: 'End time for fasting',
+                real_fast_end_dt: 'End Time for Fasting',
                 real_fast_end_tip: 'Expected end time: {{time}}',
                 real_sleep_start_dt: 'Bedtime',
                 real_sleep_start_tip: 'Expected wake-up time: {{time}}',
-                real_sleep_end_dt: 'Wake-up time',
+                real_sleep_end_dt: 'Wake-up Time',
                 real_sleep_end_tip: 'Expected wake-up time: {{time}}',
                 target: 'Target',
                 lock_fast_tip: 'Start fasting first.',
@@ -702,13 +702,13 @@ export default {
                 multi_selection: 'Multiple Selection'
             },
             weekly: {
-                show_eating_window:'Show eating and activity windows',
+                show_eating_window:'Eating and Wake Windows',
                 current_week: 'Current week',
-                title: 'Weekly',
-                fast_average: 'Avg. Fasting',
+                title: 'Windows',
+                fast_average: 'Avg. Fast',
                 sleep_average: 'Avg. Sleep',
                 eat_average:'Avg. Eating',
-                wake_average:'Avg. Activity',
+                wake_average:'Avg. Wake',
                 back:'Back'
             },
             log_timing:{

src/context/locales/zh.js

@@ -14,7 +14,7 @@ export default {
     },
     page: {
         clock: {
-            title: '今天',
+            title: '生物钟',
         },
         reminders:{
             title:'提醒',
@@ -42,7 +42,7 @@ export default {
             stone: '成为 Pro 会员',
             stone_desc: '更多高级会员专属功能，敬请期待！',
             pro_member:'Pro 会员',
-            member_desc:'{{time}} 到期',
+            member_desc:'{{time}} 到期。',
             setting: '设置',
             reset_session: '重置session',
             debug_mode: '走查模式'
@@ -473,9 +473,9 @@ export default {
                 started_fasting: '开始断食',//完成时
                 end_fast: '结束断食',
                 ended_fasting: '结束断食',
-                start_sleep: '开始睡眠',
+                start_sleep: '就 寝',
                 started_sleeping: '开始睡眠',
-                end_sleep: '结束睡眠',
+                end_sleep: '起 床',
                 ended_sleeping: '结束睡眠',
                 start_fasting_first: '开始断食后可设置',
                 okay: '好的',
@@ -700,7 +700,7 @@ export default {
                 multi_selection: '多选'
             },
             weekly: {
-                show_eating_window:'显示进食和活动窗口',
+                show_eating_window:'进食与活动时间',
                 current_week: '本周',
                 title: '每周趋势',
                 fast_average: '平均断食',

src/features/trackTimeDuration/components/TitleView.scss

@@ -19,7 +19,6 @@
     font-size: 72px;
     line-height: 72px;
     font-weight: bold;
-
 }
 
 .title_bg{

src/pages/account/Profile.tsx

@@ -171,13 +171,21 @@ export default function Page() {
         </TitleView>
     }
 
-    function member_expire() {
+    function memberdesc(){
+        if (!accessObj.access){
+            return ''
+        }
         if (accessObj.access.member.type == 'NON_CONSUMABLE') {
             return 'Unlimited premium access to Pro features forever.'
         }
         if (accessObj.access.member.type == 'AUTO_RENEW') {
             return 'Premium access to Pro features during membership.'
         }
+        return t('page.more.member_desc', { time: member_expire() })
+    }
+
+    function member_expire() {
+        
         if (global.language == 'en') {
             return dayjs(accessObj.access.member.expire).format('MMM D HH:mm')
         }
@@ -215,7 +223,8 @@ export default function Page() {
                     </View> :
                         <View className="balance" onClick={tapBalance}>
                             <Text className="title">{t('page.more.pro_member')}</Text>
-                            <Text className="desc">{t('page.more.member_desc', { time: member_expire() })}</Text>
+                            <Text className="desc">{memberdesc()}</Text>
+                            {/* <Text className="desc">{t('page.more.member_desc', { time: member_expire() })}</Text> */}
                         </View>
                 }
 

src/pages/clock/ClockMain.tsx

@@ -841,7 +841,7 @@ export default function Page() {
             </View>
             <WeekCalendar isFastSleep={false} />
             <View className="vip_calendar" style={{ marginBottom: 40 }} onClick={() => setShowEatCalendar(false)}>
-                <Text style={{ color: '#fff' }}>{t('feature.track_time_duration.weekly.back')}</Text>
+                <Text style={{ color: '#fff',fontWeight:'bold' }}>{t('feature.track_time_duration.weekly.back')}</Text>
             </View>
         </View>
     }
@@ -929,7 +929,7 @@ export default function Page() {
                         <View className="vip_calendar" onClick={() => setShowEatCalendar(true)}>
                             {
                                 process.env.TARO_ENV == 'weapp' ? <Text className="eat_calendar_text">{t('feature.track_time_duration.weekly.show_eating_window')}</Text> :
-                                    <GradientText style={{ fontSize: rpxToPx(28), color: 'black' }} colors={[ColorType.food, ColorType.activity]}>{t('feature.track_time_duration.weekly.show_eating_window')}</GradientText>
+                                    <GradientText style={{ fontSize: rpxToPx(28), color: 'black',fontWeight:'bold' }} colors={[ColorType.food, ColorType.activity]}>{t('feature.track_time_duration.weekly.show_eating_window')}</GradientText>
                             }
 
                         </View>

src/pages/index/index.config.ts

@@ -1,7 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '首页',
-  usingComponents:{
-    // 'ec-canvas': '../../lib/ec-canvas/ec-canvas',
-    // 'demo':'../../components/demo'
-  }
-})

src/pages/index/index.scss

@@ -1,14 +0,0 @@
-.canvas-container {
-    width: 100%;
-    height: 500px;
-  }
-
-.demo{
-    width: 749px;
-    height: 30px;
-    background-color: aqua;
-}
-
-.login{
-  color: red;
-}

src/pages/index/index.tsx

@@ -1,133 +0,0 @@
-import { Component, PropsWithChildren, useEffect } from 'react'
-import { View, Text, Button, Input } from '@tarojs/components'
-// import './index.scss'
-import Taro, { useReady } from '@tarojs/taro'
-// import ComponentA from './component'
-import Rings from '@components/view/Rings';
-import SingleSelect from '@/components/input/SingleSelect';
-import { useDispatch, useSelector } from 'react-redux';
-import { getInfoSuccess } from '@/store/user';
-import { wxPubFollow } from '@/services/permission';
-import { staticResources } from '@/services/common';
-import { use } from 'i18next';
-import { jumpPage } from '@/features/trackTimeDuration/hooks/Common';
-// import TabBar from '../../components/Tabbar';
-
-export default function IndexPage() {
-  const dispatch = useDispatch();
-  const array: any[] = []
-  const user = useSelector((state: any) => state.user);
-  const permission = useSelector((state: any) => state.permission);
-  const common = useSelector((state: any) => state.common);
-  array.push('ffff');
-  array.push(<Text>ffff</Text>)
-  // array.push(<Rings radius={50}/>)
-
-  useEffect(() => {
-    dispatch(staticResources() as any);
-  }, [])
-
-
-
-  useReady(async () => {
-    const userData = await getStorage('userData');
-    if (userData) {
-      dispatch(getInfoSuccess(JSON.parse(userData as string)) as any);
-      // return JSON.parse(userData as string) as UserState;
-      setTimeout(() => {
-        checkWXPubFollow()
-      }, 200)
-    }
-  })
-
-  function checkWXPubFollow() {
-  }
-
-  function followWxPub() {
-    const resource = common.resources.filter((item: any) => {
-      return item.code == 'follow_wx_pub'
-    })
-
-    Taro.showModal({
-      title: '提示',
-      content: '关注公众号后可接收提醒\n点击确定，前往关注',
-      showCancel: true,
-      success(result) {
-        if (result.confirm) {
-          jumpPage('/pages/common/H5?title=fast16cc 关注服务号&url=' + resource[0].url)
-        }
-      },
-    })
-  }
-
-
-  async function getStorage(key: string) {
-    try {
-      const res = await Taro.getStorage({ key });
-      return res.data;
-    } catch {
-      return '';
-    }
-  }
-
-  function goDetail() {
-  }
-
-  function login() {
-    if (user.isLogin) {
-      Taro.navigateTo({
-        url: '/pages/ChooseScenario'
-      })
-    }
-    else {
-      Taro.navigateTo({
-        url: '/pages/ChooseAuth'
-      })
-    }
-
-  }
-  return (
-    <View style={{ backgroundColor: '#fff', flex: 1, flexDirection: 'column', display: 'flex' }}>
-      <Text>homepage12234</Text>
-      <Text>{user.isLogin ? '已登录' : '未登录'}</Text>
-      <Text>{user.isLogin ? `用户昵称：${user.nickname}` : ''}</Text>
-      {
-        permission.wxPubFollow == false && <Text onClick={() => followWxPub()}>去关注公众号</Text>
-      }
-      {/* <ComponentA value="ABBBB" /> */}
-      <Button onClick={() => goDetail()}>go detail</Button>
-      {/* <SingleSelect items={array}></SingleSelect> */}
-      <Rings radius={50} />
-      <Input placeholder="请输入用户名1" style={{ textAlign: 'left', backgroundColor: 'pink' }} />
-      <Text className='login' onClick={() => login()}>sss</Text>
-      {/* <TabBar /> */}
-    </View>
-  )
-}
-
-// export default class Index extends Component<PropsWithChildren> {
-
-//   componentDidMount () { }
-
-//   componentWillUnmount () { }
-
-//   componentDidShow () { }
-
-//   componentDidHide () { }
-
-//   goDetail(){
-//     Taro.navigateTo({
-//       url: '/pages/index/detail'
-//     })
-//   }
-
-//   render () {
-//     return (
-//       <View className='index'>
-//         <Text>Hello world123!</Text>
-//         <ComponentA value="A"/>
-//         <Button onClick={()=>this.goDetail()}>detail</Button>
-//       </View>
-//     )
-//   }
-// }

src/pages/index/indexecharts.jsx

@@ -1,75 +0,0 @@
-import { Component, PropsWithChildren } from 'react'
-import { View, Text } from '@tarojs/components'
-import * as echarts from '../../lib/ec-canvas/echarts'
-import './index.scss'
-
-export default class Index extends Component {
-  // this.state = {
-  //   ec:{
-  //     onInit:function(){}
-  //   }
-  // }
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      ec: {
-        onInit: function (canvas, width, height) {
-          const chart = echarts.init(canvas, null, {
-            width: width,
-            height: height
-          });
-          canvas.setChart(chart);
-          const option = {
-            title: {
-              text: 'ECharts 入门示例'
-            },
-            tooltip: {},
-            legend: {
-              data: ['销量']
-            },
-            xAxis: {
-              data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
-            },
-            yAxis: {},
-            series: [
-              {
-                name: '销量',
-                type: 'bar',
-                data: [5, 20, 36, 10, 10, 20]
-              }
-            ]
-          };
-          chart.setOption(option)
-          return chart;
-        }
-      }
-    }
-  }
-  componentDidMount() { }
-
-  componentWillUnmount() { }
-
-  componentDidShow() { }
-
-  componentDidHide() { }
-
-  callback(e){
-  }
-
-  render() {
-    return (
-      <View className='index'>
-        <Text>Hello world!</Text>
-        <View className='canvas-container'>
-          <ec-canvas id='mychart-dom-bar' canvas-id='mychart-bar' ec={this.state.ec}></ec-canvas>
-        </View>
-        <demo content="hi" detail={{a:'1',b:2}} onApple={(e)=>{
-          debugger
-        }}/>
-        <Text>Just say hi</Text>
-        <View className='demo'></View>
-      </View>
-    )
-  }
-}

src/pages/notification/setting.scss

@@ -119,4 +119,12 @@
 /* #ifdef rn */
 .myswitch{
 }
-/* #endif */
+/* #endif */
+
+.new_item_cell_line{
+    height: 1px;
+    background-color: #fff;
+    opacity: 0.2;
+    margin-left: 40px;
+    transform: scaleY(0.5);
+}

src/pages/notification/setting.tsx

@@ -257,11 +257,11 @@ export default function Page() {
             {/* <Text style={{fontSize:30,color:'#fff'}} onClick={iap}>iap test</Text> */}
             <View className="setting_container">
                 <View className="setting_section">
-                    <Text className="setting_section_title">Fasting & Sleep</Text>
+                    <Text className="setting_section_title">Fast & Sleep</Text>
                 </View>
                 <Text className="setting_header">Reminders</Text>
                 <View className="setting_cell">
-                    <Text className="setting_cell_title" style={{ flex: 1 }}>At my scheduled time</Text>
+                    <Text className="setting_cell_title" style={{ flex: 1 }}>At schedule time</Text>
                     {
                         isLogin ? <Text className="setting_cell_value1">{systemFast ? 'Always' : 'Off'}</Text> :
                             <Text className="setting_cell_value1">Off</Text>
@@ -306,9 +306,9 @@ export default function Page() {
                 </View>
                 <Text className="setting_footer">In case you missed your previous action, receive another reminder to log it together with the current one. This gives you extra protection against any streak loss.</Text>
                 <View className="setting_section">
-                    <Text className="setting_section_title">The Sun (PRO)</Text>
+                    <Text className="setting_section_title">The Sun (Pro)</Text>
                 </View>
-                <Text className="setting_header">Reminders for Your Daily Local Salor Times</Text>
+                <Text className="setting_header">Reminders for Your Daily Local Solar Times</Text>
                 <View className="setting_cell_group">
                     <View className="setting_cell_group_item">
                         <Text className="setting_cell_title" style={{ flex: 1 }}>Sunrise</Text>
@@ -346,6 +346,7 @@ export default function Page() {
                             })
                         }} />
                     </View>
+                    <View className="new_item_cell_line" />
                     <View className="setting_cell_group_item">
                         <Text className="setting_cell_title" style={{ flex: 1 }}>Sunset</Text>
                         <Switch className="myswitch" value={isLogin ? isSunset : false} trackColor={{ true: ColorType.fast }} color={ColorType.fast} onChange={(e) => {
@@ -381,8 +382,9 @@ export default function Page() {
                             })
                         }} />
                     </View>
+                    <View className="new_item_cell_line" />
                     <View className="setting_cell_group_item">
-                        <Text className="setting_cell_title" style={{ flex: 1 }}>Solar Noon</Text>
+                        <Text className="setting_cell_title" style={{ flex: 1 }}>Solar noon</Text>
                         <Switch className="myswitch" value={isLogin ? isSolarNoon : false} trackColor={{ true: ColorType.fast }} color={ColorType.fast} onChange={(e) => {
                             // setIsMulti(e.nativeEvent.value)
                             if (!isLogin) {
@@ -418,7 +420,7 @@ export default function Page() {
                         }} />
                     </View>
                 </View>
-                <Text className="setting_footer">Note if live in polar region, during time of Polar Day (Midnight Sun) when the Sun is up all day and during time of Polar Night when the Sun is down all day, the only reminder available is for daily Solar Noon.</Text>
+                <Text className="setting_footer">Note for polar region, during Polar Day (Midnight Sun) when the Sun is up all day or Polar Night when the Sun is down all day, the only reminder available is the daily Solar Noon.</Text>
             </View>
         </ScrollView>
     }