@ledvance/ui-biz-bundle 1.1.122 → 1.1.124

package/src/newModules/biorhythm/BiorhythmEditPage.tsx

@@ -7,7 +7,6 @@ import { colorTemperatureValue, Plan } from './BiorhythmBean'
 import iconList from './iconListData'
 import I18n from '@ledvance/base/src/i18n'
 import TextField from '@ledvance/base/src/components/TextField'
-import BiologicalRes from './res/BiologicalRes'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 import ColorTempAdjustView from '@ledvance/base/src/components/ColorTempAdjustView'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
@@ -166,7 +165,7 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
             }}
           />
           {minimumTipEnable() && <View style={{ flexDirection: 'row', marginVertical: cx(5) }}>
-              <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={res.ic_info} />
+              <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={{ uri: res.ic_info }} />
               <Text
                   style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{I18n.getLang('add_new_trigger_time_information_text')}</Text>
           </View>}
@@ -191,9 +190,9 @@ const BiorhythmEditPage = (props: { theme?: ThemeType }) => {
                 style={{ flex: 1, flexDirection: 'row', justifyContent: 'flex-end', alignContent: 'center', alignItems: 'center' }}>
                 <Image
                   style={{ width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor }}
-                  source={setImg()}
+                  source={{ uri: setImg()}}
                 />
-                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={BiologicalRes.biorhythom_select_rightIcon} />
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={{ uri: res.biorhythom_select_right_icon}} />
               </View>
             </TouchableOpacity>
           </View>

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -20,7 +20,6 @@ import {
 import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
 import { ui_biz_routerKey } from "../../navigation/Routers";
-import BiologicalRes from './res/BiologicalRes'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 import { setDataSource } from '@ledvance/base/src/components/weekSelect'
 import { BiorhythmEditPageParams } from './BiorhythmEditPage'
@@ -164,19 +163,19 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     switch (img) {
       case 'rhythm_icon1':
       case '31':
-        return { icon: BiologicalRes.biorhythom_Icon1, iconId: 1 }
+        return { icon: res.biorhythom_icon1, iconId: 1 }
       case 'rhythm_icon2':
       case '33':
-        return { icon: BiologicalRes.biorhythom_Icon5, iconId: 5 }
+        return { icon: res.biorhythom_icon5, iconId: 5 }
       case 'rhythm_icon3':
       case '35':
-        return { icon: BiologicalRes.biorhythom_Icon2, iconId: 2 }
+        return { icon: res.biorhythom_icon2, iconId: 2 }
       case 'rhythm_icon4':
       case '32':
-        return { icon: BiologicalRes.biorhythom_Icon9, iconId: 9 }
+        return { icon: res.biorhythom_icon9, iconId: 9 }
       case 'rhythm_icon12':
       case '39':
-        return { icon: BiologicalRes.biorhythom_Icon3, iconId: 3 }
+        return { icon: res.biorhythom_icon3, iconId: 3 }
       default:
         return { icon: item?.icon, iconId: item?.id }
     }
@@ -415,7 +414,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             }}>
             {state.planList.length === 8 && <View
                 style={{ marginVertical: cx(10), flexDirection: 'row', alignItems: 'center', width: width - cx(48) }}>
-                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={res.ic_warning_amber} />
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{uri: res.ic_warning_amber}} />
                 <Text
                     style={{
                       flexWrap: 'wrap',
@@ -471,7 +470,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                           }
                           navigation.navigate(ui_biz_routerKey.bi_biz_biological_edit, editPageParams)
                         }}>
-                        <Image source={BiologicalRes.biorhythom_add} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
+                        <Image source={{uri: res.biorhythom_add}} style={{ height: cx(24), width: cx(24), tintColor: props.theme?.icon.primary }} />
                     </TouchableOpacity>
                 </>
             }
@@ -522,7 +521,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                     <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'space-between', marginTop: cx(16) }}>
                       <View style={{ flexDirection: 'row', justifyContent: 'center', alignItems: 'center' }}>
                         <Image
