@ledvance/group-ui-biz-bundle 1.0.82 → 1.0.84

package/src/modules/mood_new/MixDynamicMoodEditor.tsx

@@ -39,6 +39,7 @@ import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView';
 import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import { showDialog } from '@ledvance/base/src/utils/common';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -49,7 +50,7 @@ interface MixDynamicMoodEditorPageState extends StaticMoodEditorPageState {
   secondaryIdx: number;
   sceneMode: StripLightMoodMode;
 }
-const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
+const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation();
   const routeParams = useParams<StaticMoodEditorPageParams>();
   const params = cloneDeep(routeParams);
@@ -164,7 +165,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
       marginHorizontal: cx(16),
     },
     light: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(18),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
@@ -220,17 +221,17 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
       borderRadius: cx(8),
       borderWidth: cx(1),
       borderStyle: 'dashed',
-      borderColor: props.theme.addNode.border,
-      backgroundColor: props.theme.addNode.background,
+      borderColor: props.theme?.addNode.border,
+      backgroundColor: props.theme?.addNode.background,
     },
     deleteBtn: {
       width: '100%',
       height: cx(50),
-      backgroundColor: props.theme.button.delete,
+      backgroundColor: props.theme?.button.delete,
       borderRadius: cx(8),
     },
     deleteBtnText: {
-      color: props.theme.button.fontColor,
+      color: props.theme?.button.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
@@ -286,7 +287,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
             }}
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
-            tipColor={nameRepeat ? props.theme.global.error : undefined}
+            tipColor={nameRepeat ? props.theme?.global.error : undefined}
             tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
             errorText={I18n.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
@@ -295,7 +296,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
           <Card style={styles.adjustCard}>
             <LdvSwitch
               title={I18n.getLang('light_sources_tile_main_lighting_headline')}
-              color={props.theme.card.background}
+              color={props.theme?.card.background}
               colorAlpha={1}
               enable={!!state.mood.mainLamp.enable}
               setEnable={v => {
@@ -365,7 +366,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                       <Image
                         style={[
                           styles.adjustButton,
-                          { tintColor: state.mainBucketSelected ? props.theme.icon.primary : props.theme.icon.normal },
+                          { tintColor: state.mainBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal },
                         ]}
                         source={res.ic_paint_bucket}
                       />
@@ -378,7 +379,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                       <Image
                         style={[
                           styles.adjustButton,
-                          { tintColor: state.mainBucketSelected ? props.theme.icon.normal : props.theme.icon.primary },
+                          { tintColor: state.mainBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary },
                         ]}
                         source={res.ic_colorize}
                       />
@@ -414,7 +415,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                               style={[
                                 styles.nodeDeleteIcon,
                                 {
-                                  tintColor: state.mood.mainLamp.nodes.length < 3 ? props.theme.icon.disable : props.theme.icon.normal,
+                                  tintColor: state.mood.mainLamp.nodes.length < 3 ? props.theme?.icon.disable : props.theme?.icon.normal,
                                 },
                               ]}
                               source={res.ic_mood_del}
@@ -446,7 +447,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                               style={{
                                 width: cx(18),
                                 height: cx(18),
-                                tintColor: props.theme.addNode.fontColor,
+                                tintColor: props.theme?.addNode.fontColor,
                               }}
                               source={{ uri: res.add }}
                             />
@@ -490,7 +491,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
           <Card style={styles.adjustCard}>
             <LdvSwitch
               title={I18n.getLang('light_sources_tile_sec_lighting_headline')}
-              color={props.theme.card.background}
+              color={props.theme?.card.background}
               colorAlpha={1}
               enable={!!state.mood.secondaryLamp.enable}
               setEnable={v => {
@@ -630,7 +631,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                       <Image
                         style={[
                           styles.adjustButton,
-                          { tintColor: state.secondaryBucketSelected ? props.theme.icon.primary : props.theme.icon.normal },
+                          { tintColor: state.secondaryBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal },
                         ]}
                         source={res.ic_paint_bucket}
                       />
@@ -643,7 +644,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                       <Image
                         style={[
                           styles.adjustButton,
-                          { tintColor: state.secondaryBucketSelected ? props.theme.icon.normal : props.theme.icon.primary },
+                          { tintColor: state.secondaryBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary },
                         ]}
                         source={res.ic_colorize}
                       />
@@ -679,7 +680,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                                 styles.nodeDeleteIcon,
                                 {
                                   tintColor:
-                                    state.mood.secondaryLamp.nodes.length < 3 ? props.theme.icon.disable : props.theme.icon.normal,
+                                    state.mood.secondaryLamp.nodes.length < 3 ? props.theme?.icon.disable : props.theme?.icon.normal,
                                 },
                               ]}
                               source={res.ic_mood_del}
@@ -711,7 +712,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
                               style={{
                                 width: cx(18),
                                 height: cx(18),
-                                tintColor: props.theme.addNode.fontColor,
+                                tintColor: props.theme?.addNode.fontColor,
                               }}
                               source={{ uri: res.add }}
                             />

package/src/modules/mood_new/MoodItem.tsx

@@ -10,6 +10,7 @@ import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine';
 import { MoodJumpGradientMode, MoodLampInfo, MoodUIInfo } from './Interface';
 import I18n from '@ledvance/base/src/i18n';
 import res from '@ledvance/base/src/res';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -22,7 +23,7 @@ interface LightCategory {
 }
 
 interface MoodItemProps extends ViewProps {
-  theme?: any
+  theme?: ThemeType
   enable: boolean;
   isMix: boolean;
   mood: MoodUIInfo;
@@ -52,7 +53,7 @@ const MoodItem = (props: MoodItemProps) => {
     },
     headText: {
       flex: 1,
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_bd',
       lineHeight: cx(20),
@@ -63,12 +64,12 @@ const MoodItem = (props: MoodItemProps) => {
     moodTypeLabel: {
       marginStart: cx(16),
       paddingHorizontal: cx(12.5),
-      backgroundColor: props.theme.tag.background,
+      backgroundColor: props.theme?.tag.background,
       borderRadius: cx(8),
     },
     moodTypeLabelText: {
       height: cx(16),
-      color: props.theme.tag.fontColor,
+      color: props.theme?.tag.fontColor,
       fontSize: cx(10),
       textAlignVertical: 'center',
       fontFamily: 'helvetica_neue_lt_std_roman',

package/src/modules/mood_new/MoodPage.tsx

@@ -24,13 +24,14 @@ import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep, filter, map } from 'lodash';
 import { useFlagMode } from '../flags/FlagActions';
 import { WorkMode } from '@ledvance/base/src/utils/interface';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
 
 const MAX_MOOD_COUNT = 255;
 
-const MoodPage = (props: {theme?: any}) => {
+const MoodPage = (props: {theme?: ThemeType}) => {
   const params = useParams<MoodPageParams>();
   const deviceInfo = useDeviceInfo();
   const uaGroupInfo = useUAGroupInfo()
@@ -266,7 +267,7 @@ const MoodPage = (props: {theme?: any}) => {
       right: cx(60),
       top: Platform.OS === 'android' ? cx(90) : cx(130),
       maxWidth: cx(200),
-      backgroundColor: props.theme.card.background,
+      backgroundColor: props.theme?.card.background,
     },
     popoverItem: {
       padding: cx(5),
@@ -289,7 +290,7 @@ const MoodPage = (props: {theme?: any}) => {
         }}
         loading={state.loading}
       >
-        {!params.isStripLight && <View style={styles.tagLine}>
+        {!params.isStripLight && !params.isStringLight && <View style={styles.tagLine}>
             <Tag
                 checked={state.staticTagChecked}
                 text={Strings.getLang('mood_overview_filter_name_text1')}
@@ -313,7 +314,7 @@ const MoodPage = (props: {theme?: any}) => {
             <InfoText
               icon={res.ic_warning_amber}
               text={Strings.getLang('mood_overview_warning_max_number_text')}
-              contentColor={props.theme.global.warning}
+              contentColor={props.theme?.global.warning}
             />
             <Spacer height={cx(6)} />
           </View>

package/src/modules/mood_new/RecommendMoodItem.tsx

@@ -6,6 +6,7 @@ import { StyleSheet, View } from 'react-native';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import { MoodJumpGradientMode, MoodUIInfo } from './Interface';
 import { MixMoodColorsLine } from './MoodItem';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -18,7 +19,7 @@ interface LightCategory {
 }
 
 interface RecommendMixMoodItemProps {
-  theme?: any
+  theme?: ThemeType
   title: string;
   isMix: boolean;
   mood: MoodUIInfo;
@@ -46,7 +47,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
       width: cx(295)
     },
     title: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
@@ -63,7 +64,7 @@ const RecommendMixMoodItem = (props: RecommendMixMoodItemProps) => {
         style={styles.content}
         titleStyle={styles.title}
         iconStyle={{
-          color: props.theme.global.fontColor,
+          color: props.theme?.global.fontColor,
           size: cx(16),
         }}
       />

package/src/modules/mood_new/StaticMoodEditorPage.tsx

@@ -22,6 +22,7 @@ import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import { showDialog } from '@ledvance/base/src/utils/common';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -42,7 +43,7 @@ export interface StaticMoodEditorPageState {
   loading: boolean;
 }
 
-const StaticMoodEditorPage = (props: { theme?: any }) => {
+const StaticMoodEditorPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation();
   const routeParams = useParams<StaticMoodEditorPageParams>();
   const params = cloneDeep(routeParams);
@@ -143,11 +144,11 @@ const StaticMoodEditorPage = (props: { theme?: any }) => {
     deleteBtn: {
       width: '100%',
       height: cx(50),
-      backgroundColor: props.theme.button.delete,
+      backgroundColor: props.theme?.button.delete,
       borderRadius: cx(8),
     },
     deleteBtnText: {
-      color: props.theme.button.fontColor,
+      color: props.theme?.button.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
@@ -183,7 +184,7 @@ const StaticMoodEditorPage = (props: { theme?: any }) => {
             }}
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
-            tipColor={nameRepeat ? props.theme.global.error : undefined}
+            tipColor={nameRepeat ? props.theme?.global.error : undefined}
             tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
             errorText={I18n.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'

package/src/modules/music/MusicPage.tsx

@@ -19,6 +19,8 @@ import { cloneDeep } from 'lodash'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import { ColorParser } from '@ledvance/base/src/utils/ColorParser'
 import { WorkMode } from '@ledvance/base/src/utils/interface'
+import ThemeType from '@ledvance/base/src/config/themeType'
+
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
@@ -30,7 +32,7 @@ export interface MusicPageParams {
   isMixLight?: boolean
 }
 
-const MusicPage = (props: { theme?: any }) => {
+const MusicPage = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo()
   const tyGroupId = useUAGroupInfo().tyGroupId
   const params = useParams<MusicPageParams>()
@@ -108,7 +110,7 @@ const MusicPage = (props: { theme?: any }) => {
       marginBottom: cx(24)
     },
     tiptext: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       lineHeight: cx(14),
     }
@@ -134,10 +136,10 @@ const MusicPage = (props: { theme?: any }) => {
         {params.dreamMusicDp && <TabBar
             type='radio'
             tabs={musicTabs}
-            style={{ borderRadius: cx(8), backgroundColor: props.theme.segment.background, height: cx(36) }}
-            tabTextStyle={{ color: props.theme.segment.fontColor, fontSize: cx(14) }}
-            tabActiveTextStyle={{ color: props.theme.segment.fontColor, fontSize: cx(14), fontWeight: 'bold' }}
-            activeColor={props.theme.segment.active}
+            style={{ borderRadius: cx(8), backgroundColor: props.theme?.segment.background, height: cx(36) }}
+            tabTextStyle={{ color: props.theme?.segment.fontColor, fontSize: cx(14) }}
+            tabActiveTextStyle={{ color: props.theme?.segment.fontColor, fontSize: cx(14), fontWeight: 'bold' }}
+            activeColor={props.theme?.segment.active}
             activeKey={state.musicData.musicType}
             onChange={async (v) => {
               state.musicData.musicType = Number(v)

package/src/modules/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -7,6 +7,7 @@ import {useReactive} from "ahooks";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import {StyleSheet, Text, View} from "react-native";
 import {Result} from "@ledvance/base/src/models/modules/Result";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -19,7 +20,7 @@ export function useOverchargeSwitch(): [boolean, (v: boolean) => Promise<Result<
   return useFeatureHook<OverchargeSwitchConfig, boolean>('overchargeSwitch', false)
 }
 
-const OverchargeSwitchPage = (props: { theme?: any }) => {
+const OverchargeSwitchPage = (props: { theme?: ThemeType }) => {
   const devInfo = useDeviceInfo()
   const [overchargeSwitch, setOverchargeSwitch] = useOverchargeSwitch()
   const state = useReactive({
@@ -35,16 +36,16 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
       marginTop: cx(30)
     },
     title: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_bd',
       paddingVertical: cx(16),
     },
     desc: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
     },
     shadow: {
-      shadowColor: props.theme.card.shadowColor,
+      shadowColor: props.theme?.card.shadowColor,
       shadowOpacity: 0.2,
       shadowRadius: 8,
       elevation:8,
@@ -52,7 +53,7 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
         width: 0,
         height: 4,
       },
-      backgroundColor: props.theme.card.background,
+      backgroundColor: props.theme?.card.background,
       borderRadius: 8,
     },
   })

package/src/modules/randomTimeForPlug/ItemCard.tsx

@@ -5,13 +5,14 @@ import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
 import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {convertX: cx} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 const {parseTimer} = Utils.TimeUtils
 
 export interface ItemCardProps<T> {
-  theme?: any
+  theme?: ThemeType
   item: T & {
     enable: boolean
     startTime: number
@@ -42,14 +43,14 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
     },
     time: {
       flex: 1,
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchBtn: {},
     loopText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },

package/src/modules/randomTimeForPlug/RandomTimeForPlugDetailPage.tsx

@@ -18,6 +18,7 @@ import {cloneDeep, isEqual} from "lodash";
 import Summary from "./Summary";
 import {RandomTimeParam} from "./RandomTimeForPlugAction";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {parseTimer} = Utils.TimeUtils
 const { withTheme } = Utils.ThemeUtils
@@ -41,7 +42,7 @@ const newRandomTimeItem = (): RandomTimeItem => {
   }
 }
 
-const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
+const RandomTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const params = useRoute().params as RandomTimeDetailParam
   const initItem = newRandomTimeItem();
@@ -109,13 +110,13 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
       marginHorizontal: cx(24)
     },
     itemTitle: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     applyContent: {
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
       borderRadius: 4,
       minHeight: cx(55),
       flex: 1,
@@ -128,7 +129,7 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
       flexDirection: 'row',
       justifyContent: 'space-between',
       alignItems: 'center',
-      backgroundColor: props.theme.global.background,
+      backgroundColor: props.theme?.global.background,
       height: cx(35),
     },
   })
@@ -162,8 +163,8 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
         {/* pick */}
         <TimerPicker
           itemTextColor="#aeadb5"
-          style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme.global.background }}
-          pickerFontColor={props.theme.global.fontColor}
+          style={{ paddingVertical: cx(0), marginVertical: cx(0), backgroundColor: props.theme?.global.background }}
+          pickerFontColor={props.theme?.global.fontColor}
           is12Hours={!params.is24Hour}
           startTime={state.item.startTime}
           endTime={state.item.endTime}
@@ -179,7 +180,7 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
             state.item.weeks[rawIndex] = state.item.weeks[rawIndex] === 1 ? 0 : 1
           }}/>
         <Spacer/>
-        <Text style={{ ...styles.cardContainer, color: props.theme.global.fontColor, fontSize: cx(14) }}>
+        <Text style={{ ...styles.cardContainer, color: props.theme?.global.fontColor, fontSize: cx(14) }}>
           {loopText(state.item.weeks, parseTimer(state.item.endTime * 60))}
         </Text>
         <Spacer/>
@@ -189,17 +190,17 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
           <Spacer height={cx(10)}/>
           <View style={styles.applyContent}>
             {state.item.channel === undefined ?
-              <Text style={{color: props.theme.global.fontColor}}>
+              <Text style={{color: props.theme?.global.fontColor}}>
                 {I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}
               </Text> :
               <View style={[styles.applyItem, {marginBottom: cx(10), borderRadius: 4}]}>
-                <Text style={{color: props.theme.global.fontColor}}>{params.channels[state.item.channel]}</Text>
+                <Text style={{color: props.theme?.global.fontColor}}>{params.channels[state.item.channel]}</Text>
                 {params.channels.length > 1 && <TouchableOpacity
                     onPress={() => {
                       state.item.channel = undefined
                     }}
                     style={{paddingHorizontal: cx(5)}}>
-                    <Image style={{width: cx(16), height: cx(16), tintColor: props.theme.global.fontColor}} source={res.ic_arrows_nav_clear}/>
+                    <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor}} source={res.ic_arrows_nav_clear}/>
                 </TouchableOpacity>}
               </View>
             }
@@ -216,8 +217,8 @@ const RandomTimeForPlugDetailPage = (props: { theme?: any }) => {
                   state.item.channel = index
                 }}
               >
-                <Text style={{color: props.theme.global.fontColor}}>{item}</Text>
-                <Image style={{width: cx(16), height: cx(16), tintColor: props.theme.global.fontColor}} source={res.device_panel_timer_add}/>
+                <Text style={{color: props.theme?.global.fontColor}}>{item}</Text>
+                <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor}} source={res.device_panel_timer_add}/>
               </TouchableOpacity>
             )
           })}

package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx

@@ -13,12 +13,13 @@ import Spacer from "@ledvance/base/src/components/Spacer";
 import ItemCard from "./ItemCard";
 import {cloneDeep} from "lodash";
 import InfoText from "@ledvance/base/src/components/InfoText";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {convertX: cx, topBarHeight} = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 const MAX_NUM = 16
 
-const RandomTimeForPlugPage = (props: { theme?: any}) => {
+const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
   const devInfo = useDeviceInfo()
   const navigation = useNavigation()
   const params = useRoute().params as RandomTimeParam
@@ -75,16 +76,16 @@ const RandomTimeForPlugPage = (props: { theme?: any}) => {
       height: cx(198)
     },
     execTip: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       marginLeft: cx(24),
     },
     maxImg: {
       width: cx(16),
       height: cx(16),
-      tintColor: props.theme.global.warning
+      tintColor: props.theme?.global.warning
     },
     maxTip: {
-      color: props.theme.global.secondFontColor,
+      color: props.theme?.global.secondFontColor,
     },
     addButton: {
       height: cx(36),
@@ -92,12 +93,12 @@ const RandomTimeForPlugPage = (props: { theme?: any}) => {
       marginVertical: cx(25),
       marginHorizontal: cx(24),
       borderRadius: cx(6),
-      backgroundColor: props.theme.button.primary,
+      backgroundColor: props.theme?.button.primary,
     },
     addButtonText: {
       fontSize: cx(12),
       fontWeight: 'bold',
-      color: props.theme.button.fontColor,
+      color: props.theme?.button.fontColor,
       textAlign: 'center'
     }
   })
