@ledvance/group-ui-biz-bundle 1.0.1 → 1.0.3

package/package.json

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

package/src/modules/mood/MoodPage.tsx

@@ -8,7 +8,7 @@ import { useDeviceInfo, useMoods, useUAGroupInfo } from '@ledvance/base/src/mode
 import { useReactive } from 'ahooks'
 import Strings from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
-import { FlatList, StyleSheet, View } from 'react-native'
+import { FlatList, StyleSheet, View, Platform } from 'react-native'
 import Tag from '@ledvance/base/src/components/Tag'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import InfoText from '@ledvance/base/src/components/InfoText'
@@ -306,15 +306,14 @@ const styles = StyleSheet.create({
     marginHorizontal: cx(24),
   },
   addMoodPopover: {
-    width: cx(171),
-    height: cx(90.5),
-    marginStart: cx(156),
-    marginTop: cx(105),
+    position: 'absolute',
+    right: cx(60),
+    top: Platform.OS === 'android' ? cx(90) : cx(130),
+    maxWidth: cx(200),
     backgroundColor: '#fff',
   },
   popoverItem: {
-    width: cx(171),
-    height: cx(45),
+    padding: cx(5),
     alignItems: 'flex-start',
   },
 })

package/src/modules/time_schedule/TimeScheduleActions.ts

@@ -89,4 +89,14 @@ export const fanModeOption = [
     label: I18n.getLang('ceiling_fan_mode_info_option_2_headline'),
     value: UVCFanMode.Nature,
   },
-]
+]
+
+export const actionOption = {
+  switchLed: I18n.getLang('light_sources_tile_tw_lighting_headline'),
+  switchSocket: I18n.getLang('feature_summary_action_component_5'),
+  switchSocket1: I18n.getLang('feature_summary_action_component_6'),
+  switchSocket2: I18n.getLang('feature_summary_action_component_7'),
+  switchSocket3: I18n.getLang('feature_summary_action_component_8'),
+  switchSocket4: I18n.getLang('feature_summary_action_component_9'),
+  switchFan: I18n.getLang('add_new_dynamic_mood_ceiling_fan_field_headline'),
+}

package/src/modules/time_schedule/TimeScheduleDetailPage.tsx

@@ -31,7 +31,7 @@ import StripAdjustView, { ColorList } from "@ledvance/base/src/components/StripA
 import SocketItem from '@ledvance/base/src/components/SocketItem'
 import { WorkMode } from "@ledvance/base/src/utils/interface";
 import { Buffer } from 'buffer'
-import { fanModeOption } from "./TimeScheduleActions";
+import { fanModeOption, actionOption } from "./TimeScheduleActions";
 
 const { convertX: cx } = Utils.RatioUtils;
 const { toFixedString } = Utils.NumberUtils;
