@ledvance/group-ui-biz-bundle 1.0.55 → 1.0.57

package/package.json

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

package/src/modules/mood_new/MoodActions.ts

@@ -37,6 +37,8 @@ export interface SceneDataConfigType {
   colour_switch: boolean
   white_switch: boolean
   switch: boolean
+  switch_fan: boolean
+  fan_switch: boolean
 }
 
 export function useSwitchLed(params: MoodPageParams): boolean {
@@ -68,7 +70,19 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
           if (mainDp && params.mainDp) {
             dps[params.mainDp] = mainDp
             dps[params.mainSwitch] = true 
-            dps[params.mainWorkMode] = WorkMode.Scene 
+            dps[params.mainWorkMode] = WorkMode.Scene
+            if (params.isUVCFan){
+              dps[getGlobalParamsDp('fan_switch')] = mainLamp.fanEnable
+              // if (mainLamp.fanEnable){
+              //   dps[getGlobalParamsDp('fan_speed')] = mainLamp.fanSpeed
+              // }
+            }
+            if (params.isFanLight && !params.isUVCFan){
+              dps[getGlobalParamsDp('switch_fan')] = mainLamp.fanEnable
+              // if (mainLamp.fanEnable){
+              //   dps[getGlobalParamsDp('fan_speed')] = mainLamp.fanSpeed
+              // }
+            }
           }
         }
         if (secondaryLamp.nodes.length && params.isCeilingLight) {
@@ -98,6 +112,16 @@ export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: Sc
           } else {
             config.switch_led = true
           }
