@ledvance/ui-biz-bundle 1.1.37 → 1.1.39

package/package.json

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

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -151,13 +151,18 @@ const DynamicMoodEditorPage = () => {
       state.mood.name.length > 32 ||
       state.mood.nodes.length < 2
   }
+
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   const nameRepeat = useMemo(() => {
     return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
   }, [state.mood.name])
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={
         Strings.getLang(params.mode === 'add' ?
           'string_light_pp_dialog_sm_add_headline_c' :

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -168,10 +168,15 @@ const FantasyMoodEditPage = () => {
   const nameRepeat = useMemo(() => {
     return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
   }, [state.mood.name])
+
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   return (
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={
         I18n.getLang(params.mode === 'add' ?
           'string_light_pp_dialog_sm_add_headline_c' :

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -154,10 +154,14 @@ const StaticMoodEditorPage = () => {
     return !!find(params.moods, m => (m.id !== state.mood.id && m.name === state.mood.name))
   }, [state.mood.name])
 
+  const showBackDialog = (): boolean => {
+    return !isEqual(state.mood, routeParams.currentMood);
+  }
+
   return (
     <Page
       backText={Strings.getLang('mesh_device_detail_mode')}
-      showBackDialog={true}
+      showBackDialog={showBackDialog()}
       backDialogTitle={
         Strings.getLang(params.mode === 'add' ?
           'string_light_pp_dialog_sm_add_headline_c' :

package/src/modules/music/MusicPage.tsx

@@ -180,9 +180,9 @@ const MusicPage = () => {
 
   const getSelect = async () => {
     const res: any = await NativeApi.getJson(deviceId, 'musicSelect')
-    const type = res?.data ? JSON.parse(res?.data)?.type : 0
+    const type = res?.data ? (JSON.parse(res?.data)?.type || 0) : 0
     state.musicType = res?.data ? JSON.parse(res?.data)?.musicType : props.dreamMusicDp ? 0 : 1
-    state.phoneGenreMode = musicDefalutDatasource[type !== '' && type]?.id
+    state.phoneGenreMode = musicDefalutDatasource[type]?.id
     state.musicEnable = workMode === 'music' && !!switchLed
     if (type !== '' && state.musicType === 1 && state.musicEnable) {
       openMusic()
@@ -190,6 +190,7 @@ const MusicPage = () => {
   }
 
   const changeMusic = async (id: number) => {
+    console.log(id, '< --- id')
     if (workMode !== 'music') await setWorkMode('music')
     if (!switchLed) setSwitchLed(true)
     await saveSelect(id)
@@ -206,6 +207,7 @@ const MusicPage = () => {
   }
 
   const putMusicDataFn = (data: any, extraDp = {}) => {
+    console.log(data, '< --- data')
     setMusicData(data, extraDp).then()
   }
 

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)}