@ledvance/ui-biz-bundle 1.1.78 → 1.1.80

package/package.json

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

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/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,7 @@ 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.CeilingLight; deviceData: StripLightData }
   | { type: DeviceType.FanLight; deviceData: FanLightData }
   | { type: DeviceType.PowerStrip; deviceData: DeviceData}
 

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -24,6 +24,14 @@ export const defStripDeviceData = {
   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,7 +39,7 @@ 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 '../mood/Interface';
@@ -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 = {
@@ -631,15 +632,17 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         : props.isCeilingLight 
         ? DeviceType.CeilingLight
          : DeviceType.LightSource
-  const deviceData =
-    (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
-      ? defStripDeviceData
-      : deviceType === DeviceType.MixLight
-        ? defMixDeviceData
-        : defDeviceData;
-  // @ts-ignore
+         const deviceData =
+         (deviceType === DeviceType.StripLight || deviceType === DeviceType.CeilingLight)
+           ? defStripDeviceData
+           : deviceType === DeviceType.MixLight
+             ? defMixDeviceData
+             : deviceType === DeviceType.FanLight
+             ? defFanLightDeviceData
+             : defDeviceData;
+
   return {
-    type: deviceType,
+    type: deviceType as any, 
     deviceData: {
       ...deviceData,
       isColorMode: props.isSupportColor,

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>;
 }

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) => (