-                          source={setImg(item?.iconId) || type && { uri: item?.icon } || item?.icon}
+                          source={{uri: setImg(item?.iconId)} || type && { uri: item?.icon } || item?.icon}
                           style={{
                             width: cx(24),
                             height: cx(24),

package/src/newModules/biorhythm/IconSelect.tsx

@@ -69,7 +69,7 @@ function IconSelect(props: { theme?: ThemeType }) {
               key={item.id}
             >
               <Image
-                source={item?.icon}
+                source={{ uri: item?.icon }}
                 style={{
                   width: cx(32),
                   height: cx(32),

package/src/newModules/biorhythm/circular/ItemIcon.tsx

@@ -170,4 +170,4 @@ const styles = StyleSheet.create({
         backgroundColor: "#FFFFFF",
         borderRadius: Math.round(timeIconSize / 2)
     }
-});
+});

package/src/newModules/biorhythm/circular/Progress.tsx

@@ -238,7 +238,7 @@ export default class Progress extends Component<any> {
               key={item.index}
               leftValeu={leftValeu}
               topValue={topValue}
-              imageSource={setImg(item?.iconId) || type && { uri: item?.icon } || item?.icon}
+              imageSource={{uri: setImg(item?.iconId)} || type && { uri: item?.icon } || item?.icon}
               circularRadius={newRadius}
               onPanMoving={(_xValue, _yValue, angle) => {
 
@@ -369,4 +369,4 @@ const styles = StyleSheet.create({
     width: 260,
     borderRadius: 130,
   },
-})
+})

package/src/newModules/biorhythm/circular/TimeCircular.tsx

@@ -2,7 +2,7 @@ import React from 'react'
 import {Image, StyleSheet, View} from 'react-native'
 import Progress from './Progress'
 import {Plan} from '../BiorhythmBean'
-import BiologicalRes from '../res/BiologicalRes'
+import res from '@ledvance/base/src/res'
 import { useCreation } from 'ahooks'
 import { useSystemTimeFormate } from '@ledvance/base/src/models/modules/NativePropsSlice'
 
@@ -30,9 +30,9 @@ const TimeCircular = (
   const enabledPlanList = planList.filter(plan => plan.enable)
   const timeDialPic = useCreation(() =>{
     if(is24Hour){
-      return replaceStatus ? BiologicalRes.ic_warning_amber_sun : BiologicalRes.ic_warning_amber_new
+      return replaceStatus ? res.ic_warning_amber_sun : res.ic_warning_amber_new
     }else{
-      return replaceStatus ? BiologicalRes.ic_warning_amber_sun_12 : BiologicalRes.ic_warning_amber_new_12
+      return replaceStatus ? res.ic_warning_amber_sun_12 : res.ic_warning_amber_new_12
     }
   }, [is24Hour, replaceStatus])
 
@@ -48,7 +48,7 @@ const TimeCircular = (
         onPanMoved={(id: number, time: number) => {
           onPanMoved && onPanMoved(id, time)
         }}>
-        <Image source={timeDialPic} style={{width: 172, height: 172}}/>
+        <Image source={{uri: timeDialPic}} style={{width: 172, height: 172}}/>
       </Progress>
     </View>
   )

package/src/newModules/biorhythm/iconListData.ts

@@ -1,30 +1,30 @@
-import BiologicalRes from './res/BiologicalRes'
+import res from '@ledvance/base/src/res'
 
 const iconList = [
-  {id: 1, icon: BiologicalRes.biorhythom_Icon1, selectStatus: false, disabled: false},
-  {id: 2, icon: BiologicalRes.biorhythom_Icon2, selectStatus: false, disabled: false},
-  {id: 3, icon: BiologicalRes.biorhythom_Icon3, selectStatus: false, disabled: false},
-  {id: 4, icon: BiologicalRes.biorhythom_Icon4, selectStatus: false, disabled: false},
-  {id: 5, icon: BiologicalRes.biorhythom_Icon5, selectStatus: false, disabled: false},
-  {id: 6, icon: BiologicalRes.biorhythom_Icon6, selectStatus: false, disabled: false},
-  {id: 7, icon: BiologicalRes.biorhythom_Icon7, selectStatus: false, disabled: false},
-  {id: 8, icon: BiologicalRes.biorhythom_Icon8, selectStatus: false, disabled: false},
-  {id: 9, icon: BiologicalRes.biorhythom_Icon9, selectStatus: false, disabled: false},
-  {id: 10, icon: BiologicalRes.biorhythom_Icon10, selectStatus: false, disabled: false},
-  {id: 11, icon: BiologicalRes.biorhythom_Icon11, selectStatus: false, disabled: false},
-  {id: 12, icon: BiologicalRes.biorhythom_Icon12, selectStatus: false, disabled: false},
-  {id: 13, icon: BiologicalRes.biorhythom_Icon13, selectStatus: false, disabled: false},
-  {id: 14, icon: BiologicalRes.biorhythom_Icon14, selectStatus: false, disabled: false},
-  {id: 15, icon: BiologicalRes.biorhythom_Icon15, selectStatus: false, disabled: false},
-  {id: 16, icon: BiologicalRes.biorhythom_Icon16, selectStatus: false, disabled: false},
-  {id: 17, icon: BiologicalRes.biorhythom_Icon17, selectStatus: false, disabled: false},
-  {id: 18, icon: BiologicalRes.biorhythom_Icon18, selectStatus: false, disabled: false},
-  {id: 19, icon: BiologicalRes.biorhythom_Icon19, selectStatus: false, disabled: false},
-  {id: 20, icon: BiologicalRes.biorhythom_Icon20, selectStatus: false, disabled: false},
-  {id: 21, icon: BiologicalRes.biorhythom_Icon21, selectStatus: false, disabled: false},
-  {id: 22, icon: BiologicalRes.biorhythom_Icon22, selectStatus: false, disabled: false},
-  {id: 23, icon: BiologicalRes.biorhythom_Icon23, selectStatus: false, disabled: false},
-  {id: 24, icon: BiologicalRes.biorhythom_Icon24, selectStatus: false, disabled: false},
+  {id: 1, icon: res.biorhythom_icon1, selectStatus: false, disabled: false},
+  {id: 2, icon: res.biorhythom_icon2, selectStatus: false, disabled: false},
+  {id: 3, icon: res.biorhythom_icon3, selectStatus: false, disabled: false},
+  {id: 4, icon: res.biorhythom_icon4, selectStatus: false, disabled: false},
+  {id: 5, icon: res.biorhythom_icon5, selectStatus: false, disabled: false},
+  {id: 6, icon: res.biorhythom_icon6, selectStatus: false, disabled: false},
+  {id: 7, icon: res.biorhythom_icon7, selectStatus: false, disabled: false},
+  {id: 8, icon: res.biorhythom_icon8, selectStatus: false, disabled: false},
+  {id: 9, icon: res.biorhythom_icon9, selectStatus: false, disabled: false},
+  {id: 10, icon: res.biorhythom_icon10, selectStatus: false, disabled: false},
+  {id: 11, icon: res.biorhythom_icon11, selectStatus: false, disabled: false},
+  {id: 12, icon: res.biorhythom_icon12, selectStatus: false, disabled: false},
+  {id: 13, icon: res.biorhythom_icon13, selectStatus: false, disabled: false},
+  {id: 14, icon: res.biorhythom_icon14, selectStatus: false, disabled: false},
+  {id: 15, icon: res.biorhythom_icon15, selectStatus: false, disabled: false},
+  {id: 16, icon: res.biorhythom_icon16, selectStatus: false, disabled: false},
+  {id: 17, icon: res.biorhythom_icon17, selectStatus: false, disabled: false},
+  {id: 18, icon: res.biorhythom_icon18, selectStatus: false, disabled: false},
+  {id: 19, icon: res.biorhythom_icon19, selectStatus: false, disabled: false},
+  {id: 20, icon: res.biorhythom_icon20, selectStatus: false, disabled: false},
+  {id: 21, icon: res.biorhythom_icon21, selectStatus: false, disabled: false},
+  {id: 22, icon: res.biorhythom_icon22, selectStatus: false, disabled: false},
+  {id: 23, icon: res.biorhythom_icon23, selectStatus: false, disabled: false},
+  {id: 24, icon: res.biorhythom_icon24, selectStatus: false, disabled: false},
 ]
 
-export default iconList
+export default iconList

package/src/newModules/childLock/ChildLockPage.tsx

@@ -70,7 +70,7 @@ const ChildLockPage = (props: { theme?: ThemeType }) => {
     headlineText={I18n.getLang('sockets_specific_settings_child_lock')}
     loading={state.loading}>
     <View style={styles.tipInfoContainer}>
-      <Image style={styles.image} source={res.ic_info}/>
+      <Image style={styles.image} source={{uri: res.ic_info}}/>
       <Text style={{color: props.theme?.global.fontColor}}>
         {params.descriptionText ? params.descriptionText : I18n.getLang('childlock_overview_description_text')}
       </Text>

package/src/newModules/diyScene/DiySceneEditorPage.tsx

@@ -203,8 +203,8 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
         state.sceneInfo.type !== 'DIY' && <TouchableOpacity onPress={() => {
           toggleLoveScene(state.sceneInfo.id)
         }}>
-          {isLove ? <Image source={res.like} style={{width: cx(30), height: cx(26)}}/>
-            : <Image source={res.un_like}
+          {isLove ? <Image source={{uri: res.like}} style={{width: cx(30), height: cx(26)}}/>
+            : <Image source={{uri: res.un_like}}
                      style={{width: cx(30), height: cx(26), tintColor: props.theme?.global.fontColor}}/>}
           </TouchableOpacity>
       }
@@ -237,7 +237,7 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
                       const color = {h: state.h, s: state.s * 10, v: 1000}
                       state.sceneInfo.nodes.push({top: color, bottom: color});
                     }}>
-                        <Image source={res.ic_plus} style={{tintColor: props.theme?.icon.primary}} />
+                        <Image source={{uri: res.ic_plus}} style={{tintColor: props.theme?.icon.primary}} />
                     </TouchableOpacity>}
                     { state.sceneInfo.nodes.length > 2 && <TouchableOpacity onPress={() => {
                       console.log('onPress delete node')
@@ -245,7 +245,7 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
                       state.currentNode = state.currentNode === state.sceneInfo.nodes.length ? 0 : state.currentNode
                       console.log('nextNode', state.currentNode)
                     }}>
-                        <Image source={res.ic_mood_del} style={{marginLeft: cx(5),tintColor: props.theme?.icon.primary}} />
+                        <Image source={{uri: res.ic_mood_del}} style={{marginLeft: cx(5),tintColor: props.theme?.icon.primary}} />
                     </TouchableOpacity>}
                   </View>
                   <View style={styles.nodeList}>

package/src/newModules/diyScene/DiyScenePage.tsx

@@ -252,7 +252,7 @@ const DiyScenePage = (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>
         <Spacer height={cx(10)} />
         {state.originScenes.length >= MAX_MOOD_COUNT && (

package/src/newModules/energyConsumption/EnergyConsumptionChart.tsx

@@ -163,7 +163,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
                   onDateChange={(date) => {
                     state.date = date;
                   }}/>
-              <TouchableOpacity 
+              <TouchableOpacity
                 style={{width: cx(30)}}
                 onPress={() => {
                   const values = state.chartData.map(item => [item.key, item.value, (Number(params.price) * Number(item.value)).toFixed(2)])
@@ -171,7 +171,7 @@ const EnergyConsumptionChart = (props: { theme?: ThemeType }) => {
               }}>
                 <Image
                     style={styles.downloadIcon}
-                    source={state.chartData?.length ? res.download_icon : undefined}/>
+                    source={{ uri: state.chartData?.length ? res.download_icon : undefined}}/>
               </TouchableOpacity>
             </View>
           }

package/src/newModules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -218,7 +218,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
                 <View style={{ flexDirection: 'row', alignItems: 'center' }}>
                     <View style={styles.priceBg}>
                         <Image
-                            source={res.energy_consumption_cash}
+                            source={{uri: res.energy_consumption_cash}}
                             resizeMode="contain"
                             style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                         />
@@ -233,7 +233,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
                                 }}
                             >
                                 <Image
-                                    source={res.co2Icon}
+                                    source={{uri: res.co2_icon}}
                                     resizeMode="contain"
                                     style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                                 />
@@ -248,7 +248,7 @@ const EnergyConsumptionDetail = (props: {theme?: ThemeType}) => {
             <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <View style={styles.priceBg}>
                 <Image
-                  source={res.energy_consumption_cash}
+                  source={{ uri: res.energy_consumption_cash}}
                   resizeMode="contain"
                   style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                 />

package/src/newModules/energyConsumption/EnergyConsumptionPage.tsx

@@ -382,7 +382,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                   }}
               >
                   <Image
-                      source={res.co2Icon}
+                      source={{uri: res.co2_icon}}
                       resizeMode="contain"
                       style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                   />
@@ -399,7 +399,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                 <View style={{ flexDirection: 'row', alignItems: 'center' }}>
                     <View style={styles.priceBg}>
                         <Image
-                            source={res.energy_consumption_cash}
+                            source={{uri: res.energy_consumption_cash}}
                             resizeMode="contain"
                             style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                         />
@@ -414,7 +414,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
                                 }}
                             >
                                 <Image
