@ledvance/ui-biz-bundle 1.0.50 → 1.0.52

package/package.json

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

package/src/modules/sleepWakeup/SleepWakeUpDetailPage.tsx

@@ -10,13 +10,13 @@ import TextField from "@ledvance/base/src/components/TextField";
 import LdvTopName from "@ledvance/base/src/components/ldvTopName";
 import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
 import LdvWeekView from '@ledvance/base/src/components/weekSelect'
-import { loopText, toFixed } from "@ledvance/base/src/utils/common";
+import { loopText, showDialog, toFixed } from "@ledvance/base/src/utils/common";
 import DeviceState from "./DeviceState";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
 import { SleepWakeUpPageRouteParams } from "./SleepWakeUpPage";
 import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";
-import { cloneDeep } from "lodash";
+import { cloneDeep, isEqual } from "lodash";
 import dayjs from "dayjs";
 
 const { convertX: cx } = Utils.RatioUtils;
@@ -76,6 +76,7 @@ const SleepWakeUpDetailPage = () => {
 
   useEffect(() => {
     if (props.mode === 'edit' && scheduleItem) {
+      console.log(scheduleItem, '< -- scheduleItem')
       state.hour = scheduleItem.time[0].toString().padStart(2, '0')
       state.minute = scheduleItem.time[1].toString().padStart(2, '0')
       state.name = scheduleItem.name
@@ -142,8 +143,8 @@ const SleepWakeUpDetailPage = () => {
     state.duration = (Number(state.durationHour) * 60) + Number(min)
   }, [state.durationHour, state.durationMinute])
 
-  const postActions = async () => {
-    const baseItemData: any = {
+  const getNewItem = () =>{
+    return {
       enable: 1,
       loops: state.loop,
       time: [parseInt(state.hour), parseInt(state.minute)],
@@ -156,6 +157,10 @@ const SleepWakeUpDetailPage = () => {
       isSleep: props.isSleep,
       fade: props.isSleep ? state.fadeOut : state.fadeIn
     }
+  }
+
+  const postActions = async () => {
+    const baseItemData: any = getNewItem()
     if (props.mode === 'edit') baseItemData.index = scheduleItem.index
 
     if (props.isMixRGBWLamp) {
@@ -263,14 +268,27 @@ const SleepWakeUpDetailPage = () => {
     }
   }
 
+  const showBackDialog = () =>{
+    const newItem:any = {
+      ...getNewItem(),
+      index: props.scheduleItem.index,
+      enable: props.scheduleItem.enable
+    }
+    if(!props.isSleep){
+      newItem.duration = state.durationStatus && state.duration || 0
+    }
+    return props.mode === 'edit' && !isEqual(props.scheduleItem, newItem)
+  }
+
+
+
   return (
     <Page
       backText={I18n.getLang('add_sleepschedule_one_source_system_back_text')}
-      // headlineText={I18n.getLang(props.isSleep ? 'add_sleepschedule_one_source_headline_text' : 'add_wakeupschedule_one_source_headline_text')}
+      showBackDialog={showBackDialog()}
+      backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
+      backDialogContent={I18n.getLang(props.isSleep ? 'cancel_dialog_leave_unsaved_sleepschedule_note' : 'cancel_dialog_leave_unsaved_wakeupschedule_note')}
       rightButtonIcon={showSubmit() ? res.ic_check : res.ic_uncheck}
-      onBackClick={() => {
-        navigation.goBack()
-      }}
       rightButtonIconClick={showSubmit() && postActions || undefined}
     >
       <ScrollView

package/src/modules/timeSchedule/TimeScheduleEditpage.tsx

@@ -16,7 +16,7 @@ import { useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import res from '@ledvance/base/src/res'
 import { useReactive } from 'ahooks'
 import { dpItem, TimeSchedulePageRouteParams } from './TimeSchedulePage'
-import { cloneDeep, differenceBy } from 'lodash'
+import { cloneDeep, differenceBy, isEqual } from 'lodash'
 import DeviceState from './DeviceState'
 import { getHexByHSV, getHSVByHex } from '@ledvance/base/src/utils'
 import { Buffer } from 'buffer'
@@ -428,20 +428,27 @@ const TimeScheduleEditPage = () => {
     return dps.length > 1 && !props.isMixRGBWLamp
   }
 
-  // console.log(scheduleItem, '< --- scheduleItem')
   return (
     <Page
       backText={I18n.getLang('motion_detection_add_time_schedule_system_back_text')}
       onBackClick={navigation.goBack}
       rightButtonIcon={saveEnable() ? res.ic_check : res.ic_uncheck}
       rightButtonIconClick={() => saveAction()}
-      rightButtonDisabled={state.loading}
-    >
+      rightButtonDisabled={
+        state.loading ||
+        (scheduleItem?.aliasName === state.name &&
+          JSON.stringify(scheduleItem?.time) === JSON.stringify([state.hour, state.minute].join(':')) &&
+          JSON.stringify(scheduleItem?.loops) === JSON.stringify(state.loop.join('')) &&
+          scheduleItem?.isAppPush === state.isNotification &&
+          isEqual(scheduleItem?.dps, getSendDps()))
+      }
+      showBackDialog={true}
+      backDialogTitle={I18n.getLang('cancel_dialog_leave_unsaved_titel')}
+      backDialogContent={I18n.getLang('cancel_dialog_leave_unsaved_timeschedule_note')}>
       <ScrollView
         nestedScrollEnabled={true}
         showsHorizontalScrollIndicator={false}
-        showsVerticalScrollIndicator={false}
-      >
+        showsVerticalScrollIndicator={false}>
         <LdvTopName
           title={I18n.getLang(props.mode === 'add' ? 'motion_detection_add_time_schedule_headline_text' : 'edit_timeschedule_headline_text')}/>
         <View style={styles.content}>

package/src/modules/timer/TimerPage.tsx

@@ -85,7 +85,7 @@ const TimerPage = () => {
         }
     }
 
-    const onStartPress = () => {
+    const onStartPress = async () => {
         let mCountdown = 0
         const hour = parseInt(state.hour)
         const minute = parseInt(state.minute)
@@ -100,12 +100,11 @@ const TimerPage = () => {
             .add(Number(minute), 'm')
             .format('YYYY-MM-DD HH:mm:ss');
         if (!state.selectedSkill.length || mCountdown === 0) return
-
-        state.selectedSkill.forEach(skill => {
-            const timer = countdowns.find(timer => timer.dpId === skill.dpId)
-            timer?.countdown[1](mCountdown)
-            getProgressByDp(skill.dpId)[1](mCountdown, time)
-        })
+        for(let skill of state.selectedSkill){
+          const timer = countdowns.find(timer => timer.dpId === skill.dpId)
+          await getProgressByDp(skill.dpId)[1](mCountdown, time)
+          await timer?.countdown[1](mCountdown)
+        }
         state.selectedSkill = []
     }
 
@@ -161,9 +160,9 @@ const TimerPage = () => {
         );
     };
 
-    console.log(progress, '< --- progress')
-    console.log(countdowns, 'countdowns')
-    console.log(runningTimer(), '< --- runningTimer')
+    // console.log(progress, '< --- progress')
+    // console.log(countdowns, 'countdowns')
+    // console.log(runningTimer(), '< --- runningTimer')
     return (
         <Page
             backText={devInfo.name}

package/src/modules/timer/TimerPageAction.ts

@@ -6,86 +6,102 @@ import dayjs from "dayjs"
 import { NativeApi } from "@ledvance/base/src/api/native"
 import { useEffect, useState } from "react"
 
-export const useCountdowns= (dps: dpItem[]) =>{
-    return dps.map(dp => {
-        return ({
-            countdown: useDp<number,(value:number)=>Promise<Result<any>>>(dp.dpId),
-            enable: useDp<boolean, (value:boolean)=>Promise<Result<any>>>(dp.enableDp),
-            ...dp
-        })
+export const useCountdowns = (dps: dpItem[]) => {
+  return dps.map(dp => {
+    return ({
+      countdown: useDp<number, (value: number) => Promise<Result<any>>>(dp.dpId),
+      enable: useDp<boolean, (value: boolean) => Promise<Result<any>>>(dp.enableDp),
+      ...dp
     })
+  })
 }
 
 
-const useFormateProgress : (dp: dpItem, func: Function) => [number, (time: number, t: any) => void]= (dp, cancelTimer) =>{
-    const [progress, setProgress] = useCountDownAHook({
-        interval: 1000,
-        onEnd: () => cancelTimer(dp.dpId),
+const useFormateProgress: (dp: dpItem, func: Function) => [number, (time: number, t: any) => Promise<any>] = (dp, cancelTimer) => {
+  const [progress, setProgress] = useCountDownAHook({
+    interval: 1000,
+    onEnd: () => cancelTimer(dp.dpId),
+  })
+  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 getCloudJson = () => {
+    NativeApi.getJson(devId, dp.cloudKey).then(res => {
+      NativeApi.log(`${JSON.stringify(res)} < --- cloud Json`)
+      console.log(res, '< -- cloud Json')
+      if (res.success && res.data) {
+        const result = JSON.parse(res.data)
+        setCloudData(result)  
+        setCloudProgressNumber(result.progressAllNumber)
+        if (countdown > 0) setProgress(Date.now() + countdown * 1000)
+      }
     })
-    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 getCloudJson = () =>{
-        NativeApi.getJson(devId, dp.cloudKey).then(res =>{
-            if(res.success && res.data){
-                const result = JSON.parse(res.data)
-                setCloudData(result)
-                setCloudProgressNumber(result.progressAllNumber)
-                if(countdown > 0) setProgress(Date.now() + countdown * 1000)
-            }
-        })
-    }
-    useEffect(() =>{
-        getCloudJson()
-    }, [])
+  }
+  useEffect(() => {
+    getCloudJson()
+  }, [])
 
-    useEffect(() =>{
-        if(cloudProgressNumber > 0){
-            const currentTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
-            const remainingTime = Number(cloudData && dayjs(cloudData[getKey('StartTime', dp.dpId)] || 0).diff(currentTime))
-            const time = (cloudData && cloudData[getKey('Status', dp.dpId)] && remainingTime >= -1000) ? remainingTime : Number(progress.toString().slice(0, -3) + "000")
-            const conversion = (time / 1000) / cloudProgressNumber * 100
-            setProgressNumber(!isNaN(conversion) ? conversion : 0)
-        }
-    }, [progress])
-
-    useUpdateEffect(() =>{
-        if(countdown === 0 && cloudData){
-            setProgress(0)
-            setProgressNumber(0)
-            setCloudData('')
-            NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 }))
-        }
+  useEffect(() => {
+    if (cloudProgressNumber > 0) {
+      const currentTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      const remainingTime = Number(cloudData && dayjs(cloudData[getKey('StartTime', dp.dpId)] || 0).diff(currentTime))
+      const time = (cloudData && cloudData[getKey('Status', dp.dpId)] && remainingTime >= -1000) ? remainingTime : Number(progress.toString().slice(0, -3) + "000")
+      const conversion = (time / 1000) / cloudProgressNumber * 100
+      setProgressNumber(!isNaN(conversion) ? conversion : 0)
+    }
+  }, [progress])
 
-        if(countdown === 0 && !cloudData){
-            setProgress(0)
-            setProgressNumber(0)
-        }
 
-        if(countdown > 0 && !cloudData){
-            getCloudJson()
-        }
-    }, [countdown, cloudData])
+  useUpdateEffect(() => {
+    if (countdown === 0 && cloudData) {
+      setProgress(0)
+      setProgressNumber(0)
+      setCloudProgressNumber(0)
+      setCloudData('')
+      if(cloudData.progressAllNumber === 0){
+        NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: false, [getKey('StartTime', dp.dpId)]: '', progressAllNumber: 0 })).then(res => {
+          NativeApi.log(`${JSON.stringify(res)}, off time`)
+          console.log(res, 'off timer')
+        })
+      }
+    }
 
-    const getKey = (suffix:string, dpId:string) =>{
-            const key = dpId + suffix
-            return key
+    if (countdown === 0 && !cloudData) {
+      setProgress(0)
+      setProgressNumber(0)
+      setCloudProgressNumber(0)
     }
 
-    const startTimer = (time: number, t) => {
-        setCloudProgressNumber(time)
-        setProgress(Date.now() + time * 1000)
-        NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }));
+    if (countdown > 0 && !cloudData) {
+      getCloudJson()
     }
+    NativeApi.log(`${countdown}, < --- countdown`)
+  }, [countdown, cloudData])
+  
+
+  const getKey = (suffix: string, dpId: string) => {
+    const key = dpId + suffix
+    return key
+  }
+
+  const startTimer = async (time: number, t) => {
+    const res = await NativeApi.putJson(devId, dp.cloudKey, JSON.stringify({ [getKey('Status', dp.dpId)]: true, [getKey('StartTime', dp.dpId)]: t, progressAllNumber: time }))
+    NativeApi.log(`${JSON.stringify(res)}, on timer`)
+    console.log(res, '< -- on timer')
 
-    return [progressNumber, startTimer]
+    setCloudProgressNumber(time)
+    setProgress(Date.now() + time * 1000)
+  }
+  NativeApi.log(`${progressNumber}< --- progressNumber`)
+  console.log(progressNumber, '< --- progressNumber')
+  return [progressNumber, startTimer]
 }
 
-export const useProgress = (dps: dpItem[], cancelTimer) =>{
-    return dps.map(dp => ({
-        progressHook: useFormateProgress(dp, cancelTimer),
-        ...dp
-    }))
+export const useProgress = (dps: dpItem[], cancelTimer) => {
+  return dps.map(dp => ({
+    progressHook: useFormateProgress(dp, cancelTimer),
+    ...dp
+  }))
 }