@ledvance/ui-biz-bundle 1.1.75 → 1.1.77

package/package.json

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

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -48,7 +48,7 @@ export const useBiorhythm: UseBiorhythmType = (dpKey: string, disabledFeature?:
     if (disabledFeature) return
     biorhythmTimer = setTimeout(() => {
       getBiorhythm()
-    }, 250)
+    }, 300)
 
     return () => {
       clearTimeout(biorhythmTimer)

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -101,7 +101,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
           }
         }
       })
-    }, 250)
+    }, 300)
 
     return () => clearTimeout(fixedTimer)
   }, [fixedTimeDp])

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -21,7 +21,6 @@ import Tag from "@ledvance/base/src/components/Tag";
 import InfoText from "@ledvance/base/src/components/InfoText";
 
 const { convertX: cx } = Utils.RatioUtils
-const MAX_NUM = 10
 
 export interface FixedTimePageParams {
   fixedTimeDpCode: string
@@ -43,6 +42,7 @@ const FixedTimePage = () => {
   const navigation = useNavigation()
   const devInfo = useDeviceInfo()
   const params = useParams<FixedTimePageParams>()
+  const MAX_NUM = params.isPlug ? 10 : 4
   const is24Hour = useSystemTimeFormate()
   const [fixedTime, setFixedTime] = useFixedTime(params.fixedTimeDpCode, params.isPlug)
   const state = useReactive({

package/src/newModules/mood/DynamicMoodEditorPage.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 Strings from '@ledvance/base/src/i18n';
 import { StaticMoodEditorPageParams } from './StaticMoodEditorPage';

package/src/newModules/mood/MoodActions.ts

@@ -170,7 +170,7 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
     const secondaryDps = {}
     if (moodInfo) {
       const { mainLamp, secondaryLamp } = moodInfo
-      if (mainLamp?.nodes?.length) {
+      if (params.isMixLight || mainLamp?.nodes?.length) {
         const mainHex = getMoodDp(params.isCeilingLight ? {...moodInfo, id: mainLamp.id!} : moodInfo, params);
         mainDps[params.mainDp] = mainHex
         mainDps[params.mainWorkMode] = WorkMode.Scene;
@@ -184,7 +184,6 @@ export const useMoodScene = (params: MoodPageParams): [MoodInfo, (moodInfo: Mood
             id: secondaryLamp.id!,
             version: 1
           });
-          console.log(secondaryHex, secondaryLamp, 'hexxxxx')
           secondaryDps[params.secondaryDp] = secondaryHex
           secondaryDps[params.secondaryWorkMode!] = WorkMode.Scene
           secondaryDps[params.secondarySwitch!] = true

package/src/newModules/mood/MoodItem.tsx

@@ -54,7 +54,7 @@ const MoodItem = (props: MoodItemProps) => {
         </View>
         <Spacer />
         <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} type={(mood.mainLamp.mode === gradientMode && !deviceTypeOption?.isCeilingLight) ? 'gradient' : 'separate'}/>
-        {(isMix && !!mood.secondaryLamp.nodes.length) &&  (
+        {(deviceTypeOption?.isMixLight || (isMix && !!mood.secondaryLamp.nodes.length)) &&  (
           <>
             <Spacer height={cx(7)} />
             <MixMoodColorsLine mixSubLight={mood.secondaryLamp} isMix={isMix} type={mood.secondaryLamp.mode === (deviceTypeOption?.isMixLight ? MoodJumpGradientMode.SourceGradient : MoodJumpGradientMode.StripGradient) ? 'gradient' : 'separate'}/>

package/src/newModules/mood/MoodPage.tsx

@@ -8,7 +8,7 @@ import {
   useFlagMode,
   useMoods,
 } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import { useReactive, useUpdateEffect } from 'ahooks';
+import { useReactive } from 'ahooks';
 import Strings from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
 import { FlatList, StyleSheet, View, Platform } from 'react-native';
@@ -41,7 +41,7 @@ const MoodPage = () => {
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
   const [switchLed] = useSwitchLed(params.switchLedDp)
   const [flagMode, setFlagMode] = useFlagMode();
-  
+
   const state = useReactive<MoodPageState>({
     currentMood: undefined,
     staticTagChecked: true,
@@ -70,7 +70,6 @@ const MoodPage = () => {
       ).then(res => {
         state.loading = false 
         if (res.success && Array.isArray(res.data)) {
-          console.log(res.data, ' <--- res.data')
           state.originMoods = cloneDeep(res.data);
         }
       });

package/src/newModules/mood/RecommendMoodItem.tsx

@@ -48,7 +48,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
           <View style={styles.lineStyle}>
             <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 === (deviceTypeOption?.isMixLight ? MoodJumpGradientMode.SourceGradient : MoodJumpGradientMode.StripGradient) ? 'gradient' : 'separate'}/>}
+            {(deviceTypeOption?.isMixLight || (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/StaticMoodEditorPage.tsx

@@ -22,6 +22,7 @@ import LampAdjustView2 from '@ledvance/base/src/components/LampAdjustView2';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import { showDialog } from '@ledvance/base/src/utils/common';
+import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
 
 const cx = Utils.RatioUtils.convertX;
 
@@ -54,7 +55,7 @@ const StaticMoodEditorPage = () => {
     secondaryNode: params.currentMood?.secondaryLamp?.nodes?.[0],
     loading: false,
   });
-  
+
   useEffect(() => {
     state.headline = I18n.getLang(
       params.mode === 'add' ? 'add_new_static_mood_headline_text' : 'edit_static_mood_headline_text'
@@ -90,10 +91,10 @@ const StaticMoodEditorPage = () => {
         nodes: [cloneDeep(state.secondaryNode)],
       };
       newMood.mainLamp.type = 2
-      if(moduleParams.isSupportBrightness && !moduleParams.isSupportTemperature){
+      if (moduleParams.isSupportBrightness && !moduleParams.isSupportTemperature) {
         newMood.mainLamp.type = 1
       }
-      if(moduleParams.isSupportColor){
+      if (moduleParams.isSupportColor) {
         newMood.secondaryLamp.type = 3
       }
     }
@@ -108,11 +109,11 @@ const StaticMoodEditorPage = () => {
     return params.nameRepeat(state.mood)
   }, [state.mood.name]);
 
-  const checkMoodChanged = useMemo(() =>{
+  const checkMoodChanged = useMemo(() => {
     return isEqual(state.mood, params.currentMood)
   }, [JSON.stringify(state.mood), params.currentMood])
 
-  const canSaveMoodData = useMemo(() =>{
+  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])
 
@@ -194,6 +195,50 @@ const StaticMoodEditorPage = () => {
               />
             )}
           </Card>
+          {moduleParams.isMixLight && <Card style={styles.adjustCard}>
+            <LdvSwitch
+              title={I18n.getLang('add_new_trigger_time_field_headline_text3')}
+              color={''}
+              colorAlpha={1}
+              enable={!!state.mood.secondaryLamp.enable}
+              setEnable={(enable: boolean) => {
+                if (enable && state.mood.secondaryLamp.nodes.length === 0) {
+                  state.mood.secondaryLamp.nodes.push(
+                    {
+                      h: 0,
+                      s: 100,
+                      v: 100,
+                      brightness: 100,
+                      colorTemp: 0,
+                      isColorNode: true,
+                    }
+                  );
+                }
+                state.mood.secondaryLamp.type = 3
+                state.secondaryNode = state.mood.secondaryLamp.nodes[0]
+                state.mood.secondaryLamp.enable = enable
+              }} />
+            {state.mood.secondaryLamp.enable &&
+              <>
+                <ColorAdjustView
+                  reserveSV={true}
+                  h={state.secondaryNode.h}
+                  s={state.secondaryNode.s}
+                  v={state.secondaryNode.v}
+                  onHSVChange={(h, s, v) => {
+                    state.secondaryNode.h = h
+                    state.secondaryNode.s = s
+                    state.secondaryNode.v = v
+                  }}
+                  onHSVChangeComplete={(h, s, v) => {
+                    state.secondaryNode.h = h
+                    state.secondaryNode.s = s
+                    state.secondaryNode.v = v
+                  }} />
+                <Spacer />
+              </>
+            }
+          </Card>}
           <Spacer />
           {!!(moduleParams.isFanLight || moduleParams.isUVCFan) && (
             <FanAdjustView
@@ -223,7 +268,7 @@ const StaticMoodEditorPage = () => {
                     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})=>{
+                    onConfirm: async (_, { close }) => {
                       close();
                       state.loading = true;
                       const res = await params.modDeleteMood('del', state.mood);

package/src/newModules/randomTime/RandomTimeActions.ts

@@ -102,7 +102,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
           }
         }
       })
-    }, 250)
+    }, 300)
 
     return () => clearTimeout(randomTimer)
   }, [randomTimeDp])

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -22,7 +22,6 @@ import InfoText from '@ledvance/base/src/components/InfoText'
 
 const { convertX: cx } = Utils.RatioUtils
 const { parseTimer } = Utils.TimeUtils
-const MAX_NUM = 10
 
 export interface RandomTimePageParams {
   randomTimeDpCode: string
@@ -44,6 +43,7 @@ const RandomTimePage = () => {
   const navigation = useNavigation()
   const devInfo = useDeviceInfo()
   const params = useParams<RandomTimePageParams>()
+  const MAX_NUM = params.isPlug ? 16 : 4
   const is24Hour = useSystemTimeFormate()
   const [randomTime, setRandomTime] = useRandomTime(params.randomTimeDpCode, params.isPlug)
   const state = useReactive({