@ledvance/ui-biz-bundle 1.1.92 → 1.1.94

package/src/newModules/lightMode/LightModePage.tsx

@@ -10,6 +10,7 @@ import res from '@ledvance/base/src/res'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 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
@@ -29,7 +30,7 @@ export const useLightMode = (code: string): [LightMode, (v: LightMode) => Promis
   return useDp(code)
 }
 
-const LightModePage = (props: { theme?: any }) => {
+const LightModePage = (props: { theme?: ThemeType }) => {
   const params = useParams<LightModePageParams>()
   const deviceInfo = useDeviceInfo()
   const [lightMode, setLightMode] = useLightMode(params.lightModeCode)
@@ -49,25 +50,25 @@ const LightModePage = (props: { theme?: any }) => {
     },
     desc: {
       marginHorizontal: cx(24),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(14),
       fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     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',
@@ -78,7 +79,7 @@ const LightModePage = (props: { theme?: any }) => {
     line: {
       height: cx(1),
       marginHorizontal: cx(12),
-      backgroundColor: props.theme.container.divider,
+      backgroundColor: props.theme?.container.divider,
     },
     itemRoot: {
       flexDirection: 'row',
@@ -92,12 +93,12 @@ const LightModePage = (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/mood/AddMoodPage.tsx

@@ -17,6 +17,7 @@ import { Result } from '@ledvance/base/src/models/modules/Result';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { difference, head, range } from 'lodash';
 import { RecommendMood, getRecommendMixMoods, getRecommendMoods } from './MoodInfo';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -33,7 +34,7 @@ interface AddMoodPageState {
   data: RecommendMood[];
 }
 
-const AddMoodPage = (props: { theme?: any }) => {
+const AddMoodPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation();
   const routeParams = useRoute().params as AddMoodPageParams;
   const moduleParams = routeParams.moduleParams;
@@ -85,7 +86,7 @@ const AddMoodPage = (props: { theme?: any }) => {
       flexDirection: 'column',
     },
     desc: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       marginHorizontal: cx(24),
       marginTop: cx(12),

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -36,11 +36,12 @@ import {
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton';
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView';
 import { ui_biz_routerKey } from '../../navigation/Routers'
-import { SelectPageParams } from '@ledvance/ui-biz-bundle/src/modules/select/SelectPage';
+import { SelectPageParams } from '../select/SelectPage';
 import I18n from '@ledvance/base/src/i18n';
 import Segmented from '@ledvance/base/src/components/Segmented';
 import { MoodNodeInfo } from './Interface';
 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
@@ -52,7 +53,7 @@ interface DynamicMoodEditorPageState {
   sceneMode: StripLightMoodMode;
   loading: boolean;
 }
-const DynamicMoodEditorPage = (props: { theme?: any }) => {
+const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation();
   const routeParams = useRoute().params as StaticMoodEditorPageParams;
   const params = cloneDeep(routeParams);
@@ -155,7 +156,7 @@ const DynamicMoodEditorPage = (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',
     },
@@ -211,17 +212,17 @@ const DynamicMoodEditorPage = (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',
     },
@@ -265,7 +266,7 @@ const DynamicMoodEditorPage = (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={Strings.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
@@ -382,7 +383,7 @@ const DynamicMoodEditorPage = (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}
                   />
@@ -395,7 +396,7 @@ const DynamicMoodEditorPage = (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}
                   />
@@ -430,7 +431,7 @@ const DynamicMoodEditorPage = (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}
@@ -462,7 +463,7 @@ const DynamicMoodEditorPage = (props: { theme?: any }) => {
                           style={{
                             width: cx(18),
                             height: cx(18),
-                            tintColor: props.theme.global.fontColor,
+                            tintColor: props.theme?.global.fontColor,
                           }}
                           source={{ uri: res.add }}
                         />

package/src/newModules/mood/MixDynamicMoodEditor.tsx

@@ -32,7 +32,7 @@ import {
 } from './Interface';
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton';
 import {ui_biz_routerKey} from '../../navigation/Routers'
-import { SelectPageParams } from '@ledvance/ui-biz-bundle/src/modules/select/SelectPage';
+import { SelectPageParams } from '../select/SelectPage';
 import I18n from '@ledvance/base/src/i18n';
 import Segmented from '@ledvance/base/src/components/Segmented';
 import { MoodNodeInfo } from './Interface';
@@ -40,6 +40,7 @@ import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView';
 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
@@ -51,7 +52,7 @@ interface MixDynamicMoodEditorPageState extends StaticMoodEditorPageState {
   sceneMode: StripLightMoodMode;
   mainSceneMode: any
 }
-const MixDynamicMoodEditorPage = (props: { theme?: any }) => {
+const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation();
   const routeParams = useRoute().params as StaticMoodEditorPageParams;
   const params = cloneDeep(routeParams);
@@ -167,7 +168,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',
     },
@@ -223,17 +224,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',
     },
@@ -289,7 +290,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={Strings.getLang(
               nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text'
@@ -298,7 +299,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 => {
@@ -368,7 +369,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}
                       />
@@ -381,7 +382,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}
                       />
@@ -417,7 +418,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}
@@ -449,7 +450,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 }}
                             />
@@ -493,7 +494,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 => {
@@ -633,7 +634,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}
                       />
@@ -646,7 +647,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}
                       />
@@ -682,7 +683,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}
@@ -714,7 +715,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/newModules/mood/MoodActions.ts

@@ -128,9 +128,17 @@ export const getRemoteMoodList = async (
         data: result.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
       };
     }
+    const moodUIData = res.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)).filter(item => {
+      if (!option.isSupportTemperature) {
+        const isContainTemperature = item.mainLamp?.nodes?.some(node => !node.isColorNode && node.colorTemp > 0) || false
+        return !isContainTemperature;
+      } else {
+        return true
+      }
+    });
     return {
       success: true,
-      data: res.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
+      data: moodUIData,
     };
   } else {
     const res = await NativeApi.getJson(devId, moodFeatureId);
@@ -249,7 +257,12 @@ export const saveMoodList = (
   return setRemoteMoodList(devId, isFeature, remoteMoods, moodFeatureId);
 };
 
-export function useSceneStatusId(params: MoodPageParams): [number, (moodId: number) => Promise<any>] {
+interface SceneStatusParams {
+  isSupportSceneStatus?: boolean
+  sceneStatusType: SceneStatusType
+}
+
+export function useSceneStatusId(params: SceneStatusParams): [number, (moodId: number) => Promise<any>] {
   const devId = useDeviceId();
   const [sceneStatusId, setSceneStatusId] = useState(-1);
   if (!params.isSupportSceneStatus) {
@@ -262,14 +275,14 @@ export function useSceneStatusId(params: MoodPageParams): [number, (moodId: numb
   }
   useEffect(() => {
     getFeature(devId, "SceneStatus").then((res) => {
-      if (res.data && res.data.type === SceneStatusType.Mood) {
+      if (res.data && res.data.type === params.sceneStatusType) {
         setSceneStatusId(res.data.id)
       }
     })
   }, [])
   const setSceneStatusIdRemote = useCallback((moodId: number) => {
     return new Promise<any>((resolve, _reject) => {
-      putFeature(devId, "SceneStatus", {type: SceneStatusType.Mood, id: moodId}).then((res) => {
+      putFeature(devId, "SceneStatus", {type: params.sceneStatusType, id: moodId}).then((res) => {
         setSceneStatusId(moodId);
         resolve(res);
       })

package/src/newModules/mood/MoodInfo.ts

@@ -206,13 +206,6 @@ function getOnlyRGBDefSceneList(): RemoteMoodInfo[] {
       t: 0,
       e: false,
     },
-    {
-      n: I18n.getLang('mesh_device_detail_lighting_white_mode'),
-      i: '0646460100000000000003e8000046460100000000000003e8019046460100000000000003e803e8',
-      s: '',
-      t: 0,
-      e: false,
-    },
     ...defColorSceneList,
   ];
 }

package/src/newModules/mood/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;
@@ -53,7 +54,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),
@@ -64,12 +65,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/newModules/mood/MoodPage.tsx

@@ -24,16 +24,18 @@ import { useParams } from '@ledvance/base/src/hooks/Hooks';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep, filter, map } from 'lodash';
 import { saveFlagMode } from '@ledvance/ui-biz-bundle/src/modules/flags/FlagActions';
-import { WorkMode } from '@ledvance/base/src/utils/interface';
+import { SceneStatusType, WorkMode } from '@ledvance/base/src/utils/interface';
 import { showDialog } from '@ledvance/base/src/utils/common';
 import I18n from '@ledvance/base/src/i18n';
+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 devId = useDeviceId();
@@ -44,7 +46,10 @@ const MoodPage = (props: { theme?: any }) => {
   const [secondaryWork, setSecondaryWork] = useWorkMode(params.secondaryWorkMode!);
   const [switchLed] = useSwitchLed(params.switchLedDp)
   const [flagMode, setFlagMode] = useFlagMode();
-  const [sceneStatusId, setSceneStatusId] = useSceneStatusId(params);
+  const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
+    isSupportSceneStatus: params.isSupportSceneStatus,
+    sceneStatusType: SceneStatusType.Mood
+  });
 
   const state = useReactive<MoodPageState>({
     currentMood: undefined,
@@ -369,7 +374,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/newModules/mood/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/newModules/mood/StaticMoodEditorPage.tsx

@@ -23,6 +23,7 @@ import { ui_biz_routerKey } from '../../navigation/Routers'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
 import { showDialog } from '@ledvance/base/src/utils/common';
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView';
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX;
 const { withTheme } = Utils.ThemeUtils
@@ -43,7 +44,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);
@@ -142,11 +143,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',
     },
@@ -182,7 +183,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/newModules/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -8,6 +8,7 @@ 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 {useParams} from "@ledvance/base/src/hooks/Hooks";
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -20,7 +21,7 @@ export function useOverchargeSwitch(overchargeSwitchCode: string): [boolean, (v:
   return useDp(overchargeSwitchCode)
 }
 
-const OverchargeSwitchPage = (props: { theme?: any }) => {
+const OverchargeSwitchPage = (props: { theme?: ThemeType }) => {
   const params = useParams<OverchargeSwitchPageParams>()
   const devInfo = useDeviceInfo()
   const [overchargeSwitch, setOverchargeSwitch] = useOverchargeSwitch(params.overchargeSwitchCode)
@@ -37,16 +38,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,
@@ -54,7 +55,7 @@ const OverchargeSwitchPage = (props: { theme?: any }) => {
         width: 0,
         height: 4,
       },
-      backgroundColor: props.theme.card.background,
+      backgroundColor: props.theme?.card.background,
       borderRadius: 8,
     },
   })