@ledvance/ui-biz-bundle 1.1.93 → 1.1.95

package/src/newModules/powerOnBehavior/LightBehaviorPage.tsx

@@ -13,6 +13,7 @@ import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
 import { cloneDeep } from 'lodash'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -31,7 +32,7 @@ export enum PowerMemoryMode {
   Last = 1,
   Custom = 2
 }
-const LightBehaviorPage = (props: { theme?: any }) => {
+const LightBehaviorPage = (props: { theme?: ThemeType }) => {
   const params = useParams<LightBehaviorPageParams>()
   const deviceInfo = useDeviceInfo()
   const [powerMemory, setPowerMemory] = usePowerOffMemory(params.memoryDpCode)
@@ -51,18 +52,18 @@ const LightBehaviorPage = (props: { theme?: any }) => {
     },
     tipText: {
       marginHorizontal: cx(24),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     modeSelectGroup: {
       marginHorizontal: cx(24),
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
       borderRadius: cx(4),
     },
     modeTip: {
       marginHorizontal: cx(8),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
@@ -73,7 +74,7 @@ const LightBehaviorPage = (props: { theme?: any }) => {
     line: {
       height: cx(1),
       marginHorizontal: cx(12),
-      backgroundColor: props.theme.container.divider,
+      backgroundColor: props.theme?.container.divider,
     },
     itemRoot: {
       flexDirection: 'row',
@@ -87,12 +88,12 @@ const LightBehaviorPage = (props: { theme?: any }) => {
       justifyContent: 'center',
     },
     itemTitle: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     itemContent: {
-      color: props.theme.global.secondFontColor,
+      color: props.theme?.global.secondFontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
@@ -204,7 +205,7 @@ const LightBehaviorPage = (props: { theme?: any }) => {
                   <Card style={{ borderRadius: cx(4) }}>
                       <LdvSwitch
                           title={I18n.getLang('light_settings_default_secondbox_text')}
-                          color={props.theme.card.background}
+                          color={props.theme?.card.background}
                           colorAlpha={1}
                           enable={doNotDisturb}
                           setEnable={async (enable: boolean) => {
@@ -218,7 +219,7 @@ const LightBehaviorPage = (props: { theme?: any }) => {
               <Text
                   style={{
                     marginHorizontal: cx(8),
-                    color: props.theme.global.fontColor,
+                    color: props.theme?.global.fontColor,
                     fontSize: cx(12),
                     fontFamily: 'helvetica_neue_lt_std_roman',
                   }}>

package/src/newModules/powerOnBehavior/PlugBehaviorPage.tsx

@@ -10,6 +10,7 @@ import Card from '@ledvance/base/src/components/Card'
 import res from '@ledvance/base/src/res'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -18,7 +19,7 @@ const RELAY_STATUS_OFF = 'off'
 const RELAY_STATUS_ON = 'on'
 const RELAY_STATUS_MEMORY = 'memory'
 
-const PlugBehaviorPage = (props: { theme?: any }) => {
+const PlugBehaviorPage = (props: { theme?: ThemeType }) => {
   const params = useParams<PowerBehaviorPageParams>()
   const deviceInfo = useDeviceInfo()
   const [powerMemory, setPowerMemory] = usePowerBehavior(params.powerBehaviorCode)
@@ -38,18 +39,18 @@ const PlugBehaviorPage = (props: { theme?: any }) => {
     },
     tipText: {
       marginHorizontal: cx(24),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     modeSelectGroup: {
       marginHorizontal: cx(24),
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
       borderRadius: cx(4),
     },
     modeTip: {
       marginHorizontal: cx(8),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
@@ -60,7 +61,7 @@ const PlugBehaviorPage = (props: { theme?: any }) => {
     line: {
       height: cx(1),
       marginHorizontal: cx(12),
-      backgroundColor: props.theme.container.divider,
+      backgroundColor: props.theme?.container.divider,
     },
     itemRoot: {
       flexDirection: 'row',
@@ -74,12 +75,12 @@ const PlugBehaviorPage = (props: { theme?: any }) => {
       justifyContent: 'center',
     },
     itemTitle: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     itemContent: {
-      color: props.theme.global.secondFontColor,
+      color: props.theme?.global.secondFontColor,
       fontSize: cx(14),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -20,6 +20,7 @@ import Summary from "./Summary";
 import { RandomTimePageParams } from "./RandomTimePage";
 import { Result } from "@ledvance/base/src/models/modules/Result";
 import { useSystemTimeFormate } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -31,7 +32,7 @@ export interface RandomTimeDetailPageParams extends RandomTimePageParams {
   onPost: (mode: 'add' | 'edit' | 'del', randomTime: RandomTimerUiItem) => Promise<Result<any>>
 }
 const minTimeGap = 30
-const RandomTimeDetailPage = (props: { theme?: any }) => {
+const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const params = useRoute().params as RandomTimeDetailPageParams
   const is24Hour = useSystemTimeFormate()
@@ -69,13 +70,13 @@ const RandomTimeDetailPage = (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,
@@ -88,7 +89,7 @@ const RandomTimeDetailPage = (props: { theme?: any }) => {
       flexDirection: 'row',
       justifyContent: 'space-between',
       alignItems: 'center',
-      backgroundColor: props.theme.global.background,
+      backgroundColor: props.theme?.global.background,
       height: cx(35),
     },
   })
@@ -152,8 +153,8 @@ const RandomTimeDetailPage = (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={!is24Hour}
           startTime={state.randomTime.startTime}
           endTime={state.randomTime.endTime}
@@ -169,8 +170,8 @@ const RandomTimeDetailPage = (props: { theme?: any }) => {
             state.randomTime.weeks[rawIndex] = state.randomTime.weeks[rawIndex] === 1 ? 0 : 1
           }} />
         <Spacer />
-        <Text style={{ ...styles.cardContainer, color: props.theme.global.fontColor, fontSize: cx(14) }}>
-          {loopText(state.randomTime.weeks)}
+        <Text style={{ ...styles.cardContainer, color: props.theme?.global.fontColor, fontSize: cx(14) }}>
+          {loopText(state.randomTime.weeks, parseTimer(state.randomTime.endTime * 60))}
         </Text>
         <Spacer />
         {/* Apply for */}
@@ -179,17 +180,17 @@ const RandomTimeDetailPage = (props: { theme?: any }) => {
           <Spacer height={cx(10)} />
           <View style={[styles.applyContent, { paddingTop: state.randomTime.channel === undefined ? 0 : cx(10) }]}>
             {state.randomTime.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, fontSize: cx(12) }}>{params.applyForList[params.isPlug ? state.randomTime.channel : 0]?.key}</Text>
+                <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{params.applyForList[params.isPlug ? state.randomTime.channel : 0]?.key}</Text>
                 {params.applyForList.length > 1 && <TouchableOpacity
                     onPress={() => {
                       state.randomTime.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>
             }
@@ -203,8 +204,8 @@ const RandomTimeDetailPage = (props: { theme?: any }) => {
                 onPress={() => {
                   state.randomTime.channel = params.isPlug ? index : 1
                 }}>
-                <Text style={{ color: props.theme.global.fontColor, fontSize: cx(12) }}>{item.key}</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, fontSize: cx(12) }}>{item.key}</Text>
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={res.device_panel_timer_add} />
               </TouchableOpacity>
             )
           })}
@@ -217,7 +218,7 @@ const RandomTimeDetailPage = (props: { theme?: any }) => {
             <Card>
                 <LdvSwitch
                     title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
-                    color={props.theme.card.background}
+                    color={props.theme?.card.background}
                     colorAlpha={1}
                     enable={true}
                     setEnable={() => { }}

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -19,6 +19,7 @@ import { ApplyForItem } from '@ledvance/base/src/utils/interface'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import Tag from '@ledvance/base/src/components/Tag'
 import InfoText from '@ledvance/base/src/components/InfoText'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -40,7 +41,7 @@ export interface RandomTimePageParams {
   isSupportBrightness?: boolean
 }
 
-const RandomTimePage = (props: { theme?: any }) => {
+const RandomTimePage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const devInfo = useDeviceInfo()
   const params = useParams<RandomTimePageParams>()
@@ -106,14 +107,14 @@ const RandomTimePage = (props: { theme?: any }) => {
     },
     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',
     },
@@ -131,7 +132,7 @@ const RandomTimePage = (props: { theme?: any }) => {
     tag: {
       borderRadius: cx(16),
       height: cx(16),
-      backgroundColor: props.theme.tag.background,
+      backgroundColor: props.theme?.tag.background,
       marginRight: cx(10),
       paddingHorizontal: cx(12)
     },
@@ -139,7 +140,7 @@ const RandomTimePage = (props: { theme?: any }) => {
       fontSize: cx(10),
       textAlign: 'center',
       fontFamily: 'PingFangSC-Medium',
-      color: props.theme.tag.fontColor
+      color: props.theme?.tag.fontColor
     },
   })
 
@@ -174,7 +175,7 @@ const RandomTimePage = (props: { theme?: any }) => {
     >
       <ScrollView nestedScrollEnabled={true}>
         <Text style={{
-          color: props.theme.global.fontColor,
+          color: props.theme?.global.fontColor,
           marginLeft: cx(24),
         }}>{I18n.getLang('timeschedule_overview_description_text')}</Text>
         <Spacer height={cx(10)} />
@@ -182,7 +183,7 @@ const RandomTimePage = (props: { theme?: any }) => {
             style={{ marginHorizontal: cx(24), marginBottom: cx(5) }}
             icon={res.ic_warning_amber}
             iconStyle={{width: cx(16), height: cx(16)}}
-            contentColor={props.theme.global.warning}
+            contentColor={props.theme?.global.warning}
             text={I18n.getLang('randomtimecycle_warning_max_number_text')}
             textStyle={{fontSize: cx(12)}}
         />}
@@ -223,19 +224,19 @@ const RandomTimePage = (props: { theme?: any }) => {
               icon={res.device_panel_schedule_alert}
               text={I18n.getLang(!state.originList.length ? 'timeschedule_overview_empty_information_text' : 'sleepwakeschedule_empty_filtering_information_text')}
               style={{ width: 'auto', alignItems: 'center' }}
-              textStyle={{ color: props.theme.global.secondFontColor, fontSize: cx(12), flex: undefined }}
-              iconStyle={{ width: cx(16), height: cx(16), tintColor: props.theme.global.secondFontColor }}
+              textStyle={{ color: props.theme?.global.secondFontColor, fontSize: cx(12), flex: undefined }}
+              iconStyle={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.secondFontColor }}
             />
             <Spacer />
             {!state.originList.length && <TextButton
                 text={I18n.getLang('randomtimecycle_empty_bttn_text')}
                 style={{
-                  backgroundColor: props.theme.button.primary,
+                  backgroundColor: props.theme?.button.primary,
                   borderRadius: cx(6),
                   paddingVertical: cx(12),
                   paddingHorizontal: cx(24),
                 }}
-                textStyle={{ color: props.theme.button.fontColor }}
+                textStyle={{ color: props.theme?.button.fontColor }}
                 onPress={() => {
                   navigateToEdit('add', newRandomTime(params.isPlug))
                 }} />}

package/src/newModules/randomTime/Summary.tsx

@@ -5,12 +5,13 @@ import I18n from "@ledvance/base/src/i18n";
 import { Utils } from "tuya-panel-kit";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import InfoText from "@ledvance/base/src/components/InfoText";
+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
@@ -25,7 +26,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',
@@ -41,14 +42,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,
@@ -60,10 +61,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/newModules/remoteControl/RemoteControlPage.tsx

@@ -10,6 +10,7 @@ import Card from '@ledvance/base/src/components/Card';
 import Spacer from '@ledvance/base/src/components/Spacer';
 import { Utils } from 'tuya-panel-kit'
 import {showDialog} from "@ledvance/base/src/utils/common";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -17,7 +18,7 @@ const { withTheme } = Utils.ThemeUtils
 export interface RemoteControlPageParams {
   remoteControlDpCode: string;
 }
-const RemoteControlPage = (props: { theme?: any }) => {
+const RemoteControlPage = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo();
   const params = useParams<RemoteControlPageParams>();
   const [remoteControl, setRemoteControl] = useRemoteControl(params.remoteControlDpCode);
@@ -36,7 +37,7 @@ const RemoteControlPage = (props: { theme?: any }) => {
       <Card style={{marginHorizontal: cx(24)}}>
         <LdvSwitch
           title={I18n.getLang('light_sources_specific_settings_remote_control')}
-          color={props.theme.card.background}
+          color={props.theme?.card.background}
           colorAlpha={1}
           enable={remoteControl}
           setEnable={async v => {

package/src/newModules/select/SelectPage.tsx

@@ -6,6 +6,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import I18n from '@ledvance/base/src/i18n'
 import Card from '@ledvance/base/src/components/Card'
 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 @@ export interface SelectPageParams<T> {
   onSelect: (selectPageData: SelectPageData<T>) => void
 }
 
-const SelectPage = (props: { theme?: any }) => {
+const SelectPage = (props: { theme?: ThemeType }) => {
   const params = useRoute().params as SelectPageParams<any>
   const navigation = useNavigation()
 
@@ -31,11 +32,11 @@ const SelectPage = (props: { theme?: any }) => {
       flex: 1,
     },
     topBar: {
-      backgroundColor: props.theme.card.head,
+      backgroundColor: props.theme?.card.head,
     },
     line: {
       height: cx(1),
-      backgroundColor: props.theme.container.divider,
+      backgroundColor: props.theme?.container.divider,
     },
     topContent: {
       paddingVertical: cx(30),
@@ -44,7 +45,7 @@ const SelectPage = (props: { theme?: any }) => {
     },
     cancel: {
       marginStart: cx(16),
-      color: props.theme.button.cancel,
+      color: props.theme?.button.cancel,
       fontSize: cx(17),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
@@ -53,13 +54,13 @@ const SelectPage = (props: { theme?: any }) => {
       position: 'absolute',
       start: 0,
       textAlign: 'center',
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(17),
       paddingHorizontal: cx(110),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     card: {
-      backgroundColor: props.theme.card.background,
+      backgroundColor: props.theme?.card.background,
       marginHorizontal: cx(16),
     },
     item: {
@@ -70,20 +71,20 @@ const SelectPage = (props: { theme?: any }) => {
     itemText: {
       flex: 1,
       marginStart: cx(13),
-      color: props.theme.global.fontColor,
+      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,
+      backgroundColor: props.theme?.container.divider,
     },
     itemIcon: {
       width: cx(30),
       height: cx(30),
       marginEnd: cx(13),
-      tintColor: props.theme.icon.primary,
+      tintColor: props.theme?.icon.primary,
     },
   })