@ledvance/ui-biz-bundle 1.1.122 → 1.1.124

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -72,6 +72,27 @@ interface ConflictItem {
   endTime: number 
   weeks: number[]
   enable: boolean
+  channel?: number
+}
+
+const processConflictItems = <T extends ConflictItem>(
+  items: T[],
+  conflictItem: ConflictItem,
+  transformItem?: (item: T) => ConflictItem
+): { hasConflict: boolean; newItems: T[] } => {
+  let hasConflict = false
+  const newItems = items.map(item => {
+    if (!item.enable || (item.channel !== undefined && item.channel !== conflictItem.channel)) return item
+    
+    const checkItem = transformItem ? transformItem(item) : item
+    if (isConflictTask(checkItem, conflictItem)) {
+      hasConflict = true
+      return { ...item, enable: false }
+    }
+    return item
+  })
+  
+  return { hasConflict, newItems }
 }
 
 export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v: ConflictItem) => boolean, () => void] => {
@@ -101,75 +122,35 @@ export const useConflictTask = (conflictDps: ConflictDps, isPlug?: boolean): [(v
       }
     }
     if (conflictDps.fixedTimeDpCode && fixedTime.length){
-      let conflict = false 
-      const newFixedTime = fixedTime.map(item => {
-        if (item.enable && isConflictTask(item, conflictItem)) {
-          conflict = true 
-          return {
-            ...item,
-            enable: false
-          }
-        }
-        return item 
-      })
-      if (conflict){
-        newState[conflictDps.fixedTimeDpCode] = newFixedTime
+      const { hasConflict, newItems } = processConflictItems(fixedTime, conflictItem)
+      if (hasConflict) {
+        newState[conflictDps.fixedTimeDpCode] = newItems
       }
     }
     if (conflictDps.randomTimeDpCode && randomTime.length){
-      let conflict = false 
-      const newRandomTime = randomTime.map(item => {
-        if (item.enable && isConflictTask(item, conflictItem)) {
-          conflict = true 
-          return {
-            ...item,
-            enable: false
-          }
-        }
-        return item 
-      })
-      if (conflict){
-        newState[conflictDps.randomTimeDpCode] = newRandomTime
+      const { hasConflict, newItems } = processConflictItems(randomTime, conflictItem)
+      if (hasConflict) {
+        newState[conflictDps.randomTimeDpCode] = newItems
       }
     }
     if (conflictDps.sleepDpCode && sleepPlan.length){
-      let conflict = false 
-      const newSleepPlan = sleepPlan.map(item => {
-        if (item.enable && isConflictTask({
-          ...item,
-          startTime: getStartTime(item),
-          endTime: getEndTime(item)
-        }, conflictItem)) {
-          conflict = true 
-          return {
-            ...item,
-            enable: false
-          }
-        }
-        return item 
-      })
-      if (conflict){
-        newState[conflictDps.sleepDpCode] = newSleepPlan
+      const { hasConflict, newItems } = processConflictItems(sleepPlan, conflictItem, (item) => ({
+        ...item,
+        startTime: getStartTime(item),
+        endTime: getEndTime(item)
+      }))
+      if (hasConflict) {
+        newState[conflictDps.sleepDpCode] = newItems
       }
     }
     if (conflictDps.wakeUpDpCode && wakeUpPlan.length){
-      let conflict = false 
-      const newWakeUpPlan = wakeUpPlan.map(item => {
-        if (item.enable && isConflictTask({
-          ...item,
-          startTime: getStartTime(item),
-          endTime: getEndTime(item)
-        }, conflictItem)) {
-          conflict = true 
-          return {
-            ...item,
-            enable: false
-          }
-        }
-        return item 
-      })
-      if (conflict){
-        newState[conflictDps.wakeUpDpCode] = newWakeUpPlan
+      const { hasConflict, newItems } = processConflictItems(wakeUpPlan, conflictItem, (item) => ({
+        ...item,
+        startTime: getStartTime(item),
+        endTime: getEndTime(item)
+      }))
+      if (hasConflict) {
+        newState[conflictDps.wakeUpDpCode] = newItems
       }
     }
     if (conflictDps.switchIngCode && switchInching.enable){

package/src/modules/flags/FlagEditPage.tsx

@@ -290,7 +290,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                   }}>
                   <Image
                     style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal }]}
-                    source={res.ic_paint_bucket} />
+                    source={{uri: res.ic_paint_bucket}} />
                 </TouchableOpacity>
                 <TouchableOpacity
                   onPress={() => {
@@ -298,7 +298,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                   }}>
                   <Image
                     style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary }]}