-                                    source={res.co2Icon}
+                                    source={{uri: res.co2_icon}}
                                     resizeMode="contain"
                                     style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                                 />
@@ -429,7 +429,7 @@ const EnergyConsumptionPage = (props: {theme?: ThemeType}) => {
             <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <View style={styles.priceBg}>
                 <Image
-                  source={res.energy_consumption_cash}
+                  source={{uri: res.energy_consumption_cash}}
                   resizeMode="contain"
                   style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                 />

package/src/newModules/energyConsumption/component/DateSwitch.tsx

@@ -3,7 +3,7 @@ import React, {PropsWithChildren, useCallback, useEffect} from "react";
 import {Image, Text, TouchableOpacity, View, ViewProps} from "react-native";
 import {Utils} from "tuya-panel-kit";
 import {useReactive} from "ahooks";
-import {DateType} from "@ledvance/ui-biz-bundle/src/newModules/energyConsumption/co2Data";
+import {DateType} from "../co2Data";
 import res from "@ledvance/base/src/res";
 import dayjs from "dayjs";
 
@@ -84,7 +84,7 @@ export default withTheme(function DateSwitch(props: DateSwitchProps) {
                 changeDate(false);
             }}>
             <Image
-                source={res.arrow_left}
+                source={{ uri: res.arrow_left}}
                 style={{tintColor: state.disableArrowLeft ? theme?.global.disabledFontColor : theme?.global.brand}}
                 height={cx(36)}
                 width={cx(36)}/>
@@ -102,10 +102,10 @@ export default withTheme(function DateSwitch(props: DateSwitchProps) {
                 changeDate(true);
             }}>
             <Image
-                source={res.arrow_right}
+                source={{ uri: res.arrow_right}}
                 style={{tintColor: state.disableArrowRight ? theme?.global.disabledFontColor : theme?.global.brand}}
                 height={cx(36)}
                 width={cx(36)}/>
         </TouchableOpacity>
     </View>)
