@ledvance/ui-biz-bundle 1.1.105 → 1.1.107

package/package.json

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

package/src/hooks/DeviceDpStateHooks.ts

@@ -1,6 +1,13 @@
 import {NativeApi} from '@ledvance/base/src/api/native'
 import {useDp} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {Result} from '@ledvance/base/src/models/modules/Result'
+import { useRandomTime } from '../newModules/randomTime/RandomTimeActions'
+import { useBiorhythm } from '../newModules/biorhythm/BiorhythmActions'
+import { useFixedTime } from '../newModules/fixedTime/FixedTimeActions'
+import { getEndTime, getStartTime, useSleepMode, useWakeUp } from '../newModules/sleepWakeUp/SleepWakeUpActions'
+import { isConflictTask } from '@ledvance/base/src/utils/common'
+import { isEmpty } from 'lodash'
+import { useReactive } from 'ahooks'
 
 export const WHITE = 'white'
 export const COLOUR = 'colour'
@@ -48,4 +55,153 @@ export const setMixSceneDp = (deviceId: string, value: string, dpCodes: Record<s
 
 export const useWorkMode = (workModeDpCode: string): [string, (mode: string) => Promise<Result<any>>] => {
   return useDp(workModeDpCode)
+}
+
+interface ConflictDps {
+  fixedTimeDpCode?: string
+  randomTimeDpCode?: string 
+  biorhythmDpCode?: string
+  sleepDpCode?: string
+  wakeUpDpCode?: string
+}
+
+interface ConflictItem {
+  startTime: number 
+  endTime: number 
+  weeks: number[]
+  enable: boolean
+}
+
+export const useConflictTask = (conflictDps: ConflictDps): [(v: ConflictItem) => boolean, () => void] => {
+  const [biorhythm, setBiorhythm] = useBiorhythm(conflictDps.biorhythmDpCode!, true)
+  const [fixedTime, setFixedTime] = useFixedTime(conflictDps.fixedTimeDpCode!, false, true)
+  const [randomTime, setRandomTime] = useRandomTime(conflictDps.randomTimeDpCode!, false, true)
+  const [sleepPlan, setSleepPlan] = useSleepMode(conflictDps.sleepDpCode!, true)
+  const [wakeUpPlan, setWakeUpPlan] = useWakeUp(conflictDps.wakeUpDpCode!, true)
+  const state = useReactive({
+    conflictTask: {}
+  })
+  const checkConflict = (conflictItem: ConflictItem) => {
+    state.conflictTask = {}
+    if (conflictDps.biorhythmDpCode && biorhythm.enable){
+      const biorhythmTask = {
+        startTime: 0,
+        endTime: 1440,
+        weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0)
+      }
+      if (isConflictTask(conflictItem, biorhythmTask)){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.biorhythmDpCode]: {
+            ...biorhythm,
+            enable: false 
+          }
+        }
+      }
+    }
+    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){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.fixedTimeDpCode]: newFixedTime
+        }
+      }
+    }
+    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){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.randomTimeDpCode]: newRandomTime
+        }
+      }
+    }
+    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){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.sleepDpCode]: newSleepPlan
+        }
+      }
+    }
+    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){
+        state.conflictTask = {
+          ...state.conflictTask,
+          [conflictDps.wakeUpDpCode]: newWakeUpPlan
+        }
+      }
+    }
+    return !isEmpty(state.conflictTask)
+  }
+
+  const resolveConfict = () => {
+    if (conflictDps.biorhythmDpCode && state.conflictTask[conflictDps.biorhythmDpCode]){
+      setBiorhythm(state.conflictTask[conflictDps.biorhythmDpCode], false).then()
+    }
+    if (conflictDps.fixedTimeDpCode && state.conflictTask[conflictDps.fixedTimeDpCode]){
+      setFixedTime(state.conflictTask[conflictDps.fixedTimeDpCode], false).then()
+    }
+    if (conflictDps.randomTimeDpCode && state.conflictTask[conflictDps.randomTimeDpCode]){
+      setRandomTime(state.conflictTask[conflictDps.randomTimeDpCode], false).then()
+    }
+    if (conflictDps.sleepDpCode && state.conflictTask[conflictDps.sleepDpCode]){
+      setSleepPlan(state.conflictTask[conflictDps.sleepDpCode], false).then()
+    }
+    if (conflictDps.wakeUpDpCode && state.conflictTask[conflictDps.wakeUpDpCode]){
+      setWakeUpPlan(state.conflictTask[conflictDps.wakeUpDpCode], false).then()
+    }
+  }
+  return [checkConflict, resolveConfict]
 }

