@ledvance/ui-biz-bundle 1.1.65 → 1.1.67

package/package.json

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

package/src/navigation/Routers.ts

@@ -7,6 +7,7 @@ export const ui_biz_routerKey = {
   'ui_biz_mood_add': 'ui-biz_mood_add',
   'ui_biz_static_mood_edit': 'ui_biz_static_mood_edit',
   'ui_biz_dynamic_mood_edit': 'ui_biz_dynamic_mood_edit',
+  'ui_biz_dynamic_mix_mood_edit': 'ui_biz_dynamic_mix_mood_edit',
   'ui_biz_mix_mood': 'ui_biz_mix_mood',
   'ui_biz_mix_mood_edit': 'ui_biz_mix_mood_edit',
   'ui_biz_mix_mood_add': 'ui_biz_mix_mood_add',

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -46,18 +46,22 @@ interface UIState extends BiorhythmBean {
 }
 
 export interface BiorhythmPageParams {
-  biorhythmDp: string
-  sleepPlanDp: string
-  wakeUpPlanDp: string
+  biorhythmDpCode: string
+  conflictDps: {
+    randomTimeDpCode?: string
+    fixedTimeDpCode?: string 
+    sleepDpCode?: string
+    wakeUpDpCode?: string 
+  }
   isSupportTemperature: boolean
   isSupportBrightness: boolean
-  isMixRGBWLamp: boolean
+  isMixLight?: boolean
 }
 
 const BiorhythmPage = () => {
   const params = useParams<BiorhythmPageParams>()
   const navigation = useNavigation()
-  const [biorhythm, setBiorhythm] = useBiorhythm(params.biorhythmDp)
+  const [biorhythm, setBiorhythm] = useBiorhythm(params.biorhythmDpCode)
   const deviceId = useDeviceId()
   const deviceInfo = useDeviceInfo()
   const { productId } = deviceInfo
@@ -437,7 +441,7 @@ const BiorhythmPage = () => {
                       iconIdList: state.planList?.map(item => {
                         return item.iconId
                       }),
-                      isMixRGBWLamp: params.isMixRGBWLamp,
+                      isMixRGBWLamp: !!params.isMixLight,
                       isSupportTemperature: params.isSupportTemperature,
                       isSupportBrightness: params.isSupportBrightness,
                       showDeleteBtn
@@ -478,7 +482,7 @@ const BiorhythmPage = () => {
                         iconIdList: state.planList?.map(item => {
                           return item.iconId
                         }),
-                        isMixRGBWLamp: params.isMixRGBWLamp,
+                        isMixRGBWLamp: !!params.isMixLight,
                         isSupportTemperature: params.isSupportTemperature,
                         isSupportBrightness: params.isSupportBrightness,
                         showDeleteBtn

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -26,9 +26,10 @@ const MAX_NUM = 10
 export interface FixedTimePageParams {
   fixedTimeDpCode: string
   conflictDps: {
-    randomTimeDp?: string
-    biorhythmDp?: string
-    sleepWakeUpDp?: string
+    randomTimeDpCode?: string
+    biorhythmDpCode?: string
+    sleepDpCode?: string
+    wakeUpDpCode?: string 
   }
   isPlug?: boolean
   showTags?: boolean

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -35,7 +35,7 @@ import {
 } from './Interface';
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton';
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView';
-import { RouterKey } from 'navigation/Router';
+import { ui_biz_routerKey } from '../../navigation/Routers'
 import { SelectPageParams } from '@ledvance/ui-biz-bundle/src/modules/select/SelectPage';
 import I18n from '@ledvance/base/src/i18n';
 import Segmented from '@ledvance/base/src/components/Segmented';
@@ -94,15 +94,6 @@ const DynamicMoodEditorPage = () => {
     return cctToColor(node.colorTemp.toFixed());
   }, []);
 
-  const getButtonStatus = () => {
-    return (
-      (params.mode === 'edit' && isEqual(state.mood, routeParams.currentMood)) ||
-      !!!state.mood.name ||
-      nameRepeat ||
-      state.mood.name.length > 32
-    );
-  };
-
   const createSelectModeData = useCallback(
     (mode: number, moodMode?: StripLightMoodMode) => {
       return Object.values(moodMode ? moodMode : state.sceneMode).map(scene => {
@@ -132,17 +123,21 @@ const DynamicMoodEditorPage = () => {
   }, []);
 
   const nameRepeat = useMemo(() => {
-    return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
+    return params.nameRepeat(state.mood)
   }, [state.mood.name]);
 
-  const showBackDialog = (): boolean => {
-    return !isEqual(state.mood, routeParams.currentMood);
-  }
+  const checkMoodChanged = useMemo(() =>{
+    return isEqual(state.mood, params.currentMood)
+  }, [JSON.stringify(state.mood), params.currentMood])
+
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodChanged)
+  }, [nameRepeat, state.mood.name, checkMoodChanged, params.mode])
 
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={showBackDialog()}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={Strings.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -154,16 +149,13 @@ const DynamicMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
-        if (getButtonStatus()) {
-          return
-        }
-        if (state.loading) return;
+        if (state.loading || !canSaveMoodData) return;
         state.loading = true;
         const res = await params.modDeleteMood(params.mode, cloneDeep(state.mood));
         if (res.success) {
-          navigation.navigate(RouterKey.ui_biz_mood);
+          navigation.navigate(ui_biz_routerKey.ui_biz_mood);
         }
         state.loading = false;
       }}
@@ -206,7 +198,7 @@ const DynamicMoodEditorPage = () => {
                     state.mood.mainLamp.mode = selectPageData.value;
                   },
                 };
-                navigation.navigate(RouterKey.ui_biz_select_page, paramsSelect);
+                navigation.navigate(ui_biz_routerKey.ui_biz_select_page, paramsSelect);
               }}
             />
             <Spacer height={cx(10)} />
