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

package/src/modules/fixedTimeForPlug/Summary.tsx

@@ -6,8 +6,10 @@ import { Utils } from "tuya-panel-kit";
 import Spacer from "@ledvance/base/src/components/Spacer";
 
 const { convertX: cx } = Utils.RatioUtils;
+const { withTheme } = Utils.ThemeUtils
 
 interface SummaryProps {
+  theme?: any
   style?: ViewStyle
   frequency?: string | ReactElement
   time?: string | ReactElement
@@ -16,6 +18,53 @@ interface SummaryProps {
 }
 
 const Summary = (props: SummaryProps) => {
+
+  const styles = StyleSheet.create({
+    cardContainer: {
+      marginHorizontal: cx(24),
+    },
+    itemTitle: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(16),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    summaryContainer: {
+      flex: 1,
+      flexDirection: 'row',
+      marginBottom: cx(10),
+    },
+    summaryLeft: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      minWidth: cx(100)
+    },
+    summaryImg: {
+      tintColor: props.theme.global.fontColor,
+      width: cx(12),
+      height: cx(12),
+      marginRight: cx(6)
+    },
+    leftTitle: {
+      fontSize: cx(14),
+      color: props.theme.global.fontColor,
+    },
+    summaryRight: {
+      flex: 1,
+      flexDirection: 'column',
+      marginLeft: cx(15),
+    },
+    rightWrap: {
+      borderRadius: cx(16),
+      paddingHorizontal: cx(12),
+      alignSelf: 'flex-start',
+      backgroundColor: props.theme.tag.background,
+    },
+    rightItem: {
+      color: props.theme.tag.fontColor,
+    },
+  })
+
   return (
     <View style={styles.cardContainer}>
       <Text style={styles.itemTitle}>{I18n.getLang('add_randomtimecycle_subheadline_text')}</Text>
@@ -56,68 +105,23 @@ const Summary = (props: SummaryProps) => {
           </View>
         </View>
         {!props.hideActions && <View style={[styles.summaryContainer, { alignItems: 'flex-start' }]}>
-          <View style={styles.summaryLeft}>
-            <Image
-              source={res.summary_icon3}
-              resizeMode="contain"
-              style={styles.summaryImg}
-            />
-            <View>
-              <Text style={styles.leftTitle}>{I18n.getLang('motion_detection_add_time_schedule_actions_text1')}</Text>
+            <View style={styles.summaryLeft}>
+                <Image
+                    source={res.summary_icon3}
+                    resizeMode="contain"
+                    style={styles.summaryImg}
+                />
+                <View>
+                    <Text style={styles.leftTitle}>{I18n.getLang('motion_detection_add_time_schedule_actions_text1')}</Text>
+                </View>
+            </View>
+            <View style={styles.summaryRight}>
+              {props.actions}
             </View>
-          </View>
-          <View style={styles.summaryRight}>
-            {props.actions}
-          </View>
         </View>}
       </View>
     </View>
   )
 }
 
-const styles = StyleSheet.create({
-  cardContainer: {
-    marginHorizontal: cx(24),
-  },
-  itemTitle: {
-    color: '#000',
-    fontSize: cx(16),
-    fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  summaryContainer: {
-    flex: 1,
-    flexDirection: 'row',
-    marginBottom: cx(10),
-  },
-  summaryLeft: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    minWidth: cx(100)
-  },
-  summaryImg: {
-    width: cx(12),
-    height: cx(12),
-    marginRight: cx(6)
-  },
-  leftTitle: {
-    fontSize: cx(14),
-    color: '#000'
-  },
-  summaryRight: {
-    flex: 1,
-    flexDirection: 'column',
-    marginLeft: cx(15),
-  },
-  rightWrap: {
-    borderRadius: cx(16),
-    paddingHorizontal: cx(12),
-    alignSelf: 'flex-start',
-    backgroundColor: '#cbcbcb',
-  },
-  rightItem: {
-    color: '#000',
-  },
-})
-
-export default memo(Summary)
+export default memo(withTheme(Summary))

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/lightMode/LightModePage.tsx

@@ -60,7 +60,7 @@ const LightModePage = (props: { theme?: any }) => {
     },
     modeSelectGroup: {
       marginHorizontal: cx(24),
-      backgroundColor: props.theme.card.board,
+      backgroundColor: props.theme.container.background,
       borderRadius: cx(4),
     },
     modeTip: {
@@ -76,7 +76,7 @@ const LightModePage = (props: { theme?: any }) => {
     line: {
       height: cx(1),
       marginHorizontal: cx(12),
-      backgroundColor: '#3C3C435B',
+      backgroundColor: props.theme.container.divider,
     },
     itemRoot: {
       flexDirection: 'row',

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/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -57,6 +57,9 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
       fontFamily: 'helvetica_neue_lt_std_bd',
       paddingVertical: cx(16),
     },
+    desc: {
+      color: props.theme.global.fontColor,
+    },
     shadow: {
       shadowColor: props.theme.card.shadowColor,
       shadowOpacity: 0.2,
@@ -66,7 +69,7 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
         width: 0,
         height: 4,
       },
-      backgroundColor: props.theme.global.background,
+      backgroundColor: props.theme.card.background,
       borderRadius: 8,
     },
   })
@@ -80,7 +83,7 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
           <Text style={styles.title}>{I18n.getLang('switch_overcharge_headline_text')}</Text>
         </View>
         <View style={{ paddingBottom: cx(16) }}>
-          <Text>{I18n.getLang('switch_overcharge_headline_description')}</Text>
+          <Text style={styles.desc}>{I18n.getLang('switch_overcharge_headline_description')}</Text>
         </View>
       </View>
       <Spacer style={{ flex: 1 }} height={0} width={0} />

package/src/modules/randomTimeForPlug/ItemCard.tsx

@@ -7,9 +7,11 @@ import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 
 const {convertX: cx} = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
 const {parseTimer} = Utils.TimeUtils
 
 export interface ItemCardProps<T> {
+  theme?: any
   item: T & {
     enable: boolean
     startTime: number
@@ -25,8 +27,33 @@ export interface ItemCardProps<T> {
 
 const ItemCard = <T, >(props: ItemCardProps<T>) => {
   const {item, is24Hour, onSwitch, onPress} = props
-  // 判断是否关闭 
+  // 判断是否关闭
   const closed = getIsClosed(item)
+
+
+  const styles = StyleSheet.create({
+    itemCard: {
+      marginHorizontal: cx(24),
+      paddingHorizontal: cx(16),
+    },
+    switchLine: {
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    time: {
+      flex: 1,
+      color: props.theme.global.fontColor,
+      fontSize: cx(16),
+      fontWeight: 'bold',
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    switchBtn: {},
+    loopText: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(14),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+  })
   return (
     <Card style={styles.itemCard} onPress={onPress}>
       <Spacer height={cx(16)}/>
@@ -52,28 +79,4 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
   )
 }
 
-const styles = StyleSheet.create({
-  itemCard: {
-    marginHorizontal: cx(24),
-    paddingHorizontal: cx(16),
-  },
-  switchLine: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  time: {
-    flex: 1,
-    color: '#000',
-    fontSize: cx(16),
-    fontWeight: 'bold',
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  switchBtn: {},
-  loopText: {
-    color: '#000',
-    fontSize: cx(14),
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-})
-
-export default ItemCard
+export default withTheme(ItemCard)