-                    source={res.ic_colorize} />
+                    source={{uri: res.ic_colorize}} />
                 </TouchableOpacity>
               </View>
               <FlatList
@@ -332,7 +332,7 @@ const FlagEditPage = (props: { theme?: ThemeType }) => {
                               tintColor: state.mood.colors.length < 3 ? props.theme?.icon.disable : props.theme?.icon.normal,
                             },
                           ]}
-                          source={res.ic_mood_del} />
+                          source={{uri: res.ic_mood_del}} />
                       </TouchableOpacity>
                     </View>
                   )

package/src/modules/flags/FlagPage.tsx

@@ -219,7 +219,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
             })
           }}
         >
-          <Image source={res.ic_refresh} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor }} />
+          <Image source={{ uri: res.ic_refresh}} style={{ width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor }} />
         </TouchableOpacity>
       </View>
       <FlatList

package/src/modules/history/HistoryPage.tsx

@@ -10,7 +10,7 @@ import { FlatList, Image, StyleSheet, Text, View } from 'react-native'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import { isEmpty } from 'lodash'
 import Tag from "@ledvance/base/src/components/Tag"
-import { exportHistoryFile } from '@ledvance/base/src/utils/common'
+import {exportCsvFile } from '@ledvance/base/src/utils/common'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import ThemeType from '@ledvance/base/src/config/themeType'
 
@@ -82,7 +82,17 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
   }, [state.onRefresh, state.filterTags])
 
   const downFile = () => {
-    exportHistoryFile(state.data)
+    const headers = [I18n.getLang('date'), 'Time', 'Status', I18n.getLang('manual_search_button_socket')]
+    const values = state.data.reduce((acc, item) => {
+      const actions = item.actions.map(action => {
+        const name = tags ? tags[action.dpId] : action.dpId
+        return [action.date, action.time, action.action, name]
+      });
+      return acc.concat(actions);
+    }, [] as string[][]);
+
+    const functionName = 'history'
+    exportCsvFile(headers, values, functionName)
   }
 
   const styles = StyleSheet.create({
@@ -211,7 +221,7 @@ const SwitchHistoryPage = (props: { theme?: ThemeType }) => {
                 source={{ uri: res.ldv_timer_empty }} />
               <Spacer height={cx(14)} />
               <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-                <Image style={styles.listEmptyTextIcon} source={res.ic_info} />
+                <Image style={styles.listEmptyTextIcon} source={{ uri: res.ic_info}} />
                 <Spacer width={cx(4)} height={0} />
                 <Text style={styles.listEmptyText}>{I18n.getLang('history_overview_empty_information_text')}</Text>
               </View>

package/src/modules/mood/DynamicMoodEditorPage.tsx

@@ -135,7 +135,7 @@ const DynamicMoodEditorPage = () => {
           )
           console.log('设置修改后的场景结果', setSceneRes)
         }
-        
+
       } else {
         await setWorkMode(moduleParams.isOnlyRGBLamp ? COLOUR : WHITE)
         console.log('Mood被清空，将work_mode设置成white')
@@ -245,7 +245,7 @@ const DynamicMoodEditorPage = () => {
                   }}>
                   <Image
                     style={[styles.adjustButton, {tintColor: state.paintBucketSelected ? '#f60' : '#666'}]}
-                    source={res.ic_paint_bucket}/>
+                    source={{uri: res.ic_paint_bucket}}/>
                 </TouchableOpacity>
                 <TouchableOpacity
                   onPress={() => {
@@ -253,7 +253,7 @@ const DynamicMoodEditorPage = () => {
                   }}>
                   <Image
                     style={[styles.adjustButton, {tintColor: state.paintBucketSelected ? '#666' : '#f60'}]}
-                    source={res.ic_colorize}/>
+                    source={{uri: res.ic_colorize}}/>
                 </TouchableOpacity>
               </View>
               <FlatList
@@ -286,7 +286,7 @@ const DynamicMoodEditorPage = () => {
                               tintColor: state.mood.nodes.length < 3 ? '#ccc' : '#666',
                             },
                           ]}
