@ledvance/ui-biz-bundle 1.1.71 → 1.1.72

package/package.json

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

package/src/modules/timer/TimerPageAction.ts

@@ -129,3 +129,14 @@ export const useProgress = (dps: dpItem[]) => {
     ...dp
   }))
 }
+
+export function timeFormat(time: number): string {
+  let hour = Math.trunc(time / 3600)
+  const beforeMin = (time % 3600) / 60
+  let min = Math.ceil(beforeMin)
+  if (min === 60) {
+    hour += 1
+    min = 0
+  }
+  return `${hour > 0 ? `${hour} h ` : ''}${min > 0 ? `${min} min` : ''}`
+}

package/src/navigation/Routers.ts

@@ -43,4 +43,5 @@ export const ui_biz_routerKey = {
   'ui_biz_light_mode': 'ui_biz_light_mode',
   'ui_biz_overcharge_switch': 'ui_biz_overcharge_switch',
   'ui_biz_child_lock': 'ui_biz_child_lock',
+  'ui_biz_remote_control': 'ui_biz_remote_control'
 }

package/src/newModules/fixedTime/FixedTimeActions.ts

@@ -91,7 +91,7 @@ export const useFixedTime: UseFixedTimeType = (dpKey, isPlug, disableFeature) =>
               return {
                 ...item,
                 index: idx,
-                name: featureItem ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
+                name: featureItem && featureItem?.n ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
               }
             })
             setFixedTimeUiList(uiPlan)