@@ -281,7 +273,7 @@ const DynamicMoodEditorPage = () => {
                         state.mood.mainLamp.expand = selectPageData.value;
                       },
                     };
-                    navigation.navigate(RouterKey.ui_biz_select_page, paramsSelect);
+                    navigation.navigate(ui_biz_routerKey.ui_biz_select_page, paramsSelect);
                   }}
                 />
                 <Spacer />
@@ -544,7 +536,7 @@ const DynamicMoodEditorPage = () => {
                       const res = await params.modDeleteMood('del', state.mood);
                       state.loading = false
                       if (res.success) {
-                        navigation.navigate(RouterKey.ui_biz_mood);
+                        navigation.navigate(ui_biz_routerKey.ui_biz_mood);
                       }
                     }
                   })

package/src/newModules/mood/Interface.ts

@@ -95,6 +95,7 @@ export interface DefMoodOption extends LightCategory{
 }
 
 export interface MoodDps {
+  switchLedDp: string 
   mainDp: string;
   mainWorkMode: string;
   mainSwitch: string;

package/src/newModules/mood/MixDynamicMoodEditor.tsx

@@ -30,8 +30,7 @@ import {
   StripLightMoodMode,
 } from './Interface';
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton';
-import { showDeleteMoodDialog } from './tools';
-import { RouterKey } from 'navigation/Router';
+import {ui_biz_routerKey} from '../../navigation/Routers'
 import { SelectPageParams } from '@ledvance/ui-biz-bundle/src/modules/select/SelectPage';
 import I18n from '@ledvance/base/src/i18n';
 import Segmented from '@ledvance/base/src/components/Segmented';
@@ -39,6 +38,7 @@ import { MoodNodeInfo } from './Interface';
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView';
+import { showDialog } from '@ledvance/base/src/utils/common';
 
 const cx = Utils.RatioUtils.convertX;
 interface MixDynamicMoodEditorPageState extends StaticMoodEditorPageState {
@@ -91,15 +91,6 @@ const MixDynamicMoodEditorPage = () => {
     return cctToColor(node.colorTemp.toFixed());
   }, []);
 
-  const getButtonStatus = () => {
-    return (
-      (params.mode === 'edit' && isEqual(state.mood, routeParams.currentMood)) ||
-      !!!state.mood.name ||
-      nameRepeat ||
-      state.mood.name.length > 32
-    );
-  };
-
   const createSelectModeData = useCallback(
     (mode: number, moodMode: StripLightMoodMode) => {
       return Object.values(moodMode).map(scene => {
@@ -129,17 +120,21 @@ const MixDynamicMoodEditorPage = () => {
   }, []);
 
   const nameRepeat = useMemo(() => {
-    return !!find(params.moods, m => m.id !== state.mood.id && m.name === state.mood.name);
+    return params.nameRepeat(state.mood)
   }, [state.mood.name]);
 
-  const showBackDialog = (): boolean => {
-    return !isEqual(state.mood, routeParams.currentMood);
-  }
+  const checkMoodChanged = useMemo(() =>{
+    return isEqual(state.mood, params.currentMood)
+  }, [JSON.stringify(state.mood), params.currentMood])
+
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodChanged)
+  }, [nameRepeat, state.mood.name, checkMoodChanged, params.mode])
 
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={showBackDialog()}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={Strings.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -151,26 +146,25 @@ const MixDynamicMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
-        if (getButtonStatus()) {
-          return
-        }
-        if (state.loading) return;
+        if (state.loading || !canSaveMoodData) return;
         state.loading = true;
         const newMood = cloneDeep(state.mood)
-        if(moduleParams.isSupportBrightness){
-          newMood.mainLamp.type = 1
-        }
-        if(moduleParams.isSupportBrightness && moduleParams.isSupportTemperature){
-          newMood.mainLamp.type = 2
-        }
-        if(moduleParams.isSupportColor){
-          newMood.secondaryLamp.type = 3
+        if(moduleParams.isMixLight){
+          if(moduleParams.isSupportBrightness){
+            newMood.mainLamp.type = 1
+          }
+          if(moduleParams.isSupportBrightness && moduleParams.isSupportTemperature){
+            newMood.mainLamp.type = 2
+          }
+          if(moduleParams.isSupportColor){
+            newMood.secondaryLamp.type = 3
+          }
         }
         const res = await params.modDeleteMood(params.mode, newMood);
         if (res.success) {
-          navigation.navigate(RouterKey.ui_biz_mood);
+          navigation.navigate(ui_biz_routerKey.ui_biz_mood);
         }
         state.loading = false;
       }}
@@ -243,7 +237,7 @@ const MixDynamicMoodEditorPage = () => {
                         state.mood.mainLamp.mode = selectPageData.value;
                       },
                     };
