@ledvance/ui-biz-bundle 1.1.92 → 1.1.94

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.92",
+  "version": "1.1.94",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/flags/FlagEditPage.tsx

@@ -21,6 +21,7 @@ import { FlagPageProps } from './FlagPage'
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView'
 import { showDialog } from '@ledvance/base/src/utils/common'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -33,7 +34,7 @@ export interface FlagEditParams {
   modDeleteFlag: (mode: 'add' | 'edit' | 'del', currentMood: FlagUiInfo, options?: FlagOption) => Promise<Result<any>>
 }
 
-const FlagEditPage = (props: { theme?: any }) => {
+const FlagEditPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const params = cloneDeep(useRoute().params as FlagEditParams)
   const state = useReactive({
@@ -100,7 +101,7 @@ const FlagEditPage = (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',
     },
@@ -138,7 +139,7 @@ const FlagEditPage = (props: { theme?: any }) => {
       height: cx(40),
       borderRadius: cx(8),
       borderWidth: 1,
-      borderColor: props.theme.card.border
+      borderColor: props.theme?.card.border
     },
     nodeDeleteBtn: {
       width: cx(24),
@@ -158,17 +159,17 @@ const FlagEditPage = (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',
     },
@@ -211,7 +212,7 @@ const FlagEditPage = (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')} />
           {(params.moduleParams.isSupportMixScene || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
@@ -288,7 +289,7 @@ const FlagEditPage = (props: { theme?: any }) => {
                     state.colorPaintBucketSelected = true
                   }}>
                   <Image
-                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme.icon.primary : props.theme.icon.normal }]}
+                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal }]}
                     source={res.ic_paint_bucket} />
                 </TouchableOpacity>
                 <TouchableOpacity
@@ -296,7 +297,7 @@ const FlagEditPage = (props: { theme?: any }) => {
                     state.colorPaintBucketSelected = false
                   }}>
                   <Image
-                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme.icon.normal : props.theme.icon.primary }]}
+                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary }]}
                     source={res.ic_colorize} />
                 </TouchableOpacity>
               </View>
