@ledvance/group-ui-biz-bundle 1.0.73 → 1.0.75

package/package.json

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

package/src/modules/biorhythm/BiorhythmDetailPage.tsx

@@ -102,7 +102,7 @@ const BiorhythmEditPage = () => {
 
   const canSaveMoodData = useMemo(() =>{
     return state.planData.name.length > 0 && state.planData.name.length < 33 && !nameRepeatFlag && !checkBiorhythmDataChanged && !minimumTipEnable()
-  }, [nameRepeatFlag, state.planData.name, checkBiorhythmDataChanged])
+  }, [nameRepeatFlag, state.planData.name, checkBiorhythmDataChanged, minimumTipEnable()])
 
   return (
     <Page

package/src/modules/biorhythm/circular/Progress.tsx

@@ -265,10 +265,10 @@ export default class Progress extends Component<any> {
                   }
                   item.time = changeMinutes
                   this.setState({ iconDataList: [].concat(iconDataList) }, () => {
-                    this.playTimeChangeCallBack(item.index, Math.round(changeMinutes))
+                    this.playTimeChangeCallBack(item.index ?? item.id, Math.round(changeMinutes))
                   })
                 } else {
-                  this.playTimeChangeCallBack(item.index, Math.round(item.time))
+                  this.playTimeChangeCallBack(item.index ?? item.id, Math.round(item.time))
                 }
               }}
             />

package/src/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -174,7 +174,7 @@ const FixedTimeForPlugDetailPage = () => {
             state.item.weeks[rawIndex] = state.item.weeks[rawIndex] === 1 ? 0 : 1
           }}/>
         <Spacer/>
-        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.startTime * 60))}</Text>
+        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}</Text>
         <Spacer/>
         {/*Apply for */}
         <View style={styles.cardContainer}>
@@ -244,7 +244,7 @@ const FixedTimeForPlugDetailPage = () => {
         <Spacer/>
         {/* summary */}
         <Summary
-          frequency={loopText(state.item.weeks)}
+          frequency={loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}
           time={params.is24Hour ?
             `${parseTimer(state.item.startTime * 60)} - ${parseTimer(state.item.endTime * 60)}`
             :

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -201,7 +201,7 @@ const FixedTimingForLightDetailPage = () => {
             state.item.weeks[rawIndex] = state.item.weeks[rawIndex] === 1 ? 0 : 1
           }}/>
         <Spacer/>
-        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.startTime * 60))}</Text>
+        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}</Text>
         <Spacer/>
         {/*Apply for */}
         <View style={styles.cardContainer}>