package/src/modules/flags/FlagActions.ts

@@ -9,6 +9,7 @@ import { useMemo, useState } from "react";
 import { useUpdateEffect } from "ahooks";
 import { NativeApi } from "@ledvance/base/src/api/native";
 import { stripDp2Obj } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneAction";
+import { cloneDeep } from "lodash";
 
 export interface ExtraParams extends FlagPageProps, FlagOption {
 }
@@ -71,7 +72,9 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
       }
       return setDps(extraDps)
     } else {
-      const hex = obj2Dp(flagItem, extra)
+      const cloneFlagItem = cloneDeep(flagItem)
+      cloneFlagItem.colors = cloneFlagItem.colors.reverse()
+      const hex = obj2Dp(cloneFlagItem, extra)
       const newHex = extra.isSolarLight ? ('01'+hex.substring(2)) : hex
       return setDps({ [flagCode]: newHex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
     }

package/src/modules/flags/FlagPage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
-import { useDeviceId, useDeviceInfo, useFlagMode, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceId, useDeviceInfo, useFlagMode, useFlags } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlatList, Image, TouchableOpacity, View } from "react-native";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { Utils } from "tuya-panel-kit";
@@ -22,8 +22,6 @@ import TextField from "@ledvance/base/src/components/TextField";
 import { showDialog } from "@ledvance/base/src/utils/common";
 import { defFlagHash, fnv1aHash } from "./FlagHash";
 import { NativeApi } from "@ledvance/base/src/api/native";
-import { useSceneStatusId } from "@ledvance/ui-biz-bundle/src/newModules/mood/MoodActions";
-import { SceneStatusType } from "@ledvance/base/src/utils/interface";
 import ThemeType from '@ledvance/base/src/config/themeType'
 
 const cx = Utils.RatioUtils.convertX
@@ -61,7 +59,6 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   const devId = useDeviceId()
   const navigation = useNavigation()
   const [dps, setDps] = useDps()
-  const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
   const [flagMode, setFlagMode] = useFlagMode()
   const [flagState, setFlag] = useFlag(((params.isStripLight || params.isCeilingLight) ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
@@ -70,14 +67,10 @@ const FlagPage = (props: { theme?: ThemeType }) => {
     isCeilingLight: params.isCeilingLight,
     ...params
   })
-  const [sceneStatusId, setSceneStatusId] = useSceneStatusId({
-    isSupportSceneStatus: params.isSupportSceneStatus,
-    sceneStatusType: SceneStatusType.Flag
-  });
   const state = useReactive({
     loading: false,
     flags: cloneDeep(flags) as FlagUiInfo[],
-    moods: params.isStripLight ? [] : cloneDeep(moods),
+    filterFlags: cloneDeep(flags) as FlagUiInfo[],
     searchText: ''
   })
   const flagId = useMemo(() => {
@@ -97,30 +90,12 @@ const FlagPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     if (!devInfo.devId) return
-    if (!flags?.length) {
-      getRemoteFlagInfo().then()
-    }
-    if (params.getRemoteMoodList && !moods?.length) {
-      params.getRemoteMoodList(devInfo.devId).then(res => {
-        if (res.success && Array.isArray(res.data)) {
-          state.moods = res.data
-          setMoods(cloneDeep(res.data))
-        }
-      })
-    }
+    getRemoteFlagInfo().then()
   }, [devInfo.devId])
 
   useUpdateEffect(() => {
-    state.moods = params.isStripLight ? [] : cloneDeep(moods)
-  }, [JSON.stringify(moods)])
-
-  useUpdateEffect(() => {
-    state.flags = cloneDeep(flags)
-  }, [JSON.stringify(flags)])
-
-  useUpdateEffect(() => {
-    state.flags = state.searchText !== '' ? cloneDeep(flags).filter(flag => (flag.name ?? '').toLowerCase().includes(state.searchText.toLowerCase())) : cloneDeep(flags)
-  }, [state.searchText, flags])
+    state.filterFlags = state.searchText !== '' ? cloneDeep(state.flags).filter(flag => (flag.name ?? '').toLowerCase().includes(state.searchText.toLowerCase())) : cloneDeep(state.flags)
+  }, [state.searchText, state.flags])
 
   const getRemoteFlagInfo = async (isRefresh?: boolean) => {
     const res = await getRemoteFlag(devInfo.devId, isRefresh)
@@ -169,13 +144,12 @@ const FlagPage = (props: { theme?: ThemeType }) => {
       setFlags(cloneDeep(newScene))
       state.flags = cloneDeep(newScene)
       if (mood) {
-        if (mode === 'del' && (!flagMode?.flagMode || currentMood.id !== flagId || !dps[params.switchLedCode])) {
+        if (mode === 'del' && (!flagMode?.flagMode || (params.isSolarLight ? (flagMode?.flagId !== currentMood.id) : currentMood.id !== flagId) || !dps[params.switchLedCode])) {
           return {
             success: true
           }
         }
         updateFlagMode(true, mood)
-        setSceneStatusId(mood.id).then()
         return setFlag(mood)
       } else {
         updateFlagMode(false)
@@ -199,12 +173,10 @@ const FlagPage = (props: { theme?: ThemeType }) => {
   }
 
   const getItemEnable = useCallback((flagItem: FlagUiInfo) =>{
-    if (params.isSupportSceneStatus && sceneStatusId !== -1){
-      return flagMode?.flagMode && sceneStatusId === flagItem.id && dps[params.workModeCode] === WORK_MODE.SCENE && dps[params.switchLedCode]
-    }else{
-      return flagMode?.flagMode && dps[params.workModeCode] === (params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === flagItem.id && dps[params.switchLedCode]
-    }
-  }, [params.isSupportSceneStatus, sceneStatusId, dps[params.workModeCode], dps[params.switchLedCode], flagId, flagMode?.flagMode])
+    const workMode = params.isCeilingLight ? WORK_MODE.WHITE : params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE
+    const idEnable = params.isSolarLight ? (flagMode?.flagId === flagItem.id) : (flagId === flagItem.id)
+    return flagMode?.flagMode && dps[params.workModeCode] === workMode && idEnable && dps[params.switchLedCode]
+  }, [dps[params.workModeCode], dps[params.switchLedCode], flagId, JSON.stringify(flagMode)])
 
   return (
     <Page
@@ -214,8 +186,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
       loading={state.loading}
       onHeadlineIconClick={() => {
         const useIds = map([
-          ...state.flags,
-          ...state.moods
+          ...state.flags
         ], 'id')
         const idRange = range(0, 256)
         const unuseId = last(difference(idRange, useIds))
@@ -252,7 +223,7 @@ const FlagPage = (props: { theme?: ThemeType }) => {
         </TouchableOpacity>
       </View>
       <FlatList
-        data={state.flags}
+        data={state.filterFlags}
         renderItem={({ item }) => <FlagItem
           enable={getItemEnable(item)}
           title={item.name}
@@ -262,7 +233,6 @@ const FlagPage = (props: { theme?: ThemeType }) => {
             if (enable) {
               state.loading = true
               await setFlag(item)
-              await setSceneStatusId(item.id)
               const flagHash = fnv1aHash(JSON.stringify(item.colors))
               if (defFlagHash[flagHash]) {
                 NativeApi.putFlagFirebase({

package/src/modules/music/MusicPage.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect } from 'react'
 import { StyleSheet, View, Text, Image } from 'react-native'
 import { useRoute, useNavigation } from '@react-navigation/core'
 import Page from '@ledvance/base/src/components/Page'
-import { useDeviceId, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceId, useDeviceInfo, useDps } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import Strings from '@ledvance/base/src/i18n'
 import Img from './res'
 import { useEnable, useWorkMode, useMixRgbcw, useMixScene, useMusicData, useDreamMusic, DreamLightMicMusicData, getRemoteDreamMusic, DreamLightMicMusicUIState, saveRemoteDreamMusic } from './MusicPageActions'
@@ -17,7 +17,7 @@ import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
 import { SelectPageParams } from '../select/SelectPage'
 import { ui_biz_routerKey } from '../../navigation/Routers'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, isEmpty } from 'lodash'
 import ThemeType from '@ledvance/base/src/config/themeType'
 import { WorkMode } from '@ledvance/base/src/utils/interface'
 
@@ -45,6 +45,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   const [, setMusicData] = useMusicData(params.music_data)
   const [dreamMusic, setDreamMusic] = params.dreamMusicDp ? useDreamMusic(params.dreamMusicDp) : []
   const [switchLed, setSwitchLed] = useEnable(params.switch_led)
+  const [, setDps] = useDps()
 
   const state = useReactive({
     musicEnable: false,
@@ -112,8 +113,12 @@ const MusicPage = (props: { theme?: ThemeType }) => {
         power: true
       }, extraDp).then()
     } else {
-      if (workMode !== 'music') await setWorkMode(WorkMode.Music)
-      if (!switchLed) setSwitchLed(true)
+      const dps = {}
+      if (workMode !== 'music') dps[params.work_mode] = WorkMode.Music
+      if (!switchLed) dps[params.switch_led] = true 
+      if (!isEmpty(dps)){
+        await setDps(dps)
+      }
       await MusicManager.open(
         musicDefalutDatasource[state.phoneGenreMode],
         () => { },
@@ -184,11 +189,12 @@ const MusicPage = (props: { theme?: ThemeType }) => {
   }
 
   const getSelect = async () => {
+    state.musicEnable = workMode === 'music' && !!switchLed
+    if (!state.musicEnable) return 
     const res: any = await NativeApi.getJson(deviceId, 'musicSelect')
     const type = res?.data ? (JSON.parse(res?.data)?.type || 0) : 0
     state.musicType = res?.data ? JSON.parse(res?.data)?.musicType : params.dreamMusicDp ? 0 : 1
     state.phoneGenreMode = musicDefalutDatasource[type]?.id
-    state.musicEnable = workMode === 'music' && !!switchLed
     if (type !== '' && state.musicType === 1 && state.musicEnable) {
       openMusic()
     }
@@ -216,7 +222,7 @@ const MusicPage = (props: { theme?: ThemeType }) => {
 
   useEffect(() => {
     getSelect().then()
-  }, [workMode])
+  }, [workMode, switchLed])
 
   const getSelectModeData = useCallback((): [string | undefined, any[]] => {
     const genreModeData = params.dreamMusicDp && state.musicType === 0 ? state.musicModeData : musicDefalutDatasource
@@ -270,8 +276,8 @@ const MusicPage = (props: { theme?: ThemeType }) => {
                 confirmText: Strings.getLang('cancel_dialog_delete_item_sleepschedule_answer_yes_text'),
                 onConfirm: async (_, { close }) => {
                   close()
-                  state.musicEnable = v
                   await openMusic()
+                  state.musicEnable = v
                 },
               })
             } else {

package/src/modules/timer/TimerPage.tsx

@@ -65,7 +65,10 @@ const TimerPage = (props: {theme?: ThemeType}) => {
 
   useEffect(() => {
     if (progress.length > 1) {
-      state.skillList = progress.filter(p => p.progressHook.countdown === 0)
+      const runSkill = progress.filter(p => p.progressHook.countdown > 0)
+      const skill = progress.filter(p => p.progressHook.countdown === 0)
+      state.selectedSkill = state.selectedSkill.filter(item => runSkill.find(r => r.dpId !== item.dpId))
+      state.skillList = skill.filter(item => !state.selectedSkill.find(s => s.dpId === item.dpId))
     } else {
       state.skillList = []
       state.selectedSkill = cloneDeep(dps)

package/src/modules/timer/TimerPageAction.ts

@@ -29,7 +29,6 @@ const useFormateProgress: (dp: dpItem) => FormateProgressType = (dp) => {
     interval: 1000,
     onEnd: () => {
       initTimerFn()
-      setCountdown(0)
     },
   })
   const devId = useDeviceId()

package/src/navigation/Routers.ts

@@ -44,5 +44,7 @@ export const ui_biz_routerKey = {
   'ui_biz_overcharge_switch': 'ui_biz_overcharge_switch',
   'ui_biz_child_lock': 'ui_biz_child_lock',
   'ui_biz_remote_control': 'ui_biz_remote_control',
-  'ui_biz_switch_gradient': 'ui_biz_switch_gradient'
+  'ui_biz_switch_gradient': 'ui_biz_switch_gradient',
+  'ui_biz_diy_scene_page': 'ui_biz_diy_scene_page',
+  'ui_biz_diy_scene_edit_page': 'ui_biz_diy_scene_edit_page',
 }

package/src/newModules/biorhythm/BiorhythmBean.ts

@@ -91,7 +91,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         index: 1,
         icon: icon12,
-        time: 420,
+        time: 390,
         name: I18n.getLang('bio_ryhthm_default_field_text2'),
         colorTemperature: 25,
         brightness: 20,

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -9,7 +9,7 @@ import {
   getDefBiorhythmUIState,
   Plan,
 } from './BiorhythmBean'
-import { Modal, Utils } from 'tuya-panel-kit'
+import { Dialog, Modal, Utils } from 'tuya-panel-kit'
 import { cloneDeep, sortBy } from 'lodash'
 import iconList from './iconListData'
 import pIdList from './pIdList'
@@ -33,6 +33,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import { useConflictTask } from 'hooks/DeviceDpStateHooks'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -67,9 +68,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const { productId } = deviceInfo
   const is24Hour = useSystemTimeFormate()
   const devicesJudge = pIdList.some(val => val === productId)
-  // const [sleepList, setSleepList] = useSleepPlan({ sleep_mode: params.sleepPlanDp })
-  // const [wakeUpList, setWakeUpList] = useWakeUpPlan({ wakeup_mode: params.wakeUpPlanDp })
-  // const sleepWakeUpStatus = [...sleepList, ...wakeUpList].some(ele => ele.enable)
+  const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
+
   const state = useReactive<UIState>({
     ...biorhythm,
     showGradientTypeSelectModal: false,
@@ -269,6 +269,29 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
           thumbColor={props.theme?.icon.primary}
           trackColor={{ false: '#00000026', true: '#ff660036' }}
           onValueChange={async enable => {
+            const biorhythmTask = {
+              startTime: 0,
+              endTime: 1440,
+              weeks: biorhythm.repeatPeriod.map(item => item.enabled ? 1 : 0),
+              enable: biorhythm.enable
+            }
+            if (enable && checkConflict(biorhythmTask)) {
+              return showCommonDialog({
+                method: 'confirm',
+                title: I18n.getLang('conflict_dialog_active_item_bio_rhythm_titel'),
+                subTitle: I18n.getLang('conflict_dialog_active_item_bio_rhythm_description'),
+                onConfirm: (_, { close }) => {
+                  resolveConflict()
+                  close()
+                  state.loading = true
+                  state.enable = enable
+                  requestSetBiorhythm(false)
+                },
+                onCancel: () => {
+                  Dialog.close()
+                }
+              })
+            }
             state.loading = true
             state.enable = enable
             requestSetBiorhythm(false)