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

package/src/modules/randomTimeForPlug/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/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -362,7 +362,7 @@ const SleepWakeUpDetailPage = (props: {theme?: any}) => {
           </Text>
           <View
             style={{
-              backgroundColor: props.theme.card.board,
+              backgroundColor: props.theme.card.border,
               borderRadius: 4,
               minHeight: cx(50),
               flex: 1,

package/src/modules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -191,7 +191,7 @@ const SleepWakeUpPage = (props: {theme?: any}) => {
       alignItems: 'center'
     },
     emptyBtn: {
-      backgroundColor: props.theme.button.active,
+      backgroundColor: props.theme.button.primary,
       borderRadius: cx(5),
       paddingHorizontal: cx(15),
       paddingVertical: cx(10)

package/src/modules/swithInching/SwithInching.tsx

@@ -4,7 +4,7 @@ import Page from "@ledvance/base/src/components/Page";
 import {useDeviceInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useNavigation} from '@react-navigation/native'
 import {SwitchButton, Utils} from "tuya-panel-kit";
-import LdvPickerView from "./pickerView";
+import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
 import I18n from '@ledvance/base/src/i18n'
 import {useReactive, useUpdateEffect} from "ahooks";
 import {useSwitchInching} from "./SwithInchingAction";
@@ -71,7 +71,7 @@ const SwitchInching = (props: { theme?: any }) => {
 
   const styles = StyleSheet.create({
     switchContainer: {
-      backgroundColor: props.theme.card.board,
+      backgroundColor: props.theme.container.background,
       marginHorizontal: cx(24),
       padding: cx(10),
       borderRadius: cx(6),
@@ -149,6 +149,7 @@ const SwitchInching = (props: { theme?: any }) => {
       <View style={styles.pickContainer}>
         {switchInching.enable && <View style={styles.disabledCover}/>}
         <LdvPickerView
+          maxHour={61}
           hour={state.minute}
           minute={state.second}
           unit={[

package/src/modules/timeSchedule/Interface.ts

@@ -67,6 +67,7 @@ export interface HSV {
 export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight'
 
 export interface ApplyForItem {
+  name?: string
   key: string;
   dp: string;
   type: Category;
@@ -86,6 +87,7 @@ interface judgmentSupport {
 }
 
 export interface ManualSettingProps extends judgmentSupport {
+  theme?: any
   applyForList: ApplyForItem[];
   dps: Record<string, any>;
   manualData: ComponentConfig;
@@ -127,7 +129,7 @@ export interface CeilingLightData extends DeviceData, StripLightData, MixLightDa
 }
 
 export interface FanLightData extends DeviceData {
-  fanSpeed: number 
+  fanSpeed: number
   direction: 'forward' | 'reverse'
   mode: 'nature' | 'normal'
   disinfect: boolean