@ledvance/ui-biz-bundle 1.1.90 → 1.1.92

package/src/newModules/randomTime/Summary.tsx

@@ -7,8 +7,10 @@ import Spacer from "@ledvance/base/src/components/Spacer";
 import InfoText from "@ledvance/base/src/components/InfoText";
 
 const { convertX: cx } = Utils.RatioUtils;
+const { withTheme } = Utils.ThemeUtils
 
 interface SummaryProps {
+  theme?: any
   style?: ViewStyle
   frequency?: string | ReactElement
   time?: string | ReactElement
@@ -17,6 +19,54 @@ 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),
+      marginTop: cx(5)
+    },
+    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_sleepschedule_one_source_subheadline4_text')}</Text>
@@ -51,66 +101,20 @@ const Summary = (props: SummaryProps) => {
           </View>
         </View>
         {!props.hideActions && <View style={[styles.summaryContainer, { alignItems: 'flex-start' }]}>
-          <InfoText
-            icon={res.summary_icon3}
-            text={I18n.getLang('motion_detection_add_time_schedule_actions_text1')}
-            iconStyle={styles.summaryImg}
-            textStyle={styles.leftTitle}
-            style={styles.summaryLeft}
-          />
-          <View style={styles.summaryRight}>
-            {props.actions}
-          </View>
+            <InfoText
+                icon={res.summary_icon3}
+                text={I18n.getLang('motion_detection_add_time_schedule_actions_text1')}
+                iconStyle={styles.summaryImg}
+                textStyle={styles.leftTitle}
+                style={styles.summaryLeft}
+            />
+            <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),
-    marginTop: cx(5)
-  },
-  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/newModules/remoteControl/RemoteControlPage.tsx

@@ -12,11 +12,12 @@ import { Utils } from 'tuya-panel-kit'
 import {showDialog} from "@ledvance/base/src/utils/common";
 
 const { convertX: cx } = Utils.RatioUtils
+const { withTheme } = Utils.ThemeUtils
 
 export interface RemoteControlPageParams {
   remoteControlDpCode: string;
 }
-const RemoteControlPage = () => {
+const RemoteControlPage = (props: { theme?: any }) => {
   const deviceInfo = useDeviceInfo();
   const params = useParams<RemoteControlPageParams>();
   const [remoteControl, setRemoteControl] = useRemoteControl(params.remoteControlDpCode);
@@ -35,7 +36,7 @@ const RemoteControlPage = () => {
       <Card style={{marginHorizontal: cx(24)}}>
         <LdvSwitch
           title={I18n.getLang('light_sources_specific_settings_remote_control')}
-          color="#fff"
+          color={props.theme.card.background}
           colorAlpha={1}
           enable={remoteControl}
           setEnable={async v => {
@@ -66,4 +67,4 @@ const RemoteControlPage = () => {
   );
 };
 
-export default RemoteControlPage;
+export default withTheme(RemoteControlPage)

package/src/newModules/select/SelectPage.tsx

@@ -8,6 +8,7 @@ import Card from '@ledvance/base/src/components/Card'
 import res from '@ledvance/base/src/res'
 
 const cx = Utils.RatioUtils.convertX
+const { withTheme } = Utils.ThemeUtils
 
 export interface SelectPageData<T> {
   text: string
@@ -21,9 +22,71 @@ export interface SelectPageParams<T> {
   onSelect: (selectPageData: SelectPageData<T>) => void
 }
 
-const SelectPage = () => {
+const SelectPage = (props: { theme?: any }) => {
   const params = useRoute().params as SelectPageParams<any>
   const navigation = useNavigation()
+
+  const styles = StyleSheet.create({
+    root: {
+      flex: 1,
+    },
+    topBar: {
+      backgroundColor: props.theme.card.head,
+    },
+    line: {
+      height: cx(1),
+      backgroundColor: props.theme.container.divider,
+    },
+    topContent: {
+      paddingVertical: cx(30),
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    cancel: {
+      marginStart: cx(16),
+      color: props.theme.button.cancel,
+      fontSize: cx(17),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    title: {
+      width: '100%',
+      position: 'absolute',
+      start: 0,
+      textAlign: 'center',
+      color: props.theme.global.fontColor,
+      fontSize: cx(17),
+      paddingHorizontal: cx(110),
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    card: {
+      backgroundColor: props.theme.card.background,
+      marginHorizontal: cx(16),
+    },
+    item: {
+      height: cx(44),
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    itemText: {
+      flex: 1,
+      marginStart: cx(13),
+      color: props.theme.global.fontColor,
+      fontSize: cx(17),
+      fontFamily: 'helvetica_neue_lt_std_roman',
+    },
+    itemLine: {
+      height: cx(1),
+      marginStart: cx(13),
+      backgroundColor: props.theme.container.divider,
+    },
+    itemIcon: {
+      width: cx(30),
+      height: cx(30),
+      marginEnd: cx(13),
+      tintColor: props.theme.icon.primary,
+    },
+  })
+
   return (
     <View style={styles.root}>
       <View style={styles.topBar}>
@@ -75,64 +138,4 @@ const SelectPage = () => {
   )
 }
 
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-  },
-  topBar: {
-    backgroundColor: '#eaeaea',
-  },
-  line: {
-    height: cx(1),
-    backgroundColor: '#d9d9d9',
-  },
-  topContent: {
-    paddingVertical: cx(30),
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  cancel: {
-    marginStart: cx(16),
-    color: '#f60',
-    fontSize: cx(17),
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-  title: {
-    width: '100%',
-    position: 'absolute',
-    start: 0,
-    textAlign: 'center',
-    color: '#000',
-    fontSize: cx(17),
-    paddingHorizontal: cx(110),
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  card: {
-    marginHorizontal: cx(16),
-  },
-  item: {
-    height: cx(44),
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  itemText: {
-    flex: 1,
-    marginStart: cx(13),
-    color: '#000',
-    fontSize: cx(17),
-    fontFamily: 'helvetica_neue_lt_std_roman',
-  },
-  itemLine: {
-    height: cx(1),
-    marginStart: cx(13),
-    backgroundColor: '#ccc',
-  },
-  itemIcon: {
-    width: cx(30),
-    height: cx(30),
-    marginEnd: cx(13),
-    tintColor: '#f60',
-  },
-})
-
-export default SelectPage
+export default withTheme(SelectPage)

package/src/newModules/sleepWakeUp/SleepWakeUpActions.ts

@@ -154,8 +154,10 @@ const wakeUpObj2Dp = (wakeUp: WakeUpData) => {
     const weeksValue = padStart([...node.weeks].reverse().join(''), 8, '0')
     const weeksHex = to16(parseInt(weeksValue, 2), 2)
     const delayHex = to16(node.delay)
-    const hourHex = to16(node.hour)
-    const minuteHex = to16(node.minute)
+    const hour = Math.trunc(node.time / 60)
+    const min = node.time % 60
+    const hourHex = to16(hour)
+    const minuteHex = to16(min)
     const hString = node.h.toString().padStart(4, '0')
     const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
     const s = to16(node.s)
@@ -175,8 +177,10 @@ export const wakeUpNode2Dp = (node: WakeUpItem) =>{
   const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
   const weeksHex = to16(parseInt(weeksValue, 2), 2)
   const delayHex = to16(node.delay)
-  const hourHex = to16(node.hour)
-  const minuteHex = to16(node.minute)
+  const hour = Math.trunc(node.time / 60)
+  const min = node.time % 60
+  const hourHex = to16(hour)
+  const minuteHex = to16(min)
   const hString = node.h.toString().padStart(4, '0')
   const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
   const s = to16(node.s)
@@ -300,8 +304,10 @@ export const sleepObj2Dp = (sleep: SleepData) => {
     const weeksValue = padStart([...node.weeks].reverse().join(''), 8, '0')
     const weeksHex = to16(parseInt(weeksValue, 2), 2)
     const delayHex = to16(node.delay)
-    const hourHex = to16(node.hour)
-    const minuteHex = to16(node.minute)
+    const hour = Math.trunc(node.time / 60)
+    const min = node.time % 60
+    const hourHex = to16(hour)
+    const minuteHex = to16(min)
     const hString = node.h.toString().padStart(4, '0')
     const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
     const s = to16(node.s)
@@ -320,8 +326,10 @@ export const sleepNode2Dp = (node: SleepItem) => {
   const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
   const weeksHex = to16(parseInt(weeksValue, 2), 2)
   const delayHex = to16(node.delay)
-  const hourHex = to16(node.hour)
-  const minuteHex = to16(node.minute)
+  const hour = Math.trunc(node.time / 60)
+  const min = node.time % 60
+  const hourHex = to16(hour)
+  const minuteHex = to16(min)
   const hString = node.h.toString().padStart(4, '0')
   const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
   const s = to16(node.s)