+          if (params.isUVCFan || params.isFanLight){
+            if (mainLamp.fanEnable){
+              if(params.isUVCFan){
+                config.fan_switch = true 
+              }
+              if (params.isFanLight && !params.isUVCFan){
+                config.switch_fan = true
+              }
+            }
+          }
         }
         if (secondaryLamp?.nodes?.length) {
           if (params.isCeilingLight) {

package/src/modules/mood_new/MoodPage.tsx

@@ -52,20 +52,20 @@ const MoodPage = () => {
     flag: Symbol(),
   });
 
-  const moodIds = useMemo(() =>{
+  const moodIds = useMemo(() => {
     const mainIds = map(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[]
+    return filter([...mainIds, ...secondaryIds], v => v !== undefined) as number[]
   }, [JSON.stringify(state.originMoods)])
 
   useEffect(() => {
     state.timerId = setTimeout(() => {
-      state.loading = true 
+      state.loading = true
       getRemoteMoodList(
         uaGroupInfo.tyGroupId.toString(),
         params
       ).then(res => {
-        state.loading = false 
+        state.loading = false
         if (res.success && Array.isArray(res.data)) {
           state.originMoods = cloneDeep(res.data);
           console.log(state.originMoods, '< --- originMoods')
@@ -188,14 +188,14 @@ const MoodPage = () => {
     }
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood;
     const res = await saveMoodList(uaGroupInfo.tyGroupId.toString(), newScene, params);
-    console.log(res, '< --- save res')
     if (res.success) {
       state.originMoods = cloneDeep(newScene);
       setMoods(cloneDeep(newScene));
-      if ((mode === 'del' && (params.isCeilingLight ? 
-        (moodInfo.scene?.mainLamp.id !== checkedMood.mainLamp.id || moodInfo.scene?.secondaryLamp.id !== checkedMood.secondaryLamp.id) : 
-        moodInfo.scene?.id !== checkedMood.id)) || 
-        (params.isCeilingLight ? (workMode !== WorkMode.Scene && rgbicWorkMode !== WorkMode.Scene) : workMode !== WorkMode.Scene) || !switchLed) {
+      if (mode === 'del' && ((params.isCeilingLight ?
+        (moodInfo.scene?.mainLamp.id !== checkedMood.mainLamp.id || moodInfo.scene?.secondaryLamp.id !== checkedMood.secondaryLamp.id) :
+        moodInfo.scene?.id !== checkedMood.id) ||
+        (params.isCeilingLight ? (workMode !== WorkMode.Scene && rgbicWorkMode !== WorkMode.Scene) : workMode !== WorkMode.Scene) ||
+        !switchLed)) {
         return {
           success: true
         }
@@ -243,7 +243,7 @@ const MoodPage = () => {
     },
     [moodInfo]
   );
-  
+
   const nameRepeat = useCallback((mood: MoodUIInfo) => {
     return !!state.originMoods.filter(m => !(params.isCeilingLight ? (m.mainLamp.id === mood.mainLamp.id && m.secondaryLamp.id === mood.secondaryLamp.id) : (m.id === mood.id))).find(m => m.name === mood.name)
   }, [state.originMoods, params.isCeilingLight])

package/src/modules/mood_new/StaticMoodEditorPage.tsx

@@ -47,11 +47,12 @@ const StaticMoodEditorPage = () => {
   const params = cloneDeep(routeParams);
   const moduleParams = params.moduleParams;
   const isMix = !!(moduleParams.isCeilingLight || moduleParams.isMixLight);
+  console.log(params.currentMood, '< -- currentMood')
   const state = useReactive<StaticMoodEditorPageState>({
     headline: '',
     mood: params.currentMood,
     mainNode: params.currentMood.mainLamp.nodes[0],
-    secondaryNode: params.currentMood?.secondaryLamp?.nodes[0],
+    secondaryNode: params.currentMood?.secondaryLamp?.nodes?.[0],
     loading: false,
   });
 

package/src/modules/randomTimeForPlug/Router.ts

@@ -5,7 +5,7 @@ import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const RandomTimeForPlugRouters: NavigationRoute[] = [
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug,
+    name: ui_biz_routerKey.group_ui_biz_random_time_plug,
     component: RandomTimeForPlugPage,
     options:{
       hideTopbar: true,
@@ -13,7 +13,7 @@ const RandomTimeForPlugRouters: NavigationRoute[] = [
     }
   },
   {
-    name: ui_biz_routerKey.group_ui_biz_fixed_time_plug_detail,
+    name: ui_biz_routerKey.group_ui_biz_random_time_plug_detail,
     component: RandomTimeForPlugDetailPage,
     options:{
       hideTopbar: true,

package/src/modules/timeSchedule/Interface.ts

@@ -41,7 +41,8 @@ export enum UVCFanMode {
 }
 
 
-import { MoodInfo, MoodUIInfo } from "@ledvance/group-ui-biz-bundle/src/modules/mood/Interface";
+import I18n from "@ledvance/base/src/i18n";
+import { MoodInfo, MoodUIInfo } from "../mood_new/Interface";
 
 export interface Timer {
   status: number;
@@ -80,6 +81,8 @@ interface judgmentSupport {
   isStripLight?: boolean;
   isStringLight?: boolean;
   isMixLight?: boolean;
+  isFanLight?: boolean;
+  isUVCFan?: boolean;
 }
 
 export interface ManualSettingProps extends judgmentSupport {
@@ -94,7 +97,8 @@ export enum DeviceType {
   LightSource = 'lightSource',
   MixLight = 'mixLight',
   StripLight = 'stripLight',
-  CeilingLight = 'ceilingLight'
+  CeilingLight = 'ceilingLight',
+  FanLight = 'fanLight'
 }
 // export type DeviceType = 'LightSource' | 'CeilingLight' | 'StringLight' | 'StripLight' | 'MixLight';
 
@@ -122,16 +126,25 @@ export interface StripLightData extends DeviceData {
 export interface CeilingLightData extends DeviceData, StripLightData, MixLightData {
 }
 
+export interface FanLightData extends DeviceData {
+  fanSpeed: number 
+  direction: 'forward' | 'reverse'
+  mode: 'nature' | 'normal'
+  disinfect: boolean
+}
+
 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 }
 
 export interface TimeScheduleDetailState {
   timeSchedule: Timer;
   dps: Record<string, any>;
   isManual: boolean;
+  initSelectedSkill: ApplyForItem[],
   selectedSkill: ApplyForItem[];
   unSelectedSkill: ApplyForItem[];
   loading: boolean;
@@ -148,3 +161,13 @@ export interface DeviceStateType {
   mood?: MoodInfo
   isManual: boolean
 }
+
+export const directOptions = [
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_1'), value: 'forward'},
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_direction_opt_2'), value: 'reverse'}
+]
+
+export const modeOptions = [
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_mode_opt_1'), value: 'normal'},
+  {label: I18n.getLang('ceiling_fan_tile_uvc_fan_mode_opt_2'), value: 'nature'},
+]

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -32,6 +32,14 @@ export const defCeilingLihtDeviceData = {
   activeKey: 1
 }
 
+export const defFanLightDeviceData = {
+  ...defDeviceData,
+  fanSpeed: 1,
+  direction: 'forward',
+  mode: 'normal',
+  disinfect: false
+}
+
 export const addTimeSchedule = async (props: IAddSingleTime) => {
   try {
     const res = await commonApi.timerApi.addSingleTimer({

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -37,11 +37,12 @@ import DeleteButton from '@ledvance/base/src/components/DeleteButton';
 import SegmentControl from '@ledvance/base/src/components/segmentControl';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import ManualSettings from './components/ManuaSettings';
-import { defCeilingLihtDeviceData, defDeviceData, defMixDeviceData, defStripDeviceData } from './TimeScheduleActions';
+import { defCeilingLihtDeviceData, defDeviceData, defMixDeviceData, defStripDeviceData, defFanLightDeviceData } from './TimeScheduleActions';
 import MoodItem from '../mood_new/MoodItem';
 import Summary from './components/Summary'
 import { getRemoteMoodList } from '../mood_new/MoodActions'
 import { MoodUIInfo } from '../mood_new/Interface';
+import InfoText from '@ledvance/base/src/components/InfoText';
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
@@ -62,6 +63,7 @@ const TimeScheduleDetailPage = () => {
     timeSchedule: props.mode === 'add' ? newTimeSchedule() : cloneDeep(props.timeSchedule),
     dps: props.mode === 'add' ? {} : props.timeSchedule.dps,
     isManual: true, // manual ,mood
+    initSelectedSkill: [] as ApplyForItem[],
     selectedSkill: [] as ApplyForItem[],
     unSelectedSkill: [] as ApplyForItem[],
     loading: false,
@@ -106,10 +108,10 @@ const TimeScheduleDetailPage = () => {
       state.unSelectedSkill = [];
     } else {
       const selectedList = cloneApplyList.filter(item =>
-        Object.keys(timeSchedule.dps).includes(item.dp)
+        Object.keys(timeSchedule?.dps || {}).includes(item.dp)
       );
       const unSelectedList = cloneApplyList.filter(
-        item => !Object.keys(timeSchedule.dps).includes(item.dp)
+        item => !Object.keys(timeSchedule?.dps || {}).includes(item.dp)
       );
       state.selectedSkill = mode === 'add' ? [] : selectedList;
       state.unSelectedSkill = mode === 'add' ? cloneApplyList : unSelectedList;
@@ -119,7 +121,7 @@ const TimeScheduleDetailPage = () => {
       state.isManual = isManual;
       state.mood = mood;
     }
-
+    state.initSelectedSkill = cloneDeep(state.selectedSkill)
     if (!(Array.isArray(moods) && moods.length)) {
       state.timerId = setTimeout(() => {
         getRemoteMoodList(uaGroupInfo.tyGroupId.toString(), props).then(res => {
@@ -169,6 +171,7 @@ const TimeScheduleDetailPage = () => {
         : props.manualDataDp2Obj(props.timeSchedule.dps).deviceData;
     const before = {
       ...schedule,
+      selectedSkill: state.initSelectedSkill,
       dps: manual,
       isManual:
         props.mode === 'add' ? true : props.manualDataDp2Obj(props.timeSchedule.dps).isManual,
@@ -178,26 +181,32 @@ const TimeScheduleDetailPage = () => {
     before.mood = (before.isManual || props.mode === 'add') ? undefined : props.manualDataDp2Obj(props.timeSchedule.dps)?.mood
     const now = {
       ...state.timeSchedule,
+      selectedSkill: state.selectedSkill,
       dps: state.manualData,
       isManual: state.isManual,
       mood: state.isManual ? undefined : state.mood,
       id: 1,
     };
     return isEqual(before, now);
-  }, [JSON.stringify(state.timeSchedule), state.manualData, state.isManual, state.mood]);
+  }, [JSON.stringify(state.timeSchedule), JSON.stringify(state.initSelectedSkill), JSON.stringify(state.selectedSkill), state.manualData, state.isManual, state.mood]);
+
+  const showMoodFanSelectText = useMemo(() =>{
+    return (props.isUVCFan || props.isFanLight) && !state.isManual && state.selectedSkill.length < 2
+  }, [props.isUVCFan, props.isFanLight, state.selectedSkill.length, state.isManual])
 
   const allowSubmit = useMemo(() => {
     return (
       (state.timeSchedule.aliasName.length && state.timeSchedule.aliasName.length < 33) &&
       state.selectedSkill.length &&
       (state.isManual ? state.isManual : !!state.mood) &&
-      !isModify
+      !isModify &&
+      !showMoodFanSelectText
     );
-  }, [state.timeSchedule.aliasName, state.selectedSkill, isModify, state.isManual, state.mood]);
+  }, [state.timeSchedule.aliasName, state.selectedSkill, isModify, state.isManual, state.mood, showMoodFanSelectText]);
 
   const showSelectedIcon = useMemo(() => {
-    return state.selectedSkill.length !== 1 && !props.applyForDisabled;
-  }, [state.selectedSkill.length, props.applyForDisabled]);
+    return props.applyForList.length !== 1 && !props.applyForDisabled;
+  }, [props.applyForList.length, props.applyForDisabled]);
 
   const getMoodItemEnable = useCallback((item: MoodUIInfo ) =>{
     return props.isCeilingLight ? ((item.mainLamp.id === state.mood?.mainLamp?.id) && (item.secondaryLamp.id === state.mood?.secondaryLamp?.id)) : item.id === state.mood?.id 
@@ -286,8 +295,8 @@ const TimeScheduleDetailPage = () => {
             {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
           </Text>
           <Spacer height={cx(10)} />
-          <View style={styles.applyContent}>
-            {props.applyForList.length === 0 ? (
+          <View style={[styles.applyContent, {paddingTop: state.selectedSkill.length ? cx(10) : 0}]}>
+            {state.selectedSkill.length === 0 ? (
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
             ) : (
               state.selectedSkill.map(skill => (
@@ -352,6 +361,18 @@ const TimeScheduleDetailPage = () => {
           </>
         )}
         <Spacer height={cx(10)} />
+        {(!state.selectedSkill.length && !showMoodFanSelectText) && <InfoText 
+          style={{marginHorizontal: cx(24)}}
+          icon={res.ic_warning_amber}
+          contentColor="#FF9500"
+          text={I18n.getLang('timeschedule_add_schedule_no_device_warning_text')}
+        />}
+        {showMoodFanSelectText && <InfoText 
+          style={{marginHorizontal: cx(24)}}
+          icon={res.ic_warning_amber}
+          contentColor="#FF9500"
+          text={I18n.getLang('timeschedule_add_schedule_devicestate_sec_warning_text')}
+        />}
         {state.isManual ? (
           <ManualSettings
             dps={state.dps}
@@ -373,7 +394,7 @@ const TimeScheduleDetailPage = () => {
             }}
           />
         ) : (
-          <FlatList
+          !showMoodFanSelectText ? <FlatList
             data={state.moods}
             renderItem={({ item }) => {
               return (
@@ -391,7 +412,7 @@ const TimeScheduleDetailPage = () => {
             ItemSeparatorComponent={() => <Spacer />}
             ListFooterComponent={() => <Spacer />}
             keyExtractor={item => `${item.name}`}
-          />
+          /> : <View></View>
         )}
         <Spacer />
 
@@ -529,6 +550,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? DeviceType.MixLight
         : props.isCeilingLight
         ? DeviceType.CeilingLight
+        : props.isFanLight ?
+        DeviceType.FanLight
         : DeviceType.LightSource;
   const deviceData =
     deviceType === DeviceType.StripLight
@@ -537,6 +560,8 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
         ? defMixDeviceData
         : deviceType === DeviceType.CeilingLight
         ? defCeilingLihtDeviceData
+        : deviceType === DeviceType.FanLight
+        ? defFanLightDeviceData
         : defDeviceData;
   // @ts-ignore
   return {
@@ -565,7 +590,6 @@ const styles = StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
     paddingHorizontal: cx(10),
-    paddingTop: cx(10),
   },
   applyItem: {
     paddingLeft: cx(5),

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -33,8 +33,8 @@ export interface TimeSchedulePageParams {
   isMatterLight?: boolean;
   isCeilingLight?: boolean;
   isMixLight?: boolean;
-  isSupportFan?: boolean;
-  isSupportUVC?: boolean;
+  isFanLight?: boolean
+  isUVCFan?: boolean;
   applyForList: ApplyForItem[];
   applyForDisabled: boolean; // 是否可以选择apply for
   manualDataDp2Obj: (dps: Record<string, any>) => DeviceStateType;

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

@@ -1,5 +1,5 @@
 import React, { memo, useMemo } from 'react';
-import { CeilingLightData, DeviceType, ManualSettingProps, StripLightData } from '../Interface';
+import { CeilingLightData, DeviceType, ManualSettingProps, StripLightData, directOptions, modeOptions } from '../Interface';
 import { View } from 'react-native';
 import Card from '@ledvance/base/src/components/Card';
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView';
@@ -14,6 +14,7 @@ import Spacer from '@ledvance/base/src/components/Spacer';
 import { useGroupDevices } from '@ledvance/base/src/models/modules/NativePropsSlice';
 import ApplyForDeviceList from '@ledvance/base/src/components/ApplyForDeviceList';
 import { cloneDeep } from 'lodash';
+import { FanAdjustViewContent } from '@ledvance/base/src/components/FanAdjustView';
 const { convertX: cx } = Utils.RatioUtils;
 
 function ManualSettings(props: ManualSettingProps) {
@@ -50,7 +51,7 @@ function ManualSettings(props: ManualSettingProps) {
         ),
       },
     ];
-    if(props.isCeilingLight){
+    if (props.isCeilingLight) {
       return tabs.filter(tab => tab.key !== 0)
     }
     if (!isSupportWhite) {
@@ -87,7 +88,7 @@ function ManualSettings(props: ManualSettingProps) {
                   state.applyFlag = Symbol()
                 }}
               />
-              {item.enable && item.type !== 'socket' && (
+              {item.enable && (item.type !== 'socket' && item.type !== 'fan') && (
                 <LampAdjustView
                   isSupportColor={props.isSupportColor}
                   isSupportBrightness={props.isSupportBrightness}
@@ -131,6 +132,54 @@ function ManualSettings(props: ManualSettingProps) {
                   }}
                 />
               )}
+
+              {item.enable && item.type === 'fan' && (
+                <FanAdjustViewContent
+                  hideEnable={true}
+                  fanEnable={item.enable}
+                  maxFanSpeed={props.isUVCFan ? 20 : 3}
+                  isSupportDirection={props.isUVCFan}
+                  isSupportDisinfect={props.isUVCFan}
+                  isSupportMode={props.isUVCFan}
+                  directValue={''}
+                  disinfect={true}
+                  modeValue={''}
+                  directOptions={directOptions}
+                  modeOptions={modeOptions}
+                  directChange={(direction: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      direction
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  modeChange={(mode: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      mode
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  disinfectChange={(disinfect: any) => {
+                    state.deviceData = {
+                      ...state.deviceData,
+                      disinfect
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                  // @ts-ignore
+                  fanSpeed={deviceData.fanSpeed}
+                  onFanSwitch={() => {}}
+                  onFanSpeedChangeComplete={(fanSpeed) => { 
+                    state.deviceData = {
+                      ...state.deviceData,
+                      fanSpeed
+                    }
+                    state.manualFlag = Symbol()
+                  }}
+                />
+              )}
+
               <ApplyForDeviceList
                 devices={cloneDeep(groupDevices)}
               />