@ledvance/group-ui-biz-bundle 1.0.50 → 1.0.52

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -11,15 +11,35 @@ import {hex2Int, spliceByStep} from '@ledvance/base/src/utils/common'
 import I18n from '@ledvance/base/src/i18n'
 import BiologicalRes from './res/BiologicalRes'
 import { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
+import { useCallback } from 'react'
+import { Result } from '@ledvance/base/src/models/modules/Result'
 
 interface BiorhythmConfig {
   rhythm_mode: BiorhythmBean
 }
 
-export const useBiorhythm = () => {
-  return useFeatureHook<BiorhythmConfig, BiorhythmBean>('rhythm_mode', getDefBiorhythmUIState(), (val) => {
+export const useBiorhythm = (): [BiorhythmBean, (value: BiorhythmBean) => Promise<Result<any>>] => {
+  const [config, setConfig] = useFeatureHook<BiorhythmConfig, BiorhythmBean>('rhythm_mode', getDefBiorhythmUIState(), (val) => {
     return obj2Dp(val)
   })
+  const supportOldData = useCallback((oldData: BiorhythmBean) =>{
+    return {
+      ...oldData,
+      planList: oldData.planList.map(p => {
+        // @ts-ignore  老数据中使用的是startTime
+        if (!p.hasOwnProperty('time') && p.startTime){
+         // @ts-ignore
+          const t = p.startTime.split(':')
+          return {
+            ...p,
+            time: Number(t[0]) * 60 + Number(t[1])
+          }
+        }
+        return p
+      })
+    }
+  }, [])
+  return [supportOldData(config), setConfig]
 }
 
 export function dp2Obj(dp: string): BiorhythmBean {

package/src/modules/flags/FlagActions.ts

@@ -39,7 +39,7 @@ export interface FlagConfigType {
 export const useFlagMode = () : [FlagMode, (flagMode: FlagMode) => Promise<Result<any>>] =>{
   const uaGroupInfo = useUAGroupInfo()
   const [config, setConfig] = useGroupEzvizConfig<FlagConfigType, FlagMode>('flagMode', undefined)
-  const [cloudConfig, setCloudConfig] = useState()
+  const [cloudConfig, setCloudConfig] = useState<FlagMode>({flagMode: false, flagId: undefined})
   useEffect(() =>{
     if (!config) {
       getFlagMode(uaGroupInfo.tyGroupId.toString()).then(res =>{

package/src/modules/mood_new/AddMoodPage.tsx

@@ -15,15 +15,16 @@ import {
 } from './Interface';
 import { Result } from '@ledvance/base/src/models/modules/Result';
 import { ui_biz_routerKey } from '../../navigation/Routers'
-import { difference, head, map, range } from 'lodash';
+import { difference, head, range } from 'lodash';
 import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
 
 const cx = Utils.RatioUtils.convertX;
 
 export interface AddMoodPageParams {
   isStatic: boolean;
-  moods: MoodUIInfo[];
+  moodIds: number[];
   moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
   modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
 }
 
@@ -56,32 +57,21 @@ const AddMoodPage = () => {
 
   const onMoodItemClick = useCallback(
     (moodItem: RecommendMood) => {
-      let useIds: any[] = []
-      if(moduleParams.isCeilingLight){
-        const mainIds = map(routeParams.moods.map(m => m.mainLamp), 'id') ?? 0
-        const secondaryIds = map(routeParams.moods.map(m => m.secondaryLamp), 'id') ?? 0
-        useIds = [...mainIds, ...secondaryIds]
-      }else{
-        useIds = map(routeParams.moods, 'id');
-      }
       const idRange = range(0, 256);
-      const mainId: number = head(difference(idRange, useIds));
-      const secondaryId: number = head(difference(idRange, [...useIds, mainId])) 
-      console.log(mainId, secondaryId, '< --- iddddddddd ')
+      const mainId: number = head(difference(idRange, routeParams.moodIds)) || 0;
+      const secondaryId: number = moduleParams.isCeilingLight ? head(difference(idRange, [...routeParams.moodIds, mainId])) || 0 : 0
       const url = routeParams.isStatic
         ? ui_biz_routerKey.group_ui_biz_static_mood_edit
         : !!(moduleParams.isCeilingLight || moduleParams.isMixLight)
-        ? ui_biz_routerKey.group_ui_biz_dynamic_mix_mood_edit
-        : ui_biz_routerKey.group_ui_biz_dynamic_mood_edit;
+          ? ui_biz_routerKey.group_ui_biz_dynamic_mix_mood_edit
+          : ui_biz_routerKey.group_ui_biz_dynamic_mood_edit;
       const currentMood = moodItem.mainLamp
-        ? { ...moodItem, id: mainId, mainLamp: {...moodItem.mainLamp, id: mainId}, secondaryLamp: {...moodItem.secondaryLamp, id: secondaryId}}
-        : newMood(mainId, secondaryId ,moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
+        ? { ...moodItem, id: mainId, mainLamp: { ...moodItem.mainLamp, id: mainId }, secondaryLamp: { ...moodItem.secondaryLamp, id: secondaryId } }
+        : newMood(mainId, secondaryId, moduleParams.isSupportColor, routeParams.isStatic, moduleParams);
       navigation.navigate(url, {
+        ...routeParams,
         mode: 'add',
         currentMood,
-        moods: routeParams.moods,
-        moduleParams,
-        modDeleteMood: routeParams.modDeleteMood,
       });
     },
     [routeParams]
@@ -113,6 +103,7 @@ const AddMoodPage = () => {
                 title={item.name}
                 isMix={isMix}
                 mood={getFormateItem(item)}
+                deviceTypeOption={moduleParams}
                 onPress={() => {
                   onMoodItemClick(item);
                 }}
@@ -144,6 +135,17 @@ const styles = StyleSheet.create({
 
 export default AddMoodPage;
 
+const defStripConfig = {
+  version: 0,
+  expand: 0,
+  reserved1: 0,
+  reserved2: 0,
+  segmented: 0,
+  loop: 0,
+  excessive: 0,
+  direction: 0,
+}
+
 function newMood(
   mainId: number,
   secondaryId: number,
@@ -154,8 +156,8 @@ function newMood(
   const jump = moduleParams.isStringLight
     ? MoodJumpGradientMode.StringJump
     : moduleParams.isStripLight
-    ? MoodJumpGradientMode.StripJump
-    : MoodJumpGradientMode.SourceJump;
+      ? MoodJumpGradientMode.StripJump
+      : MoodJumpGradientMode.SourceJump;
   const node = {
     brightness: 100,
     colorTemp: 100,
@@ -175,6 +177,7 @@ function newMood(
       enable: true,
       fanEnable: true,
       fanSpeed: 1,
+      ...defStripConfig,
       mode: isStatic ? MoodNodeTransitionMode.Static : jump,
       nodes: isStatic ? [node] : [node, { ...node }],
     },
@@ -183,15 +186,9 @@ function newMood(
       enable: true,
       mode: MoodJumpGradientMode.StripJump,
       speed: 75,
-      version: 0,
-      expand: 0,
-      reserved1: 0,
-      reserved2: 0,
-      segmented: 0,
-      loop: 0,
-      excessive: 0,
-      direction: 0,
-      nodes: isStatic ? [] : [{...node, isColorNode: true}, {...node, isColorNode: true}],
+      ...defStripConfig,
+      version: 1,
+      nodes: isStatic ? [] : [{ ...node, isColorNode: true }, { ...node, isColorNode: true }],
     },
   };
 }

package/src/modules/mood_new/DynamicMoodEditorPage.tsx

@@ -10,9 +10,8 @@ import {
 } from 'react-native';
 import { Utils } from 'tuya-panel-kit';
 import { useReactive } from 'ahooks';
-import { cloneDeep, find, isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import Page from '@ledvance/base/src/components/Page';
-import Strings from '@ledvance/base/src/i18n';
 import { StaticMoodEditorPageParams } from './StaticMoodEditorPage';
 import { useNavigation } from '@react-navigation/native';
 import { hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils';
@@ -71,7 +70,7 @@ const DynamicMoodEditorPage = () => {
   });
 
   useEffect(() => {
-    state.headline = Strings.getLang(
+    state.headline = I18n.getLang(
       params.mode === 'add'
         ? 'add_new_dynamic_mood_headline_text'
         : 'edit_static_mood_headline_text'
@@ -95,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 => {
@@ -133,31 +123,38 @@ 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 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={true}
-      backDialogTitle={Strings.getLang(
+      backText={I18n.getLang('mesh_device_detail_mode')}
+      showBackDialog={!checkMoodChanged}
+      backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
           : 'manage_user_unsaved_changes_dialog_headline'
       )}
-      backDialogContent={Strings.getLang(
+      backDialogContent={I18n.getLang(
         params.mode === 'add'
           ? 'strip_light_static_mood_add_step_2_dialog_text'
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
-        if (state.loading) return;
+        if (state.loading || !canSaveMoodData) return;
         state.loading = true;
         const res = await params.modDeleteMood(params.mode, cloneDeep(state.mood));
+        console.log(res, '< --- res ---- >')
         if (res.success) {
           navigation.navigate(ui_biz_routerKey.group_ui_biz_mood);
         }
@@ -170,7 +167,7 @@ const DynamicMoodEditorPage = () => {
           <TextField
             style={styles.name}
             value={state.mood.name}
-            placeholder={Strings.getLang('edit_static_mood_inputfield_topic_text')}
+            placeholder={I18n.getLang('edit_static_mood_inputfield_topic_text')}
             onChangeText={text => {
               state.mood.name = text;
             }}
@@ -178,7 +175,7 @@ const DynamicMoodEditorPage = () => {
             showError={state.mood.name.length > 32 || nameRepeat}
             tipColor={nameRepeat ? '#f00' : undefined}
             tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
-            errorText={Strings.getLang(
+            errorText={I18n.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
             )}
           />
@@ -186,14 +183,14 @@ const DynamicMoodEditorPage = () => {
             <Spacer height={cx(16)} />
             <View style={styles.lightLine}>
               <Text style={styles.light}>
-                {Strings.getLang('light_sources_tile_tw_lighting_headline')}
+                {I18n.getLang('light_sources_tile_tw_lighting_headline')}
               </Text>
             </View>
             <Spacer height={cx(18)} />
             <TextFieldStyleButton
               style={styles.transitionMode}
               text={state.sceneMode[state.mood.mainLamp.mode]?.title}
-              placeholder={Strings.getLang('add_new_dynamic_mood_color_changing_mode_headline')}
+              placeholder={I18n.getLang('add_new_dynamic_mood_color_changing_mode_headline')}
               onPress={() => {
                 const paramsSelect: SelectPageParams<number> = {
                   title: I18n.getLang('add_new_dynamic_mood_color_changing_mode_headline'),
@@ -207,7 +204,7 @@ const DynamicMoodEditorPage = () => {
             />
             <Spacer height={cx(10)} />
             <LdvSlider
-              title={Strings.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
+              title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
               value={state.mood.mainLamp.speed}
               onValueChange={() => {}}
               onSlidingComplete={value => {
@@ -386,7 +383,7 @@ const DynamicMoodEditorPage = () => {
             <Spacer />
             <View style={styles.lightLine}>
               <Text style={styles.light}>
-                {Strings.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
+                {I18n.getLang('add_new_dynamic_mood_lights_field_headline2_text')}
               </Text>
               <View
                 style={[styles.preview, { backgroundColor: getColorBlockColor(state.mainNode) }]}
@@ -527,7 +524,7 @@ const DynamicMoodEditorPage = () => {
               <TextButton
                 style={styles.deleteBtn}
                 textStyle={styles.deleteBtnText}
-                text={Strings.getLang('edit_static_mood_button_delete_text')}
+                text={I18n.getLang('edit_static_mood_button_delete_text')}
                 onPress={() => {
                   showDialog({
                     method: 'confirm',
@@ -648,7 +645,7 @@ const styles = StyleSheet.create({
 export default DynamicMoodEditorPage;
 export function getTransitionModeString(transitionMode: MoodNodeTransitionMode): string {
   if (transitionMode === MoodNodeTransitionMode.Jump) {
-    return Strings.getLang('other_lights_modes_jump_text');
+    return I18n.getLang('other_lights_modes_jump_text');
   }
-  return Strings.getLang('other_lights_modes_gradient_text');
+  return I18n.getLang('other_lights_modes_gradient_text');
 }

package/src/modules/mood_new/MixDynamicMoodEditor.tsx

@@ -10,7 +10,7 @@ import {
 } from 'react-native';
 import { Utils } from 'tuya-panel-kit';
 import { useReactive } from 'ahooks';
-import { cloneDeep, find, isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import Page from '@ledvance/base/src/components/Page';
 import { StaticMoodEditorPageParams, StaticMoodEditorPageState } from './StaticMoodEditorPage';
 import { useNavigation } from '@react-navigation/native';
@@ -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,13 +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 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={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -147,10 +146,9 @@ const MixDynamicMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
-        if (state.loading) return;
+        if (state.loading || !canSaveMoodData) return;
         state.loading = true;
         const newMood = cloneDeep(state.mood)
         if(moduleParams.isMixLight){

package/src/modules/mood_new/MoodActions.ts

@@ -3,6 +3,7 @@ import {
   DefMoodOption,
   LightCategory,
   MixRemoteMoodInfo,
+  MoodPageParams,
   MoodUIInfo,
   RemoteMoodInfo,
 } from './Interface';
@@ -35,16 +36,12 @@ export interface SceneDataConfigType {
   switch_led: boolean
   colour_switch: boolean
   white_switch: boolean
+  switch: boolean
 }
 
-interface LightType {
-  isStringLight?: boolean
-  isStripLight?: boolean
-  isCeilingLight?: boolean
-  isFanLight?: boolean
-  isMixLight?: boolean
-  isUVCFan?: boolean
-  isMatterLight?: boolean
+export function useSwitchLed(params: MoodPageParams): boolean {
+  const [switchLed] = useGroupDp<boolean>(getGlobalParamsDp(params.isMatterLight ? 'switch' : 'switch_led'))
+  return switchLed
 }
 
 export function useWorkMode(): WorkMode {
@@ -57,28 +54,21 @@ export function useRgbicWorkMode(): WorkMode {
   return rgbicWorkMode
 }
 
-export function useMoodScene(params: LightType): [SceneDataType, (value: SceneDataType) => Promise<Result<any>>] {
+export function useMoodScene(params: MoodPageParams): [SceneDataType, (value: SceneDataType) => Promise<Result<any>>] {
   const defConfig = {
     scene: undefined
   }
-  // const [] = useGroupDp<MoodUIInfo>(getGlobalParamsDp('scene_data'))
-  // const [] = useGroupDp<MoodUIInfo>(getGlobalParamsDp(''))
   const [config, setConfig] = useFeatureHook<SceneDataConfigType, SceneDataType>('sceneConfig', defConfig, undefined,
     (moodInfo) => {
       if (moodInfo?.scene) {
-        console.log(moodInfo.scene, '< --- moodInfo.scene')
         const dps = {}
         const { mainLamp, secondaryLamp } = moodInfo.scene
         if (mainLamp?.nodes?.length) {
           const mainDp = getMoodDp(params.isCeilingLight ? ({...moodInfo.scene, id: mainLamp.id!}) : moodInfo.scene, params)
-          if (mainDp && getGlobalParamsDp('scene_data')) {
-            dps[getGlobalParamsDp('scene_data')] = mainDp
-            dps[getGlobalParamsDp('work_mode')] = WorkMode.Scene
-            if (params.isCeilingLight) {
-              dps[getGlobalParamsDp('white_switch')] = true
-            } else {
-              dps[getGlobalParamsDp('switch_led')] = true
-            }
+          if (mainDp && params.mainDp) {
+            dps[params.mainDp] = mainDp
+            dps[params.mainSwitch] = true 
+            dps[params.mainWorkMode] = WorkMode.Scene 
           }
         }
         if (secondaryLamp.nodes.length && params.isCeilingLight) {
@@ -87,10 +77,10 @@ export function useMoodScene(params: LightType): [SceneDataType, (value: SceneDa
             mainLamp: secondaryLamp,
             id: secondaryLamp.id!
           });
-          if (secondaryDp && getGlobalParamsDp('dreamlight_scene_mode')) {
-            dps[getGlobalParamsDp('dreamlight_scene_mode')] = secondaryDp
-            dps[getGlobalParamsDp('rgbic_work_mode')] = WorkMode.Scene
-            dps[getGlobalParamsDp('colour_switch')] = true
+          if (secondaryDp && params.secondaryDp) {
+            dps[params.secondaryDp] = secondaryDp
+            dps[params.secondaryWorkMode!] = WorkMode.Scene
+            dps[params.secondarySwitch!] = true 
           }
         }
         return dps
@@ -103,6 +93,8 @@ export function useMoodScene(params: LightType): [SceneDataType, (value: SceneDa
           config.work_mode = WorkMode.Scene
           if (params.isCeilingLight) {
             config.white_switch = true
+          }else if(params.isMatterLight){
+            config.switch = true 
           } else {
             config.switch_led = true
           }
@@ -149,7 +141,7 @@ const getMoodDp = (moodInfo: MoodUIInfo, option: LightCategory) => {
 
 const remoteMoodInfo2MoodUIState = (
   remoteMoodInfo,
-  index: number,
+  _: number,
   option: DefMoodOption
 ): MoodUIInfo => {
   const moodInfo = option.isMixLight
@@ -166,8 +158,6 @@ export const getRemoteMoodList = async (
   devId: string,
   option: DefMoodOption,
 ) => {
-  // const defaultScene = getDefMoodList(option);
-  // await setRemoteMoodList(devId, defaultScene, SceneFeatureId);
   const res = await NativeApi.getJson(devId, SceneFeatureId);
   const isNormalData = Array.isArray(parseJSON(res?.data));
   if (res.success && isNormalData) {

package/src/modules/mood_new/MoodInfo.ts

@@ -66,7 +66,7 @@ export function getDefMoodList(option: DefMoodOption) {
     if (option.isSupportTemperature && option.isSupportBrightness) {
       return getRGBWDefSceneList();
     }
-    if (option.isSupportTemperature) {
+    if (option.isSupportBrightness) {
       return getRGBDefSceneList();
     }
     return getOnlyRGBDefSceneList();
@@ -135,43 +135,35 @@ function getRGBDefSceneList(): RemoteMoodInfo[] {
       s: '',
       t: 0,
       e: false,
-    },
-    {
+  },
+  {
       n: I18n.getLang('mesh_device_detail_lighting_read'),
       i: '010e0d0000000000000003e803e8',
       s: '',
       t: 0,
       e: false,
-    },
-    {
+  },
+  {
       n: I18n.getLang('mesh_device_detail_lighting_work'),
       i: '020e0d0000000000000003e803e8',
       s: '',
       t: 0,
       e: false,
-    },
-    {
+  },
+  {
       n: I18n.getLang('mesh_device_detail_lighting_leisure'),
       i: '030e0d0000000000000001f403e8',
       s: '',
       t: 0,
       e: false,
-    },
-    {
+  },
+  {
       n: I18n.getLang('mesh_device_detail_lighting_color_mode'),
-      i:
-        '05464601000003e803e800000000464601007803e803e80000000046460100f003e803e800000000464601003d03e803e80000000046460100ae03e803e800000000464601011303e803e800000000',
+      i: '05464601000003e803e800000000464601007803e803e80000000046460100f003e803e800000000464601003d03e803e80000000046460100ae03e803e800000000464601011303e803e800000000',
       s: '',
       t: 0,
       e: false,
-    },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_white_mode'),
-      i: '0646460100000000000003e8000046460100000000000003e8019046460100000000000003e803e8',
-      s: '',
-      t: 0,
-      e: false,
-    },
+  },
     ...defColorSceneList,
   ];
 }
@@ -1454,6 +1446,16 @@ export type RecommendMood = {
   secondaryLamp?: MoodLampInfo;
 };
 
+const defStripConfig = {
+  expand: 0,
+  reserved1: 0,
+  reserved2: 0,
+  segmented: 0,
+  loop: 0,
+  excessive: 0,
+  direction: 0,
+};
+
 export function getRecommendMoods(
   isStatic: boolean,
   moduleParams: MoodPageParams
@@ -1697,6 +1699,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 75,
@@ -1734,6 +1737,7 @@ export function getRecommendMoods(
           fanEnable: true,
           enable: true,
           fanSpeed: 1,
+          ...defStripConfig,
           nodes: [
             {
               h: 40,
@@ -1771,6 +1775,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 300,
@@ -1815,6 +1820,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -1852,6 +1858,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -1889,6 +1896,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -1933,6 +1941,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -1970,6 +1979,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -2007,6 +2017,7 @@ export function getRecommendMoods(
           fanEnable: true,
           fanSpeed: 1,
           enable: true,
+          ...defStripConfig,
           nodes: [
             {
               h: 0,
@@ -2039,17 +2050,6 @@ export function getRecommendMoods(
   }
 }
 
-const defSecondly = {
-  version: 0,
-  expand: 0,
-  reserved1: 0,
-  reserved2: 0,
-  segmented: 0,
-  loop: 0,
-  excessive: 0,
-  direction: 0,
-};
-
 export function getRecommendMixMoods(
   isStatic: boolean,
   moduleParams: MoodPageParams
@@ -2069,7 +2069,7 @@ export function getRecommendMixMoods(
           nodes: [{ h: 0, s: 0, v: 0, brightness: 100, colorTemp: 20, isColorNode: false }],
         },
         secondaryLamp: {
-          ...defSecondly,
+          ...defStripConfig,
           enable: false,
           id: -1,
           speed: 100,
@@ -2087,7 +2087,7 @@ export function getRecommendMixMoods(
           nodes: [{ h: 0, s: 0, v: 0, brightness: 100, colorTemp: 40, isColorNode: false }],
         },
         secondaryLamp: {
-          ...defSecondly,
+          ...defStripConfig,
           enable: false,
           id: -1,
           speed: 100,
@@ -2105,7 +2105,7 @@ export function getRecommendMixMoods(
           nodes: [{ h: 0, s: 0, v: 0, brightness: 100, colorTemp: 50, isColorNode: false }],
         },
         secondaryLamp: {
-          ...defSecondly,
+          ...defStripConfig,
           enable: false,
           id: -1,
           speed: 100,
@@ -2133,7 +2133,7 @@ export function getRecommendMixMoods(
         ],
       },
       secondaryLamp: {
-        ...defSecondly,
+        ...defStripConfig,
         id: 0,
         speed: 14,
         mode: moduleParams.isCeilingLight

package/src/modules/mood_new/MoodItem.tsx

@@ -7,27 +7,38 @@ import { mapFloatToRange } from '@ledvance/base/src/utils';
 import Card from '@ledvance/base/src/components/Card';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine';
-import { MoodLampInfo, MoodUIInfo } from './Interface';
+import { MoodJumpGradientMode, MoodLampInfo, MoodUIInfo } from './Interface';
 import I18n from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
 
 const cx = Utils.RatioUtils.convertX;
 
+interface LightCategory {
+  isMixLight?: boolean
+  isStripLight?: boolean
+  isStringLight?: boolean
+  isCeilingLight?: boolean
+}
+
 interface MoodItemProps extends ViewProps {
   enable: boolean;
   isMix: boolean;
   mood: MoodUIInfo;
   style?: ViewStyle;
+  deviceTypeOption?: LightCategory
   onPress?: () => void;
   onSwitch: (enable: boolean) => void;
 }
 
 const MoodItem = (props: MoodItemProps) => {
-  const { mood, isMix } = props;
+  const { mood, isMix, deviceTypeOption } = props;
   const isDynamic = useMemo(() => {
     return mood.mainLamp.nodes?.length > 1 || mood.secondaryLamp.nodes?.length > 1;
   }, [mood.mainLamp.nodes, mood.secondaryLamp.nodes]);
 
+  const gradientMode = useMemo(() => (
+     deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : (deviceTypeOption?.isStripLight || deviceTypeOption?.isCeilingLight) ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
+  ), [MoodJumpGradientMode, deviceTypeOption])
   return (
     <Card style={[styles.card, props.style]} onPress={props.onPress}>
       <View>
@@ -41,11 +52,11 @@ const MoodItem = (props: MoodItemProps) => {
           />
         </View>
         <Spacer />
-        <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} />
+        <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
         {(isMix && !!mood.secondaryLamp.nodes.length) && (
           <>
             <Spacer height={cx(7)} />
-            <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} />
+            <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
           </>
         )}
         <Spacer height={cx(12)} />
@@ -66,7 +77,7 @@ const MoodItem = (props: MoodItemProps) => {
 
 export default MoodItem;
 
-export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boolean }) {
+export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boolean, type: 'gradient' | 'separate' }) {
   const { mixSubLight, isMix } = props;
   const lightColors = !!(mixSubLight.enable && mixSubLight.nodes.length) ? mixSubLight.nodes?.map(n => {
     return n.isColorNode
@@ -79,7 +90,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boo
       <MoodColorsLine
         nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
         width={isMix ? cx(264) : undefined}
-        type={'separate'}
+        type={props.type}
         colors={lightColors}
       />
       {isMix && (

package/src/modules/mood_new/MoodPage.tsx

@@ -1,7 +1,7 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import Page from '@ledvance/base/src/components/Page';
 import { Utils } from 'tuya-panel-kit';
-import { saveMoodList, useRgbicWorkMode, useWorkMode } from './MoodActions';
+import { saveMoodList, useRgbicWorkMode, useSwitchLed, useWorkMode } from './MoodActions';
 import {
   useDeviceInfo,
   useMoods,
@@ -21,7 +21,7 @@ import { MoodPageParams, MoodPageState, MoodUIInfo } from './Interface';
 import { getRemoteMoodList, useMoodScene } from './MoodActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import { ui_biz_routerKey } from '../../navigation/Routers'
-import { cloneDeep } from 'lodash';
+import { cloneDeep, filter, map } from 'lodash';
 import { useFlagMode } from '../flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
 
@@ -34,17 +34,9 @@ const MoodPage = () => {
   const deviceInfo = useDeviceInfo();
   const uaGroupInfo = useUAGroupInfo()
   const navigation = useNavigation();
-  const option = {
-    isCeilingLight: params.isCeilingLight,
-    isStripLight: params.isStripLight,
-    isStringLight: params.isStringLight,
-    isFanLight: params.isFanLight,
-    isMixLight: params.isMixLight,
-    isUVCFan: params.isUVCFan,
-    isMatterLight: params.isMatterLight,
-  };
-  const [moodInfo, setMoodInfo] = useMoodScene(option);
+  const [moodInfo, setMoodInfo] = useMoodScene(params);
   const workMode = useWorkMode()
+  const switchLed = useSwitchLed(params)
   const rgbicWorkMode = useRgbicWorkMode()
   const [moods, setMoods] = useMoods();
   const [flagMode, setFlagMode] = useFlagMode();
@@ -60,22 +52,23 @@ const MoodPage = () => {
     flag: Symbol(),
   });
 
+  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[]
+  }, [JSON.stringify(state.originMoods)])
+
   useEffect(() => {
     state.timerId = setTimeout(() => {
       state.loading = true 
       getRemoteMoodList(
         uaGroupInfo.tyGroupId.toString(),
-        {
-          ...option,
-          isSupportBrightness: params.isSupportBrightness,
-          isSupportColor: params.isSupportColor,
-          isSupportTemperature: params.isSupportTemperature,
-        }
+        params
       ).then(res => {
         state.loading = false 
-        console.log(res.data, '< --- res.data --- >')
         if (res.success && Array.isArray(res.data)) {
           state.originMoods = cloneDeep(res.data);
+          console.log(state.originMoods, '< --- originMoods')
         }
       });
     }, 200);
@@ -110,9 +103,10 @@ const MoodPage = () => {
     navigation.navigate(path, {
       mode,
       isStatic,
-      moods: state.originMoods,
       currentMood,
       moduleParams: params,
+      moodIds,
+      nameRepeat,
       modDeleteMood,
     });
   };
@@ -142,7 +136,7 @@ const MoodPage = () => {
       },
       secondaryLamp: {
         ...currentMood.secondaryLamp,
-        nodes: currentMood.secondaryLamp
+        nodes: currentMood.secondaryLamp && currentMood.secondaryLamp.nodes?.length
           ? currentMood.secondaryLamp.nodes.map(node => {
             if (mode !== 'del') {
               if (node.isColorNode) {
@@ -160,6 +154,7 @@ const MoodPage = () => {
           : [],
       },
     };
+
     if (mode === 'set') {
       return setMoodInfo({
         scene: checkedMood,
@@ -192,14 +187,15 @@ const MoodPage = () => {
       }
     }
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood;
-    const res = await saveMoodList(uaGroupInfo.tyGroupId.toString(), newScene, option);
+    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)) {
+        (params.isCeilingLight ? (workMode !== WorkMode.Scene && rgbicWorkMode !== WorkMode.Scene) : workMode !== WorkMode.Scene) || !switchLed) {
         return {
           success: true
         }
@@ -235,19 +231,22 @@ const MoodPage = () => {
 
   const getItemEnable = useCallback(
     (moodItem: MoodUIInfo) => {
-      if (option.isCeilingLight) {
+      if (params.isCeilingLight) {
         return (
           moodInfo.scene?.mainLamp?.id === moodItem.mainLamp.id &&
           moodInfo.scene?.secondaryLamp.id === moodItem.secondaryLamp.id &&
-          (workMode === WorkMode.Scene || rgbicWorkMode === WorkMode.Scene)
+          (workMode === WorkMode.Scene || rgbicWorkMode === WorkMode.Scene) && switchLed
         );
       } else {
-        return moodInfo.scene?.id === moodItem.id && workMode === WorkMode.Scene && !flagMode.flagMode;
+        return moodInfo.scene?.id === moodItem.id && workMode === WorkMode.Scene && !flagMode.flagMode && switchLed;
       }
     },
     [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])
 
   return (
     <>
@@ -264,7 +263,7 @@ const MoodPage = () => {
         }}
         loading={state.loading}
       >
-        <View style={styles.tagLine}>
+        {!params.isStripLight && <View style={styles.tagLine}>
           <Tag
             checked={state.staticTagChecked}
             text={Strings.getLang('mood_overview_filter_name_text1')}
@@ -280,7 +279,7 @@ const MoodPage = () => {
               state.dynamicTagChecked = checked;
             }}
           />
-        </View>
+        </View>}
         <Spacer height={cx(10)} />
         {state.originMoods.length >= MAX_MOOD_COUNT && (
           <View style={styles.infoLine}>
@@ -300,6 +299,7 @@ const MoodPage = () => {
               <MoodItem
                 enable={getItemEnable(item)}
                 isMix={!!(params.isMixLight || params.isCeilingLight)}
+                deviceTypeOption={params}
                 mood={item}
                 onPress={() => {
                   navigationRoute(item.mainLamp.nodes.length === 1, 'edit', item);

package/src/modules/mood_new/MoodParse.ts

@@ -192,7 +192,7 @@ export function stripObj2Dp(mood: MoodInfo, isStringLight: boolean = false) {
     speed,
     nodes,
   } = mood.mainLamp;
-  const versionHex = nToHS(mood.version);
+  const versionHex = nToHS(1);
   const idHex = nToHS(mood.id);
   const modeHex = nToHS(mode);
   const intervalTimeHex = nToHS(speed);

package/src/modules/mood_new/RecommendMoodItem.tsx

@@ -1,24 +1,36 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Utils } from 'tuya-panel-kit';
 import Card from '@ledvance/base/src/components/Card';
 import { CellContent } from '@ledvance/base/src/components/Cell';
 import { StyleSheet, View } from 'react-native';
 import Spacer from '@ledvance/base/src/components/Spacer';
-import { MoodUIInfo } from './Interface';
+import { MoodJumpGradientMode, MoodUIInfo } from './Interface';
 import { MixMoodColorsLine } from './MoodItem';
 
 const cx = Utils.RatioUtils.convertX;
 
+interface LightCategory {
+  isMixLight?: boolean
+  isStripLight?: boolean
+  isStringLight?: boolean
+  isCeilingLight?: boolean
+}
+
 interface RecommendMixMoodItemProps {
   title: string;
   isMix: boolean;
   mood: MoodUIInfo;
+  deviceTypeOption?: LightCategory
   onPress: () => void;
 }
 
 const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
-  const { mood, isMix } = props;
+  const { mood, isMix, deviceTypeOption } = props;
 
+  const gradientMode = useMemo(() => (
+    deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : (deviceTypeOption?.isStripLight || deviceTypeOption?.isCeilingLight) ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
+ ), [MoodJumpGradientMode, deviceTypeOption])
+ 
   return (
     <Card style={styles.root} onPress={props.onPress}>
       <CellContent
@@ -34,9 +46,9 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
       {!!(mood.mainLamp) && (
         <>
           <View style={styles.lineStyle}>
-            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} />
+            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
             <Spacer height={cx(7)} />
-            {(isMix && !!mood.secondaryLamp.nodes.length) && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} />}
+            {(isMix && !!mood.secondaryLamp.nodes.length) && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === gradientMode ? 'gradient' : 'separate'}/>}
           </View>
           <Spacer height={cx(24)} />
         </>
@@ -53,8 +65,8 @@ const styles = StyleSheet.create({
   },
   content: {
     height: cx(56),
-    display: 'flex',
     marginHorizontal: cx(16),
+    width: cx(295)
   },
   title: {
     color: '#000',

package/src/modules/mood_new/Router.ts

@@ -3,6 +3,7 @@ import MoodPage from "./MoodPage";
 import DynamicMoodEditorPage from "./DynamicMoodEditorPage";
 import StaticMoodEditorPage from "./StaticMoodEditorPage";
 import MixDynamicMoodEditorPage from "./MixDynamicMoodEditor";
+import AddMoodPage from "./AddMoodPage"
 import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const MoodPageRouters: NavigationRoute[] = [
@@ -14,6 +15,14 @@ const MoodPageRouters: NavigationRoute[] = [
       showOfflineView: false,
     }
   },
+  {
+    name: ui_biz_routerKey.group_ui_biz_mood_add,
+    component: AddMoodPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
   {
     name: ui_biz_routerKey.group_ui_biz_dynamic_mood_edit,
     component: DynamicMoodEditorPage,

package/src/modules/mood_new/StaticMoodEditorPage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { ScrollView, StyleSheet, View } from 'react-native';
-import { cloneDeep, find, isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { useReactive } from 'ahooks';
 import Page from '@ledvance/base/src/components/Page';
 import I18n from '@ledvance/base/src/i18n';
@@ -27,10 +27,9 @@ const cx = Utils.RatioUtils.convertX;
 
 export interface StaticMoodEditorPageParams {
   mode: 'add' | 'edit';
-  moods: MoodUIInfo[];
   currentMood: MoodUIInfo;
-  onSave: () => void;
   moduleParams: MoodPageParams;
+  nameRepeat: (mood: MoodUIInfo) => boolean
   modDeleteMood: (mode: 'add' | 'edit' | 'del', currentMood: MoodUIInfo) => Promise<Result<any>>;
 }
 
@@ -72,7 +71,7 @@ const StaticMoodEditorPage = () => {
   }, []);
 
   const onRightClick = async () => {
-    if (state.loading) return;
+    if (state.loading || !canSaveMoodData) return;
     state.loading = true;
     const newMood: MoodUIInfo = {
       ...state.mood,
@@ -105,23 +104,22 @@ const StaticMoodEditorPage = () => {
     }
   };
 
-  const getButtonStatus = () => {
-    return (
-      (params.mode === 'edit' && isEqual(state.mood, params.currentMood)) ||
-      !state.mood.name ||
-      nameRepeat ||
-      state.mood.name.length > 32
-    );
-  };
-
   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 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={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={!checkMoodChanged}
       backDialogTitle={I18n.getLang(
         params.mode === 'add'
           ? 'string_light_pp_dialog_sm_add_headline_c'
@@ -133,8 +131,7 @@ const StaticMoodEditorPage = () => {
           : 'strip_light_static_mood_editor_step_2_dialog_text'
       )}
       headlineText={state.headline}
-      rightButtonIcon={getButtonStatus() ? res.ic_uncheck : res.ic_check}
-      rightButtonDisabled={getButtonStatus()}
+      rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={onRightClick}
       loading={state.loading}
     >