@ledvance/ui-biz-bundle 1.1.121 → 1.1.123

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.121",
+  "version": "1.1.123",
   "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/timer/TimerPage.tsx

@@ -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,

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

@@ -12,7 +12,7 @@ import ThemeType from '@ledvance/base/src/config/themeType'
 import dayjs from "dayjs";
 import {EnergyHistory} from "../EnergyConsumptionActions";
 
-const { convertX: cx, height } = Utils.RatioUtils
+const { convertX: cx, height, statusBarHeight } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export const UnitList = [
@@ -264,7 +264,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>),
@@ -326,7 +326,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/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/MoodActions.ts

@@ -98,8 +98,8 @@ export const getRemoteMoodList = async (
 ) => {
   const isFeature = !(option.isCeilingLight || option.isStringLight || option.isStripLight);
   const moodFeatureId = isFeature ? (option.isMixLight ? MixLightSceneListFeatureId : SceneFeatureId) : (option.isCeilingLight ? SceneFeatureId : featureId)
+  const defScene = getDefMoodList(option)
   if (isRefresh){
-    const defScene = getDefMoodList(option)
     const res = await setRemoteMoodList(devId, isFeature, defScene, featureId)
     if (res.success){
       return {
@@ -117,7 +117,7 @@ export const getRemoteMoodList = async (
       const result = await setRemoteMoodList(
         devId,
         isFeature,
-        getDefMoodList(option),
+        defScene,
         moodFeatureId
       );
       if (!result.success) {
@@ -125,7 +125,7 @@ export const getRemoteMoodList = async (
       }
       return {
         success: true,
-        data: result.data.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
+        data: defScene.map((item, index) => remoteMoodInfo2MoodUIState(item, index, option)),
       };
     }
     return {
@@ -144,12 +144,11 @@ export const getRemoteMoodList = async (
       };
     } else {
       if (res.msg?.includes('资源未找到') || !isNormalData) {
-        const defaultScene = getDefMoodList(option);
-        const res = await setRemoteMoodList(devId, isFeature, defaultScene, moodFeatureId);
+        const res = await setRemoteMoodList(devId, isFeature, defScene, moodFeatureId);
         if (res.success) {
           return {
             success: true,
-            data: defaultScene.map((item, index) =>
+            data: defScene.map((item, index) =>
               remoteMoodInfo2MoodUIState(item, index, option)
             ),
           };

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 
         }