@@ -320,7 +320,7 @@ const FixedTimingForLightDetailPage = () => {
         <Spacer />
         {/* summary */}
         <Summary
-          frequency={loopText(state.item.weeks)}
+          frequency={loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}
           time={params.is24Hour ?
             `${parseTimer(state.item.startTime * 60)} - ${parseTimer(state.item.endTime * 60)}`
             :

package/src/modules/mood_new/MoodInfo.ts

@@ -319,59 +319,211 @@ function getDIMDefSceneList(): RemoteMoodInfo[] {
 function getStringLightSceneList(): RemoteMoodInfo[] {
   return [
     {
-      n: I18n.getLang('strip_lights_modes_flow_text'),
-      i: '010d0d3232000000640000640000000064003c64000000006400f06400000000',
+      n: I18n.getLang('dynamicmoods_forest'),
+      i: "0107104b4b0000003700784c0000000064003364000000002700786400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('strip_lights_modes_rainbow_text'),
-      i: '0102023232000000640000640000000064003c64000000006400f06400000000',
+      n: I18n.getLang('dynamicmoods_desert'),
+      i: "0108104b4b000000520022210000000064001045000000006400106400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_chase_text'),
-      i:
-        '010e0e3232000000640000640000000064003c640000000064007864000000006400b464000000006400f0640000000064012c6400000000',
+      n: I18n.getLang('dynamicmoods_dreams'),
+      i: "0109104b4b00000064014b14000000005d00b41a0000000064001c1b00000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_dazzle_text'),
-      i:
-        '010f0f3232000000640000640000000064003c640000000064007864000000006400b464000000006400f0640000000064012c6400000000',
+      n: I18n.getLang('dynamicmoods_breeze'),
+      i: "010a104b4b00000055002b550000000046000051000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_waters'),
+      i: "010b104b4b0000006400c364000000006400a032000000002c00f04e00000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_splash'),
+      i: "010c104b4b00000064003c640000000064002764000000006400106400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sunrise'),
+      i: "010d104b4b00000064000948000000006400261d000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_wonderland'),
+      i: "010e104b4b0000005a00bb170000000064000002000000004b00000000000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Twilight'),
+      i: "010f104b4b00000064014a3b0000000064002764000000003200b46400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_symphony'),
+      i: "0110104b4b0000006400d2580000000064000000000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sorbet'),
+      i: "0110104b4b0000006400d2580000000064000000000000006400336400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_mansion'),
+      i: "0112104b4b00000032012c64000000006400b464000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_hour'),
+      i: "0113104b4b000000640033640000000064002164000000006400261d00000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_isle'),
+      i: "0114104b4b0000003200786400000000370092430000000063005a6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Beat'),
+      i: "0115104b4b0000006400b4640000000064012c640000000064003c6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_glamour'),
+      i: "0116104b4b000000640033640000000032012c640000000064015e1900000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_edreams'),
+      i: "0117104b4b00000064012c64000000006400b464000000006400276400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_sunset'),
+      i: "0118104b4b000000640010640000000064001d450000000055002b5500000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_carnival'),
+      i: "0119104b4b00000064012c6400000000640027640000000064003c6400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_serenade'),
+      i: "011a104b4b0000002c00f04e000000001f00b429000000006200f00800000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_glow'),
+      i: "011b104b4b00000064001e640000000064003064000000006400005000000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Canopy'),
+      i: "011c104b4b00000028007864000000003c007843000000003c001e4300000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Burst'),
+      i: "011d104b4b0000006400006400000000640027640000000064003c640000000064007864000000006400d264000000006401116400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Lights'),
+      i: "011e104b4b00000064012c640000000064003c64000000006400b464000000006400186400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_Dreamscape'),
+      i: "011f104b4b00000064012c14000000006400f0140000000064003c14000000006400b41400000000",
+      s: '',
+      t: 0,
+      e: false,
+    },
+    {
+      n: I18n.getLang('dynamicmoods_NLights'),
+      i: "0120104b4b00000064009664000000006400d2640000000064010e6400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('other_lights_modes_gradient_text'),
-      i: '01101032320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_paradise'),
+      i: "0121104b4b0000006401403c0000000064001e500000000064003c3c00000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('other_lights_modes_jump_text'),
-      i: '010a0a32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_ice'),
+      i: "0122104b4b000000640018640000000064000000000000006400d86400000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('strip_lights_modes_breath_text'),
-      i: '010b0b32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_voyage'),
+      i: "0123104b4b0000002800f0640000000028010e64000000006400000000000000",
       s: '',
       t: 0,
       e: false,
     },
     {
-      n: I18n.getLang('string_lights_modes_blink_text'),
-      i: '010c0c32320000006400f0640000000064012c640000000064003c6400000000',
+      n: I18n.getLang('dynamicmoods_wave'),
+      i: "0124104b4b0000006400d264000000006400b464000000006400966400000000",
       s: '',
       t: 0,
       e: false,

package/src/modules/mood_new/StaticMoodEditorPage.tsx

@@ -177,6 +177,14 @@ const StaticMoodEditorPage = () => {
                 reserveSV={true}
                 setIsColorMode={isColorMode => {
                   state.mainNode.isColorNode = isColorMode;
+                  if (isColorMode && state.mainNode.h === 0 && state.mainNode.s === 0 && state.mainNode.v === 0) {
+                    state.mainNode.s = 100;
+                    state.mainNode.v = 100;
+                  } else {
+                    if (state.mainNode.brightness === 0 && state.mainNode.colorTemp === 0) {
+                      state.mainNode.brightness = 100;
+                    }
+                  }
                 }}
                 hsv={state.mainNode}
                 onHSVChange={(hsv) => {

package/src/modules/randomTimeForPlug/RandomTimeForPlugDetailPage.tsx

@@ -147,7 +147,7 @@ const RandomTimeForPlugDetailPage = () => {
             state.item.weeks[rawIndex] = state.item.weeks[rawIndex] === 1 ? 0 : 1
           }}/>
         <Spacer/>
-        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.startTime * 60))}</Text>
+        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}</Text>
         <Spacer/>
         {/*Apply for */}
         <View style={styles.cardContainer}>
@@ -189,7 +189,7 @@ const RandomTimeForPlugDetailPage = () => {
         <Spacer/>
         {/* summary */}
         <Summary
-          frequency={loopText(state.item.weeks)}
+          frequency={loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}
           time={params.is24Hour ?
             `${parseTimer(state.item.startTime * 60)} - ${parseTimer(state.item.endTime * 60)}`
             :

package/src/modules/randomTimingForLight/RandomTimingForLightDetailPage.tsx

@@ -170,7 +170,7 @@ const RandomTimingForLightDetailPage = () => {
             state.item.weeks[rawIndex] = state.item.weeks[rawIndex] === 1 ? 0 : 1
           }}/>
         <Spacer/>
-        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.startTime * 60))}</Text>
+        <Text style={styles.cardContainer}>{loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}</Text>
         <Spacer/>
         {/*Apply for */}
         <View style={styles.cardContainer}>
