@ledvance/ui-biz-bundle 1.1.133 → 1.1.134

package/src/newModules/powerOnBehavior/PlugBehaviorPage.tsx

@@ -1,16 +1,16 @@
-import React, { PropsWithChildren } from 'react'
-import { Image, ScrollView, StyleSheet, Text, TouchableOpacity, View, ViewProps } from 'react-native'
+import React from 'react'
+import {ScrollView, StyleSheet} from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
-import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useDeviceInfo} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import I18n from '@ledvance/base/src/i18n'
-import { PowerBehaviorPageParams, usePowerBehavior } from './PowerOnBehaviorActions'
-import { Utils } from 'tuya-panel-kit'
+import {PowerBehaviorPageParams, usePowerBehavior} from './PowerOnBehaviorActions'
+import {Utils} from 'tuya-panel-kit'
 import Spacer from '@ledvance/base/src/components/Spacer'
-import Card from '@ledvance/base/src/components/Card'
-import res from '@ledvance/base/src/res'
-import { useReactive, useUpdateEffect } from 'ahooks'
-import { useParams } from '@ledvance/base/src/hooks/Hooks'
-import ThemeType from '@ledvance/base/src/config/themeType'
+import OptionGroup from '@ledvance/base/src/components/OptionGroup'
+import {useReactive, useUpdateEffect} from 'ahooks'
+import {useParams} from '@ledvance/base/src/hooks/Hooks'
+import {cloneDeep} from "lodash";
+import Segmented from "@ledvance/base/src/components/Segmented";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -19,76 +19,25 @@ const RELAY_STATUS_OFF = 'off'
 const RELAY_STATUS_ON = 'on'
 const RELAY_STATUS_MEMORY = 'memory'
 