@@ -149,7 +150,7 @@ const RandomTimeForPlugPage = (props: { theme?: any}) => {
           icon={res.device_panel_schedule_alert}
           text={I18n.getLang('randomtimecycle_empty_information_text')}
           textStyle={{flex: undefined}}
-          contentColor={props.theme.global.secondFontColor}
+          contentColor={props.theme?.global.secondFontColor}
         />
         <View style={styles.addButton}>
           <TouchableOpacity

package/src/modules/randomTimeForPlug/Summary.tsx

@@ -4,12 +4,13 @@ import res from "@ledvance/base/src/res"
 import I18n from "@ledvance/base/src/i18n";
 import { Utils } from "tuya-panel-kit";
 import Spacer from "@ledvance/base/src/components/Spacer";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
 
 interface SummaryProps {
-  theme?: any
+  theme?: ThemeType
   style?: ViewStyle
   frequency?: string | ReactElement
   time?: string | ReactElement
@@ -24,7 +25,7 @@ const Summary = (props: SummaryProps) => {
       marginHorizontal: cx(24),
     },
     itemTitle: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
@@ -40,14 +41,14 @@ const Summary = (props: SummaryProps) => {
       minWidth: cx(100)
     },
     summaryImg: {
-      tintColor: props.theme.global.fontColor,
+      tintColor: props.theme?.global.fontColor,
       width: cx(12),
       height: cx(12),
       marginRight: cx(6)
     },
     leftTitle: {
       fontSize: cx(14),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
     },
     summaryRight: {
       flex: 1,
@@ -58,10 +59,10 @@ const Summary = (props: SummaryProps) => {
       borderRadius: cx(16),
       paddingHorizontal: cx(12),
       alignSelf: 'flex-start',
-      backgroundColor: props.theme.tag.background,
+      backgroundColor: props.theme?.tag.background,
     },
     rightItem: {
-      color: props.theme.tag.fontColor,
+      color: props.theme?.tag.fontColor,
     },
   })
 

package/src/modules/randomTimingForLight/ItemCard.tsx

@@ -5,13 +5,14 @@ import {StyleSheet, Text, View} from "react-native";
 import {SwitchButton, Utils} from "tuya-panel-kit";
 import {getIsClosed, loopText} from "@ledvance/base/src/utils/common";
 import {parseHour12} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const {convertX: cx} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 const {parseTimer} = Utils.TimeUtils
 
 export interface ItemCardProps<T> {
-  theme?: any
+  theme?: ThemeType
   item: T & {
     power: boolean
     startTime: number
@@ -41,14 +42,14 @@ const ItemCard = <T, >(props: ItemCardProps<T>) => {
     },
     time: {
       flex: 1,
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     switchBtn: {},
     loopText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },