@ledvance/ui-biz-bundle 1.1.38 → 1.1.40

package/package.json

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

package/src/modules/mood/AddMoodPage.tsx

@@ -5,11 +5,12 @@ import {FlatList, StyleSheet, Text, View} from 'react-native'
 import {Utils} from 'tuya-panel-kit'
 import RecommendMoodItem, {ColorsLineProps} from './RecommendMoodItem'
 import Spacer from '@ledvance/base/src/components/Spacer'
-import {useReactive} from 'ahooks'
+import {useReactive, useCreation} from 'ahooks'
 import {useNavigation, useRoute} from '@react-navigation/native'
 import {SceneNodeTransitionMode, SceneUIState} from '../scene/SceneInfo'
 import {toDynamicMoodEditorPage, toStaticMoodEditorPage} from '../../navigation/tools'
 import {MoodPageProps} from './MoodPage'
+import { difference, head, map, range } from 'lodash'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -28,6 +29,11 @@ const AddMoodPage = () => {
   const navigation = useNavigation()
   const routeParams = useRoute().params as AddMoodPageParams
   const moduleParams = routeParams.moduleParams
+  const moodId = useCreation(() => {
+    const useIds = map(routeParams.moods, 'id')
+    const idRange = range(0, 256)
+    return Math.max(head(difference(idRange, useIds)) || 0, 0)
+  }, [routeParams.moods])
   const state = useReactive<AddMoodPageState>({
     data: getRecommendMoods(
       routeParams.isStatic,
@@ -36,16 +42,15 @@ const AddMoodPage = () => {
     ),
   })
   const recommendMood2SceneUIState = useCallback((recommendMood: RecommendMood) => {
-    const id = routeParams.moods.length > 0 ? Math.max(...routeParams.moods.map(m => m.id)) + 1 : 0
     return {
-      id: id,
+      id: moodId,
       image: '',
       fanEnable: recommendMood.fanEnable,
       fanSpeed: recommendMood.fanSpeed,
       name: recommendMood.name,
       nodes: recommendMood.moodColorsLineProps?.nodes || [],
     }
-  }, [routeParams, routeParams.moods])
+  }, [routeParams, routeParams.moods, moodId])
 
   return (
     <Page
@@ -63,13 +68,12 @@ const AddMoodPage = () => {
               title={item.name}
               moodColorsLineProps={item.moodColorsLineProps}
               onPress={() => {
-                const id = routeParams.moods.length > 0 ? Math.max(...routeParams.moods.map(m => m.id)) + 1 : 0
                 if (routeParams.isStatic) {
                   toStaticMoodEditorPage(navigation,
                     {
                       mode: 'add',
                       currentMood: index === 0 ? newMood(
-                        id,
+                        moodId,
                         moduleParams.isSupportColor && moduleParams.isSupportTemperature,
                         routeParams.isStatic,
                         moduleParams.isSupportColor,
@@ -83,7 +87,7 @@ const AddMoodPage = () => {
                     {
                       mode: 'add',
                       currentMood: index === 0 ? newMood(
-                        id,
+                        moodId,
                         moduleParams.isSupportColor && moduleParams.isSupportTemperature,
                         routeParams.isStatic,
                         moduleParams.isSupportColor,

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -512,6 +512,8 @@ const styles = StyleSheet.create({
     flex: 1,
     height: cx(40),
     borderRadius: cx(8),
+    borderWidth: 1,
+    borderColor: '#ccc'
   },
   nodeDeleteBtn: {
     width: cx(24),

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

@@ -10,7 +10,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import RecommendMixMoodItem from './RecommendMixMoodItem'
 import { SceneNodeTransitionMode } from '@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo'
 import { ui_biz_routerKey } from '../../../navigation/Routers'
-import { difference, last, map, range } from 'lodash'
+import { difference, head, map, range } from 'lodash'
 import { Result } from '@ledvance/base/src/models/modules/Result'
 import { MixMoodPageProps } from './MixMoodPage'
 
@@ -43,9 +43,9 @@ const AddMixMoodPage = () => {
     })
     const useIds = map(mixMoods, 'id')
     const idRange = range(0, 256)
-    const mainId: number = last(difference(idRange, useIds)) || -1
+    const mainId: number = head(difference(idRange, useIds)) || -1
     useIds.push(mainId)
-    const secondlyId: number = last(difference(idRange, useIds)) || -1
+    const secondlyId: number = head(difference(idRange, useIds)) || -1
     return { mainId, secondlyId }
   }, [routeParams.mixMoods])
   const state = useReactive<AddMoodPageState>({

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

@@ -641,6 +641,8 @@ const styles = StyleSheet.create({
     flex: 1,
     height: cx(40),
     borderRadius: cx(8),
+    borderWidth: 1,
+    borderColor: '#ccc'
   },
   nodeDeleteBtn: {
     width: cx(24),

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

@@ -67,6 +67,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MixMainLampInfo, colorLi
     <View style={styles.gradientItem}>
       <Spacer height={0} width={cx(16)} />
       <MoodColorsLine
+        nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
         width={cx(264)}
         type={'separate'}
         colors={lightColors} />

package/src/modules/mood/MoodItem.tsx

@@ -52,6 +52,7 @@ const MoodItem = (props: MoodItemProps) => {
                 <Spacer />
                 <View style={styles.gradientItem}>
                     <MoodColorsLine
+                        nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
                         type={mood.nodes[0].transitionMode === SceneNodeTransitionMode.Gradient ? 'gradient' : 'separate'}
                         colors={state.colors} />
                 </View>

package/src/modules/mood/MoodPage.tsx

@@ -44,7 +44,7 @@ export interface MoodPageProps {
   isSupportBrightness: boolean
 }
 
-const MAX_MOOD_COUNT = 8
+const MAX_MOOD_COUNT = 256
 
 const MoodPage = () => {
   const routeParams = useRoute().params as MoodPageProps

package/src/modules/scene/SceneInfo.ts

@@ -255,6 +255,7 @@ function getRGBWDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
+    ...defColorSceneList
   ]
 }
 
@@ -302,6 +303,7 @@ function getRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
+    ...defColorSceneList
   ]
 }
 
@@ -349,6 +351,7 @@ function getOnlyRGBDefSceneList(): RemoteSceneInfo[] {
       t: 0,
       e: false,
     },
+    ...defColorSceneList
   ]
 }
 
@@ -825,6 +828,219 @@ function getStripLightSceneList(): RemoteSceneInfo[] {
   ]
 }
 
+const defColorSceneList: RemoteSceneInfo[] = [
+  {
+    n: I18n.getLang('dynamicmoods_forest'),
+    i: '074b4b01007802f80226000000004b4b01003303e803e8000000004b4b01007803e8018600000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_desert'),
+    i: '084b4b010022014a0334000000004b4b01001002b203e8000000004b4b01001003e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_dreams'),
+    i: '094b4b01014b00c803e8000000004b4b0100b4010403a2000000004b4b01001c010e03e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_breeze'),
+    i: '0a4b4b01002b03520352000000004b4b010000032a02bc000000004b4b01002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_waters'),
+    i: '0b4b4b0100c303e803e8000000004b4b0100a001f403e8000000004b4b0100f0030c01b800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_splash'),
+    i: '0c4b4b01003c03e803e8000000004b4b01002703e803e8000000004b4b01001003e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang("dynamicmoods_sunrise"),
+    i: '0d4b4b01000902d003e8000000004b4b010026012203e8000000004b4b01003303e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_wonderland'),
+    i: '0e4b4b01003c03e803e8000000004b4b01002703e803e8000000004b4b01001003e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Twilight'),
+    i: '0f4b4b01014a024e03e8000000004b4b01002703e803e8000000004b4b0100b403e801f400000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_symphony'),
+    i: '104b4b0100d3034803e8000000004b4b010000000003e8000000004b4b01003303e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_sorbet'),
+    i: '114b4b01015e00fa03e8000000004b4b010011020803e8000000004b4b01003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_mansion'),
+    i: '124b4b01012c03e801f4000000004b4b0100b403e803e8000000004b4b01002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_hour'),
+    i: '134b4b01003303e803e8000000004b4b01002103e803e8000000004b4b010026012203e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_isle'),
+    i: '144b4b01007803e801f4000000004b4b010092029e0226000000004b4b01005a03e803de00000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Beat'),
+    i: '154b4b0100b403e803e8000000004b4b01012c03e803e8000000004b4b01003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_glamour'),
+    i: '164b4b01003303e803e8000000004b4b01012c03e801f4000000004b4b01015e00fa03e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_edreams'),
+    i: '174b4b01012c03e803e8000000004b4b0100b403e803e8000000004b4b01002703e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_sunset'),
+    i: '184b4b01001003e803e8000000004b4b01001d02b203e8000000004b4b01002b0352035200000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_carnival'),
+    i: '194b4b01012c03e803e8000000004b4b01002703e803e8000000004b4b01003c03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_serenade'),
+    i: '1a4b4b0100f0030c01b8000000004b4b0100b4019a0136000000004b4b0100f0005003d400000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_glow'),
+    i: '1b4b4b01001e03e803e8000000004b4b01003003e803e8000000004b4b010000032003e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Canopy'),
+    i: '1c4b4b01007803e80190000000004b4b010078029e0258000000004b4b01001e029e025800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Burst'),
+    i: '1d4b4b01000003e803e8000000004b4b01002703e803e8000000004b4b01003c03e803e8000000004b4b01007803e803e8000000004b4b0100d203e803e8000000004b4b01011103e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Lights'),
+    i: '1e4b4b01012c03e803e8000000004b4b01003c03e803e8000000004b4b0100b403e803e8000000004b4b01001803e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_Dreamscape'),
+    i: '1f4b4b01012c00c803e8000000004b4b0100f000c803e8000000004b4b01003c00c803e8000000004b4b0100b400c803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_NLights'),
+    i: '204b4b01009603e803e8000000004b4b0100d203e803e8000000004b4b01010e03e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_paradise'),
+    i: '214b4b010140025803e8000000004b4b01001e032003e8000000004b4b01003c025803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_ice'),
+    i: '224b4b01001803e803e8000000004b4b010000000003e8000000004b4b0100d803e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_voyage'),
+    i: '234b4b0100f003e80190000000004b4b01010e03e80190000000004b4b010000000003e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+  {
+    n: I18n.getLang('dynamicmoods_wave'),
+    i: '244b4b0100d203e803e8000000004b4b0100b403e803e8000000004b4b01009603e803e800000000',
+    s: '',
+    t: 0,
+    e: false,
+  },
+]
+
 export const MAXSCENE = 8
 
 export const AddScene = {

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -59,7 +59,7 @@ const TimeScheduleEditPage = () => {
     isManual: true,
     singleActions: {
       enable: true,  // colorLightSwitch
-      whiteLightSwitch: false,
+      whiteLightSwitch: true,
       isColor: true,
       h: 0,
       s: 100,
@@ -114,6 +114,7 @@ const TimeScheduleEditPage = () => {
         }
         state.isManual = lightData.isManual
         state.actionScene = lightData.actionScene
+        
         return
       }
 
@@ -629,11 +630,11 @@ const TimeScheduleEditPage = () => {
                     style={styles.leftTitle}>{I18n.getLang('motion_detection_add_time_schedule_actions_text1')}</Text>
                 </View>
               </View>
-              <View style={{marginLeft: cx(16)}}>
+              <View style={{marginLeft: cx(16), flex: 1}}>
                 {!!state.selectedSkill.length && <>
                   {(!!state.selectedSkill.filter(skill => skill.enable).length) && <>
                       <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_1')}</Text>
-                      <View style={{ flexDirection: 'row' }}>{
+                      <View style={{ flexDirection: 'row',flexWrap: 'wrap' }}>{
                         state.selectedSkill.filter(skill => skill.enable).map(item => (
                           <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
                                 key={item.dpId}>
@@ -646,7 +647,7 @@ const TimeScheduleEditPage = () => {
 
                   {(!!state.selectedSkill.filter(skill => !skill.enable).length) && <>
                       <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_2')}</Text>
-                      <View style={{ flexDirection: 'row' }}>{
+                      <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>{
                         state.selectedSkill.filter(skill => !skill.enable).map(item => (
                           <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
                                 key={item.dpId}>

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}>
-            {Object.keys(state.filterTags).map(tag => {
+            {(props.isCeilingLight ? [...Object.keys(state.filterTags)].reverse() : Object.keys(state.filterTags)).map(tag => {
               return <Tag
                 key={tag}
                 text={getLabelByDp(tag)}