@ledvance/group-ui-biz-bundle 1.0.112 → 1.0.114

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -9,7 +9,7 @@ import {
 import { useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
 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 { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { useCallback } from 'react'
 import { Result } from '@ledvance/base/src/models/modules/Result'
@@ -151,23 +151,23 @@ function getNodeNameByIndex(index: number): string {
 function getNodeIconByIndex(index: number): string {
   switch (index) {
     case 0:
-      return BiologicalRes.rhythm_icon1
+      return res.rhythm_icon1
     case 1:
-      return BiologicalRes.rhythm_icon2
+      return res.rhythm_icon2
     case 2:
-      return BiologicalRes.rhythm_icon3
+      return res.rhythm_icon3
     case 3:
-      return BiologicalRes.rhythm_icon4
+      return res.rhythm_icon4
     case 4:
-      return BiologicalRes.rhythm_icon12
+      return res.rhythm_icon12
     case 5:
-      return BiologicalRes.rhythm_icon1
+      return res.rhythm_icon1
     case 6:
-      return BiologicalRes.rhythm_icon2
+      return res.rhythm_icon2
     case 7:
-      return BiologicalRes.rhythm_icon3
+      return res.rhythm_icon3
     default:
-      return BiologicalRes.rhythm_icon1
+      return res.rhythm_icon1
   }
 }
 

package/src/modules/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(),
@@ -222,7 +222,7 @@ export interface RemoteBiorhythmBean {
 interface RemoteBiorhythmPlan {
   iconId: any;
   name: string;
-  rhythmIcon: string;
+  rhythmicon: string;
   enable: boolean;
   startTime: string;
   sustain: number; // 持续时间涂鸦这边没有，直接用来存ID

package/src/modules/biorhythm/BiorhythmDetailPage.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'
@@ -172,7 +171,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>}
@@ -197,9 +196,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/modules/biorhythm/BiorhythmPage.tsx

@@ -22,7 +22,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 './BiorhythmDetailPage'
@@ -143,19 +142,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 }
     }
@@ -395,7 +394,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',
@@ -451,7 +450,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                             }
                             navigation.navigate(ui_biz_routerKey.group_ui_biz_biological_detail, 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>
                   </>
               }
@@ -517,7 +516,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/modules/biorhythm/IconSelect.tsx

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

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

@@ -238,7 +238,7 @@ export default class Progress extends Component<any> {
               key={item.id}
               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/modules/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/modules/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/modules/childLock/ChildLockPage.tsx

@@ -48,7 +48,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 }}>
         {I18n.getLang('childlock_overview_description_text')}
       </Text>

package/src/modules/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>
       }
@@ -236,13 +236,13 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
                       const color = {h: state.h, s: state.s * 10, v: state.v}
                       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={() => {
                       state.sceneInfo.nodes.splice(state.currentNode, 1)
                       state.currentNode = state.currentNode === state.sceneInfo.nodes.length ? 0 : 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/modules/diyScene/DiyScenePage.tsx

@@ -240,7 +240,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/modules/energyConsumption/EnergyConsumptionChart.tsx

@@ -12,12 +12,12 @@ import InfoText from "@ledvance/base/src/components/InfoText";
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { overDays } from "@ledvance/base/src/utils/index";
 import dayjs from "dayjs";
-import { DateType } from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/co2Data";
+import { DateType } from "./co2Data";
 import { useReactive, useUpdateEffect } from "ahooks";
-import DateTypeItem from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/component/DateTypeItem";
-import DateSelectedItem from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/component/DateSelectedItem";
-import NewBarChart from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/component/NewBarChart";
-import { exportEnergyCsv, getElectricity } from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/EnergyConsumptionActions";
+import DateTypeItem from "./component/DateTypeItem";
+import DateSelectedItem from "./component/DateSelectedItem";
+import NewBarChart from "./component/NewBarChart";
+import { exportEnergyCsv, getElectricity } from "./EnergyConsumptionActions";
 import DateSwitch from "./component/DateSwitch";
 
 const { convertX: cx } = Utils.RatioUtils
@@ -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/modules/energyConsumption/EnergyConsumptionDetail.tsx

@@ -243,7 +243,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 }}
                   />
@@ -258,9 +258,9 @@ 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.action }}
+                        style={{ height: cx(20), width: cx(20), tintColor: props.theme?.button.primary }}
                       />
                     </TouchableOpacity>
                   </View>