@@ -261,7 +261,7 @@ const RandomTimingForLightDetailPage = () => {
         </View>
         {/* summary */}
         <Summary
-          frequency={loopText(state.item.weeks)}
+          frequency={loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}
           time={params.is24Hour ?
             `${parseTimer(state.item.startTime * 60)} - ${parseTimer(state.item.endTime * 60)}`
             :

package/src/modules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -34,6 +34,8 @@ import {getEndTime, getStartTime, SleepWakeUpItem} from "./SleepWakeUpActions";
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
 const { withTheme } = Utils.ThemeUtils
+const {parseTimer} = Utils.TimeUtils
+
 
 interface SleepWakeUpDetailPageProps extends SleepWakeUpPageRouteParams {
   mode: 'add' | 'edit';
@@ -253,7 +255,7 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
   return (
     <Page
       backText={I18n.getLang('add_sleepschedule_one_source_system_back_text')}
-      showBackDialog={showBackDialog() && caSubmit}
+      showBackDialog={showBackDialog()}
       loading={state.loading}
       backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
       backDialogContent={I18n.getLang(
@@ -264,25 +266,35 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
       rightButtonIcon={showBackDialog() && caSubmit ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={async () => {
         if (!showBackDialog() || !caSubmit || state.loading) return;
-        state.loading = true;
-        if (state.sleepWakeUp.isColorMode) {
-          state.sleepWakeUp.brightness = 0;
-          state.sleepWakeUp.temperature = 0;
-        } else {
-          state.sleepWakeUp.hue = 0;
-          state.sleepWakeUp.sat = 0;
-          state.sleepWakeUp.value = 0;
-        }
-        state.sleepWakeUp.enable = true
-        const res = await params.modDeleteTimeSchedule(
-          params.mode,
-          state.sleepWakeUp.isSleep,
-          {...state.sleepWakeUp, settingTime: new Date().getTime()}
-        );
-        state.loading = false;
-        if (res.success) {
-          navigation.goBack();
-        }
+        showDialog({
+          method: 'confirm',
+          title: I18n.getLang('conflict_dialog_active_item_sleepschedule_titel'),
+          subTitle: I18n.getLang('group_conflict_feature'),
+          confirmText: I18n.getLang('registration_dialog_button_yes'),
+          cancelText: I18n.getLang('registration_dialog_button_no'),
+          onConfirm: async (_, { close }) => {
+            state.loading = true
+            close()
+            if (state.sleepWakeUp.isColorMode) {
+              state.sleepWakeUp.brightness = 0;
+              state.sleepWakeUp.temperature = 0;
+            } else {
+              state.sleepWakeUp.hue = 0;
+              state.sleepWakeUp.sat = 0;
+              state.sleepWakeUp.value = 0;
+            }
+            state.sleepWakeUp.enable = true
+            const res = await params.modDeleteTimeSchedule(
+              params.mode,
+              state.sleepWakeUp.isSleep,
+              {...state.sleepWakeUp, settingTime: new Date().getTime()}
+            );
+            state.loading = false;
+            if (res.success) {
+              navigation.goBack();
+            }
+          }
+        })
       }}
       headlineText={I18n.getLang(
         params.isSleep
@@ -339,7 +351,7 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
             }}
           />
           <Spacer />
-          <Text style={{ marginHorizontal: cx(24), color: props.theme.global.fontColor }}>{loopText(state.sleepWakeUp.weeks)}</Text>
+          <Text style={{ marginHorizontal: cx(24), color: props.theme.global.fontColor }}>{loopText(state.sleepWakeUp.weeks, parseTimer(getEndTime(state.sleepWakeUp) * 60))}</Text>
           <Spacer />
         </View>
 
@@ -556,7 +568,7 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
             style={styles.summaryLeft}
           />
           <View style={styles.summaryRight}>
-            <Text style={styles.rightItem}>{loopText(state.sleepWakeUp.weeks)}</Text>
+            <Text style={styles.rightItem}>{loopText(state.sleepWakeUp.weeks, parseTimer(getEndTime(state.sleepWakeUp) * 60))}</Text>
           </View>
         </View>
         <View style={styles.summaryContainer}>
@@ -604,12 +616,7 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
             </Text>
             <View style={styles.filletCorner}>
               <Text style={styles.rightTitle}>
-                {convertMinutesTo12HourFormat(
-                  params.isSleep
-                    ? getEndTime(state.sleepWakeUp)
-                    : getEndTime(state.sleepWakeUp),
-                  is24HourClock
-                )}
+                {convertMinutesTo12HourFormat(getEndTime(state.sleepWakeUp),is24HourClock)}
               </Text>
             </View>
           </View>

package/src/modules/timer/TimerAction.ts

@@ -18,6 +18,8 @@ export interface TimerTask {
   status: TaskStatus
   stringOn: I18nKey
   stringOff: I18nKey
+  stringOnMin: I18nKey
+  stringOffMin: I18nKey
 }
 
 export enum TaskStatus {
@@ -53,6 +55,8 @@ export function useTimerTasks(timerSettableDps: TimerSettableDp[]):
       status: TaskStatus.NoSelected,
       stringOn: timerSettableDp.stringOn,
       stringOff: timerSettableDp.stringOff,
+      stringOnMin: timerSettableDp.stringOnMin,
+      stringOffMin: timerSettableDp.stringOffMin
     }))
   }, [JSON.stringify(timerSettableDps)])
 
@@ -157,6 +161,8 @@ export interface TimerSettableDp {
   }
   stringOn: I18nKey
   stringOff: I18nKey
+  stringOnMin: I18nKey
+  stringOffMin: I18nKey
 }
 
 export interface TimerPageParams {
@@ -170,7 +176,7 @@ export function timeFormatToRealTime(mCountdown: number) {
   return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
 }
 
-export function timeFormat(time: number): string {
+export function timeFormat(time: number, hideUnit?: boolean): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60
   let min = Math.ceil(beforeMin)
@@ -178,5 +184,5 @@ export function timeFormat(time: number): string {
     hour += 1
     min = 0
   }
-  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min} min` : ''}`
+  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min} ${hideUnit ? '' : 'min'}` : ''}`
 }