-                          source={res.ic_mood_del}/>
+                          source={{uri: res.ic_mood_del}}/>
                       </TouchableOpacity>
                     </View>
                   )
@@ -559,4 +559,4 @@ export function createSelectPageData(transitionMode: SceneNodeTransitionMode, mo
     selected: transitionMode === mode,
     value: mode,
   }
-}
+}

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -320,7 +320,7 @@ const FantasyMoodEditPage = () => {
                   }}>
                   <Image
                     style={[styles.adjustButton, { tintColor: state.paintBucketSelected ? '#f60' : '#666' }]}
-                    source={res.ic_paint_bucket} />
+                    source={{uri: res.ic_paint_bucket}} />
                 </TouchableOpacity>
                 <TouchableOpacity
                   onPress={() => {
@@ -328,7 +328,7 @@ const FantasyMoodEditPage = () => {
                   }}>
                   <Image
                     style={[styles.adjustButton, { tintColor: state.paintBucketSelected ? '#666' : '#f60' }]}
-                    source={res.ic_colorize} />
+                    source={{uri: res.ic_colorize}} />
                 </TouchableOpacity>
               </View>
               <FlatList
@@ -361,7 +361,7 @@ const FantasyMoodEditPage = () => {
                               tintColor: state.mood.nodes.length < 3 ? '#ccc' : '#666',
                             },
                           ]}
-                          source={res.ic_mood_del} />
+                          source={{uri: res.ic_mood_del}} />
                       </TouchableOpacity>
                     </View>
                   )

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

@@ -261,7 +261,7 @@ const RgbcMoodEditPage = () => {
                       }}>
                       <Image
                         style={[styles.adjustButton, { tintColor: state.paintWhiteBucketSelected ? '#f60' : '#666' }]}
-                        source={res.ic_paint_bucket} />
+                        source={{uri: res.ic_paint_bucket}} />
                     </TouchableOpacity>
                     <TouchableOpacity
                       onPress={() => {
@@ -269,7 +269,7 @@ const RgbcMoodEditPage = () => {
                       }}>
                       <Image
                         style={[styles.adjustButton, { tintColor: state.paintWhiteBucketSelected ? '#666' : '#f60' }]}
-                        source={res.ic_colorize} />
+                        source={{uri: res.ic_colorize}} />
                     </TouchableOpacity>
                   </View>
                   <FlatList
@@ -302,7 +302,7 @@ const RgbcMoodEditPage = () => {
                                   tintColor: state.mainLamp.nodes.length < 3 ? '#ccc' : '#666',
                                 },
                               ]}
-                              source={res.ic_mood_del} />
+                              source={{uri: res.ic_mood_del}} />
                           </TouchableOpacity>
                         </View>
                       )
@@ -457,7 +457,7 @@ const RgbcMoodEditPage = () => {
                       }}>
                       <Image
                         style={[styles.adjustButton, { tintColor: state.paintBucketSelected ? '#f60' : '#666' }]}
-                        source={res.ic_paint_bucket} />
+                        source={{uri: res.ic_paint_bucket}} />
                     </TouchableOpacity>
                     <TouchableOpacity
                       onPress={() => {
@@ -465,7 +465,7 @@ const RgbcMoodEditPage = () => {
                       }}>
                       <Image
                         style={[styles.adjustButton, { tintColor: state.paintBucketSelected ? '#666' : '#f60' }]}
-                        source={res.ic_colorize} />
+                        source={{uri: res.ic_colorize}} />
                     </TouchableOpacity>
                   </View>
                   <FlatList
@@ -498,7 +498,7 @@ const RgbcMoodEditPage = () => {
                                   tintColor: state.secondlyLamp.nodes.length < 3 ? '#ccc' : '#666',
                                 },
                               ]}
-                              source={res.ic_mood_del} />
+                              source={{ uri: res.ic_mood_del}} />
                           </TouchableOpacity>
                         </View>
                       )

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