@@ -273,7 +273,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/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -384,7 +384,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),
@@ -407,7 +407,7 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
                         }}
                       >
                         <Image
-                          source={res.co2Icon}
+                          source={{ uri: res.co2_icon}}
                           resizeMode="contain"
                           style={{
                             height: cx(20),
@@ -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/modules/energyConsumption/component/DateSwitch.tsx

@@ -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/modules/energyConsumption/component/EnergyModal.tsx

@@ -204,7 +204,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>
@@ -271,7 +271,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/modules/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/modules/fixedTimeForPlug/FixedTimeForPlugDetailPage.tsx

@@ -243,7 +243,7 @@ const FixedTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
                       state.item.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>
             }
@@ -261,7 +261,7 @@ const FixedTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
                 }}
               >
                 <Text style={{color: props.theme?.global.fontColor}}>{item}</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>
             )
           })}
@@ -270,7 +270,7 @@ const FixedTimeForPlugDetailPage = (props: { theme?: ThemeType }) => {
         <View style={styles.cardContainer}>
           <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline4_text')}</Text>
           {!isTimeEffective && <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/modules/fixedTimeForPlug/FixedTimeForPlugPage.tsx

@@ -60,7 +60,8 @@ const FixedTimeForPlugPage = (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
         }
@@ -124,7 +125,7 @@ const FixedTimeForPlugPage = (props: { theme?: ThemeType}) => {
         <Text style={styles.execTip}>{I18n.getLang('timeschedule_overview_description_text')}</Text>
         <Spacer height={cx(10)}/>
         {isMaxNum && <View style={{marginHorizontal: cx(24), flexDirection: 'row'}}>
-            <Image style={styles.maxImg} source={res.ic_warning_amber}/>
+            <Image style={styles.maxImg} source={{uri: res.ic_warning_amber}}/>
             <Text style={styles.maxTip}>{I18n.getLang('randomtimecycle_warning_max_number_text')}</Text>
         </View>}
         <FlatList

package/src/modules/fixedTimeForPlug/Summary.tsx

@@ -74,7 +74,7 @@ const Summary = (props: SummaryProps) => {
         <View style={styles.summaryContainer}>
           <View style={styles.summaryLeft}>
             <Image
-              source={res.summary_icon1}
+              source={{ uri: res.summary_icon1}}
               resizeMode="contain"
               style={styles.summaryImg}
             />
@@ -91,7 +91,7 @@ const Summary = (props: SummaryProps) => {
         <View style={styles.summaryContainer}>
           <View style={styles.summaryLeft}>
             <Image
-              source={res.summary_icon2}
+              source={{ uri: res.summary_icon2}}
               resizeMode="contain"
               style={styles.summaryImg}
             />
@@ -108,7 +108,7 @@ const Summary = (props: SummaryProps) => {
         {!props.hideActions && <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}
                 />

package/src/modules/fixedTimingForLight/FixedTimingForLightDetailPage.tsx

@@ -276,7 +276,7 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
                       state.item.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>
             }
@@ -294,7 +294,7 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
                 }}
               >
                 <Text style={{color: props.theme?.global.fontColor}}>{item}</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>
             )
           })}
@@ -352,7 +352,7 @@ const FixedTimingForLightDetailPage = (props: { theme?: ThemeType }) => {
         <View style={styles.cardContainer}>
           <Text style={styles.itemTitle}>{I18n.getLang('timeschedule_add_schedule_subheadline4_text')}</Text>
           {!isTimeEffective && <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/modules/fixedTimingForLight/FixedTimingForLightPage.tsx

@@ -129,7 +129,7 @@ const FixedTimeForLightPage =  (props: { theme?: ThemeType}) => {
         <Text style={styles.execTip}>{I18n.getLang('timeschedule_overview_description_text')}</Text>
         <Spacer height={cx(10)}/>
         {isMaxNum && <View style={{marginHorizontal: cx(24), flexDirection: 'row'}}>
-            <Image style={styles.maxImg} source={res.ic_warning_amber}/>
+            <Image style={styles.maxImg} source={{uri: res.ic_warning_amber}}/>
             <Text style={styles.maxTip}>{I18n.getLang('fixedtimecycle_warning_max_number_text')}</Text>
         </View>}
         <FlatList