@ledvance/group-ui-biz-bundle 1.0.111 → 1.0.113

package/package.json

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

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

@@ -10,7 +10,7 @@ import { useReactive, useUpdateEffect } from "ahooks";
 import { cloneDeep } from "lodash";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
-const { convertX: cx, height } = Utils.RatioUtils
+const { convertX: cx, height, statusBarHeight } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export const UnitList = [
@@ -245,7 +245,7 @@ const EnergyModal = (props: EnergyModalProps) => {
           </View>
         ),
         wrapperStyle: {
-          height: height - cx(40),
+          height: height - statusBarHeight - cx(40),
           backgroundColor: props.theme?.global.background
         },
         footer: (<View style={{ backgroundColor: props.theme?.global.background}}></View>),
@@ -307,7 +307,7 @@ const EnergyModal = (props: EnergyModalProps) => {
             <Text style={{ color: props.theme?.button.primary, fontSize: cx(16) }}>{props.confirmText}</Text>
           </TouchableOpacity>
         </View>
-        <View style={{ height: height - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
+        <View style={{ height: height - statusBarHeight - cx(100), paddingHorizontal: cx(16), backgroundColor: props.theme?.global.background }}>
           {getContent()}
         </View>
       </ScrollView>

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
         }

package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx

@@ -60,7 +60,8 @@ const RandomTimeForPlugPage = (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
         }