@@ -26,7 +26,7 @@ const MixMoodItem = (props: MixMoodItemProps) => {
   const isStaticMood = useMemo(() => {
     return mixMood.secondlyLamp.nodes?.length === 0
   }, [mixMood])
-  
+
   return (
     <Card style={[styles.card, props.style]} onPress={props.onPress}>
       <View>
@@ -73,7 +73,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MixMainLampInfo, colorLi
         colors={lightColors} />
       <Spacer height={0} width={cx(7)} />
       <View style={styles.gradientItemIconView}>
-        <Image style={styles.gradientItemIcon} source={res.light_on} />
+        <Image style={styles.gradientItemIcon} source={{ uri: res.light_on}} />
       </View>
       <Spacer height={0} width={cx(16)} />
     </View>

package/src/modules/music/MusicDataBean.ts

@@ -1,5 +1,5 @@
 import Strings from '@ledvance/base/src/i18n'
-import res from './res'
+import res from '@ledvance/base/src/res'
 
 export interface AppleMusicColorAreaType {
   area: number[];
@@ -110,9 +110,9 @@ export const musicDefalutDatasource = [
   ]
 
 export type DreamMusicDataType = {
-    id: number 
-    mode: number 
-    title: string 
+    id: number
+    mode: number
+    title: string
     value: string
   }
 

package/src/modules/music/MusicPage.tsx

@@ -4,7 +4,7 @@ import { useRoute, useNavigation } from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
 import { useDeviceId, useDeviceInfo, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import Strings from '@ledvance/base/src/i18n'
-import Img from './res'
+import res from '@ledvance/base/src/res'
 import { useEnable, useWorkMode, useMixRgbcw, useMixScene, useMusicData, useDreamMusic, DreamLightMicMusicData, getRemoteDreamMusic, DreamLightMicMusicUIState, saveRemoteDreamMusic } from './MusicPageActions'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import { NativeApi } from '@ledvance/base/src/api/native'
@@ -311,7 +311,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
         <View style={{ alignItems: 'center', marginVertical: cx(38) }}>
           <Image
             style={{ width: cx(200), height: cx(204) }}
-            source={state.musicEnable ? (props.theme?.type === 'light' ? Img.app_music_center_on_light : Img.app_music_center_on_dark) : Img.app_music_center_off}
+            source={{ uri: state.musicEnable ? (props.theme?.type === 'light' ? res.app_music_center_on_light : res.app_music_center_on_dark) : res.app_music_center_off}}
             resizeMode="contain"
           />
         </View>

package/src/modules/timeSchedule/DeviceState.tsx

@@ -65,7 +65,7 @@ const DeviceState = (props: DeviceStateProps) => {
           {
             showErrorText() ?
               <View style={{ flexDirection: 'row', marginTop: cx(10) }}>
-                <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber}/>
+                <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={{uri: res.ic_warning_amber}}/>
                 <Text style={{
                   color: '#FF9500',
                   marginLeft: cx(5),
@@ -92,4 +92,4 @@ const DeviceState = (props: DeviceStateProps) => {
   )
 }
 
-export default DeviceState
+export default DeviceState

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -114,7 +114,7 @@ const TimeScheduleEditPage = () => {
         }
         state.isManual = lightData.isManual
         state.actionScene = lightData.actionScene
-        
+
         return
       }
 
@@ -184,7 +184,7 @@ const TimeScheduleEditPage = () => {
   const manualCheck = () => {
     return state.isManual && state.selectedSkill.length
   }
-  
+
   // 只支持风扇灯跟普通灯
   const sceneCheck = () => {
     if(props.isCeilingLight){
@@ -192,7 +192,7 @@ const TimeScheduleEditPage = () => {
     }
     return !state.isManual && state.skillList.length === 0 && state.actionScene && (state?.actionScene?.nodes || state?.actionScene?.value)
   }
-  
+
   const saveEnable = () => {
     return !state.loading
         && state.name.length && state.name.length <= 32
@@ -425,7 +425,7 @@ const TimeScheduleEditPage = () => {
           {item.label}
         </Text>
         {showClearIcon() && <TouchableOpacity onPress={() => handelSkill('lower', item)}>
-            <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5) }} source={res.ic_arrows_nav_clear}/>
+            <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5) }} source={{uri: res.ic_arrows_nav_clear}}/>
         </TouchableOpacity>}
       </View>
     )
@@ -528,7 +528,7 @@ const TimeScheduleEditPage = () => {
                 <TouchableOpacity style={styles.skillListItem} key={item.dpId + 'skill'}
                                   onPress={() => handelSkill('add', item)}>
                   <Text style={{ color: '#000' }}>{item.label}</Text>
-                  <Image style={{ width: cx(16), height: cx(16) }} source={res.device_panel_timer_add}/>
+                  <Image style={{ width: cx(16), height: cx(16) }} source={{uri: res.device_panel_timer_add}}/>
                 </TouchableOpacity>
               )
             })}
