@ledvance/ui-biz-bundle 1.1.77 → 1.1.79

package/package.json

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

package/src/modules/flags/FlagEditPage.tsx

@@ -56,11 +56,15 @@ const FlagEditPage = () => {
   }, [state.currentNode, state.currentWhiteNode])
 
   useUpdateEffect(() =>{
-    state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    if (state.colorPaintBucketIdx < state.mood.colors.length) {
+      state.currentNode = state.mood.colors[state.colorPaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.colors), state.colorPaintBucketIdx])
 
   useUpdateEffect(() =>{
-    state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    if (state.whitePaintBucketIdx < state.mood.whiteColors.length) {
+      state.currentWhiteNode = state.mood.whiteColors[state.whitePaintBucketIdx]
+    }
   }, [JSON.stringify(state.mood.whiteColors), state.whitePaintBucketIdx])
 
   const checkMoodDataChanged = useMemo(() =>{

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -101,7 +101,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
           }
         }
       })
-    }, 300)
+    }, 200)
 
     return () => clearTimeout(fixedTimer)
   }, [fixedTimeDp])
@@ -197,7 +197,7 @@ const fixedTimeDp2Obj = (fixedDp: string, isPlug?: boolean) => {
         brightness,
         temperature
       },
-      isColorMode: !!(h && s && v)
+      isColorMode: !!(h !== 0 || s !== 0 || v !== 0)
     }
   })
   return {

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -38,15 +38,21 @@ const FixedTimeDetailPage = () => {
   const is24Hour = useSystemTimeFormate()
   const state = useReactive({
     loading: false,
-    isColorMode: false,
-    fixedTime: cloneDeep(params.scheduleItem)
+    fixedTime: cloneDeep(params.scheduleItem),
+    initFixedTime: cloneDeep(params.scheduleItem)
   })
 
   useEffect(() => {
     if (!params.isPlug && state.fixedTime.color) {
       const { brightness, temperature, h, s, v } = state.fixedTime.color
       const isColor = brightness === 0 && temperature === 0 && (h !== 0 || s !== 0 || v !== 0)
-      state.isColorMode = isColor
+      if (isColor) {
+        state.fixedTime.color.brightness = 100;
+      } else {
+        state.fixedTime.color.s = 100;
+        state.fixedTime.color.v = 100;
+      }
+      state.initFixedTime = cloneDeep(state.fixedTime)
     }
   }, [])
 
@@ -66,8 +72,8 @@ const FixedTimeDetailPage = () => {
   }, [JSON.stringify(state.fixedTime)])
 
   const checkItemChanged = useMemo(() =>{
-    return isEqual(state.fixedTime, params.scheduleItem)
-  }, [params.scheduleItem, JSON.stringify(state.fixedTime)])
+    return isEqual(state.fixedTime, state.initFixedTime)
+  }, [state.initFixedTime, JSON.stringify(state.fixedTime)])
 
   const canSubmit = useMemo(() => {
     return state.fixedTime.name?.length > 0 && state.fixedTime.name?.length < 33 && !checkItemChanged && inRangeTime && state.fixedTime.channel !== undefined
@@ -91,11 +97,11 @@ const FixedTimeDetailPage = () => {
         }
         if (!params.isPlug && state.fixedTime.color) {
           editFixedTime.color = {
-            h: state.isColorMode ? state.fixedTime.color?.h : 0,
-            s: state.isColorMode ? state.fixedTime.color?.s : 0,
-            v: state.isColorMode ? state.fixedTime.color?.v : 0,
-            temperature: state.isColorMode ? 0 : state.fixedTime.color?.temperature,
-            brightness: state.isColorMode ? 0 : state.fixedTime.color?.brightness
+            h: state.fixedTime.isColorMode ? state.fixedTime.color?.h : 0,
+            s: state.fixedTime.isColorMode ? state.fixedTime.color?.s : 0,
+            v: state.fixedTime.isColorMode ? state.fixedTime.color?.v : 0,
+            temperature: state.fixedTime.isColorMode ? 0 : state.fixedTime.color?.temperature,
+            brightness: state.fixedTime.isColorMode ? 0 : state.fixedTime.color?.brightness
           }
         }
         const res = await params.onPost(params.mode, editFixedTime)
@@ -190,9 +196,9 @@ const FixedTimeDetailPage = () => {
               isSupportColor={!!params.isSupportColor}
               isSupportBrightness={!!params.isSupportBrightness}
               isSupportTemperature={!!params.isSupportTemperature}
-              isColorMode={state.isColorMode}
+              isColorMode={state.fixedTime.isColorMode ?? false}
               reserveSV={true}
-              setIsColorMode={(v) => state.isColorMode = v}
+              setIsColorMode={(v) => state.fixedTime.isColorMode = v}
               h={state.fixedTime.color.h}
               s={state.fixedTime.color.s}
               v={state.fixedTime.color.v}

package/src/newModules/mood/AddMoodPage.tsx

@@ -66,7 +66,7 @@ const AddMoodPage = () => {
           ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
           : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
       const currentMood = moodItem.mainLamp
-        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
+        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: moodItem.secondaryLamp?.nodes?.length ? secondaryId : -1 } }
         : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
       navigation.navigate(url, {
         ...routeParams,
@@ -182,7 +182,7 @@ function newMood(
       nodes: isStatic ? [node] : [node, { ...node }],
     },
     secondaryLamp: {
-      id: secondaryId,
+      id: isStatic ? -1 : secondaryId,
       enable: true,
       mode: MoodJumpGradientMode.StripJump,
       speed: 75,

package/src/newModules/mood/MoodPage.tsx

@@ -55,7 +55,8 @@ const MoodPage = () => {
   });
 
   const moodIds = useMemo(() => {
-    const mainIds = map(state.originMoods, 'id').filter(v => v !== undefined)
+    // @ts-ignore
+    const mainIds = map(params.isCeilingLight ? (state.originMoods.map(m => m.mainLamp) || []) : state.originMoods, 'id').filter(v => v !== undefined)
     const secondaryIds = map(state.originMoods.map(m => m.secondaryLamp) || [], 'id')
     return filter([...mainIds, ...secondaryIds], v => v !== undefined) as number[]
   }, [JSON.stringify(state.originMoods)])

package/src/newModules/randomTime/RandomTimeActions.ts

@@ -102,7 +102,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
           }
         }
       })