-const PlugBehaviorPage = (props: { theme?: ThemeType }) => {
+const PlugBehaviorPage = () => {
   const params = useParams<PowerBehaviorPageParams>()
   const deviceInfo = useDeviceInfo()
-  const [powerMemory, setPowerMemory] = usePowerBehavior(params.powerBehaviorCode)
+  const [powerMemories, setPowerMemories] = usePowerBehavior(params.powerBehaviorKeys)
 
   const state = useReactive({
-    powerMemory,
+    channel: 0,
+    powerMemories: powerMemories,
     loading: false,
   })
 
   useUpdateEffect(() => {
-    state.powerMemory = powerMemory
-  }, [powerMemory])
+    state.powerMemories = cloneDeep(powerMemories)
+  }, [JSON.stringify(powerMemories)])
 
   const styles = StyleSheet.create({
     root: {
       flex: 1,
     },
-    tipText: {
-      marginHorizontal: cx(24),
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    modeSelectGroup: {
-      marginHorizontal: cx(24),
-      backgroundColor: props.theme?.container.background,
-      borderRadius: cx(4),
-    },
-    modeTip: {
-      marginHorizontal: cx(8),
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontWeight: 'bold',
-      fontFamily: 'helvetica_neue_lt_std_bd',
-    },
-    modeSelectCard: {
-      marginHorizontal: cx(8),
-    },
-    line: {
-      height: cx(1),
-      marginHorizontal: cx(12),
-      backgroundColor: props.theme?.container.divider,
-    },
-    itemRoot: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingHorizontal: cx(12),
-      paddingBottom: cx(8),
-    },
-    itemTextGroup: {
-      flex: 1,
-      marginEnd: cx(12),
-      justifyContent: 'center',
-    },
-    itemTitle: {
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    itemContent: {
-      color: props.theme?.global.secondFontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_roman',
-    },
-    itemCheckedIcon: {
-      width: cx(32),
-      height: cx(32),
-      marginEnd: cx(4),
-    },
   })
 
   return (
@@ -97,84 +46,54 @@ const PlugBehaviorPage = (props: { theme?: ThemeType }) => {
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>
+        {params.powerBehaviorKeys.length > 1 && <>
+            <Spacer height={cx(16)} />
+            <Segmented
+                style={{ marginHorizontal: cx(24) }}
+                options={params.powerBehaviorKeys.map((_, index) => ({
+                  // @ts-ignore
+                  label: I18n.getLang(`switchmodule_switch${index + 1}title`),
+                  value: index
+                }))}
+                value={state.channel}
+                onChange={v => {
+                  state.channel = Number(v)
+                }}
+            />
+        </>}
         <Spacer />
-        <View style={styles.modeSelectGroup}>
-          <Spacer height={cx(8)} />
-          <Text style={styles.modeTip}>
-            {I18n.getLang('socket_settings_firstbox_topic')}
-          </Text>
-          <Spacer height={cx(8)} />
-          <Card style={styles.modeSelectCard}>
-            <Spacer height={cx(12)} />
-            <PowerOnBehaviorModeItem
-              styles={styles}
-              enable={state.powerMemory === RELAY_STATUS_OFF}
-              title={I18n.getLang('feature_summary_action_txt_2')}
-              content={I18n.getLang('socket_settings_firstbox_status1_description')}
-              onPress={async () => {
-                state.powerMemory = RELAY_STATUS_OFF
-                await setPowerMemory(state.powerMemory)
-              }} />
-            <View style={styles.line} />
-            <Spacer height={cx(8)} />
-            <PowerOnBehaviorModeItem
-              styles={styles}
-              enable={state.powerMemory === RELAY_STATUS_ON}
-              title={I18n.getLang('feature_summary_action_txt_1')}
-              content={I18n.getLang('socket_settings_firstbox_status2_description')}
-              onPress={async () => {
-                state.powerMemory = RELAY_STATUS_ON
-                await setPowerMemory(state.powerMemory)
-              }} />
-            <View style={styles.line} />
-            <Spacer height={cx(8)} />
-            <PowerOnBehaviorModeItem
-              styles={styles}
-              enable={state.powerMemory === RELAY_STATUS_MEMORY}
-              title={I18n.getLang('sockets_specific_settings_relay_status_remember')}
-              content={I18n.getLang('socket_settings_firstbox_status3_description')}
-              onPress={async () => {
-                state.powerMemory = RELAY_STATUS_MEMORY
-                await setPowerMemory(state.powerMemory)
-              }} />
-            <Spacer height={cx(4)} />
-          </Card>
-          <Spacer height={cx(8)} />
-        </View>
+        <OptionGroup
+          tips={I18n.getLang('socket_settings_firstbox_topic')}
+          selected={state.powerMemories[state.channel]}
+          options={[{
+            title: I18n.getLang('feature_summary_action_txt_2'),
+            content: I18n.getLang('socket_settings_firstbox_status1_description'),
+            value: RELAY_STATUS_OFF,
+            onPress: (value) => {
+              state.powerMemories[state.channel] = value
+              setPowerMemories[state.channel](value).then()
+            }
+          }, {
+            title: I18n.getLang('feature_summary_action_txt_1'),
+            content: I18n.getLang('socket_settings_firstbox_status2_description'),
+            value: RELAY_STATUS_ON,
+            onPress: (value) => {
+              state.powerMemories[state.channel] = value
+              setPowerMemories[state.channel](value).then()
+            }
+          }, {
+            title: I18n.getLang('sockets_specific_settings_relay_status_remember'),
+            content: I18n.getLang('socket_settings_firstbox_status3_description'),
+            value: RELAY_STATUS_MEMORY,
+            onPress: (value) => {
+              state.powerMemories[state.channel] = value
+              setPowerMemories[state.channel](value).then()
+            }
+          }]}
+        />
       </ScrollView>
     </Page>
   )
 }
 
-interface PowerOnBehaviorModeItemProps extends PropsWithChildren<ViewProps> {
-  onPress: () => void
-  title: string
-  content: string
-  enable: boolean
-  styles: StyleSheet.NamedStyles<any>
-}
-
-function PowerOnBehaviorModeItem(props: PowerOnBehaviorModeItemProps) {
-  const { styles } = props
-  return (
-    <TouchableOpacity onPress={props.onPress}>
-      <View style={styles.itemRoot}>
-        <View style={styles.itemTextGroup}>
-          <Text style={styles.itemTitle}>{props.title}</Text>
-          <Spacer height={cx(4)} />
-          <Text style={styles.itemContent}>{props.content}</Text>
-        </View>
-        <Image
-          source={{ uri: res.ic_check }}
-          style={[
-            styles.itemCheckedIcon,
-            {
-              display: props.enable ? 'flex' : 'none',
-            },
-          ]} />
-      </View>
-    </TouchableOpacity>
-  )
-}
-
 export default withTheme(PlugBehaviorPage)

package/src/newModules/powerOnBehavior/PowerOnBehaviorActions.ts

@@ -2,21 +2,29 @@ import { useState } from 'react';
 import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
 import { Result } from "@ledvance/base/src/models/modules/Result"
 import { Utils } from 'tuya-panel-kit';
-import { spliceByStep } from "@ledvance/base/src/utils/common";
+import {getGlobalParamsDp, spliceByStep} from "@ledvance/base/src/utils/common";
 import { useUpdateEffect } from 'ahooks';
 
 const { hexStringToNumber } = Utils.StringUtils;
 
 // plug
 export interface PowerBehaviorPageParams {
-  powerBehaviorCode: string 
+  powerBehaviorKeys: string[]
 }
 
 type PowerBehaviorType = 'off' | 'on' | 'memory'
 
-export const usePowerBehavior = (code: string): [PowerBehaviorType, (v: PowerBehaviorType) => Promise<Result<any>>] => {
-  return useDp(code)
-}
+export const usePowerBehavior = (keys: string[]): [PowerBehaviorType[], ((v: PowerBehaviorType) => Promise<Result<any>>)[]] => {
+  return keys.reduce(
+    (acc, key) => {
+      const [behavior, handler] = useDp<PowerBehaviorType, any>(getGlobalParamsDp(key));
+      acc[0].push(behavior);
+      acc[1].push(handler);
+      return acc;
+    },
+    [[], []] as [PowerBehaviorType[], ((v: PowerBehaviorType) => Promise<Result<any>>)[]]
+  );
+};
 
 
 // light source

package/src/newModules/sleepWakeUp/SleepWakeUpActions.ts

@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useDp, useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { getFeature, putFeature } from '@ledvance/base/src/api/native'
 import { hex2Int, spliceByStep } from '@ledvance/base/src/utils/common'
@@ -7,6 +7,7 @@ import { cloneDeep, padStart } from 'lodash'
 import { parseJSON, to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { Result } from '@ledvance/base/src/models/modules/Result'
 import I18n from '@ledvance/base/src/i18n'
+import { useUpdateEffect } from 'ahooks'
 const sleepPlanFeatureId = 'SleepPlan'
 const wakeUpPlanFeatureId = 'WakeUpPlan'
 
@@ -44,40 +45,69 @@ export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
   const devId = useDeviceId()
   const [wakeUp, setWakeUp]: [string, (wakeUp: string) => Promise<Result<any>>] = useDp(wakeUpDp)
   const [wakeUpList, setWakeUpList] = useState(wakeUpDp2Obj(wakeUp)?.nodes || [])
-  const [isComplete, setIsComplete] = useState(false)
-  useEffect(() => {
-    if(disableFeature) {
-      setIsComplete(true)
-      setWakeUpList(wakeUpDp2Obj(wakeUp)?.nodes || [])
-      return 
+  const isInternalUpdateRef = useRef(false)
+  const previousDpRef = useRef(wakeUp)
+
+  const getWakeUp = () => {
+    if (wakeUpTimerId) {
+      clearTimeout(wakeUpTimerId)
+      wakeUpTimerId = undefined
     }
     wakeUpTimerId = setTimeout(() => {
-      setIsComplete(false)
-      getFeature(devId, wakeUpPlanFeatureId).then(res => {
-        setIsComplete(true)
-        if (res.result) {
-          const nodes = wakeUpDp2Obj(wakeUp)?.nodes || []
-          const uiPlan = nodes.map((item, idx) => {
-            const plan = res.data[idx]
-            const dp = parseJSON(plan?.startTime)?.dp
-            const featureItem = (plan && dp) ? plan : res.data.find(p => parseJSON(p?.startTime)?.dp)?.includes(item.nodeHex)
-            return {
-              ...item,
-              id: idx,
-              name: featureItem ? featureItem?.name : `${I18n.getLang('sleepwakeschedule_field_3_Times_chips_text')} ${idx + 1}`
-            }
-          })
-          setWakeUpList(uiPlan || [])
-        }
-      })
-    }, 250)
+    getFeature(devId, wakeUpPlanFeatureId).then(res => {
+      if (res.result) {
+        const nodes = wakeUpDp2Obj(wakeUp)?.nodes || []
+        const uiPlan = nodes.map((item, idx) => {
+          const plan = res.data[idx]
+          const dp = parseJSON(plan?.startTime)?.dp
+          const featureItem = (plan && dp) ? plan : res.data.find(p => parseJSON(p?.startTime)?.dp)?.includes(item.nodeHex)
+          return {
+            ...item,
+            id: idx,
+            name: featureItem ? featureItem?.name : `${I18n.getLang('sleepwakeschedule_field_3_Times_chips_text')} ${idx + 1}`
+          }
+        })
+        setWakeUpList(uiPlan || [])
+      }
+    })
+    }, 150)
+  }
+
+  useEffect(() => {
+    if (disableFeature) {
+      return
+    }
+    if (wakeUp && wakeUp.length > 6) {
+      getWakeUp()
+    }
+    return () => {
+      if (wakeUpTimerId) {
+        clearTimeout(wakeUpTimerId)
+        wakeUpTimerId = undefined
+      }
+    }
+  }, [])
 
-    return () =>{
-      if(wakeUpTimerId) clearTimeout(wakeUpTimerId)
+  useUpdateEffect(() => {
+    if (isInternalUpdateRef.current || disableFeature) {
+      isInternalUpdateRef.current = false
+      if (isInternalUpdateRef.current) {
+        previousDpRef.current = wakeUp
+      }
+      if (disableFeature) {
+        setWakeUpList(wakeUpDp2Obj(wakeUp)?.nodes || [])
+      }
+      return
     }
+    if (wakeUp.toLocaleLowerCase() === previousDpRef.current?.toLocaleLowerCase()) {
+      return
+    }
+    previousDpRef.current = wakeUp
+    getWakeUp()
   }, [wakeUp])
 
   const setWakeUpFn = async (wakeUp: WakeUpUIItem[], pushFeature = true) => {
+    isInternalUpdateRef.current = true
     const featureData = wakeUp.map(item => {
       return {
         name: item.name,
@@ -86,7 +116,7 @@ export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
         })
       }
     })
-    const res = pushFeature ? await putFeature(devId, wakeUpPlanFeatureId, featureData || []) : {result: true}
+    const res = pushFeature ? await putFeature(devId, wakeUpPlanFeatureId, featureData || []) : { result: true }
     const wakeUpData = {
       version: 0,
       num: wakeUp.length,
@@ -98,11 +128,13 @@ export const useWakeUp: WakeUpType = (wakeUpDp, disableFeature) => {
         success: true
       }
     }
+    console.log('==== wakeUp running 444444====')
+    isInternalUpdateRef.current = false
     return {
       success: false
     }
   }
-  return [wakeUpList, setWakeUpFn, isComplete]
+  return [wakeUpList, setWakeUpFn]
 }
 
 
@@ -175,7 +207,7 @@ const wakeUpObj2Dp = (wakeUp: WakeUpData) => {
   return versionHex + numHex + nodeHex
 }
 
-export const wakeUpNode2Dp = (node: WakeUpItem) =>{
+export const wakeUpNode2Dp = (node: WakeUpItem) => {
   const enableHex = node.enable ? '01' : '00'
   const cloneWeek = cloneDeep(node.weeks)
   cloneWeek.pop()
@@ -203,40 +235,70 @@ export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
   const devId = useDeviceId()
   const [sleepMode, setSleepMode]: [string, (sleep: string) => Promise<Result<any>>] = useDp(sleepDp)
   const [sleepPlan, setSleepPlan] = useState(sleepDp2Obj(sleepMode)?.nodes || [])
-  const [isComplete, setIsComplete] = useState(false)
+  const isInternalUpdateRef = useRef(false)
+  const previousDpRef = useRef(sleepMode)
+
+  const getSleepPlan = () => {
+    if (sleepTimerId) {
+      clearTimeout(sleepTimerId)
+      sleepTimerId = undefined
+    }
+    sleepTimerId = setTimeout(() => {
+    getFeature(devId, sleepPlanFeatureId).then(res => {
+      if (res.result) {
+        const nodes = sleepDp2Obj(sleepMode)?.nodes || []
+        const uiPlan = nodes.map((item, idx) => {
+          const plan = res.data[idx]
+          const dp = parseJSON(plan?.startTime)?.dp
+          const featureItem = (plan && dp) ? plan : res.data.find(p => parseJSON(p?.startTime)?.dp)?.includes(item.nodeHex)
+          return {
+            ...item,
+            id: idx,
+            name: featureItem ? featureItem?.name : `${I18n.getLang('sleepwakeschedule_field_3_Times_chips2_text')} ${idx + 1}`
+          }
+        })
+        setSleepPlan(uiPlan || [])
+      }
+    })
+    }, 150)
+  }
+
   useEffect(() => {
-    if(disableFeature) {
-      setIsComplete(true)
+    if (disableFeature) {
       setSleepPlan(sleepDp2Obj(sleepMode)?.nodes || [])
-      return 
+      return
+    }
+    if (sleepMode && sleepMode.length > 6) {
+      getSleepPlan()
+    }
+    return () => {
+      if (sleepTimerId) {
+        clearTimeout(sleepTimerId)
+        sleepTimerId = undefined
+      }
     }
-    sleepTimerId = setTimeout(() =>{
-      setIsComplete(false)
-      getFeature(devId, sleepPlanFeatureId).then(res => {
-        setIsComplete(true)
-        if (res.result) {
-          const nodes = sleepDp2Obj(sleepMode)?.nodes || []
-          const uiPlan = nodes.map((item, idx) => {
-            const plan = res.data[idx]
-            const dp = parseJSON(plan?.startTime)?.dp
-            const featureItem = (plan && dp) ? plan : res.data.find(p => parseJSON(p?.startTime)?.dp)?.includes(item.nodeHex)
-            return {
-              ...item,
-              id: idx,
-              name: featureItem ? featureItem?.name : `${I18n.getLang('sleepwakeschedule_field_3_Times_chips2_text')} ${idx + 1}`
-            }
-          })
-          setSleepPlan(uiPlan || [])
-        }
-      })
-    }, 250)
+  }, [])
 
-    return () =>{
-      if(sleepTimerId) clearTimeout(sleepTimerId)
+  useUpdateEffect(() => {
+    if (isInternalUpdateRef.current || disableFeature) {
+      isInternalUpdateRef.current = false
+      if (isInternalUpdateRef.current) {
+        previousDpRef.current = sleepMode
+      }
+      if (disableFeature) {
+        setSleepPlan(sleepDp2Obj(sleepMode)?.nodes || [])
+      }
+      return
+    }
+    if (sleepMode.toLocaleLowerCase() === previousDpRef.current?.toLocaleLowerCase()) {
+      return
     }
+    previousDpRef.current = sleepMode
+    getSleepPlan()
   }, [sleepMode])
 
   const setSleepPlanFn = async (sleep: SleepUIItem[], pushFeature = true) => {
+    isInternalUpdateRef.current = true
     const featureData = sleep.map(item => {
       return {
         name: item.name,
@@ -245,7 +307,7 @@ export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
         })
       }
     })
-    const res = pushFeature ? await putFeature(devId, sleepPlanFeatureId, featureData || []) : {result: true}
+    const res = pushFeature ? await putFeature(devId, sleepPlanFeatureId, featureData || []) : { result: true }
     const sleepData = {
       version: 0,
       num: sleep.length,
@@ -257,11 +319,12 @@ export const useSleepMode: SleepModeType = (sleepDp, disableFeature) => {
         success: true
       }
     }
+    isInternalUpdateRef.current = false
     return {
       success: false
     }
   }
-  return [sleepPlan, setSleepPlanFn, isComplete]
+  return [sleepPlan, setSleepPlanFn]
 }
 
 export const sleepDp2Obj = (dp: string): SleepData | undefined => {

package/src/newModules/sleepWakeUp/SleepWakeUpPage.tsx

@@ -49,8 +49,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
   const navigation = useNavigation()
   const is24HourClock = useSystemTimeFormate()
   const params = useParams<SleepWakeUpPageRouteParams>()
-  const [wakeUpList, setWakeUpList, wakeupComplete] = useWakeUp(params.wakeUpDpCode)
-  const [sleepList, setSleepList, sleepComplete] = useSleepMode(params.sleepDpCode)
+  const [wakeUpList, setWakeUpList] = useWakeUp(params.wakeUpDpCode)
+  const [sleepList, setSleepList] = useSleepMode(params.sleepDpCode)
   const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
   const state = useReactive({
     showAddSchedulePopover: false,
@@ -60,7 +60,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     wakeUpScheduleList: cloneDeep(wakeUpList),
     filteredScheduleList: [] as any[],
     flag: Symbol(),
-    loading: true
+    loading: false
   })
 
   const isMaxNum = useMemo(() => {
@@ -75,9 +75,6 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     state.wakeUpScheduleList = cloneDeep(wakeUpList)
   }, [JSON.stringify(wakeUpList)])
 
-  useUpdateEffect(() => {
-    state.loading = !wakeupComplete && !sleepComplete
-  }, [wakeupComplete, sleepComplete])
 
   const onAddScheduleDialogItemClick = (isSleep: boolean, mode: 'add' | 'edit', scheduleItem?: any) => {
     if (mode === 'add' && isSleep && state.sleepScheduleList.length === MAX_SCHEDULE) return
@@ -118,8 +115,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
     if ((mode === 'edit' && sleepWakeUp.enable) || mode === 'add') {
       let sleepConflict = false
       let wakeUpConflict = false
-      const cloneSleepPlan = isSleep ? cloneSleepWakeUp : cloneDeep(sleepList)
-      const cloneWakeUpPlan = isSleep ? cloneDeep(wakeUpList) : cloneSleepWakeUp
+      const cloneSleepPlan = isSleep ? cloneSleepWakeUp : cloneDeep(state.sleepScheduleList)
+      const cloneWakeUpPlan = isSleep ? cloneDeep(state.wakeUpScheduleList) : cloneSleepWakeUp
       const currentSleepWakeUp = {
         ...sleepWakeUp,
         startTime: getStartTime(sleepWakeUp),
@@ -131,7 +128,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
         if (!itself && item.enable && isConflictTask({
           ...item,
           startTime: getStartTime(item),
-          endTime: getEndTime(item)
+          endTime: getEndTime(item),
+          channel: 1
         }, currentSleepWakeUp)){
           sleepConflict = true
           item.enable = false
@@ -144,7 +142,8 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
         if (!itself && item.enable && isConflictTask({
           ...item,
           startTime: getStartTime(item),
-          endTime: getEndTime(item)
+          endTime: getEndTime(item),
+          channel: 1
         }, currentSleepWakeUp)){
           wakeUpConflict = true
           item.enable = false
@@ -153,6 +152,7 @@ const SleepWakeUpPage = (props: { theme?: ThemeType }) => {
         return item
       })
       const isConflict = checkConflict(currentSleepWakeUp) || sleepConflict || wakeUpConflict
+
       if (isConflict) {
         return new Promise((resolve) => {
           showDialog({

package/src/newModules/biorhythm/circular/ItemIcon.d.ts

@@ -1,22 +0,0 @@
-import { PureComponent } from "react";
-import { PanResponderInstance } from "react-native";
-export default class ItemIcon extends PureComponent<any> {
-    lastX: any;
-    lastY: any;
-    _panResponder: PanResponderInstance;
-    state: any;
-    constructor(props: any);
-    componentWillMount(): void;
-    onMoveShouldSetPanResponder(): boolean;
-    onPanResponderMove(evt: any, gestureState: any): void;
-    onPanResponderEnd(evt: any, gestureState: any): void;
-    handlerData(_evt: any, ges: any, moving: any): void;
-    getPointValues(locationX: any, locationY: any): {
-        angle: number;
-        maxX: number;
-        maxY: number;
-        length: number;
-    };
-    getPointAngle(x: any, y: any): number;
-    render(): any;
-}