@@ -564,12 +564,12 @@ const TimeScheduleEditPage = () => {
             isSupportTemperature={props.isSupportTemperature}
             isSupportMood={props.isSupportMood}
             isStringLight={props.isStringLight}
-            isStripLight={props.isStripLight} 
+            isStripLight={props.isStripLight}
             fantasyFeatureId={props.fantasyFeatureId}
             isCeilingLight={props.isCeilingLight}
             />
           {!hasSelected() && <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-              <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={res.ic_warning_amber}/>
+              <Image style={{ width: cx(16), height: cx(16), tintColor: '#FF9500' }} source={{uri: res.ic_warning_amber}}/>
               <Text style={{
                 color: '#FF9500',
                 marginLeft: cx(5),
@@ -591,7 +591,7 @@ const TimeScheduleEditPage = () => {
             <View style={styles.summaryContainer}>
               <View style={styles.summaryLeft}>
                 <Image
-                  source={res.summary_icon1}
+                  source={{uri: res.summary_icon1}}
                   resizeMode="contain"
                   style={styles.summaryImg}
                 />
@@ -606,7 +606,7 @@ const TimeScheduleEditPage = () => {
             <View style={styles.summaryContainer}>
               <View style={styles.summaryLeft}>
                 <Image
-                  source={res.summary_icon2}
+                  source={{uri: res.summary_icon2}}
                   resizeMode="contain"
                   style={styles.summaryImg}
                 />
@@ -621,7 +621,7 @@ const TimeScheduleEditPage = () => {
             <View style={[styles.summaryContainer, { alignItems: 'flex-start' }]}>
               <View style={styles.summaryLeft}>
                 <Image
-                  source={res.summary_icon3}
+                  source={{uri: res.summary_icon3}}
                   resizeMode="contain"
                   style={styles.summaryImg}
                 />
@@ -763,4 +763,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default TimeScheduleEditPage
+export default TimeScheduleEditPage

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -234,7 +234,7 @@ const TimeSchedulePage = () => {
           }}>{I18n.getLang('timeschedule_overview_description_text')}</Text>
           <Spacer height={cx(10)}/>
           {showMaxNumTip() && <View style={{marginHorizontal: cx(24), flexDirection: 'row', alignItems: 'center'}}>
-            <Image style={{ width: cx(16), height: cx(16), tintColor: '#ff9500' }} source={res.ic_warning_amber} />
+            <Image style={{ width: cx(16), height: cx(16), tintColor: '#ff9500' }} source={{uri: res.ic_warning_amber}} />
             <Text>{I18n.getLang('motion_detection_time_schedule_notifications_warning_text')}</Text>
           </View>}
           {showTags() && <View style={styles.categoryList}>

package/src/modules/timer/TimerPage.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect } from "react";
-import { View, Text, ScrollView, TouchableOpacity, StyleSheet, FlatList, Image } from "react-native"
+import { View, Text, ScrollView, TouchableOpacity, StyleSheet, Image } from "react-native"
 import { useNavigation } from '@react-navigation/native'
 import { RouteProp, useRoute } from '@react-navigation/core'
 import { useReactive, useUpdateEffect } from "ahooks";
@@ -139,7 +139,9 @@ const TimerPage = (props: {theme?: ThemeType}) => {
         alignItems: 'center',
         backgroundColor: props.theme?.global.background,
         marginBottom: cx(8)
-      }}>
+      }}
+      key={item.dpId}
+      >
         <Text
           style={{
             color: props.theme?.global.fontColor,
@@ -151,7 +153,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
           {item.label}
         </Text>
         {progress.length > 1 && <TouchableOpacity onPress={() => handelTimer(item, false)}>
-            <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5), tintColor: props.theme?.global.fontColor, }} source={res.ic_arrows_nav_clear} />
+            <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5), tintColor: props.theme?.global.fontColor, }} source={{ uri: res.ic_arrows_nav_clear}} />
         </TouchableOpacity>}
       </View>
     );
