@ledvance/ui-biz-bundle 1.1.69 → 1.1.71

package/src/newModules/mood/MoodPage.tsx

@@ -1,14 +1,14 @@
 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';
+import { saveMoodList, useSwitchLed, useWorkMode } from './MoodActions';
 import {
   useDeviceId,
   useDeviceInfo,
   useFlagMode,
   useMoods,
 } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import { useReactive } from 'ahooks';
+import { useReactive, useUpdateEffect } from 'ahooks';
 import Strings from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
 import { FlatList, StyleSheet, View, Platform } from 'react-native';
@@ -39,7 +39,9 @@ const MoodPage = () => {
   const [moods, setMoods] = useMoods();
   const [mainWork, setMainWork] = useWorkMode(params.mainWorkMode);
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
+  const [switchLed] = useSwitchLed(params.switchLedDp)
   const [flagMode, setFlagMode] = useFlagMode();
+  
   const state = useReactive<MoodPageState>({
     currentMood: undefined,
     staticTagChecked: true,
@@ -68,7 +70,7 @@ const MoodPage = () => {
       ).then(res => {
         state.loading = false 
         if (res.success && Array.isArray(res.data)) {
-          console.log(res.data, '< --- res.data')
+          console.log(res.data, ' <--- res.data')
           state.originMoods = cloneDeep(res.data);
         }
       });
@@ -164,14 +166,27 @@ const MoodPage = () => {
     if (mode === 'add') {
       newScene = [checkedMood, ...state.originMoods];
     } else if (mode === 'del') {
-      newScene = state.originMoods.filter(item => item.id !== checkedMood.id);
+      if (params.isCeilingLight) {
+        newScene = state.originMoods.filter(item => (item.mainLamp.id !== checkedMood.mainLamp.id) || (item.secondaryLamp.id !== checkedMood.secondaryLamp.id))
+      } else {
+        newScene = state.originMoods.filter(item => item.id !== checkedMood.id);
+      }
     } else {
-      newScene = state.originMoods.map(item => {
-        if (item.id === checkedMood.id) {
-          return checkedMood;
-        }
-        return item;
-      });
+      if (params.isCeilingLight) {
+        newScene = state.originMoods.map(item => {
+          if (item.mainLamp.id === checkedMood.mainLamp.id && item.secondaryLamp.id === checkedMood.secondaryLamp.id) {
+            return checkedMood;
+          }
+          return item;
+        });
+      } else {
+        newScene = state.originMoods.map(item => {
+          if (item.id === checkedMood.id) {
+            return checkedMood;
+          }
+          return item;
+        });
+      }
     }
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood;
     const res = await saveMoodList(devId, newScene, params, params.featureId);
@@ -186,7 +201,7 @@ const MoodPage = () => {
             (params.isCeilingLight
               ? currentMood.mainLamp.id !== moodInfo.mainLamp.id &&
                 currentMood.secondaryLamp.id !== moodInfo.secondaryLamp.id
-              : currentMood.id !== moodInfo.id)
+              : currentMood.id !== moodInfo.id) || !switchLed
           ) {
             return {
               success: true,
@@ -254,15 +269,15 @@ const MoodPage = () => {
     (moodItem: MoodUIInfo) => {
       if (params.isCeilingLight) {
         return (
-          moodInfo.mainLamp.id === moodItem.mainLamp.id &&
+          moodInfo.mainLamp.id === moodItem.mainLamp.id &&  
           moodInfo.secondaryLamp.id === moodItem.secondaryLamp.id &&
-          (mainWork === WorkMode.Scene || secondaryWork === WorkMode.Scene)
+          (mainWork === WorkMode.Scene || secondaryWork === WorkMode.Scene) && !flagMode.flagMode && switchLed
         );
       } else {
-        return moodInfo.id === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode;
+        return moodInfo.id === moodItem.id && mainWork === WorkMode.Scene && !flagMode.flagMode && switchLed
       }
     },
-    [moodInfo, mainWork]
+    [moodInfo, mainWork, secondaryWork, flagMode?.flagMode, switchLed]
   );
 
   const nameRepeat = useCallback((mood: MoodUIInfo) => {
@@ -321,6 +336,7 @@ const MoodPage = () => {
                 enable={getItemEnable(item)}
                 isMix={!!(params.isMixLight || params.isCeilingLight)}
                 mood={item}
+                deviceTypeOption={params}
                 onPress={() => {
                   navigationRoute(item.mainLamp.nodes.length === 1, 'edit', item);
                 }}

package/src/newModules/mood/MoodParse.ts

@@ -6,7 +6,6 @@ const { nToHS, toFixed, sToN } = Utils;
 
 // light source
 export function dp2Obj(dp: string, isFan: boolean = false, isUVCFan?: boolean): MoodInfo {
-  console.log(dp, '< ---- dppppp')
   if (!dp || dp?.length <= 8) return getDefaultMood();
   let dpCopy = dp;
   let fanEnable: undefined | boolean = undefined;
@@ -424,16 +423,16 @@ export function MixCeilingDpObj(mainDp: string, secondaryDp: string): MoodInfo {
     id: 0,
     version: 0,
     mainLamp: {
+      ...mainLamp.mainLamp,
       id: mainLamp.id,
       version: mainLamp.version,
-      ...mainLamp.mainLamp,
     },
     secondaryLamp: secondaryLamp
       ? {
-          id: secondaryLamp.id,
-          version: secondaryLamp.version,
-          ...secondaryLamp.secondaryLamp,
-        }
+        ...secondaryLamp.mainLamp,
+        version: secondaryLamp.version,
+        id: secondaryLamp.id
+      }
       : {
           mode: 0,
           speed: 75,

package/src/newModules/mood/RecommendMoodItem.tsx

@@ -28,7 +28,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
   const { mood, isMix, deviceTypeOption } = props;
 
   const gradientMode = useMemo(() => (
-    deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : (deviceTypeOption?.isStripLight || deviceTypeOption?.isCeilingLight) ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
+    deviceTypeOption?.isStringLight ? MoodJumpGradientMode.StringGradient : deviceTypeOption?.isStripLight ? MoodJumpGradientMode.StripGradient : MoodJumpGradientMode.SourceGradient
  ), [MoodJumpGradientMode, deviceTypeOption])
 
   return (
@@ -46,9 +46,9 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
       {!!(mood.mainLamp) && (
         <>
           <View style={styles.lineStyle}>
-            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>
+            <MixMoodColorsLine mixSubLight={mood?.mainLamp} isMix={isMix} type={(mood.mainLamp.mode === gradientMode && !deviceTypeOption?.isCeilingLight) ? 'gradient' : 'separate'}/>
             <Spacer height={cx(7)} />
-            {(isMix && !!mood.secondaryLamp.nodes.length) && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === gradientMode ? 'gradient' : 'separate'}/>}
+            {(isMix && !!mood.secondaryLamp.nodes.length) && <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === (deviceTypeOption?.isMixLight ? MoodJumpGradientMode.SourceGradient : MoodJumpGradientMode.StripGradient) ? 'gradient' : 'separate'}/>}
           </View>
           <Spacer height={cx(24)} />
         </>

package/src/newModules/mood/Router.ts

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

package/src/newModules/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -1,96 +1,96 @@
-import React from 'react'
-import {SwitchButton, Utils} from "tuya-panel-kit";
-import Page from "@ledvance/base/src/components/Page";
-import I18n from "@ledvance/base/src/i18n/index";
-import {useDeviceInfo, useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {useReactive} from "ahooks";
-import Spacer from "@ledvance/base/src/components/Spacer";
-import {StyleSheet, Text, View} from "react-native";
-import {Result} from "@ledvance/base/src/models/modules/Result";
-import {useParams} from "@ledvance/base/src/hooks/Hooks";
-
-const { convertX: cx } = Utils.RatioUtils
-
-export interface OverchargeSwitchPageParams {
-  overchargeSwitchCode: string
-}
-
-export function useOverchargeSwitch(overchargeSwitchCode: string): [boolean, (v: boolean) => Promise<Result<any>>] {
-  return useDp(overchargeSwitchCode)
-}
-
-const OverchargeSwitchPage = () => {
-  const params = useParams<OverchargeSwitchPageParams>()
-  const devInfo = useDeviceInfo()
-  const [overchargeSwitch, setOverchargeSwitch] = useOverchargeSwitch(params.overchargeSwitchCode)
-  const state = useReactive({
-    loading: false
-  })
-  return (<Page
-    backText={devInfo.name}
-    loading={state.loading}>
-    <View style={[styles.titleBGView, styles.shadow]}>
-      <View style={{ flex: 7 }}>
-        <View>
-          <Text style={styles.title}>{I18n.getLang('switch_overcharge_headline_text')}</Text>
-        </View>
-        <View style={{ paddingBottom: cx(16) }}>
-          <Text>{I18n.getLang('switch_overcharge_headline_description')}</Text>
-        </View>
-      </View>
-      <Spacer style={{ flex: 1 }} height={0} width={0} />
-      <SwitchButton value={overchargeSwitch} onValueChange={async v => {
-        state.loading = true
-        await setOverchargeSwitch(v)
-        state.loading = false
-      } } />
-    </View>
-  </Page>)
-}
-
-const styles = StyleSheet.create({
-  tipInfoContainer: {
-    flexDirection: 'row',
-    marginHorizontal: cx(24),
-    marginVertical: cx(10)
-  },
-  image: {
-    width: cx(16),
-    height: cx(16),
-    marginRight: cx(5),
-    tintColor: '#000'
-  },
-  titleBGView: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingHorizontal: cx(16),
-    marginHorizontal: cx(24),
-    marginTop: cx(30)
-  },
-  colorBlock: {
-    width: cx(20),
-    height: cx(20),
-    marginStart: cx(12),
-    borderRadius: cx(4),
-  },
-  title: {
-    color: '#000',
-    fontSize: cx(14),
-    fontFamily: 'helvetica_neue_lt_std_bd',
-    paddingVertical: cx(16),
-  },
-  shadow: {
-    shadowColor: '#000000',
-    shadowOpacity: 0.2,
-    shadowRadius: 8,
-    elevation:8,
-    shadowOffset: {
-      width: 0,
-      height: 4,
-    },
-    backgroundColor: '#fff',
-    borderRadius: 8,
-  },
-})
-
-export default OverchargeSwitchPage
+import React from 'react'
+import {SwitchButton, Utils} from "tuya-panel-kit";
+import Page from "@ledvance/base/src/components/Page";
+import I18n from "@ledvance/base/src/i18n/index";
+import {useDeviceInfo, useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
+import {useReactive} from "ahooks";
+import Spacer from "@ledvance/base/src/components/Spacer";
+import {StyleSheet, Text, View} from "react-native";
+import {Result} from "@ledvance/base/src/models/modules/Result";
+import {useParams} from "@ledvance/base/src/hooks/Hooks";
+
+const { convertX: cx } = Utils.RatioUtils
+
+export interface OverchargeSwitchPageParams {
+  overchargeSwitchCode: string
+}
+
+export function useOverchargeSwitch(overchargeSwitchCode: string): [boolean, (v: boolean) => Promise<Result<any>>] {
+  return useDp(overchargeSwitchCode)
+}
+
+const OverchargeSwitchPage = () => {
+  const params = useParams<OverchargeSwitchPageParams>()
+  const devInfo = useDeviceInfo()
+  const [overchargeSwitch, setOverchargeSwitch] = useOverchargeSwitch(params.overchargeSwitchCode)
+  const state = useReactive({
+    loading: false
+  })
+  return (<Page
+    backText={devInfo.name}
+    loading={state.loading}>
+    <View style={[styles.titleBGView, styles.shadow]}>
+      <View style={{ flex: 7 }}>
+        <View>
+          <Text style={styles.title}>{I18n.getLang('switch_overcharge_headline_text')}</Text>
+        </View>
+        <View style={{ paddingBottom: cx(16) }}>
+          <Text>{I18n.getLang('switch_overcharge_headline_description')}</Text>
+        </View>
+      </View>
+      <Spacer style={{ flex: 1 }} height={0} width={0} />
+      <SwitchButton value={overchargeSwitch} onValueChange={async v => {
+        state.loading = true
+        await setOverchargeSwitch(v)
+        state.loading = false
+      } } />
+    </View>
+  </Page>)
+}
+
+const styles = StyleSheet.create({
+  tipInfoContainer: {
+    flexDirection: 'row',
+    marginHorizontal: cx(24),
+    marginVertical: cx(10)
+  },
+  image: {
+    width: cx(16),
+    height: cx(16),
+    marginRight: cx(5),
+    tintColor: '#000'
+  },
+  titleBGView: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: cx(16),
+    marginHorizontal: cx(24),
+    marginTop: cx(30)
+  },
+  colorBlock: {
+    width: cx(20),
+    height: cx(20),
+    marginStart: cx(12),
+    borderRadius: cx(4),
+  },
+  title: {
+    color: '#000',
+    fontSize: cx(14),
+    fontFamily: 'helvetica_neue_lt_std_bd',
+    paddingVertical: cx(16),
+  },
+  shadow: {
+    shadowColor: '#000000',
+    shadowOpacity: 0.2,
+    shadowRadius: 8,
+    elevation:8,
+    shadowOffset: {
+      width: 0,
+      height: 4,
+    },
+    backgroundColor: '#fff',
+    borderRadius: 8,
+  },
+})
+
+export default OverchargeSwitchPage

package/src/newModules/overchargeSwitch/Router.ts

@@ -1,16 +1,16 @@
-import {NavigationRoute} from "tuya-panel-kit";
-import OverchargeSwitchPage from "./OverchargeSwitchPage";
-import {ui_biz_routerKey} from "../../navigation/Routers";
-
-const OverchargeSwitchPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.ui_biz_overcharge_switch,
-    component: OverchargeSwitchPage,
-    options:{
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  }
-]
-
-export default OverchargeSwitchPageRouters
+import {NavigationRoute} from "tuya-panel-kit";
+import OverchargeSwitchPage from "./OverchargeSwitchPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const OverchargeSwitchPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_overcharge_switch,
+    component: OverchargeSwitchPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  }
+]
+
+export default OverchargeSwitchPageRouters