-})
+})

package/src/newModules/energyConsumption/component/EnergyModal.tsx

@@ -207,7 +207,7 @@ const EnergyModal = (props: EnergyModalProps) => {
                   <Text style={{ fontSize: cx(16), color: props.theme?.global.fontColor }}>{item}</Text>
                   {props.energyData && props.energyData.unit === item && <Image
                       style={{ width: cx(16), height: cx(16) }}
-                      source={res.app_music_check}
+                      source={{ uri: res.app_music_check}}
                       resizeMode="contain"
                   />}
                 </View>
@@ -290,7 +290,7 @@ const EnergyModal = (props: EnergyModalProps) => {
                       <Text style={{ fontSize: cx(16), color: props.theme?.global.fontColor }}>{item}</Text>
                       {energyData && energyData.unit === item && <Image
                           style={{ width: cx(16), height: cx(16) }}
-                          source={res.app_music_check}
+                          source={{ uri: res.app_music_check}}
                           resizeMode="contain"
                       />}
                     </View>

package/src/newModules/energyConsumption/component/Overview.tsx

@@ -57,7 +57,7 @@ const OverView = (props: OverViewProps) => {
             }}
         >
             <Image
-                source={res.energy_consumption_chart}
+                source={{ uri: res.energy_consumption_chart}}
                 style={{ width: cx(16), height: cx(16), marginLeft: cx(8) }}
             />
         </TouchableOpacity>}