@@ -218,7 +218,7 @@ const fixedTimeObj2Dp = (randomTimerData: FixedTimerData, isPlug?: boolean) => {
 
 const fixedTimeToHex = (fixedTime: FixedTimer, isPlug?: boolean, isFeatureData?: boolean) => {
   const { weeks, startTime, endTime, openTime, closeTime, channel, enable } = fixedTime
-  const channelStr = padStart((channel ?? 0).toString(2), 7, '0');
+  const channelStr = padStart((channel ?? (isPlug ? 0 : 1)).toString(2), 7, '0');
   const powerChannel = parseInt(`${channelStr}${enable ? 1 : 0}`, 2);
   const powerChannelStr = to16(powerChannel, 2);
   const weeksValue: string = padStart([...weeks].reverse().join(''), 8, '0');

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -146,7 +146,7 @@ const FixedTimeDetailPage = () => {
             {state.fixedTime.channel === undefined ?
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text> :
               <View style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}>
-                <Text style={{ color: '#000' }}>{params.applyForList[state.fixedTime.channel]?.key}</Text>
+                <Text style={{ color: '#000' }}>{params.applyForList[params.isPlug ? state.fixedTime.channel : 0]?.key}</Text>
                 {params.applyForList.length > 1 && <TouchableOpacity
                   onPress={() => {
                     state.fixedTime.channel = undefined
@@ -158,13 +158,13 @@ const FixedTimeDetailPage = () => {
             }
           </View>
           {params.applyForList.map((item, index) => {
-            if (state.fixedTime.channel === index) return null
+            if ((params.isPlug ? state.fixedTime.channel : 0)=== index) return null
             return (
               <TouchableOpacity
                 style={styles.applyItem}
                 key={item.key}
                 onPress={() => {
-                  state.fixedTime.channel = index
+                  state.fixedTime.channel = params.isPlug ? index : 1
                 }}>
                 <Text style={{ color: '#000' }}>{item.key}</Text>
                 <Image style={{ width: cx(16), height: cx(16) }} source={res.device_panel_timer_add} />

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -117,7 +117,7 @@ const FixedTimePage = () => {
       loading={state.loading}
       onBackClick={navigation.goBack}
       onHeadlineIconClick={() => {
-        navigateToEdit('add', newFixedTime())
+        navigateToEdit('add', newFixedTime(!!params.isPlug))
       }}
     >
       <ScrollView nestedScrollEnabled={true}>
@@ -185,7 +185,7 @@ const FixedTimePage = () => {
               }}
               textStyle={{ color: '#fff' }}
               onPress={() => {
-                navigateToEdit('add', newFixedTime())
+                navigateToEdit('add', newFixedTime(!!params.isPlug))
               }} />}
           </View>}
       </ScrollView>
@@ -230,7 +230,7 @@ const FixedTimeCard = memo((props: {
   )
 })
 
-const newFixedTime = () => {
+const newFixedTime = (isPlug: boolean) => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
     name: '',
@@ -240,7 +240,7 @@ const newFixedTime = () => {
     endTime: startTime + 60,
     closeTime: 1,
     openTime: 1,
-    channel: 0,
+    channel: isPlug ? 0 : 1,
     color: {
       h: 0,
       s: 100,

package/src/newModules/randomTime/RandomTimeActions.ts

@@ -91,7 +91,7 @@ export const useRandomTime: UseFixedTimeType = (dpKey: string, isPlug?: boolean,
                 return {
                   ...item,
                   index: idx,
-                  name: featureItem ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
+                  name: featureItem && featureItem?.n ? featureItem?.n : `${I18n.getLang('randomtimecycle_sockets_headline_text')} ${idx + 1}`
                 }
               })
               setRandomTimeUiList(uiPlan)
@@ -216,7 +216,7 @@ const randomTimeObj2Dp = (randomTimerData: RandomTimerData, isPlug?: boolean) =>
 
 const randomTimeToHex = (randomTime: RandomTimer, isPlug?: boolean, isFeatureData?: boolean) => {
   const { weeks, startTime, endTime, channel, enable } = randomTime
-  const channelStr = padStart((channel ?? 0).toString(2), 7, '0');
+  const channelStr = padStart((channel ?? (isPlug ? 0 : 1)).toString(2), 7, '0');
   const powerChannel = parseInt(`${channelStr}${enable ? 1 : 0}`, 2);
   const powerChannelStr = to16(powerChannel, 2);
   const weeksValue: string = padStart([...weeks].reverse().join(''), 8, '0');

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -140,7 +140,7 @@ const RandomTimeDetailPage = () => {
             {state.randomTime.channel === undefined ?
               <Text>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text> :
               <View style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}>
-                <Text style={{ color: '#000', fontSize: cx(12) }}>{params.applyForList[state.randomTime.channel]?.key}</Text>
+                <Text style={{ color: '#000', fontSize: cx(12) }}>{params.applyForList[params.isPlug ? state.randomTime.channel : 0]?.key}</Text>
                 {params.applyForList.length > 1 && <TouchableOpacity
                   onPress={() => {
                     state.randomTime.channel = undefined
@@ -152,13 +152,13 @@ const RandomTimeDetailPage = () => {
             }
           </View>
           {params.applyForList.map((item, index) => {
-            if (state.randomTime.channel === index) return null
+            if ((params.isPlug ? state.randomTime.channel : 0) === index) return null
             return (
               <TouchableOpacity
                 style={styles.applyItem}
                 key={item.key}
                 onPress={() => {
-                  state.randomTime.channel = index
+                  state.randomTime.channel = params.isPlug ? index : 1
                 }}>
                 <Text style={{ color: '#000', fontSize: cx(12) }}>{item.key}</Text>
                 <Image style={{ width: cx(16), height: cx(16) }} source={res.device_panel_timer_add} />

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -118,7 +118,7 @@ const RandomTimePage = () => {
       onBackClick={navigation.goBack}
       loading={state.loading}
       onHeadlineIconClick={() => {
-        navigateToEdit('add', newRandomTime())
+        navigateToEdit('add', newRandomTime(params.isPlug))
       }}
     >
       <ScrollView nestedScrollEnabled={true}>
@@ -185,7 +185,7 @@ const RandomTimePage = () => {
               }}
               textStyle={{ color: '#fff' }}
               onPress={() => {
-                navigateToEdit('add', newRandomTime())
+                navigateToEdit('add', newRandomTime(params.isPlug))
               }} />}
           </View>}
       </ScrollView>
@@ -229,7 +229,7 @@ const RandomTimeCard = (props: {
   )
 }
 
-const newRandomTime = () => {
+const newRandomTime = (isPlug?: boolean) => {
   const startTime = dayjs().hour() * 60 + dayjs().minute()
   return {
     name: '',
@@ -237,7 +237,7 @@ const newRandomTime = () => {
     weeks: [0, 0, 0, 0, 0, 0, 0],
     startTime: startTime,
     endTime: startTime + 60,
-    channel: 0,
+    channel: isPlug ? 0 : 1,
     color: {
       h: 0,
       s: 100,