@ledvance/ui-biz-bundle 1.1.53 → 1.1.55

package/package.json

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

package/src/modules/mood/MixMood/AddMixMoodPage.tsx

@@ -43,9 +43,9 @@ const AddMixMoodPage = () => {
     })
     const useIds = map(mixMoods, 'id')
     const idRange = range(0, 256)
-    const mainId: number = head(difference(idRange, useIds)) || -1
+    const mainId: number = head(difference(idRange, useIds)) ?? -1
     useIds.push(mainId)
-    const secondlyId: number = head(difference(idRange, useIds)) || -1
+    const secondlyId: number = head(difference(idRange, useIds)) ?? -1
     return { mainId, secondlyId }
   }, [routeParams.mixMoods])
   const state = useReactive<AddMoodPageState>({
@@ -91,7 +91,11 @@ const AddMixMoodPage = () => {
   )
 }
 
-const defSecondly = {
+export const defSecondly = {
+  id: -1,
+  speed: 100,
+  mode: 10,
+  nodes: [],
   version: 0,
   expand: 0,
   reserved1: 0,
@@ -102,6 +106,8 @@ const defSecondly = {
   direction: 0,
 }
 
+const node = { h: 0, s: 100, v: 100, brightness: 100, colorTemp: 0 }
+
 function newMixMood(mainId: number, secondlyId: number, isStatic: boolean): MixSceneInfo {
   return {
     name: '',
@@ -109,26 +115,19 @@ function newMixMood(mainId: number, secondlyId: number, isStatic: boolean): MixS
       id: mainId,
       speed: 100,
       mode: isStatic ? SceneNodeTransitionMode.Static : 1,
-      nodes: [
-        { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 0 },
-        { h: 0, s: 0, v: 0, brightness: 100, colorTemp: 0 }
-      ]
+      nodes: isStatic ? [{...node}] : [{...node}, {...node}]
     },
     secondlyLamp: {
       ...defSecondly,
       id: secondlyId,
       speed: 100,
       mode: 10,
-      nodes: [
-        { h: 0, s: 100, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
-        { h: 0, s: 100, v: 100, brightness: 0, colorTemp: 0, isColorNode: true }
-      ]
+      nodes: [{...node, isColorNode: true}, {...node, isColorNode: true}]
     }
   }
 }
 
 function getRecommendMixMoods(isStatic: boolean, mainId: number, secondlyId: number): RecommendMixMood[] {
-  console.log(mainId, secondlyId, '< -- mainId secondlyId')
   if (isStatic) {
     return [
       {
@@ -230,90 +229,6 @@ function getRecommendMixMoods(isStatic: boolean, mainId: number, secondlyId: num
         },
       },
     },
-    // {
-    //   title: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
-    //   mixMood: {
-    //     name: I18n.getLang('add_new_dynamic_mood_field_headline_text3'),
-    //     image: '',
-    //     value: '',
-    //     version: 0,
-    //     id: id,
-    //     lamps: [
-    //       {
-    //         enable: true,
-    //         type: 2,
-    //         nodes: [
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Jump,
-    //             hue: 0,
-    //             sat: 0,
-    //             lightness: 0,
-    //             brightness: 100,
-    //             colorTemp: 30,
-    //           },
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Jump,
-    //             hue: 0,
-    //             sat: 0,
-    //             lightness: 0,
-    //             brightness: 100,
-    //             colorTemp: 60,
-    //           },
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Jump,
-    //             hue: 0,
-    //             sat: 0,
-    //             lightness: 0,
-    //             brightness: 100,
-    //             colorTemp: 90,
-    //           },
-    //         ],
-    //       },
-    //       {
-    //         enable: true,
-    //         type: 3,
-    //         nodes: [
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Gradient,
-    //             hue: 330,
-    //             sat: 50,
-    //             lightness: 100,
-    //             brightness: 0,
-    //             colorTemp: 0,
-    //           },
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Gradient,
-    //             hue: 270,
-    //             sat: 50,
-    //             lightness: 100,
-    //             brightness: 0,
-    //             colorTemp: 0,
-    //           },
-    //           {
-    //             intervalTime: 14,
-    //             changeTime: 14,
-    //             changeType: SceneNodeTransitionMode.Gradient,
-    //             hue: 210,
-    //             sat: 50,
-    //             lightness: 100,
-    //             brightness: 0,
-    //             colorTemp: 0,
-    //           },
-    //         ],
-    //       },
-    //     ],
-    //   },
-    // },
   ]
 }
 

package/src/modules/mood/MixMood/MixMoodEditPage.tsx

@@ -19,7 +19,6 @@ import { stripLightSceneMode, StripNodeInfo, SceneNodeInfo, StripLightSceneMode,
 import { MixSceneInfo, MixMainLampInfo, MixSceneNodeInfo } from './MixSceneBeans'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
 import { SelectPageParams } from '../../select/SelectPage'
-import { showDeleteMoodDialog } from '../tools'
 import { ui_biz_routerKey } from '../../../navigation/Routers'
 import { MixMoodPageProps } from '@ledvance/ui-biz-bundle/src/modules/mood/MixMood/MixMoodPage'
 import Segmented from '@ledvance/base/src/components/Segmented'
@@ -27,6 +26,8 @@ import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView'
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView'
 import { Result } from '@ledvance/base/src/models/modules/Result'
+import { showDialog } from '@ledvance/base/src/utils/common'
+import { defSecondly } from './AddMixMoodPage'
 const cx = Utils.RatioUtils.convertX
 
 interface MixMoodEditPageState {
@@ -62,8 +63,8 @@ const RgbcMoodEditPage = () => {
     mood: params.currentMood,
     mainLamp,
     secondlyLamp,
-    currentWhiteNodeIdx: mainLamp.nodes?.length ? mainLamp.nodes.length - 1 : 1,
-    currentColorNodeIdx: secondlyLamp.nodes?.length ? secondlyLamp.nodes?.length - 1 : 1,
+    currentWhiteNodeIdx: mainLamp.nodes?.length ? mainLamp.nodes.length - 1 : 0,
+    currentColorNodeIdx: secondlyLamp.nodes?.length ? secondlyLamp.nodes?.length - 1 : 0,
     paintBucketSelected: false,
     paintWhiteBucketSelected: false,
     sceneMode: stripLightSceneMode,
@@ -78,7 +79,7 @@ const RgbcMoodEditPage = () => {
 
   const getColorBlockColor = useCallback(() => {
     if (state.secondlyLamp?.nodes?.length) {
-      const currentNode = state.secondlyLamp?.nodes[state.currentColorNodeIdx]
+      const currentNode = state.secondlyLamp?.nodes?.[state.currentColorNodeIdx]
       const s = Math.round(mapFloatToRange(currentNode.s / 100, 30, 100))
       if (currentNode.isColorNode) {
         return hsv2Hex(currentNode.h, s, 100)
@@ -130,25 +131,26 @@ const RgbcMoodEditPage = () => {
     return currentOther.label
   }, [state.secondlyLamp.expand])
 
-  const getButtonStatus = () => {
+  const checkMoodDataChanged = useMemo(() =>{
     return isEqual({
       ...state.mood,
       mainLamp: state.mainLamp,
       secondlyLamp: state.secondlyLamp
     }, params.currentMood)
-  }
+  }, [params.currentMood, state.mood, state.mainLamp, state.secondlyLamp])
 
   const nameRepeat = useMemo(() => {
     return !!find(params.moods, m => ((m.mainLamp.id !== state.mood.mainLamp.id && (params.isStatic ? params.isStatic : m.secondlyLamp.id !== state.mood.secondlyLamp.id)) && m.name === state.mood.name))
   }, [state.mood.name, params.isStatic])
 
-  useEffect(() =>{
-    console.log(nameRepeat, '< --- anmeRepeat')
-  }, [nameRepeat])
+  const canSaveMoodData = useMemo(() =>{
+    return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodDataChanged)
+  }, [nameRepeat, state.mood.name, checkMoodDataChanged, params.mode])
+
   return (
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={!checkMoodDataChanged}
       loading={state.loading}
       backDialogTitle={
         I18n.getLang(params.mode === 'add' ?
@@ -161,15 +163,14 @@ const RgbcMoodEditPage = () => {
           '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.modDeleteFlag(params.mode, {
           ...state.mood,
           mainLamp: state.mainLamp,
-          secondlyLamp: state.secondlyLamp
+          secondlyLamp: params.isStatic ? defSecondly : state.secondlyLamp
         })
         state.loading = false
         if (res.success) {
@@ -515,7 +516,7 @@ const RgbcMoodEditPage = () => {
                             style={styles.nodeAddBtn}
                             onPress={() => {
                               const node = {
-                                ...state.secondlyLamp.nodes[state.currentColorNodeIdx],
+                                ...state.secondlyLamp?.nodes?.[state.currentColorNodeIdx],
                               }
                               state.secondlyLamp.nodes.push(node)
                               state.currentColorNodeIdx = state.secondlyLamp.nodes.length - 1
@@ -541,9 +542,9 @@ const RgbcMoodEditPage = () => {
                 </View>
                 <Spacer />
                 <ColorAdjustView
-                  h={state.secondlyLamp.nodes[state.currentColorNodeIdx].h}
-                  s={state.secondlyLamp.nodes[state.currentColorNodeIdx].s}
-                  v={state.secondlyLamp.nodes[state.currentColorNodeIdx].v}
+                  h={state.secondlyLamp.nodes[state.currentColorNodeIdx]?.h}
+                  s={state.secondlyLamp.nodes[state.currentColorNodeIdx]?.s}
+                  v={state.secondlyLamp.nodes[state.currentColorNodeIdx]?.v}
                   onHSVChange={() => { }}
                   onHSVChangeComplete={(h, s, v) => {
                     state.secondlyLamp.nodes.forEach((node, idx) => {
@@ -572,9 +573,19 @@ const RgbcMoodEditPage = () => {
                 textStyle={styles.deleteBtnText}
                 text={I18n.getLang('edit_static_mood_button_delete_text')}
                 onPress={() => {
-                  showDeleteMoodDialog(async (_, { close }) => {
-                    close()
-                    params.modDeleteFlag('del', state.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.modDeleteFlag('del', state.mood)
+                      state.loading = false 
+                      if(res.success){
+                        navigation.navigate(ui_biz_routerKey.ui_biz_mix_mood)
+                      }
+                    }
                   })
                 }} />
             </View>}

package/src/modules/mood/MixMood/MixMoodItem.tsx

@@ -69,7 +69,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MixMainLampInfo, colorLi
       <MoodColorsLine
         nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
         width={cx(264)}
-        type={'separate'}
+        type={!colorLight ? 'separate' : (mixSubLight.mode === 1 ? 'gradient' : 'separate')}
         colors={lightColors} />
       <Spacer height={0} width={cx(7)} />
       <View style={styles.gradientItemIconView}>

package/src/modules/mood/MixMood/MixMoodPage.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect } from 'react'
+import React, { useCallback, useEffect, useMemo } from 'react'
 import { FlatList, StyleSheet, View, Platform } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import Page from '@ledvance/base/src/components/Page'
@@ -49,6 +49,7 @@ export interface MixMoodPageProps {
 }
 
 const MAX_MOOD_COUNT = 256
+let moodTimerId: undefined | number = undefined
 
 const MixMoodPage = () => {
   const routeParams = useRoute().params as MixMoodPageProps
@@ -62,7 +63,7 @@ const MixMoodPage = () => {
   const [flagMode, setFlagMode] = useFlagMode()
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
-
+  const isMoodMode = useMemo(() => workMode === WORK_MODE.SCENE || rgbcWorkMode === WORK_MODE.SCENE,[workMode, rgbcWorkMode])
   const state = useReactive<MixMoodPageUIState>({
     currentScene: undefined,
     staticTagChecked: true,
@@ -75,7 +76,7 @@ const MixMoodPage = () => {
   })
 
   const getSceneList = useCallback(async (mainId: number, secondlyId: number) => {
-    setTimeout(async () => {
+    moodTimerId = setTimeout(async () => {
       const res = await getRemoteMixScene(deviceInfo.devId)
       if (res.success) {
         state.scenes = res.data || []
@@ -84,7 +85,7 @@ const MixMoodPage = () => {
           return (mainLamp.id === mainId) && (secondlyLamp.id === secondlyId)
         })
       }
-    }, 400)
+    }, 200)
   }, [])
 
   const onAddMoodDialogItemClick = useCallback((isStatic: boolean, _: number) => {
@@ -115,6 +116,9 @@ const MixMoodPage = () => {
 
   useEffect(() => {
     getSceneList(whiteSceneId, fantasyId).then()
+    return () =>{
+      if (moodTimerId) clearTimeout(moodTimerId)
+    }
   }, [state.flag])
 
 
@@ -144,17 +148,18 @@ const MixMoodPage = () => {
     }
   }
 
-  const checkItemEnable = useCallback((mixMood: MixSceneInfo) => {
-    const { mainLamp, secondlyLamp } = mixMood
+  const checkedCurMoodInAllMoods = useCallback((checkMood: MixSceneInfo, curMood?: MixSceneInfo) =>{
+    const { mainLamp, secondlyLamp } = checkMood
+    const curWhiteId = curMood ? curMood.mainLamp.id : whiteSceneId
+    const curColorId = curMood ? curMood.secondlyLamp.id : fantasyId
     const isStatic = mainLamp.nodes.length === 1
-    return (workMode === WORK_MODE.SCENE || rgbcWorkMode === WORK_MODE.SCENE) &&
-    isStatic ? ((whiteSceneId === mainLamp.id) && mainLamp.id !== -1) :
-      (((whiteSceneId === mainLamp.id) && mainLamp.id !== -1) && ((fantasyId === secondlyLamp.id) && secondlyLamp.id !== -1))
-  }, [workMode, rgbcWorkMode, fantasyId, whiteSceneId])
+    return isStatic ? ((curWhiteId === mainLamp.id) && mainLamp.id !== -1) :
+    (((curWhiteId === mainLamp.id) && mainLamp.id !== -1) && ((curColorId === secondlyLamp.id) && secondlyLamp.id !== -1))
+  }, [fantasyId, whiteSceneId])
 
   const modDeleteFlag = async (mode: 'add' | 'edit' | 'del', currentMood: MixSceneInfo) => {
     const list = mode === 'add' ? [currentMood, ...state.scenes] :
-      mode === 'del' ? state.scenes.filter(mood => (mood.mainLamp.id !== currentMood.mainLamp.id && mood.secondlyLamp.id !== currentMood.secondlyLamp.id)) :
+      mode === 'del' ? state.scenes.filter(mood => !checkedCurMoodInAllMoods(currentMood, mood)) :
         state.scenes.map(mood => {
           return ((mood.mainLamp.id === currentMood.mainLamp.id) && (mood.secondlyLamp.id === currentMood.secondlyLamp.id)) ? currentMood : mood
         })
@@ -173,18 +178,25 @@ const MixMoodPage = () => {
       if (list.length > 0) {
         const { mainLamp, secondlyLamp } = currentMood
         if (mode === 'del') {
-          if (whiteSceneId === mainLamp.id) {
-            setScene(deviceInfo.devId, getSceneByMix(list[0].mainLamp), params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, false, false).then()
-          }
-          if (fantasyId === secondlyLamp.id) {
-            setFantasyScene(list[0]?.secondlyLamp).then()
+          // 判断当前删除的Mood是否是正在执行的
+          if (checkedCurMoodInAllMoods(currentMood) && isMoodMode){
+            if(list[0].mainLamp.nodes?.length){
+              setScene(deviceInfo.devId, getSceneByMix(list[0].mainLamp), params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, false, false).then()
+            }
+            if (list[0].secondlyLamp.nodes?.length){
+              setFantasyScene(list[0]?.secondlyLamp).then()
+            }else{
+              setRgbcWorkMode(WORK_MODE.COLOUR).then()
+            }
           }
         } else {
-          if (mainLamp.nodes.length > 0) {
+          if (mainLamp.nodes?.length > 0) {
             setScene(deviceInfo.devId, getSceneByMix(mainLamp), params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, false, false).then()
           }
-          if (secondlyLamp.nodes.length > 0) {
+          if (secondlyLamp.nodes?.length > 0) {
             setFantasyScene(secondlyLamp).then()
+          }else{
+            setRgbcWorkMode(WORK_MODE.COLOUR).then()
           }
         }
       } else {
@@ -198,9 +210,6 @@ const MixMoodPage = () => {
     return { success: false }
   }
 
-  useEffect(() => {
-    console.log(state.filteredMoods, '< --- filterMoods')
-  }, [JSON.stringify(state.filteredMoods)])
   return (
     <>
       <Page
@@ -243,7 +252,7 @@ const MixMoodPage = () => {
           renderItem={({ item }) => {
             return (
               <MixMoodItem
-                enable={checkItemEnable(item)}
+                enable={checkedCurMoodInAllMoods(item) && isMoodMode} 
                 mixMood={item}
                 onPress={() => {
                   navigation.navigate(ui_biz_routerKey.ui_biz_mix_mood_edit, {
@@ -256,7 +265,7 @@ const MixMoodPage = () => {
                   })
                 }}
                 onSwitch={async _ => {
-                  if (checkItemEnable(item)) return
+                  if (checkedCurMoodInAllMoods(item) && isMoodMode) return
                   state.loading = true
                   await modDeleteFlag('edit', item)
                   state.currentScene = item

package/src/modules/mood/MixMood/RecommendMixMoodItem.tsx

@@ -54,6 +54,7 @@ const styles = StyleSheet.create({
   content: {
     height: cx(56),
     marginHorizontal: cx(16),
+    width: cx(295)
   },
   title: {
     color: '#000',
@@ -65,4 +66,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default RecommendMixMoodItem
+export default RecommendMixMoodItem

package/src/modules/timeSchedule/MoodSetting.tsx

@@ -147,7 +147,7 @@ const MoodSetting = (props: MoodSettingProps) => {
             ListFooterComponent={() => (<Spacer />)}
             keyExtractor={item => `${item.name}`} /> :
           <>
-            <View style={styles.tagLine}>
+            <View style={[styles.tagLine, {marginHorizontal: cx(24)}]}>
               <Tag
                 checked={state.staticTagChecked}
                 text={I18n.getLang('mood_overview_filter_name_text1')}
@@ -180,7 +180,7 @@ const MoodSetting = (props: MoodSettingProps) => {
               ListHeaderComponent={() => (<Spacer height={cx(10)} />)}
               ItemSeparatorComponent={() => (<Spacer />)}
               ListFooterComponent={() => (
-                <View style={styles.infoLine}>
+                <View style={[styles.infoLine, {marginHorizontal: cx(24)}]}>
                   <Spacer />
                   <InfoText
                     icon={res.ic_info}

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -71,7 +71,7 @@ const TimeSchedulePage = () => {
 
   const [, setTimeSchedule] = useTimeSchedule()
 
-  useEffect(() => { 
+  useEffect(() => {
     getTimerScheduleList().then()
   }, [])
 
@@ -238,7 +238,7 @@ const TimeSchedulePage = () => {
             <Text>{I18n.getLang('motion_detection_time_schedule_notifications_warning_text')}</Text>
           </View>}
           {showTags() && <View style={styles.categoryList}>
-            {(props.isCeilingLight ? [...Object.keys(state.filterTags)].reverse() : Object.keys(state.filterTags)).map(tag => {
+            {(props.isCeilingLight ? [] : Object.keys(state.filterTags)).map(tag => {
               return <Tag
                 key={tag}
                 text={getLabelByDp(tag)}
@@ -355,4 +355,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default TimeSchedulePage
+export default TimeSchedulePage