@ledvance/ui-biz-bundle 1.0.77 → 1.0.78

package/package.json

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

package/src/modules/music/MusicDataBean.ts

@@ -144,13 +144,13 @@ export type DreamMusicDataType = {
     {
       id: 4,
       mode: 0,
-      title: "Genre 5",
+      title: Strings.getLang('devicemusic_classical_text'),
       value: '0101020064320100006400006400786400f064003c6400b464012c64'
     },
     {
       id: 5,
       mode: 0,
-      title: "Genre 6",
+      title: Strings.getLang('devicemusic_techno_text'),
       value: '0101031064320100006400006400786400f064003c6400b464012c64000000'
     }
   ]

package/src/modules/scene/SceneAction.ts

@@ -272,8 +272,34 @@ export async function saveScene(
   return await setRemoteSceneList(deviceId, newScenes)
 }
 
+const getDefaultScene = () => {
+  return {
+    version: 0,
+    // 场景号
+    id: -1,
+    // 变化方式
+    mode: 0,
+    // 速度
+    speed: 0,
+    // 段落 0 全段, 1 分段
+    segmented: 0,
+    // 循环 0 不循环, 1 循环
+    loop: 0,
+    // 过渡 0 不过渡, 1 过渡
+    excessive: 0,
+    // 拓展 other
+    expand: 0,
+    // 方向 0 顺时针方向, 1 逆时针方向
+    direction: 0,
+    // 设置 目前灯用不上
+    reserved1: 0,
+    reserved2: 0,
+    nodes: []
+  }
+}
 
 export function stripDp2Obj(dp: string, isStringLight: boolean = false): StripSceneInfo {
+  if (!dp) return getDefaultScene()
   const version = hex2Int(dp.slice(0, 2))
   const id = hex2Int(dp.slice(2, 4))
   const mode = hex2Int(dp.slice(4, 6))

package/src/modules/scene/SceneInfo.ts

@@ -648,7 +648,7 @@ function getStripLightSceneList(): RemoteSceneInfo[] {
       e: false,
     },
     {
-      n: I18n.getLang('strip_lights_mood_text120'),
+      n: I18n.getLang('strip_lights_mood_text20'),
       i: '01501032320000006400e64700643c01194d00b839',
       s: '',
       t: 0,

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -478,7 +478,7 @@ const TimeScheduleEditPage = () => {
             minute={state.minute}
             setHour={v => (state.hour = v)}
             setMinute={v => (state.minute = v)}
-            unit={['h', 'min']}/>
+          />
           {/* week */}
           <LdvWeekView
             value={state.loop}

package/src/modules/timer/TimerPage.tsx

@@ -11,7 +11,7 @@ import Page from "@ledvance/base/src/components/Page";
 import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { Utils, Progress } from 'tuya-panel-kit'
 import { useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { useCountdowns, useProgress } from "./TimerPageAction";
+import { useProgress } from "./TimerPageAction";
 import { cloneDeep } from "lodash";
 import dayjs from "dayjs";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
@@ -39,13 +39,7 @@ const TimerPage = () => {
   const devInfo = useDeviceInfo()
   const navigation = useNavigation()
   const { dps } = useRoute<Props['route']>().params
-  const countdowns = useCountdowns(dps)
-  const cancelTimer = (dpId: string) => {
-    const countdown = countdowns.find(c => c.dpId === dpId)?.countdown
-    countdown && countdown[1](0)
-  }
-  const progress = useProgress(dps, cancelTimer)
-
+  const progress = useProgress(dps)
   const state = useReactive({
     hour: '00',
     minute: '01',
@@ -55,11 +49,11 @@ const TimerPage = () => {
 
 
   const hasNotRunningTimer = () => {
-    return !!countdowns.find(timer => timer.countdown[0] === 0)
+    return !!progress.find(p => p.progressHook.countdown === 0)
   }
 
   const runningTimer = () => {
-    return countdowns.filter(timer => timer.countdown[0] > 0)
+    return progress.filter(p => p.progressHook.countdown > 0)
   }
   
   const getProgressByDp = useCallback((dpId: string) => {
@@ -67,8 +61,8 @@ const TimerPage = () => {
   }, [progress])
 
   useEffect(() => {
-    if (countdowns.length > 1) {
-      state.skillList = countdowns.filter(c => c.countdown[0] === 0)
+    if (progress.length > 1) {
+      state.skillList = progress.filter(p => p.progressHook.countdown === 0)
     } else {
       state.skillList = []
       state.selectedSkill = cloneDeep(dps)
@@ -104,13 +98,11 @@ const TimerPage = () => {
     }
     if (!state.selectedSkill.length || mCountdown === 0) return
     for (let skill of state.selectedSkill) {
-      const timer = countdowns.find(timer => timer.dpId === skill.dpId)
-      await timer?.countdown[1](mCountdown)
       const time = dayjs()
         .add(Number(hour), 'h')
         .add(Number(minute), 'm')
         .format('YYYY-MM-DD HH:mm:ss');
-      await getProgressByDp(skill.dpId)[1](mCountdown, time)
+      await getProgressByDp(skill.dpId).startTimer(mCountdown, time)
     }
     state.selectedSkill = []
   }
@@ -138,7 +130,7 @@ const TimerPage = () => {
   }
 
   const showActiveView = () => {
-    return countdowns.length > 1
+    return progress.length > 1
   }
 
   const renderItem = ({ item }) => {
@@ -160,7 +152,7 @@ const TimerPage = () => {
         >
           {item.label}
         </Text>
-        {countdowns.length > 1 && <TouchableOpacity onPress={() => handelTimer(item, false)}>
+        {progress.length > 1 && <TouchableOpacity onPress={() => handelTimer(item, false)}>
           <Image style={{ width: cx(16), height: cx(16), marginRight: cx(5) }} source={res.ic_arrows_nav_clear} />
         </TouchableOpacity>}
       </View>
@@ -247,8 +239,7 @@ const TimerPage = () => {
                       <Text style={styles.activeTimerTitle}>{timer.label}</Text>
                       <TouchableOpacity
                         onPress={() => { 
-                          timer.countdown[1](0).then() 
-                          getProgressByDp(timer.dpId)[2]()
+                          getProgressByDp(timer.dpId).endTimer()
                         }}
                         style={styles.activeTimerCancelBtn}>
                         <Text style={{ color: '#fff', fontSize: cx(12) }}>{I18n.getLang('auto_scan_system_cancel')}</Text>
@@ -265,16 +256,16 @@ const TimerPage = () => {
                         }}
                         disabled={true}
                         minValue={0}
-                        maxValue={getProgressByDp(timer.dpId)[0]}
+                        maxValue={getProgressByDp(timer.dpId).progressNumber}
                         startDegree={270}
                         andDegree={360}
                         scaleHeight={2}
                         thumbStrokeWidth={2}
                         thumbRadius={0}
                       />
-                      <Text style={{ marginLeft: cx(20), fontSize: cx(22) }}>{getActiveTimeString(timer.countdown[0])}</Text>
+                      <Text style={{ marginLeft: cx(20), fontSize: cx(22) }}>{getActiveTimeString(timer.progressHook.countdown)}</Text>
                     </View>
-                    <Text>{I18n.formatValue(timer.enable[0] ? timer.stringOff : timer.stringOn, getSingleLightEndTimeString(timer.countdown[0]))}</Text>
+                    <Text>{I18n.formatValue(timer.enable ? timer.stringOff : timer.stringOn, getSingleLightEndTimeString(timer.progressHook.countdown))}</Text>
                   </Card>
                   <Spacer height={cx(40)} />
                 </View>
@@ -295,7 +286,7 @@ const TimerPage = () => {
                     alignItems: 'center',
                   }}
                   minValue={0}
-                  maxValue={getProgressByDp(runningTimer()[0].dpId)[0]}
+                  maxValue={getProgressByDp(runningTimer()[0].dpId).progressNumber}
                   startDegree={270}
                   andDegree={360}
                   disabled={true}
@@ -310,7 +301,7 @@ const TimerPage = () => {
                   renderCenterView={
                     <View style={{ position: 'absolute' }}>
                       <Text style={{ fontSize: cx(22), fontWeight: 'bold', color: '#666' }}>
-                        {getActiveTimeString(runningTimer()[0].countdown[0])}
+                        {getActiveTimeString(runningTimer()[0].progressHook.countdown)}
                       </Text>
                     </View>
                   }
@@ -320,7 +311,7 @@ const TimerPage = () => {
                     {I18n.formatValue(
                       runningTimer()[0].enable[0] ?
                         runningTimer()[0].stringOff :
-                        runningTimer()[0].stringOn, getSingleLightEndTimeString(runningTimer()[0].countdown[0])
+                        runningTimer()[0].stringOn, getSingleLightEndTimeString(runningTimer()[0].progressHook.countdown)
                     )}
                   </Text>
                 </View>
@@ -329,8 +320,7 @@ const TimerPage = () => {
                   style={{ paddingHorizontal: cx(15), width: 'auto', height: cx(40) }}
                   textStyle={{ fontSize: cx(14) }}
                   onPress={() => {
-                    runningTimer()[0].countdown[1](0).then()
-                    getProgressByDp(runningTimer()[0].dpId)[2]()
+                    getProgressByDp(runningTimer()[0].dpId).endTimer()
                   }}
                 />
               </View>

package/src/modules/timer/TimerPageAction.ts

@@ -1,10 +1,11 @@
+import { useCallback, useEffect, useState } from "react"
 import { useDeviceId, useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
 import { Result } from "@ledvance/base/src/models/modules/Result"
 import { dpItem } from "./TimerPage"
 import { useCountDown as useCountDownAHook, useUpdateEffect } from 'ahooks'
 import dayjs from "dayjs"
 import { NativeApi } from "@ledvance/base/src/api/native"
-import { useCallback, useEffect, useState } from "react"
+
 
 export const useCountdowns = (dps: dpItem[]) => {
   return dps.map(dp => {
@@ -16,20 +17,26 @@ export const useCountdowns = (dps: dpItem[]) => {
   })
 }
 
-
-const useFormateProgress: (dp: dpItem, func: Function) => [number, (time: number, t: any) => Promise<any>, () => void] = (dp, cancelTimer) => {
+type FormateProgressType = {
+  progressNumber: number 
+  countdown: number 
+  startTimer: (c: number, time: string) => Promise<void>
+  endTimer: () => void
+}
+const useFormateProgress: (dp: dpItem) => FormateProgressType = (dp) => {
+  const [countdown, setCountdown] = useDp<number, (value: number) => Promise<Result<any>>>(dp.dpId)
   const [progress, setProgress] = useCountDownAHook({
     interval: 1000,
     onEnd: () => {
-      cancelTimer(dp.dpId)
       initTimerFn()
+      setCountdown(0)
     },
   })
-  const [countdown] = useDp<number, (value: number) => Promise<Result<any>>>(dp.dpId)
   const devId = useDeviceId()
   const [cloudProgressNumber, setCloudProgressNumber] = useState(0)
   const [progressNumber, setProgressNumber] = useState(0)
   const [cloudData, setCloudData] = useState<any>()
+  const [isTrigger, setIsTeigger] = useState(false)
   const getCloudJson = () => {
     NativeApi.getJson(devId, dp.cloudKey).then(res => {
       if (res.success && res.data) {
@@ -41,7 +48,9 @@ const useFormateProgress: (dp: dpItem, func: Function) => [number, (time: number
     })
   }
   useEffect(() => {
-    getCloudJson()
+    if(countdown > 0){
+      getCloudJson()
+    }
   }, [])
 
   useEffect(() => {
@@ -54,19 +63,26 @@ const useFormateProgress: (dp: dpItem, func: Function) => [number, (time: number
     }
   }, [progress])
 
-  NativeApi.log(`${JSON.stringify(progress)}, progressss`)
+  useUpdateEffect(() =>{
+    if(countdown === 0){
+      setIsTeigger(false)
+      initTimerFn()
+    }
+  }, [countdown])
+
   useUpdateEffect(() => {
     if (countdown === 0) {
-      initTimerFn()
-      if(cloudData && cloudData.progressAllNumber !== 0){
+      if(isTrigger){
         NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 })).then()
       }
     }
 
-    if (countdown > 0 && !cloudData) {
+    if (countdown > 0 && !cloudData && !isTrigger) {
       getCloudJson()
     }
   }, [countdown, cloudData])
+
+
   
   const initTimerFn = useCallback(() =>{
     setProgressNumber(0)
@@ -80,24 +96,36 @@ const useFormateProgress: (dp: dpItem, func: Function) => [number, (time: number
     return key
   }
 
-  const startTimer = async (time: number, t) => {
-    await NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }))
+  const startTimer = async (time: number, t:string) => {
+    setIsTeigger(true)
+    await setCountdown(time)
+    const putData = { [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }
+    await NativeApi.putJson(devId, dp.cloudKey, JSON.stringify(putData))
     setCloudProgressNumber(time)
     setProgress(Date.now() + time * 1000)
+    setCloudData(putData)
   }
 
-  const endTimer = () =>{
+  const endTimer = async () =>{
+    setIsTeigger(false)
+    await setCountdown(0)
     NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 })).then(() => {
       initTimerFn()
     })
   }
   
-  return [progressNumber, startTimer, endTimer]
+  return {
+    progressNumber,
+    countdown,
+    startTimer,
+    endTimer
+  }
 }
 
-export const useProgress = (dps: dpItem[], cancelTimer) => {
+export const useProgress = (dps: dpItem[]) => {
   return dps.map(dp => ({
-    progressHook: useFormateProgress(dp, cancelTimer),
+    progressHook: useFormateProgress(dp),
+    enable: useDp(dp.enableDp)[0] as boolean,
     ...dp
   }))
 }