Leon 1 ano atrás
pai
commit
87f7b9cc4b
3 arquivos alterados com 26 adições e 6 exclusões
  1. 1 1
      config/env.ts
  2. 22 2
      src/pages/clock/SetGoal.tsx
  3. 3 3
      src/pages/clock/Suggest.tsx

+ 1 - 1
config/env.ts

@@ -1,3 +1,3 @@
 
 export const APP_VERSION = '1.0.1'
-export const WX_VERSION = '1.4.2'
+export const WX_VERSION = '1.4.3'

+ 22 - 2
src/pages/clock/SetGoal.tsx

@@ -57,6 +57,15 @@ export default function SetGoal() {
         setFastDuration(str)
     }
 
+    function getFastDurationMinutes(){
+        var obj = target.fast.schedule.fast
+        var duration = obj.end_time.split(':')[0] * 60 + obj.end_time.split(':')[1] * 1 - (obj.start_time.split(':')[0] * 60 + obj.start_time.split(':')[1] * 1)
+        if (duration <= 0) {
+            duration += 24 * 60
+        }
+        return duration
+    }
+
     function getSleepDuration() {
         var obj = target.sleep.schedule.sleep
         var duration = obj.end_time.split(':')[0] * 60 + obj.end_time.split(':')[1] * 1 - (obj.start_time.split(':')[0] * 60 + obj.start_time.split(':')[1] * 1)
@@ -69,6 +78,15 @@ export default function SetGoal() {
         setSleepDuration(str)
     }
 
+    function getSleepDurationMinutes(){
+        var obj = target.sleep.schedule.sleep
+        var duration = obj.end_time.split(':')[0] * 60 + obj.end_time.split(':')[1] * 1 - (obj.start_time.split(':')[0] * 60 + obj.start_time.split(':')[1] * 1)
+        if (duration <= 0) {
+            duration += 24 * 60
+        }
+        return duration
+    }
+
     function hidePicker() {
         setShowTimePicker(false)
     }
@@ -166,7 +184,7 @@ export default function SetGoal() {
                     start_time: fastTarget.start_time,
                     end_time: fastTarget.end_time,
                     duration: {
-                        input_value: target.fast.schedule.fast.duration.init_value,
+                        input_value: getFastDurationMinutes()//target.fast.schedule.fast.duration.init_value,
                     }
                 },
             }
@@ -176,7 +194,9 @@ export default function SetGoal() {
             params.schedule.sleep = {
                 start_time: sleepTarget.start_time,
                 end_time: sleepTarget.end_time,
-                
+                duration:{
+                    input_value:getSleepDurationMinutes()
+                },
                 latency: {
                     input_value: target.sleep.schedule.sleep.latency.init_value,
                 },

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

@@ -58,15 +58,15 @@ export default function Suggest() {
                     recommendIndex = i
                 }
                 var fast = JSON.parse(JSON.stringify(target.fast))
-                var startCount = fast.schedule.fast.end_time.split(':')[0] * 60 + fast.schedule.fast.end_time.split(':')[1] * 1 - obj.duration.options[i] * 60
+                var startCount = fast.schedule.fast.end_time.split(':')[0] * 60 + fast.schedule.fast.end_time.split(':')[1] * 1 - obj.duration.options[i]
                 if (startCount < 0) {
                     startCount += 24 * 60
                 }
                 var start = TimeFormatter.padZero(Math.floor(startCount / 60)) + ':' + TimeFormatter.padZero(startCount % 60)
 
                 array.push({
-                    hours: obj.duration.options[i],
-                    left: 24 - obj.duration.options[i],
+                    hours: obj.duration.options[i]/60,
+                    left: 24 - obj.duration.options[i]/60,
                     // minutes: obj.duration.minutes[i],
                     // number: obj.duration.numbers[i],
                     time: start