@ledvance/ui-biz-bundle 1.1.65 → 1.1.67

package/src/newModules/mood/MoodInfo.ts

@@ -14,7 +14,7 @@ export const getDefaultMood = (): MoodInfo => {
   return {
     version: 0,
     // 场景号
-    id: 0,
+    id: -1,
     // 主灯
     mainLamp: {
       // 变化方式
@@ -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/newModules/mood/MoodItem.tsx

@@ -7,27 +7,39 @@ 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 +53,11 @@ const MoodItem = (props: MoodItemProps) => {
           />
         </View>
         <Spacer />
-        <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={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 +78,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 +91,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/newModules/mood/MoodPage.tsx

@@ -1,4 +1,4 @@
-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, useWorkMode } from './MoodActions';
@@ -21,8 +21,8 @@ import { useNavigation } from '@react-navigation/core';
 import { MoodPageParams, MoodPageState, MoodUIInfo } from './Interface';
 import { getRemoteMoodList, useMoodScene } from './MoodActions';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
-import { RouterKey } from 'navigation/Router';
-import { cloneDeep } from 'lodash';
+import { ui_biz_routerKey } from '../../navigation/Routers'
+import { cloneDeep, filter, map } from 'lodash';
 import { saveFlagMode } from '@ledvance/ui-biz-bundle/src/modules/flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
 
@@ -35,16 +35,7 @@ const MoodPage = () => {
   const deviceInfo = useDeviceInfo();
   const devId = useDeviceId();
   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(params.mainDp, option, params.secondaryDp);
+  const [moodInfo, setMoodInfo] = useMoodScene(params);
   const [moods, setMoods] = useMoods();
   const [mainWork, setMainWork] = useWorkMode(params.mainWorkMode);
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
@@ -60,23 +51,28 @@ const MoodPage = () => {
     timerId: undefined as any,
     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.loading = true 
     state.timerId = setTimeout(() => {
       getRemoteMoodList(
         devId,
-        {
-          ...option,
-          isSupportBrightness: params.isSupportBrightness,
-          isSupportColor: params.isSupportColor,
-          isSupportTemperature: params.isSupportTemperature,
-        },
+        params,
         params.featureId
       ).then(res => {
+        state.loading = false 
         if (res.success && Array.isArray(res.data)) {
+          console.log(res.data, '< --- res.data')
           state.originMoods = cloneDeep(res.data);
         }
       });
-    }, 400);
+    }, 250);
 
     return () => {
       clearTimeout(state.timerId);
@@ -98,18 +94,19 @@ const MoodPage = () => {
   const navigationRoute = (isStatic: boolean, mode: 'add' | 'edit', currentMood?: MoodUIInfo) => {
     const path =
       mode === 'add'
-        ? RouterKey.ui_biz_mood_add
+        ? ui_biz_routerKey.ui_biz_mood_add
         : isStatic
-        ? RouterKey.ui_biz_static_mood_edit
+        ? ui_biz_routerKey.ui_biz_static_mood_edit
         : !!(params.isMixLight || params.isCeilingLight)
-        ? RouterKey.ui_biz_dynamic_mix_mood_edit
-        : RouterKey.ui_biz_dynamic_mood_edit;
+        ? ui_biz_routerKey.ui_biz_dynamic_mix_mood_edit
+        : ui_biz_routerKey.ui_biz_dynamic_mood_edit;
     navigation.navigate(path, {
       mode,
       isStatic,
-      moods: state.originMoods,
       currentMood,
       moduleParams: params,
+      moodIds,
+      nameRepeat,
       modDeleteMood,
     });
   };
@@ -139,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) {
@@ -161,7 +158,7 @@ const MoodPage = () => {
       },
     };
     if (mode === 'set') {
-      return setMoodInfo(checkedMood, params);
+      return setMoodInfo(checkedMood);
     }
     let newScene: MoodUIInfo[] = [];
     if (mode === 'add') {
@@ -177,7 +174,7 @@ const MoodPage = () => {
       });
     }
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood;
-    const res = await saveMoodList(devId, newScene, option, params.featureId);
+    const res = await saveMoodList(devId, newScene, params, params.featureId);
     if (res.success) {
       state.originMoods = cloneDeep(newScene);
       setMoods(cloneDeep(newScene));
@@ -196,7 +193,7 @@ const MoodPage = () => {
             };
           }
         }
-        setMoodInfo(mood, params).then();
+        setMoodInfo(mood).then();
       } else {
         if (mainWork === WorkMode.Scene) {
           if (params.isCeilingLight) {
@@ -255,7 +252,7 @@ const MoodPage = () => {
 
   const getItemEnable = useCallback(
     (moodItem: MoodUIInfo) => {
-      if (option.isCeilingLight) {
+      if (params.isCeilingLight) {
         return (
           moodInfo.mainLamp.id === moodItem.mainLamp.id &&
           moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
@@ -268,6 +265,10 @@ const MoodPage = () => {
     [moodInfo, mainWork]
   );
 
+  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 (
     <>
       <Page

package/src/newModules/mood/MoodParse.ts

@@ -6,7 +6,8 @@ const { nToHS, toFixed, sToN } = Utils;
 
 // light source
 export function dp2Obj(dp: string, isFan: boolean = false, isUVCFan?: boolean): MoodInfo {
-  if (!dp) return getDefaultMood();
+  console.log(dp, '< ---- dppppp')
+  if (!dp || dp?.length <= 8) return getDefaultMood();
   let dpCopy = dp;
   let fanEnable: undefined | boolean = undefined;
   let fanSpeed: undefined | number = undefined;

package/src/newModules/mood/RecommendMoodItem.tsx

@@ -1,23 +1,35 @@
-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}>
@@ -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 && <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)} />
         </>
@@ -54,6 +66,7 @@ const styles = StyleSheet.create({
   content: {
     height: cx(56),
     marginHorizontal: cx(16),
+    width: cx(295)
   },
   title: {
     color: '#000',

package/src/newModules/mood/Router.ts

@@ -1,9 +1,8 @@
-import {NavigationRoute, TransitionPresets} from "tuya-panel-kit";
-import DynamicMoodEditorPage from "../../modules/mood/DynamicMoodEditorPage";
-import StaticMoodEditorPage from "../../modules/mood/StaticMoodEditorPage";
-import AddMoodPage from "../../modules/mood/AddMoodPage";
-import MoodPage from "../../modules/mood/MoodPage";
-import SelectPage from "../../modules/select/SelectPage";
+import {NavigationRoute} from "tuya-panel-kit";
+import DynamicMoodEditorPage from "./DynamicMoodEditorPage";
+import StaticMoodEditorPage from "./StaticMoodEditorPage";
+import AddMoodPage from "./AddMoodPage";
+import MoodPage from "./MoodPage";
 import {ui_biz_routerKey} from "../../navigation/Routers";
 
 const MoodPageRouters: NavigationRoute[] = [
@@ -38,16 +37,7 @@ const MoodPageRouters: NavigationRoute[] = [
       hideTopbar: true,
       showOfflineView: false,
     },
-  },
-  {
-    name: ui_biz_routerKey.ui_biz_select_page,
-    component: SelectPage,
-    options: {
-      gesture: true,
-      hideTopbar: true,
-      ...TransitionPresets.ModalPresentationIOS,
-    },
-  },
+  }
 ]
 
 export default MoodPageRouters