-                    navigation.navigate(RouterKey.ui_biz_select_page, paramsSelect);
+                    navigation.navigate(ui_biz_routerKey.ui_biz_select_page, paramsSelect);
                   }}
                 />
                 <Spacer height={cx(10)} />
@@ -440,7 +434,7 @@ const MixDynamicMoodEditorPage = () => {
                         state.mood.secondaryLamp.mode = selectPageData.value;
                       },
                     };
-                    navigation.navigate(RouterKey.ui_biz_select_page, paramsSelect);
+                    navigation.navigate(ui_biz_routerKey.ui_biz_select_page, paramsSelect);
                   }}
                 />
                 <Spacer height={cx(10)} />
@@ -515,7 +509,7 @@ const MixDynamicMoodEditorPage = () => {
                             state.mood.secondaryLamp.expand = selectPageData.value;
                           },
                         };
-                        navigation.navigate(RouterKey.ui_biz_select_page, paramsSelect);
+                        navigation.navigate(ui_biz_routerKey.ui_biz_select_page, paramsSelect);
                       }}
                     />
                     <Spacer />
@@ -668,15 +662,20 @@ const MixDynamicMoodEditorPage = () => {
                 textStyle={styles.deleteBtnText}
                 text={Strings.getLang('edit_static_mood_button_delete_text')}
                 onPress={() => {
-                  showDeleteMoodDialog(async (_, { close }) => {
-                    state.loading = true;
-                    close();
-                    const res = await params.modDeleteMood('del', state.mood);
-                    if (res.success) {
-                      navigation.navigate(RouterKey.ui_biz_mood);
+                  showDialog({
+                    method: 'confirm',
+                    title: I18n.getLang('string_light_pp_dialog_sm_ed_headline_d'),
+                    subTitle: I18n.getLang(`strip_light_static_mood_edit_dialog_text`),
+                    onConfirm: async (_, {close})=>{
+                      close();
+                      state.loading = true;
+                      const res = await params.modDeleteMood('del', state.mood);
+                      state.loading = false;
+                      if (res.success) {
+                        navigation.navigate(ui_biz_routerKey.ui_biz_mood);
+                      }
                     }
-                    state.loading = false;
-                  });
+                  })
                 }}
               />
             </View>

package/src/newModules/mood/MoodActions.ts

@@ -3,8 +3,8 @@ import {
   DefMoodOption,
   LightCategory,
   MixRemoteMoodInfo,
-  MoodDps,
   MoodInfo,
+  MoodPageParams,
   MoodUIInfo,
   RemoteMoodInfo,
 } from './Interface';
@@ -55,10 +55,10 @@ const getMoodInfo = (mainDp: string, option: LightCategory, secondaryDp: string)
   const moodInfo = !!(option.isStringLight || option.isStripLight)
     ? stripDp2Obj(mainDp, option.isStringLight)
     : option.isMixLight
-    ? MixDp2Obj(mainDp)
-    : option.isCeilingLight
-    ? MixCeilingDpObj(mainDp, secondaryDp)
-    : dp2Obj(mainDp, option.isFanLight, option.isUVCFan);
+      ? MixDp2Obj(mainDp)
+      : option.isCeilingLight
+        ? MixCeilingDpObj(mainDp, secondaryDp)
+        : dp2Obj(mainDp, option.isFanLight, option.isUVCFan);
   return moodInfo;
 };
 
@@ -66,8 +66,8 @@ const getMoodDp = (moodInfo: MoodUIInfo, option: LightCategory) => {
   const moodDp = !!(option.isStringLight || option.isStripLight)
     ? stripObj2Dp(moodInfo, option.isStringLight)
     : option.isMixLight
-    ? MixObj2Dp(moodInfo)
-    : obj2Dp(moodInfo, option.isFanLight, option.isUVCFan);
+      ? MixObj2Dp(moodInfo)
+      : obj2Dp(moodInfo, option.isFanLight, option.isUVCFan);
   return moodDp;
 };
 
@@ -96,6 +96,7 @@ export const getRemoteMoodList = async (
     const moodFeatureId = option.isMixLight ? MixLightSceneListFeatureId : SceneFeatureId;
     // await setRemoteMoodList(devId, isFeature, getDefMoodList(option), moodFeatureId);
     const res = await getFeature(devId, moodFeatureId);
+    console.log(res, '< --- res=====')
     if (!res.result) {
       return { success: false };
     }
@@ -148,46 +149,41 @@ export const getRemoteMoodList = async (
   }
 };
 
-export const useMoodScene = (
-  mainDp: string,
-  option: LightCategory,
-  secondaryDp?: string
-): [MoodInfo, (moodInfo: MoodUIInfo, moodDps: MoodDps) => Promise<Result<any>>] => {
+export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: MoodUIInfo) => Promise<Result<any>>] => {
   const [dps, setDps] = useDps();
-  const main = dps[mainDp];
-  const secondary = secondaryDp ? dps[secondaryDp] : '';
-  const [moodState, setMoodState] = useState(getMoodInfo(main, option, secondary));
+  const main = dps[params.mainDp];
+  const secondary = params.secondaryDp ? dps[params.secondaryDp] : '';
+  const [moodState, setMoodState] = useState(getMoodInfo(main, params, secondary));
 
   useUpdateEffect(() => {
-    setMoodState(getMoodInfo(main, option, secondary));
+    setMoodState(getMoodInfo(main, params, secondary));
   }, [main, secondary]);
 
-  const setMoodFn = (moodInfo: MoodUIInfo, moodDps: MoodDps) => {
-    const dps = {};
-    if (
-      (option.isCeilingLight && moodInfo.mainLamp && moodInfo.mainLamp.nodes.length) ||
-      !option.isCeilingLight
-    ) {
-      const mainHex = getMoodDp(moodInfo, option);
-      dps[moodDps.mainDp] = mainHex;
-      dps[moodDps.mainWorkMode] = WorkMode.Scene;
-      dps[moodDps.mainSwitch] = true;
-    }
-    if (
-      option.isCeilingLight &&
-      moodInfo.secondaryLamp &&
-      moodInfo.secondaryLamp.nodes.length &&
-      moodDps.secondaryDp
-    ) {
-      const secondaryHex = stripObj2Dp({
-        ...moodInfo,
-        mainLamp: moodInfo.secondaryLamp,
-      });
-      dps[moodDps.secondaryDp] = secondaryHex;
-      if (moodDps.secondaryWorkMode) dps[moodDps.secondaryWorkMode] = WorkMode.Scene;
-      if (moodDps.secondarySwitch) dps[moodDps.secondarySwitch] = true;
+  const setMoodFn = (moodInfo: MoodUIInfo) => {
+    const beforeDps = {}
+    const afterDps = {}
+    if (moodInfo) {
+      const { mainLamp, secondaryLamp } = moodInfo
+      if (mainLamp?.nodes?.length) {
+        const mainHex = getMoodDp(params.isCeilingLight ? {...moodInfo, id: mainLamp.id!} : moodInfo, params);
+        beforeDps[params.mainDp] = mainHex
+        afterDps[params.mainWorkMode] = WorkMode.Scene;
+        afterDps[params.mainSwitch] = true;
+      }
+      if (params.isCeilingLight && secondaryLamp.nodes?.length && params.secondaryDp) {
+        const secondaryHex = stripObj2Dp({
+          ...moodInfo,
+          mainLamp: moodInfo.secondaryLamp,
+          id: secondaryLamp.id!
+        });
+        beforeDps[params.secondaryDp] = secondaryHex
+        afterDps[params.secondaryWorkMode!] = WorkMode.Scene
+        afterDps[params.secondarySwitch!] = true
+      }
+      afterDps[params.switchLedDp] = true 
     }
-    return setDps(dps);
+    setDps(afterDps).then()
+    return setDps(beforeDps)
   };
   return [moodState, setMoodFn];
 };
@@ -208,12 +204,13 @@ export const saveMoodList = (
     }
     return {
       n: s.name,
-      i: getMoodDp(s, option),
-      s: option.isCeilingLight
+      i: getMoodDp(option.isCeilingLight ? { ...s, id: s.mainLamp.id! } : s, option),
+      s: s.secondaryLamp?.nodes?.length && option.isCeilingLight
         ? stripObj2Dp({
-            ...s,
-            mainLamp: s.secondaryLamp,
-          })
+          ...s,
+          mainLamp: s.secondaryLamp,
+          id: s.secondaryLamp.id!
+        })
         : '',
       t: 0,
       e: false,
@@ -229,7 +226,7 @@ export const saveMoodList = (
   const moodFeatureId = !!(option.isStringLight || option.isStripLight)
     ? featureId
     : option.isMixLight
-    ? MixLightSceneListFeatureId
-    : SceneFeatureId;
+      ? MixLightSceneListFeatureId
+      : SceneFeatureId;
   return setRemoteMoodList(devId, isFeature, remoteMoods, moodFeatureId);
 };