@ledvance/ui-biz-bundle 1.1.79 → 1.1.81

package/package.json

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

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

package/src/newModules/timeSchedule/Interface.ts

@@ -103,6 +103,7 @@ export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
   | { type: DeviceType.StripLight; deviceData: StripLightData }
+  | { type: DeviceType.CeilingLight; deviceData: StripLightData }
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { type: DeviceType.PowerStrip; deviceData: DeviceData}
 

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -458,6 +458,7 @@ const TimeScheduleDetailPage = (props: { theme?: any }) => {
             isSupportTemperature={params.isSupportTemperature}
             isStripLight={params.isStripLight}
             isCeilingLight={params.isCeilingLight}
+            isUVCFan={params.isUVCFan}
             manualData={state.manualData}
             onManualChange={manual => {
               state.manualData = {
@@ -639,10 +640,9 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
              : deviceType === DeviceType.FanLight
              ? defFanLightDeviceData
              : defDeviceData;
-  
+
   return {
-    // @ts-ignore
-    type: deviceType,
+    type: deviceType as any, 
     deviceData: {
       ...deviceData,
       isColorMode: props.isSupportColor,

package/src/newModules/timeSchedule/components/ManuaSettings.tsx

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, directOptions, ManualSettingProps, modeOptions, StripLightData } from '../Interface';
+import { DeviceType, directOptions, FanLightData, ManualSettingProps, modeOptions, StripLightData } from '../Interface';
 import { View } from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
@@ -142,9 +142,9 @@ function ManualSettings(props: ManualSettingProps) {
                   isSupportDirection={props.isUVCFan}
                   isSupportDisinfect={props.isUVCFan}
                   isSupportMode={props.isUVCFan}
-                  directValue={''}
-                  disinfect={true}
-                  modeValue={''}
+                  directValue={(state.deviceData as FanLightData).direction}
+                  disinfect={(state.deviceData as FanLightData).disinfect}
+                  modeValue={(state.deviceData as FanLightData).mode}
                   directOptions={directOptions}
                   modeOptions={modeOptions}
                   directChange={(direction: any) => {
@@ -316,7 +316,7 @@ function ManualSettings(props: ManualSettingProps) {
   }, [state.deviceData, state.applyForList, props.theme.type]);
 
   const ceilingLightCard = useMemo(() => {
-    const deviceData = state.deviceData as CeilingLightData
+    const deviceData = state.deviceData as StripLightData
     return (
       <View>
         {state.applyForList.map((item, idx) => (