@@ -175,7 +175,7 @@ const TimeScheduleDetailPage = () => {
         if (props.colorDataDp2Obj) {
           const color = props.colorDataDp2Obj(dps[props.colorDataCode])
           state.hsv = cloneDeep(color)
-          if(props.isMatterLight && props.brightValueCode && dps.hasOwnProperty(props.brightValueCode) && props.brightValueParser){
+          if (props.isMatterLight && props.brightValueCode && dps.hasOwnProperty(props.brightValueCode) && props.brightValueParser) {
             state.hsv.v = props.brightValueParser(dps[props.brightValueCode])
           }
         } else {
@@ -228,33 +228,60 @@ const TimeScheduleDetailPage = () => {
   }, [])
 
   const getActionOnOff = useMemo(() => {
-    const off = [] as string[]
-    const on = [] as string[]
+    const off: string[] = []
+    const on: string[] = []
     if (props.switchLedCode) {
+      const s = actionOption['switchLed']
       if (state.switchLed) {
-        on.push(I18n.getLang('light_sources_tile_tw_lighting_headline'))
+        on.push(s)
       } else {
-        off.push(I18n.getLang('light_sources_tile_tw_lighting_headline'))
+        off.push(s)
       }
     }
     if (props.switchSocket1) {
+      const s = isPowerStrip ? actionOption['switchSocket1'] : actionOption['switchSocket']
       if (state.switchSocket1) {
-        on.push(I18n.getLang('feature_summary_action_component_5'))
+        on.push(s)
       } else {
-        off.push(I18n.getLang('feature_summary_action_component_5'))
+        off.push(s)
+      }
+    }
+    if (props.switchSocket2) {
+      const s = actionOption['switchSocket2']
+      if (state.switchSocket2) {
+        on.push(s)
+      } else {
+        off.push(s)
+      }
+    }
+    if (props.switchSocket3) {
+      const s = actionOption['switchSocket3']
+      if (state.switchSocket3) {
+        on.push(s)
+      } else {
+        off.push(s)
+      }
+    }
+    if (props.switchSocketUSB) {
+      const s = actionOption['switchSocket4']
+      if (state.switchSocketUSB) {
+        on.push(s)
+      } else {
+        off.push(s)
       }
     }
     if (props.switchFan) {
+      const s = actionOption['switchFan']
       if (state.switchFan) {
-        on.push(I18n.getLang('add_new_dynamic_mood_ceiling_fan_field_headline'))
+        on.push(s)
       } else {
-        off.push(I18n.getLang('add_new_dynamic_mood_ceiling_fan_field_headline'))
+        off.push(s)
       }
     }
     return {
       on, off
     }
-  }, [state.switchLed, state.switchSocket1, state.switchFan])
+  }, [state.switchLed, state.switchSocket1, state.switchSocket2, state.switchSocket3, state.switchSocketUSB, state.switchFan])
 
   const getActions = useCallback(() => {
     const actions = {
@@ -283,7 +310,7 @@ const TimeScheduleDetailPage = () => {
             }
             if (props.colorDataObj2Dp) {
               actions.dps[props.colorDataCode] = props.colorDataObj2Dp(hsv)
-              if(props.isMatterLight && props.brightValueCode && props.brightValueFormatter) {
+              if (props.isMatterLight && props.brightValueCode && props.brightValueFormatter) {
                 actions.dps[props.brightValueCode] = props.brightValueFormatter(state.hsv.v)
               }
             } else {
@@ -713,10 +740,10 @@ const TimeScheduleDetailPage = () => {
             textStyle={styles.leftTitle}
             style={styles.summaryLeft}
           />
-          <View style={{ marginLeft: cx(16) }}>
+          <View style={{ marginLeft: cx(16), flex: 1 }}>
             {!!getActionOnOff.on.length && <View>
               <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_1')}</Text>
-              <View style={{ flexDirection: 'row' }}>{
+              <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>{
                 getActionOnOff.on.map(item => (
                   <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
                     key={item}>
@@ -728,7 +755,7 @@ const TimeScheduleDetailPage = () => {
             </View>}
             {!!getActionOnOff.off.length && <View>
               <Text style={{ marginLeft: cx(5) }}>{I18n.getLang('feature_summary_action_txt_2')}</Text>
-              <View style={{ flexDirection: 'row' }}>{
+              <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>{
                 getActionOnOff.off.map(item => (
                   <View style={[styles.summaryRight, { marginLeft: cx(5), marginBottom: cx(5) }]}
                     key={item}>

package/src/modules/timer/TimerPage.tsx

@@ -235,7 +235,7 @@ function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
           size={cx(24)}
           strokeWidth={cx(2)}/>
         <Spacer width={cx(16)}/>
-        <Text style={styles.activeTaskTimeText}>{I18n.formatValue(task.stringOn, timeFormat(task.timeLeft))}</Text>
+        <Text style={styles.activeTaskTimeText}>{timeFormat(task.timeLeft)}</Text>
         <Spacer width={cx(20)}/>
       </View>
       <Spacer/>
@@ -316,7 +316,7 @@ const styles = StyleSheet.create({
     fontSize: cx(14),
   },
   activeTaskHeadLineBtn: {
-    width: cx(50),
+    minWidth: cx(50),
     height: cx(24),
     padding: 0,
     backgroundColor: '#666',