@@ -80,7 +80,7 @@ const OverView = (props: OverViewProps) => {
                     <Text style={[styles.overviewItemText, { color: props.theme?.global.secondFontColor }]}> kWh</Text>
                   </View>
                   <Image
-                    source={res.energy_consumption_right}
+                    source={{ uri: res.energy_consumption_right}}
                     style={{ width: cx(16), height: cx(16), marginLeft: cx(8), tintColor: props.theme?.global.secondFontColor }}
                   />
                 </View>
@@ -95,10 +95,10 @@ const OverView = (props: OverViewProps) => {
           <View style={styles.listEmptyContainer}>
             <Image
               style={styles.listEmptyImage}
-              source={res.energy_consumption_empty} />
+              source={{ uri: res.energy_consumption_empty}} />
             <Spacer height={cx(10)} />
             <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: cx(25) }}>
-              <Image style={styles.listEmptyTextIcon} source={res.co2Icon} />
+              <Image style={styles.listEmptyTextIcon} source={{uri: res.co2_icon}} />
               <Spacer width={cx(4)} height={0} />
               <Text style={styles.listEmptyText}>
                 {

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -197,7 +197,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
                       state.fixedTime.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={{uri: res.ic_arrows_nav_clear}} />
                 </TouchableOpacity>}
               </View>
             }