@@ -328,7 +329,7 @@ const FlagEditPage = (props: { theme?: any }) => {
                           style={[
                             styles.nodeDeleteIcon,
                             {
-                              tintColor: state.mood.colors.length < 3 ? props.theme.icon.disable : props.theme.icon.normal,
+                              tintColor: state.mood.colors.length < 3 ? props.theme?.icon.disable : props.theme?.icon.normal,
                             },
                           ]}
                           source={res.ic_mood_del} />
@@ -359,7 +360,7 @@ const FlagEditPage = (props: { theme?: any }) => {
                           style={{
                             width: cx(18),
                             height: cx(18),
-                            tintColor: props.theme.global.fontColor,
+                            tintColor: props.theme?.global.fontColor,
                           }}
                           source={{ uri: res.add }} />
                       </TouchableOpacity>

package/src/modules/flags/FlagItem.tsx

@@ -4,12 +4,13 @@ import Card from '@ledvance/base/src/components/Card'
 import { SwitchButton, Utils } from 'tuya-panel-kit'
 import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine'
 import Spacer from '@ledvance/base/src/components/Spacer'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 interface RecommendMoodItemProps {
-  theme?: any
+  theme?: ThemeType
   enable: boolean
   title: string
   colors: string[]
@@ -32,7 +33,7 @@ function FlagItem(props: RecommendMoodItemProps) {
       justifyContent: 'space-between',
     },
     headText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_bd',
       lineHeight: cx(20),
@@ -63,7 +64,7 @@ function FlagItem(props: RecommendMoodItemProps) {
         <View style={styles.gradientItem}>
           <MoodColorsLine
             type={'separate'}
-            nodeStyle={{ borderColor: props.theme.card.border, borderWidth: 1 }}
+            nodeStyle={{ borderColor: props.theme?.card.border, borderWidth: 1 }}
             colors={props.colors} />
         </View>
         <Spacer height={cx(16)} />

package/src/modules/flags/FlagPage.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo } from "react";
+import React, { useCallback, useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
 import { useDeviceId, useDeviceInfo, useFlagMode, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlatList, Image, TouchableOpacity, View } from "react-native";
@@ -11,7 +11,7 @@ import { useRoute, useNavigation } from '@react-navigation/core'
 import I18n from "@ledvance/base/src/i18n";
 import { useReactive, useUpdateEffect } from "ahooks";
 import { cloneDeep, difference, isEqual, last, map, range } from "lodash";
-import { ui_biz_routerKey} from "../../navigation/Routers";
+import { ui_biz_routerKey } from "../../navigation/Routers";
 import res from "@ledvance/base/src/res";
 import { hsv2Hex } from "@ledvance/base/src/utils";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
@@ -20,8 +20,12 @@ import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { ColorUtils, WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import TextField from "@ledvance/base/src/components/TextField";
 import { showDialog } from "@ledvance/base/src/utils/common";
-import { defFlagHash, fnv1aHash } from "@ledvance/ui-biz-bundle/src/modules/flags/FlagHash";
+import { defFlagHash, fnv1aHash } from "./FlagHash";
 import { NativeApi } from "@ledvance/base/src/api/native";
+import { useSceneStatusId } from "@ledvance/ui-biz-bundle/src/newModules/mood/MoodActions";
+import { SceneStatusType } from "@ledvance/base/src/utils/interface";
+import ThemeType from '@ledvance/base/src/config/themeType'
+
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
@@ -33,6 +37,7 @@ export interface FlagPageProps {
   isStripLight?: boolean
   isCeilingLight?: boolean
   isSupportMixScene?: boolean
+  isSupportSceneStatus?: boolean
   drawToolLight?: {
     drawToolCode: string
     drawToolObj2dp: (colors: any[]) => string[]
@@ -42,14 +47,14 @@ export interface FlagPageProps {
   sceneDataCode?: string
   workModeCode: string
   switchLedCode: string
-  whiteSwitchCode?:string
+  whiteSwitchCode?: string
   rgbcWorkModeCode?: string
   rgbcSwitchLedCode?: string
   brightValueCode?: string
   temperatureCode?: string
 }
 
-const FlagPage = (props: { theme?: any }) => {
+const FlagPage = (props: { theme?: ThemeType }) => {
   const params = useRoute().params as FlagPageProps
   const devInfo = useDeviceInfo()
   const devId = useDeviceId()
@@ -64,35 +69,39 @@ const FlagPage = (props: { theme?: any }) => {
     isCeilingLight: params.isCeilingLight,
     ...params
   })
+  const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
+    isSupportSceneStatus: params.isSupportSceneStatus,
+    sceneStatusType: SceneStatusType.Flag
+  });
   const state = useReactive({
     loading: false,
     flags: cloneDeep(flags) as FlagUiInfo[],
     moods: params.isStripLight ? [] : cloneDeep(moods),
     searchText: ''
   })
-  const flagId = useMemo(() =>{
-    if(flagState.colors !== undefined){
-      if(flagMode?.flagId !== undefined) return flagMode.flagId
+  const flagId = useMemo(() => {
+    if (flagState.colors !== undefined) {
+      if (flagMode?.flagId !== undefined) return flagMode.flagId
       const flag = state.flags.find(item => {
         const hexColors = item.colors.map(c => ColorUtils.hsv2hex(c.h, c.s, c.v).toLocaleUpperCase())
         return isEqual(hexColors, flagState.colors)
       })
       return flag?.id
     }
-    if(flagState.id !== undefined){
+    if (flagState.id !== undefined) {
       return flagState.id
     }
     return -1
   }, [JSON.stringify(flagState), JSON.stringify(state.flags), flagMode])
 
   useEffect(() => {
-    if(!devInfo.devId) return
-    if(!flags?.length){
+    if (!devInfo.devId) return
+    if (!flags?.length) {
       getRemoteFlagInfo().then()
     }
-    if(params.getRemoteMoodList && !moods?.length){
-      params.getRemoteMoodList(devInfo.devId).then(res =>{
-        if(res.success && Array.isArray(res.data)){
+    if (params.getRemoteMoodList && !moods?.length) {
+      params.getRemoteMoodList(devInfo.devId).then(res => {
+        if (res.success && Array.isArray(res.data)) {
           state.moods = res.data
           setMoods(cloneDeep(res.data))
         }
@@ -100,15 +109,15 @@ const FlagPage = (props: { theme?: any }) => {
     }
   }, [devInfo.devId])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     state.moods = params.isStripLight ? [] : cloneDeep(moods)
   }, [JSON.stringify(moods)])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     state.flags = cloneDeep(flags)
   }, [JSON.stringify(flags)])
 
-  useUpdateEffect(() =>{
+  useUpdateEffect(() => {
     state.flags = state.searchText !== '' ? cloneDeep(flags).filter(flag => (flag.name ?? '').toLowerCase().includes(state.searchText.toLowerCase())) : cloneDeep(flags)
   }, [state.searchText, flags])
 
@@ -158,17 +167,17 @@ const FlagPage = (props: { theme?: any }) => {
     if (res.success) {
       setFlags(cloneDeep(newScene))
       state.flags = cloneDeep(newScene)
-      if (mood){
-        if (mode === 'del' && (!flagMode?.flagMode || currentMood.id !== flagId || !dps[params.switchLedCode])){
+      if (mood) {
+        if (mode === 'del' && (!flagMode?.flagMode || currentMood.id !== flagId || !dps[params.switchLedCode])) {
           return {
             success: true
           }
         }
         updateFlagMode(true, mood)
         return setFlag(mood)
-      }else{
+      } else {
         updateFlagMode(false)
-        return setDps({[params.workModeCode!!]: params.isSupportColor ? WORK_MODE.COLOUR : WORK_MODE.WHITE})
+        return setDps({ [params.workModeCode!!]: params.isSupportColor ? WORK_MODE.COLOUR : WORK_MODE.WHITE })
       }
     }
     return {
@@ -176,7 +185,7 @@ const FlagPage = (props: { theme?: any }) => {
     }
   }
 
-  const updateFlagMode = (flagMode: boolean, flag?:FlagUiInfo) =>{
+  const updateFlagMode = (flagMode: boolean, flag?: FlagUiInfo) => {
     saveFlagMode(devId, JSON.stringify({
       flagMode,
       flagId: flag?.id
@@ -187,6 +196,14 @@ const FlagPage = (props: { theme?: any }) => {
     })
   }
 
+  const getItemEnable = useCallback((flagItem: FlagUiInfo) =>{
+    if (params.isSupportSceneStatus && sceneStatusId !== -1){
+      return flagMode?.flagMode && sceneStatusId === flagItem.id && dps[params.workModeCode] === WORK_MODE.SCENE && dps[params.switchLedCode]
+    }else{
+      return flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === flagItem.id && dps[params.switchLedCode]
+    }
+  }, [params.isSupportSceneStatus, sceneStatusId, dps[params.workModeCode], dps[params.switchLedCode], flagId])
+
   return (
     <Page
       headlineText={I18n.getLang('Feature_devicepanel_flags')}
@@ -200,12 +217,12 @@ const FlagPage = (props: { theme?: any }) => {
         ], 'id')
         const idRange = range(0, 256)
         const unuseId = last(difference(idRange, useIds))
-        if(unuseId !== undefined){
+        if (unuseId !== undefined) {
           navigationRoute('add', newFlag(unuseId))
         }
       }}
     >
-      <View style={{flexDirection: 'row', display: 'flex', alignItems: 'center'}}>
+      <View style={{ flexDirection: 'row', display: 'flex', alignItems: 'center' }}>
         <TextField
           value={state.searchText}
           onChangeText={text => {
@@ -214,28 +231,28 @@ const FlagPage = (props: { theme?: any }) => {
           placeholder={I18n.getLang('country_selection_textfield_headline_search')}
           style={{ marginHorizontal: cx(24), flex: 1 }}
         />
-        <TouchableOpacity style={{paddingRight: cx(24)}}
-                          onPress={() =>{
-                            showDialog({
-                              method: 'confirm',
-                              title: I18n.getLang('flag_resetbutton'),
-                              subTitle: I18n.getLang('flag_resetdescription'),
-                              onConfirm: async (_, {close}) =>{
-                                close()
-                                state.loading = true
-                                await getRemoteFlagInfo(true)
-                                state.loading = false
-                              }
-                            })
-                          }}
+        <TouchableOpacity style={{ paddingRight: cx(24) }}
+          onPress={() => {
+            showDialog({
+              method: 'confirm',
+              title: I18n.getLang('flag_resetbutton'),
+              subTitle: I18n.getLang('flag_resetdescription'),
+              onConfirm: async (_, { close }) => {
+                close()
+                state.loading = true
+                await getRemoteFlagInfo(true)
+                state.loading = false
+              }
+            })
+          }}
         >
-          <Image source={res.ic_refresh} style={{width: cx(24), height: cx(24), tintColor: props.theme.global.fontColor}}/>
+          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor }} />
         </TouchableOpacity>
       </View>
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id && dps[params.switchLedCode]}
+          enable={getItemEnable(item)}
           title={item.name}
           icon={item.icon}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v)).reverse()}
@@ -243,8 +260,9 @@ const FlagPage = (props: { theme?: any }) => {
             if (enable) {
               state.loading = true
               await setFlag(item)
+              await setSceneStatusId(item.id)
               const flagHash = fnv1aHash(JSON.stringify(item.colors))
-              if (defFlagHash[flagHash]){
+              if (defFlagHash[flagHash]) {
                 NativeApi.putFlagFirebase({
                   country_flag: defFlagHash[flagHash].EN,
                   id: defFlagHash[flagHash].id

package/src/modules/history/HistoryPage.tsx

@@ -12,6 +12,7 @@ import { isEmpty } from 'lodash'
 import Tag from "@ledvance/base/src/components/Tag"
 import { exportHistoryFile } from '@ledvance/base/src/utils/common'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
+import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -25,7 +26,7 @@ export type SwitchHistoryPageRouteParams = {
   getActionsText: (dpData: any) => I18nKey
 }
 
-const SwitchHistoryPage = (props: { theme?: any }) => {
+const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo()
   const { dpIds, tags, headlineText, backText, showLimit, getActionsText } = useParams<SwitchHistoryPageRouteParams>()
 
@@ -101,16 +102,16 @@ const SwitchHistoryPage = (props: { theme?: any }) => {
     listEmptyTextIcon: {
       width: cx(16),
       height: cx(16),
-      tintColor: props.theme.global.fontColor,
+      tintColor: props.theme?.global.fontColor,
     },
     listEmptyText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(12),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     titleText: {
       marginHorizontal: cx(24),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
@@ -118,7 +119,7 @@ const SwitchHistoryPage = (props: { theme?: any }) => {
       marginHorizontal: cx(24),
     },
     switchHistoryItemTitle: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(18),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
@@ -136,31 +137,31 @@ const SwitchHistoryPage = (props: { theme?: any }) => {
     switchHistoryItemActionItemLine: {
       width: cx(1),
       flex: 1,
-      backgroundColor: props.theme.container.divider,
+      backgroundColor: props.theme?.container.divider,
     },
     switchHistoryItemActionItemPoint: {
       width: cx(7),
       height: cx(7),
-      backgroundColor: props.theme.icon.primary,
+      backgroundColor: props.theme?.icon.primary,
       borderRadius: cx(4),
       position: 'absolute',
       top: '50%',
       transform: [{ translateY: cx(-3) }]
     },
     switchHistoryItemActionItemText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
     switchHistoryItemTag: {
       paddingHorizontal: cx(10),
       borderRadius: cx(10),
-      backgroundColor: props.theme.tag.background,
+      backgroundColor: props.theme?.tag.background,
       marginLeft: cx(5),
     },
     switchHistoryItemTagText: {
       fontSize: cx(14),
-      color: props.theme.tag.fontColor
+      color: props.theme?.tag.fontColor
     }
   })
 

package/src/modules/mood/MixMood/AddMixMoodPage.tsx

@@ -8,7 +8,7 @@ import { useCreation, useReactive } from 'ahooks'
 import I18n from '@ledvance/base/src/i18n'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import RecommendMixMoodItem from './RecommendMixMoodItem'
-import { SceneNodeTransitionMode } from '@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo'
+import { SceneNodeTransitionMode } from '../../scene/SceneInfo'
 import { ui_biz_routerKey } from '../../../navigation/Routers'
 import { difference, head, map, range } from 'lodash'
 import { Result } from '@ledvance/base/src/models/modules/Result'
@@ -245,4 +245,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default AddMixMoodPage
+export default AddMixMoodPage

package/src/modules/mood/MixMood/MixMoodEditPage.tsx

@@ -20,7 +20,7 @@ import { MixSceneInfo, MixMainLampInfo, MixSceneNodeInfo } from './MixSceneBeans
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
 import { SelectPageParams } from '../../select/SelectPage'
 import { ui_biz_routerKey } from '../../../navigation/Routers'
-import { MixMoodPageProps } from '@ledvance/ui-biz-bundle/src/modules/mood/MixMood/MixMoodPage'
+import { MixMoodPageProps } from './MixMoodPage'
 import Segmented from '@ledvance/base/src/components/Segmented'
 import LdvSwitch from '@ledvance/base/src/components/ldvSwitch'
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView'
@@ -579,9 +579,9 @@ const RgbcMoodEditPage = () => {
                     subTitle: I18n.getLang('strip_light_static_mood_edit_dialog_text'),
                     onConfirm: async (_, { close }) => {
                       close()
-                      state.loading = true 
+                      state.loading = true
                       const res = await params.modDeleteFlag('del', state.mood)
-                      state.loading = false 
+                      state.loading = false
                       if(res.success){
                         navigation.navigate(ui_biz_routerKey.ui_biz_mix_mood)
                       }
@@ -719,4 +719,4 @@ export const defColorNode: StripNodeInfo[] = [
   { h: 0, s: 100, v: 100, brightness: 0, colorTemp: 0, isColorNode: true },
 ]
 
-export default RgbcMoodEditPage
+export default RgbcMoodEditPage

package/src/modules/mood/MixMood/MixMoodPage.tsx

@@ -17,7 +17,7 @@ import { MixSceneInfo, MixMainLampInfo } from './MixSceneBeans'
 import { SceneInfo } from '../../scene/SceneInfo'
 import MixMoodItem from './MixMoodItem'
 import { useNavigation, useRoute } from '@react-navigation/core'
-import { saveFlagMode } from '@ledvance/ui-biz-bundle/src/modules/flags/FlagActions'
+import { saveFlagMode } from '../../flags/FlagActions'
 import { ui_biz_routerKey } from '../../../navigation/Routers'
 import { WORK_MODE } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { cloneDeep } from 'lodash'
@@ -206,7 +206,7 @@ const MixMoodPage = () => {
       state.scenes = cloneDeep(list)
       return { success: true }
     }
-    
+
     return { success: false }
   }
 
@@ -252,7 +252,7 @@ const MixMoodPage = () => {
           renderItem={({ item }) => {
             return (
               <MixMoodItem
-                enable={checkedCurMoodInAllMoods(item) && isMoodMode} 
+                enable={checkedCurMoodInAllMoods(item) && isMoodMode}
                 mixMood={item}
                 onPress={() => {
                   navigation.navigate(ui_biz_routerKey.ui_biz_mix_mood_edit, {
@@ -324,4 +324,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default MixMoodPage
+export default MixMoodPage

package/src/modules/music/MusicPage.tsx

@@ -15,9 +15,11 @@ import { JudgeTimeScheduleProps } from "../timeSchedule/TimeScheduleBean"
 import Spacer from '@ledvance/base/src/components/Spacer'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
-import { SelectPageParams } from '@ledvance/ui-biz-bundle/src/modules/select/SelectPage'
-import { ui_biz_routerKey } from '@ledvance/ui-biz-bundle/src/navigation/Routers'
+import { SelectPageParams } from '../select/SelectPage'
+import { ui_biz_routerKey } from '../../navigation/Routers'
 import { cloneDeep } from 'lodash'
+import ThemeType from '@ledvance/base/src/config/themeType'
+
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
@@ -30,7 +32,7 @@ export interface MusicPageRouterParams extends JudgeTimeScheduleProps {
   dreamMusicDp?: string
 }
 
-const MusicPage = (props: { theme?: any }) => {
+const MusicPage = (props: { theme?: ThemeType }) => {
   const deviceInfo = useDeviceInfo()
   const deviceId = useDeviceId()
   const navigation = useNavigation()
@@ -243,7 +245,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),
     }
@@ -284,10 +286,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.musicType}
             onChange={async (v) => {
               state.musicType = Number(v)

package/src/modules/sleepWakeup/DeviceState.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from "react";
 import LampAdjustView from "@ledvance/base/src/components/LampAdjustView";
-import { JudgeTimeScheduleProps } from "@ledvance/ui-biz-bundle/src/modules/timeSchedule/TimeScheduleBean";
+import { JudgeTimeScheduleProps } from "../timeSchedule/TimeScheduleBean";
 import MixLightView from "../timeSchedule/mix/MixLightView";
 import Card from "@ledvance/base/src/components/Card";
 import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";
@@ -64,11 +64,11 @@ const DeviceState = (props: DeviceStateProps) => {
         props.isMixRGBWLamp ?
             <MixLightView
                 mixActions={props.mixActions}
-                setSendDps={(v) => props.editMixFn(v)} 
+                setSendDps={(v) => props.editMixFn(v)}
                 mutuallyExclusive={true}
             /> :
             <Card style={{marginHorizontal: cx(24)}}>
-                <LdvSwitch 
+                <LdvSwitch
                     title={I18n.getLang('light_sources_tile_tw_lighting_headline')}
                     color={getColorBlockColor()}
                     colorAlpha={1}
@@ -97,4 +97,4 @@ const DeviceState = (props: DeviceStateProps) => {
     )
 }
 
-export default DeviceState
+export default DeviceState

package/src/modules/sleepWakeup/SleepWakeUpPage.tsx

@@ -18,7 +18,7 @@ import { JudgeTimeScheduleProps } from "../timeSchedule/TimeScheduleBean";
 import { useSleepPlan, useWakeUpPlan } from "./SleepWakeUpActions";
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import { findConflicts } from '@ledvance/base/src/utils/loopsCompare'
-import { useBiorhythm } from '@ledvance/ui-biz-bundle/src/modules/biorhythm/BiorhythmActions'
+import { useBiorhythm } from '../biorhythm/BiorhythmActions'
 import { cloneDeep } from "lodash";
 
 const cx = Utils.RatioUtils.convertX
@@ -422,4 +422,4 @@ const styles = StyleSheet.create({
 },
 })
 
-export default SleepWakeUpPage
+export default SleepWakeUpPage