@ledvance/ui-biz-bundle 1.1.80 → 1.1.82

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.80",
+  "version": "1.1.82",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/timer/TimerPage.tsx

@@ -11,7 +11,7 @@ import Page from "@ledvance/base/src/components/Page";
 import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { Utils, Progress } from 'tuya-panel-kit'
 import { useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { useProgress } from "./TimerPageAction";
+import {timeFormatToRealTime, useProgress} from "./TimerPageAction";
 import { cloneDeep } from "lodash";
 import dayjs from "dayjs";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
@@ -123,14 +123,6 @@ const TimerPage = (props: {theme?: any}) => {
     }
   }
 
-  const getSingleLightEndTimeString = (mCountdown: number) => {
-    const date = new Date()
-    const now = date.getTime()
-    const after = new Date(now + mCountdown * 1000)
-    const timeString = `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
-    return timeString
-  }
-
   const showActiveView = () => {
     return progress.length > 1
   }
@@ -317,7 +309,7 @@ const TimerPage = (props: {theme?: any}) => {
                         />
                         <Text style={{ marginLeft: cx(20), fontSize: cx(22) }}>{getActiveTimeString(timer.progressHook.countdown)}</Text>
                       </View>
-                      <Text>{I18n.formatValue(timer.enable ? timer.stringOff : timer.stringOn, getSingleLightEndTimeString(timer.progressHook.countdown))}</Text>
+                      <Text>{I18n.formatValue(timer.enable ? timer.stringOff : timer.stringOn, timeFormatToRealTime(timer.progressHook.countdown))}</Text>
                     </Card>
                     <Spacer height={cx(40)} />
                   </View>
@@ -363,7 +355,7 @@ const TimerPage = (props: {theme?: any}) => {
                     {I18n.formatValue(
                       runningTimer()[0].enable ?
                         runningTimer()[0].stringOff :
-                        runningTimer()[0].stringOn, getSingleLightEndTimeString(runningTimer()[0].progressHook.countdown)
+                        runningTimer()[0].stringOn, timeFormatToRealTime(runningTimer()[0].progressHook.countdown)
                     )}
                   </Text>
                 </View>

package/src/modules/timer/TimerPageAction.ts

@@ -130,6 +130,13 @@ export const useProgress = (dps: dpItem[]) => {
   }))
 }
 
+export function timeFormatToRealTime(mCountdown: number) {
+  const date = new Date()
+  const now = date.getTime()
+  const after = new Date(now + mCountdown * 1000)
+  return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
+}
+
 export function timeFormat(time: number): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60

package/src/newModules/mood/StaticMoodEditorPage.tsx

@@ -78,7 +78,7 @@ const StaticMoodEditorPage = () => {
       ...state.mood,
       mainLamp: {
         ...state.mood.mainLamp,
-        nodes: [cloneDeep(state.mainNode)],
+        nodes: state.mainNode ? [cloneDeep(state.mainNode)] : [],
       },
       secondaryLamp: {
         ...state.mood.secondaryLamp,
@@ -88,7 +88,7 @@ const StaticMoodEditorPage = () => {
     if (isMix && moduleParams.isMixLight) {
       newMood.secondaryLamp = {
         ...newMood.secondaryLamp,
-        nodes: [cloneDeep(state.secondaryNode)],
+        nodes: state.secondaryNode ? [cloneDeep(state.secondaryNode)] : [],
       };
       newMood.mainLamp.type = 2
       if (moduleParams.isSupportBrightness && !moduleParams.isSupportTemperature) {

package/src/newModules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -505,7 +505,8 @@ const SleepWakeUpDetailPage = () => {
           time={`${convertMinutesTo12HourFormat(
             state.sleepWakeUp.startTime,
             is24HourClock
-          )} - ${convertMinutesTo12HourFormat(state.sleepWakeUp.endTime, is24HourClock)}`}
+          )} - ${convertMinutesTo12HourFormat(state.sleepWakeUp.endTime + (state.sleepWakeUp.isSleep ? 0 : state.sleepWakeUp.last * 5), 
+            is24HourClock)}`}
           actions={(
             <View>
               <Text style={{ fontSize: cx(12), color: '#000000' }}>

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -317,7 +317,7 @@ const SleepWakeUpCard = (props: {
       <Spacer height={cx(16)} />
       <View style={styles.switchLine}>
         <Text style={styles.time}>
-          {`${convertMinutesTo12HourFormat(sleepWakeUp.startTime, is24HourClock)} - ${convertMinutesTo12HourFormat(sleepWakeUp.endTime, is24HourClock)}`}</Text>
+          {`${convertMinutesTo12HourFormat(sleepWakeUp.startTime, is24HourClock)} - ${convertMinutesTo12HourFormat(sleepWakeUp.endTime + (sleepWakeUp.isSleep ? 0 : sleepWakeUp.last * 5), is24HourClock)}`}</Text>
         <SwitchButton
           value={sleepWakeUp.enable}
           thumbStyle={{ elevation: 0 }}
@@ -453,4 +453,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default SleepWakeUpPage
+export default SleepWakeUpPage