@@ -212,7 +212,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
                   state.fixedTime.channel = params.isPlug ? index : 1
                 }}>
                 <Text style={{ color: props.theme?.global.fontColor }}>{item.key}</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>
             )
           })}
@@ -272,7 +272,7 @@ const FixedTimeDetailPage = (props: { theme?: ThemeType }) => {
           <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline4_text')}</Text>
           <Spacer height={cx(10)} />
           {!inRangeTime && <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-              <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={res.ic_warning_amber} />
+              <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.warning }} source={{uri: res.ic_warning_amber}} />
               <Text style={{ fontSize: cx(12), color: props.theme?.global.warning }}>{I18n.getLang('addTimeCycle_warning_text')}</Text>
           </View>}
           <View >

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -95,7 +95,8 @@ const FixedTimePage = (props: { theme?: ThemeType }) => {
       let itselfConflict = false 
       cloneList.forEach((item, idx) => {
         const itself = mode === 'add' ? (idx === cloneList.length - 1) : fixedTime.index === item.index
-        if (!itself && item.enable && isConflictTask(item, fixedTime)){
+        const isSameChannel = item.channel !== undefined ? item.channel === fixedTime.channel : true
+        if (!itself && item.enable && isSameChannel && isConflictTask(item, fixedTime)){
           itselfConflict = true 
           item.enable = false 
         }

package/src/newModules/mood/DynamicMoodEditorPage.tsx

@@ -385,7 +385,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                       styles.adjustButton,
                       { tintColor: state.mainBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal },
                     ]}
-                    source={res.ic_paint_bucket}
+                    source={{ uri: res.ic_paint_bucket}}
                   />
                 </TouchableOpacity>
                 <TouchableOpacity
@@ -398,7 +398,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                       styles.adjustButton,
                       { tintColor: state.mainBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary },
                     ]}
