@ledvance/group-ui-biz-bundle 1.0.56 → 1.0.58

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "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/timeSchedule/Interface.ts

@@ -144,6 +144,7 @@ export interface TimeScheduleDetailState {
   timeSchedule: Timer;
   dps: Record<string, any>;
   isManual: boolean;
+  initSelectedSkill: ApplyForItem[],
   selectedSkill: ApplyForItem[];
   unSelectedSkill: ApplyForItem[];
   loading: boolean;

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -42,6 +42,7 @@ 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,
@@ -119,13 +121,11 @@ const TimeScheduleDetailPage = () => {
       state.isManual = isManual;
       state.mood = mood;
     }
-
+    state.initSelectedSkill = cloneDeep(state.selectedSkill)
     if (!(Array.isArray(moods) && moods.length)) {
       state.timerId = setTimeout(() => {
-        console.log(props, '< --- timeSchedule props')
         getRemoteMoodList(uaGroupInfo.tyGroupId.toString(), props).then(res => {
           if (res.success && Array.isArray(res.data)) {
-            console.log(res.data, '< --- timeSchedule mood')
             state.moods = cloneDeep(res.data);
             setMoods(cloneDeep(res.data));
             if (!state.mood) state.mood = cloneDeep(res.data[0]);
@@ -171,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,
@@ -180,22 +181,28 @@ 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 props.applyForList.length !== 1 && !props.applyForDisabled;
@@ -354,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}
@@ -375,7 +394,7 @@ const TimeScheduleDetailPage = () => {
             }}
           />
         ) : (
-          <FlatList
+          !showMoodFanSelectText ? <FlatList
             data={state.moods}
             renderItem={({ item }) => {
               return (
@@ -393,7 +412,7 @@ const TimeScheduleDetailPage = () => {
             ItemSeparatorComponent={() => <Spacer />}
             ListFooterComponent={() => <Spacer />}
             keyExtractor={item => `${item.name}`}
-          />
+          /> : <View></View>
         )}
         <Spacer />