-    }, 300)
+    }, 200)
 
     return () => clearTimeout(randomTimer)
   }, [randomTimeDp])
@@ -195,7 +195,7 @@ const randomTimeDp2Obj = (randomDp: string, isPlug?: boolean) => {
         brightness,
         temperature
       },
-      isColorMode: !!(h && s && v)
+      isColorMode: !!(h !== 0 || s !== 0 || v !== 0)
     }
   })
   return {

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -35,21 +35,28 @@ const RandomTimeDetailPage = () => {
   const is24Hour = useSystemTimeFormate()
   const state = useReactive({
     loading: false,
-    isColorMode: false,
-    randomTime: cloneDeep(params.scheduleItem)
+    randomTime: cloneDeep(params.scheduleItem),
+    initRandomTime: cloneDeep(params.scheduleItem)
   })
 
   useEffect(() => {
     if (!params.isPlug && state.randomTime.color) {
       const { brightness, temperature, h, s, v } = state.randomTime.color
       const isColor = brightness === 0 && temperature === 0 && (h !== 0 || s !== 0 || v !== 0)
-      state.isColorMode = isColor
+      state.randomTime.isColorMode = isColor
+      if (isColor) {
+        state.randomTime.color.brightness = 100;
+      } else {
+        state.randomTime.color.s = 100;
+        state.randomTime.color.v = 100;
+      }
+      state.initRandomTime = cloneDeep(state.randomTime)
     }
   }, [])
 
   const checkItemChanged = useMemo(() =>{
-    return isEqual(state.randomTime, params.scheduleItem)
-  }, [params.scheduleItem, JSON.stringify(state.randomTime)])
+    return isEqual(state.randomTime, state.initRandomTime)
+  }, [JSON.stringify(state.initRandomTime), JSON.stringify(state.randomTime)])
 
   const canSubmit = useMemo(() => {
     return state.randomTime.name?.length > 0 && state.randomTime.name?.length < 33 && !checkItemChanged && state.randomTime.channel !== undefined
@@ -85,11 +92,11 @@ const RandomTimeDetailPage = () => {
         }
         if (!params.isPlug && state.randomTime.color) {
           editRandomTime.color = {
-            h: state.isColorMode ? state.randomTime.color?.h : 0,
-            s: state.isColorMode ? state.randomTime.color?.s : 0,
-            v: state.isColorMode ? state.randomTime.color?.v : 0,
-            temperature: state.isColorMode ? 0 : state.randomTime.color?.temperature,
-            brightness: state.isColorMode ? 0 : state.randomTime.color?.brightness
+            h: state.randomTime.isColorMode ? state.randomTime.color?.h : 0,
+            s: state.randomTime.isColorMode ? state.randomTime.color?.s : 0,
+            v: state.randomTime.isColorMode ? state.randomTime.color?.v : 0,
+            temperature: state.randomTime.isColorMode ? 0 : state.randomTime.color?.temperature,
+            brightness: state.randomTime.isColorMode ? 0 : state.randomTime.color?.brightness
           }
         }
         const res = await params.onPost(params.mode, editRandomTime)
@@ -184,9 +191,9 @@ const RandomTimeDetailPage = () => {
               isSupportColor={!!params.isSupportColor}
               isSupportBrightness={!!params.isSupportBrightness}
               isSupportTemperature={!!params.isSupportTemperature}
-              isColorMode={state.isColorMode}
+              isColorMode={state.randomTime.isColorMode ?? false}
               reserveSV={true}
-              setIsColorMode={(v) => state.isColorMode = v}
+              setIsColorMode={(v) => state.randomTime.isColorMode = v}
               h={state.randomTime.color.h}
               s={state.randomTime.color.s}
               v={state.randomTime.color.v}

package/src/newModules/remoteControl/RemoteControlPage.tsx

@@ -9,6 +9,7 @@ import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import Card from '@ledvance/base/src/components/Card';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import { Utils } from 'tuya-panel-kit'
+import {showDialog} from "@ledvance/base/src/utils/common";
 
 const { convertX: cx } = Utils.RatioUtils
 
@@ -38,9 +39,26 @@ const RemoteControlPage = () => {
           colorAlpha={1}
           enable={remoteControl}
           setEnable={async v => {
-            state.loading = true;
-            await setRemoteControl(v);
-            state.loading = false;
+            if (state.loading) {
+              return
+            }
+            if (v) {
+              showDialog({
+                method: 'confirm',
+                title: I18n.getLang('Remotecontrol_Title'),
+                subTitle: I18n.getLang('Remotecontrol_description'),
+                onConfirm: async (_, { close }) => {
+                  close()
+                  state.loading = true
+                  await setRemoteControl(v)
+                  state.loading = false
+                }
+              })
+            } else {
+              state.loading = true
+              await setRemoteControl(v)
+              state.loading = false
+            }
           }}
         />
       </Card>

package/src/newModules/sleepWakeUp/SleepWakeUpActions.ts

@@ -121,7 +121,7 @@ const wakeUpDp2Obj = (dp: string): WakeUpData | undefined => {
       enable, weeks, delay, hour, minute, h, s, v, brightness, temperature, last, nodeHex, isSleep: false,
       startTime,
       endTime,
-      isColorMode: !!(h && s && v)
+      isColorMode: !!(h !== 0 || s !== 0 || v !== 0)
     }
   })
   return {
@@ -266,7 +266,7 @@ export const sleepDp2Obj = (dp: string): SleepData | undefined => {
       enable, weeks, delay, hour, minute, h, s, v, brightness, temperature, nodeHex, isSleep: true,
       startTime,
       endTime,
-      isColorMode: !!(h && s && v)
+      isColorMode: !!(h !== 0 || s !== 0 || v !== 0)
     }
   })
   return {

package/src/newModules/timeSchedule/Interface.ts

@@ -92,9 +92,6 @@ export interface StripLightData extends DeviceData {
   colorDiskActiveKey: number
 }
 
-export interface CeilingLightData extends DeviceData, StripLightData, MixLightData {
-}
-
 export interface FanLightData extends DeviceData {
   fanSpeed: number 
   direction: 'forward' | 'reverse'
@@ -106,7 +103,6 @@ export type ComponentConfig =
   | { type: DeviceType.LightSource; deviceData: DeviceData }
   | { type: DeviceType.MixLight; deviceData: MixLightData }
   | { type: DeviceType.StripLight; deviceData: StripLightData }
-  | { type: DeviceType.CeilingLight; deviceData: CeilingLightData }
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { type: DeviceType.PowerStrip; deviceData: DeviceData}
 

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -19,10 +19,19 @@ export const defMixDeviceData = {
 
 export const defStripDeviceData = {
   ...defDeviceData,
-  activeKey: 0,
+  activeKey: 1,
   colors: ColorList[0],
+  colorDiskActiveKey: 0
 };
 
+export const defFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  direction: 'forward',
+  mode: 'normal',
+  disinfect: false
+}
+
 export const getTimeSchedule = async (deviceId: string): Promise<Timer[]> => {
   const res = await NativeApi.getAllTaskTimer(deviceId);
   if (res.success && Array.isArray(res.data)) {

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -39,10 +39,10 @@ import InfoText from '@ledvance/base/src/components/InfoText';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ManualSettings from './components/ManuaSettings';
-import { defDeviceData, defMixDeviceData, defStripDeviceData } from './TimeScheduleActions';
+import { defDeviceData, defFanLightDeviceData, defMixDeviceData, defStripDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood/MoodItem';
 import { getRemoteMoodList } from '../mood/MoodActions';
-import { MoodUIInfo } from '@ledvance/ui-biz-bundle/src/newModules/mood/Interface';
+import { MoodUIInfo } from '../mood/Interface';
 import Summary from '@ledvance/base/src/components/Summary'
 
 const { convertX: cx } = Utils.RatioUtils;
@@ -161,11 +161,8 @@ const TimeScheduleDetailPage = (props: { theme?: any }) => {
     if (typeof time === 'number') {
       return `${toFixedString(Math.trunc(time / 60), 2)}:${toFixedString(time % 60, 2)}`;
     }
-    if (typeof time === 'string') {
-      const t = time.split(':');
-      return Number(t[0]) * 60 + Number(t[1]);
-    }
-    return time;
+    const t = time.split(':');
+    return Number(t[0]) * 60 + Number(t[1]);
   }, []);
 
   const isModify = useMemo(() => {
@@ -460,6 +457,7 @@ const TimeScheduleDetailPage = (props: { theme?: any }) => {
             isSupportBrightness={params.isSupportBrightness}
             isSupportTemperature={params.isSupportTemperature}
             isStripLight={params.isStripLight}
+            isCeilingLight={params.isCeilingLight}
             manualData={state.manualData}
             onManualChange={manual => {
               state.manualData = {
@@ -622,21 +620,28 @@ const newTimeSchedule = () => {
 
 const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig => {
   const deviceType =
-    props.isStripLight || props.isCeilingLight
+    props.isStripLight
       ? DeviceType.StripLight
       : props.isMixLight
         ? DeviceType.MixLight
         : props.isPowerStrip
         ? DeviceType.PowerStrip
-        : DeviceType.LightSource;
-  const deviceData =
-    deviceType === DeviceType.StripLight
-      ? defStripDeviceData
-      : deviceType === DeviceType.MixLight
-        ? defMixDeviceData
-        : defDeviceData;
-  // @ts-ignore
+        : props.isFanLight 
+        ? DeviceType.FanLight
+        : props.isCeilingLight 
+        ? DeviceType.CeilingLight
+         : DeviceType.LightSource
+         const deviceData =
+         (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
+           ? defStripDeviceData
+           : deviceType === DeviceType.MixLight
+             ? defMixDeviceData
+             : deviceType === DeviceType.FanLight
+             ? defFanLightDeviceData
+             : defDeviceData;
+  
   return {
+    // @ts-ignore
     type: deviceType,
     deviceData: {
       ...deviceData,

package/src/newModules/timeSchedule/TimeSchedulePage.tsx

@@ -41,7 +41,7 @@ export interface TimeSchedulePageParams {
   isPowerStrip?: boolean
   featureId?: string
   applyForList: ApplyForItem[];
-  applyForDisabled: boolean; // 是否可以选择apply for
+  applyForDisabled?: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;
   manualDataObj2Dp: (deviceState: DeviceStateType, applyForList: ApplyForItem[]) => Record<string, any>;
 }
@@ -194,7 +194,7 @@ const TimeSchedulePage = (props: { theme?: any }) => {
             iconStyle={{ tintColor: props.theme.global.warning }}
           />
         )}
-        {params.applyForList.length > 1 && !!state.originList.length && showTags}
+        {params.applyForList.length > 1 && !!state.originList.length && !(params.isCeilingLight || params.isMixLight) && showTags}
         {state.timeScheduleList.length > 0 ? <FlatList
           data={state.timeScheduleList}
           renderItem={({ item }) => (

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

@@ -72,7 +72,7 @@ function ManualSettings(props: ManualSettingProps) {
           <View key={item.dp}>
             <Card style={{ marginHorizontal: cx(24) }}>
               <LdvSwitch
-                title={item.key}
+                title={item.name || item.key}
                 color={props.theme.card.background}
                 colorAlpha={1}
                 enable={item.enable}
@@ -253,7 +253,7 @@ function ManualSettings(props: ManualSettingProps) {
     const deviceData = state.deviceData as StripLightData
     return (
       <View>
-        <Card>
+        <Card style={{ marginHorizontal: cx(24) }}>
           <LdvSwitch
             title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
             color={props.theme.card.background}