-                    source={res.ic_colorize}
+                    source={{ uri: res.ic_colorize}}
                   />
                 </TouchableOpacity>
               </View>
@@ -434,7 +434,7 @@ const DynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                               tintColor: state.mood.mainLamp.nodes.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/newModules/mood/MixDynamicMoodEditor.tsx

@@ -371,7 +371,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                           styles.adjustButton,
                           { tintColor: state.mainBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal },
                         ]}
-                        source={res.ic_paint_bucket}
+                        source={{uri: res.ic_paint_bucket}}
                       />
                     </TouchableOpacity>
                     <TouchableOpacity
@@ -384,7 +384,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                           styles.adjustButton,
                           { tintColor: state.mainBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary },
                         ]}
-                        source={res.ic_colorize}
+                        source={{uri: res.ic_colorize}}
                       />
                     </TouchableOpacity>
                   </View>
@@ -421,7 +421,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                                   tintColor: state.mood.mainLamp.nodes.length < 3 ? props.theme?.icon.disable : props.theme?.icon.normal,
                                 },
                               ]}
-                              source={res.ic_mood_del}
+                              source={{uri: res.ic_mood_del}}
                             />
                           </TouchableOpacity>
                         </View>
@@ -636,7 +636,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                           styles.adjustButton,
                           { tintColor: state.secondaryBucketSelected ? props.theme?.icon.primary : props.theme?.icon.normal },
                         ]}
-                        source={res.ic_paint_bucket}
+                        source={{uri: res.ic_paint_bucket}}
                       />
                     </TouchableOpacity>
                     <TouchableOpacity
@@ -649,7 +649,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                           styles.adjustButton,
                           { tintColor: state.secondaryBucketSelected ? props.theme?.icon.normal : props.theme?.icon.primary },
                         ]}
-                        source={res.ic_colorize}
+                        source={{uri: res.ic_colorize}}
                       />
                     </TouchableOpacity>
                   </View>
@@ -686,7 +686,7 @@ const MixDynamicMoodEditorPage = (props: { theme?: ThemeType }) => {
                                     state.mood.secondaryLamp.nodes.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/newModules/mood/MoodItem.tsx

@@ -157,7 +157,7 @@ export function MixMoodColorsLine(props: { mixSubLight: MoodLampInfo; isMix: boo
         <>
           <Spacer height={0} width={cx(7)} />
           <View style={styles.gradientItemIconView}>
-            <Image style={styles.gradientItemIcon} source={mixSubLight.enable ? res.light_on : res.light_off} />
+            <Image style={styles.gradientItemIcon} source={{uri: mixSubLight.enable ? res.light_on : res.light_off}} />
           </View>
         </>
       )}

package/src/newModules/mood/MoodPage.tsx

@@ -367,7 +367,7 @@ const MoodPage = (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>
         <Spacer height={cx(10)} />
         {state.originMoods.length >= MAX_MOOD_COUNT && (

package/src/newModules/randomTime/RandomTimeDetailPage.tsx

@@ -191,7 +191,7 @@ const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
                       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={{uri: res.ic_arrows_nav_clear}} />
                 </TouchableOpacity>}
               </View>
             }
@@ -206,7 +206,7 @@ const RandomTimeDetailPage = (props: { theme?: ThemeType }) => {
                   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} />
+                <Image style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }} source={{uri: res.device_panel_timer_add}} />
               </TouchableOpacity>
             )
           })}

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -96,7 +96,8 @@ const RandomTimePage = (props: { theme?: ThemeType }) => {
       let itselfConflict = false 
       cloneList.forEach((item, idx) => {
         const itself = mode === 'add' ? (idx === cloneList.length - 1) : randomTime.index === item.index
-        if (!itself && item.enable && isConflictTask(item, randomTime)){
+        const isSameChannel = item.channel !== undefined ? item.channel === randomTime.channel : true
+        if (!itself && item.enable && isSameChannel && isConflictTask(item, randomTime)){
           itselfConflict = true 
           item.enable = false 
         }