@@ -259,7 +261,7 @@ const TimerPage = (props: {theme?: ThemeType}) => {
                   return (
                     <TouchableOpacity style={styles.skillListItem} key={skill.dpId} onPress={() => handelTimer(skill, true)}>
                       <Text style={{ color: props.theme?.global.fontColor }}>{skill.label}</Text>
-                      <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={res.device_panel_timer_add} />
+                      <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={{uri: res.device_panel_timer_add}} />
                     </TouchableOpacity>
                   )
                 })}

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -16,7 +16,7 @@ import { useDeviceId, useDp } from '@ledvance/base/src/models/modules/NativeProp
 import { getFeature, NativeApi, putFeature } from '@ledvance/base/src/api/native'
 import { hex2Int, spliceByStep } from '@ledvance/base/src/utils/common'
 import I18n from '@ledvance/base/src/i18n'
-import BiologicalRes from './res/BiologicalRes'
+import res from '@ledvance/base/src/res'
 import dayjs from 'dayjs'
 import { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { useUpdateEffect } from 'ahooks'
@@ -146,7 +146,7 @@ export const useRhythmSuspend = (dp: string): [boolean, () => void, (v: string |
     }
     const res = await putSuspendTime(time)
     setSuspendTime(time)
-    return res 
+    return res
   }, [suspendTime, biorhythm.enable])
 
   return [suspendTime === currentTime, getSuspendTime, setRhythSuspend]
@@ -268,47 +268,47 @@ function getNodeIconByIndex(index: number): NodeIcon {
   switch (index) {
     case 0:
       return {
-        icon: BiologicalRes.rhythm_icon1,
+        icon: res.rhythm_icon1,
         iconId: 1
       }
     case 1:
       return {
-        icon: BiologicalRes.rhythm_icon2,
+        icon: res.rhythm_icon2,
         iconId: 2
       }
     case 2:
       return {
-        icon: BiologicalRes.rhythm_icon3,
+        icon: res.rhythm_icon3,
         iconId: 9
       }
     case 3:
       return {
-        icon: BiologicalRes.rhythm_icon4,
+        icon: res.rhythm_icon4,
         iconId: 3
       }
     case 4:
       return {
-        icon: BiologicalRes.rhythm_icon12,
+        icon: res.rhythm_icon12,
         iconId: 5
       }
     case 5:
       return {
-        icon: BiologicalRes.rhythm_icon1,
+        icon: res.rhythm_icon1,
         iconId: 1
       }
     case 6:
       return {
-        icon: BiologicalRes.rhythm_icon2,
+        icon: res.rhythm_icon2,
         iconId: 2
       }
     case 7:
       return {
-        icon: BiologicalRes.rhythm_icon3,
+        icon: res.rhythm_icon3,
         iconId: 9
       }
     default:
       return {
-        icon: BiologicalRes.rhythm_icon1,
+        icon: res.rhythm_icon1,
         iconId: 1
       }
   }

package/src/newModules/biorhythm/BiorhythmBean.ts

@@ -1,5 +1,5 @@
 import I18n from '@ledvance/base/src/i18n'
-import BiologicalRes from './res/BiologicalRes'
+import res from '@ledvance/base/src/res'
 
 export enum BiorhythmGradientType {
   // 全程渐变
@@ -58,11 +58,11 @@ export function colorTempPercent(colorTemp: number): number {
 }
 
 export function getDefBiorhythmUIState(): BiorhythmBean {
-  const icon1 = BiologicalRes.biorhythom_Icon1
-  const icon12 = BiologicalRes.biorhythom_Icon3
-  const icon2 = BiologicalRes.biorhythom_Icon5
-  const icon3 = BiologicalRes.biorhythom_Icon2
-  const icon4 = BiologicalRes.biorhythom_Icon9
+  const icon1 = res.biorhythom_Icon1
+  const icon12 = res.biorhythom_Icon3
+  const icon2 = res.biorhythom_Icon5
+  const icon3 = res.biorhythom_Icon2
+  const icon4 = res.biorhythom_Icon9
   return {
     enable: false, // 生物节律默认为关
     repeatPeriod: getDefRepeatPeriod(),