update

src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -321,7 +321,7 @@ export default function CheckAccess(props: { record: any, count: number }) {
             dispatch(updateStep({ step: 2 }))
             dispatch(chooseMode({ isMixed: true }))
             setCheckChooseMixed(true)
-            jumpPage(`/pages/clock/SetGoal`, 'SetGoal', navigation, {})
+            jumpPage(`/pages/clock/SetGoal?upgrade=true`, 'SetGoal', navigation, {})
             confirmAction = goSetting
         })
 
@@ -331,6 +331,7 @@ export default function CheckAccess(props: { record: any, count: number }) {
         const { start_time, end_time } = global.ring.schedule.fast
         var params: any = {
             scenario: 'FAST_SLEEP',
+            trigger_event:'PROVISIONAL_UPGRADE_KEEP',
             schedule: {
                 fast: {
                     start_time: start_time,

src/pages/clock/SetGoal.tsx

@@ -16,7 +16,7 @@ import showAlert from "@/components/basic/Alert";
 import Taro from "@tarojs/taro";
 
 export default function SetGoal() {
-    
+
     let router
     var navigation: any = null
     if (process.env.TARO_ENV === 'rn') {
@@ -165,8 +165,8 @@ export default function SetGoal() {
                     start_time: fastTarget.start_time,
                     end_time: fastTarget.end_time,
                     method: parseInt(router.params.isSelf + '') == 1 ? 'USER_SET' : 'SUGGEST',
-                    duration:{
-                        input_value:target.fast.schedule.fast.duration.init_value,
+                    duration: {
+                        input_value: target.fast.schedule.fast.duration.init_value,
                     }
                 },
             }
@@ -181,8 +181,8 @@ export default function SetGoal() {
                 latency: {
                     input_value: target.sleep.schedule.sleep.latency.init_value,
                 },
-                cycle:{
-                    num:{
+                cycle: {
+                    num: {
                         input_value: target.sleep.schedule.sleep.cycle.num.init_value,
                     }
                 }
@@ -192,6 +192,13 @@ export default function SetGoal() {
             params.scenario = 'FAST'
         }
 
+        if (router.params.upgrade) {
+            params.trigger_event = 'PROVISIONAL UPGRADE SET'
+        }
+        else {
+            params.trigger_event = 'SET'
+        }
+
         setPlan(params).then(res => {
             if (global.checkData) {
                 global.checkData()
@@ -279,20 +286,20 @@ export default function SetGoal() {
         // }
     }
 
-    function isNextDay(isFast: boolean, isStart: boolean){
-        var time = fastTarget.start_time.split(':')[0]*60+fastTarget.start_time.split(':')[1]*1
-        if (isFast){
-            var time2 = fastTarget.end_time.split(':')[0]*60+fastTarget.end_time.split(':')[1]*1
-            return time2<=time
+    function isNextDay(isFast: boolean, isStart: boolean) {
+        var time = fastTarget.start_time.split(':')[0] * 60 + fastTarget.start_time.split(':')[1] * 1
+        if (isFast) {
+            var time2 = fastTarget.end_time.split(':')[0] * 60 + fastTarget.end_time.split(':')[1] * 1
+            return time2 <= time
         }
         else {
-            if (isStart){
-                time2 = sleepTarget.start_time.split(':')[0]*60+sleepTarget.start_time.split(':')[1]*1
-                return time2<=time
+            if (isStart) {
+                time2 = sleepTarget.start_time.split(':')[0] * 60 + sleepTarget.start_time.split(':')[1] * 1
+                return time2 <= time
             }
             else {
-                time2 = sleepTarget.end_time.split(':')[0]*60+sleepTarget.end_time.split(':')[1]*1
-                return time2<=time
+                time2 = sleepTarget.end_time.split(':')[0] * 60 + sleepTarget.end_time.split(':')[1] * 1
+                return time2 <= time
             }
         }
     }
@@ -350,7 +357,7 @@ export default function SetGoal() {
                         setShowTimePicker(true)
                     }}>
                         <Text className="cell_title">Go to bed</Text>
-                        <Text className="cell_value" style={{ color: ColorType.sleep }}>{isNextDay(false,true)?'次日 ':' '}{sleepTarget.start_time}</Text>
+                        <Text className="cell_value" style={{ color: ColorType.sleep }}>{isNextDay(false, true) ? '次日 ' : ' '}{sleepTarget.start_time}</Text>
                         <Image className="cell_arrow" src={require('@/assets/images/arrow3.png')} />
                         <View className="cell_line" style={{ height: 1 }} />
                     </View>
@@ -363,7 +370,7 @@ export default function SetGoal() {
                     }}>
                         <Text className="cell_title">Wake up</Text>
 
-                        <Text className="cell_value" style={{ color: ColorType.sleep }}>{isNextDay(false,false)?'次日 ':' '}{sleepTarget.end_time}</Text>
+                        <Text className="cell_value" style={{ color: ColorType.sleep }}>{isNextDay(false, false) ? '次日 ' : ' '}{sleepTarget.end_time}</Text>
                         <Image className="cell_arrow" src={require('@/assets/images/arrow3.png')} />
                     </View>
                 }
@@ -374,7 +381,7 @@ export default function SetGoal() {
                 }}>
                     <Text className="cell_title">End fasting</Text>
 
-                    <Text className="cell_value" style={{ color: ColorType.fast }}>{isNextDay(true,false)?'次日 ':' '}{fastTarget.end_time}</Text>
+                    <Text className="cell_value" style={{ color: ColorType.fast }}>{isNextDay(true, false) ? '次日 ' : ' '}{fastTarget.end_time}</Text>
                     <Image className="cell_arrow" src={require('@/assets/images/arrow3.png')} />
                 </View>
             </View>