@ledvance/ui-biz-bundle 1.1.66 → 1.1.68

package/package.json

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

package/src/navigation/Routers.ts

@@ -17,6 +17,8 @@ export const ui_biz_routerKey = {
   'bi_biz_biological_icon_select': 'bi_biz_biological_icon_select',
   'ui_biz_sleep_wakeUp': 'ui_biz_sleep_wakeUp',
   'ui_biz_sleep_wakeUp_edit': 'ui_biz_sleep_wakeUp_edit',
+  'ui_biz_sleep_wakeUp_new': 'ui_biz_sleep_wakeUp_new',
+  'ui_biz_sleep_wakeUp_edit_new': 'ui_biz_sleep_wakeUp_edit_new',
   'ui_biz_music': 'ui_biz_music',
   'ui_biz_select_page': 'ui_biz_select_page',
   'ui_biz_fixed_time': 'ui_biz_fixed_time',

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -46,18 +46,22 @@ interface UIState extends BiorhythmBean {
 }
 
 export interface BiorhythmPageParams {
-  biorhythmDp: string
-  sleepPlanDp: string
-  wakeUpPlanDp: string
+  biorhythmDpCode: string
+  conflictDps: {
+    randomTimeDpCode?: string
+    fixedTimeDpCode?: string 
+    sleepDpCode?: string
+    wakeUpDpCode?: string 
+  }
   isSupportTemperature: boolean
   isSupportBrightness: boolean
-  isMixRGBWLamp: boolean
+  isMixLight?: boolean
 }
 
 const BiorhythmPage = () => {
   const params = useParams<BiorhythmPageParams>()
   const navigation = useNavigation()
-  const [biorhythm, setBiorhythm] = useBiorhythm(params.biorhythmDp)
+  const [biorhythm, setBiorhythm] = useBiorhythm(params.biorhythmDpCode)
   const deviceId = useDeviceId()
   const deviceInfo = useDeviceInfo()
   const { productId } = deviceInfo
@@ -437,7 +441,7 @@ const BiorhythmPage = () => {
                       iconIdList: state.planList?.map(item => {
                         return item.iconId
                       }),
-                      isMixRGBWLamp: params.isMixRGBWLamp,
+                      isMixRGBWLamp: !!params.isMixLight,
                       isSupportTemperature: params.isSupportTemperature,
                       isSupportBrightness: params.isSupportBrightness,
                       showDeleteBtn
@@ -478,7 +482,7 @@ const BiorhythmPage = () => {
                         iconIdList: state.planList?.map(item => {
                           return item.iconId
                         }),
-                        isMixRGBWLamp: params.isMixRGBWLamp,
+                        isMixRGBWLamp: !!params.isMixLight,
                         isSupportTemperature: params.isSupportTemperature,
                         isSupportBrightness: params.isSupportBrightness,
                         showDeleteBtn

package/src/newModules/fixedTime/FixedTimePage.tsx

@@ -26,9 +26,10 @@ const MAX_NUM = 10
 export interface FixedTimePageParams {
   fixedTimeDpCode: string
   conflictDps: {
-    randomTimeDp?: string
-    biorhythmDp?: string
-    sleepWakeUpDp?: string
+    randomTimeDpCode?: string
+    biorhythmDpCode?: string
+    sleepDpCode?: string
+    wakeUpDpCode?: string 
   }
   isPlug?: boolean
   showTags?: boolean

package/src/newModules/randomTime/RandomTimePage.tsx

@@ -27,9 +27,10 @@ const MAX_NUM = 10
 export interface RandomTimePageParams {
   randomTimeDpCode: string
   conflictDps: {
-    fixedTimeDp?: string
-    biorhythmDp?: string
-    sleepWakeUpDp?: string
+    fixedTimeDpCode?: string
+    biorhythmDpCode?: string
+    sleepDpCode?: string
+    wakeUpDpCode?: string 
   }
   isPlug?: boolean
   showTags?: boolean

package/src/newModules/remoteControl/RemoteControlActions.ts

@@ -0,0 +1,6 @@
+import { useDp } from "@ledvance/base/src/models/modules/NativePropsSlice"
+import { Result } from "@ledvance/base/src/models/modules/Result"
+
+export const useRemoteControl = (dp: string): [boolean, (v: boolean) => Promise<Result<any>>] =>{
+  return useDp(dp)
+}

package/src/newModules/remoteControl/RemoteControlPage.tsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import I18n from '@ledvance/base/src/i18n';
+import { useReactive } from 'ahooks';
+import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice';
+import Page from '@ledvance/base/src/components/Page';
+import LdvSwitch from '@ledvance/base/src/components/ldvSwitch';
+import { useRemoteControl } from './RemoteControlActions';
+import { useParams } from '@ledvance/base/src/hooks/Hooks';
+import Card from '@ledvance/base/src/components/Card';
+import Spacer from '@ledvance/base/src/components/Spacer';
+import { Utils } from 'tuya-panel-kit'
+
+const { convertX: cx } = Utils.RatioUtils
+
+export interface RemoteControlPageParams {
+  remoteControlDpCode: string;
+}
+const RemoteControlPage = () => {
+  const deviceInfo = useDeviceInfo();
+  const params = useParams<RemoteControlPageParams>();
+  const [remoteControl, setRemoteControl] = useRemoteControl(params.remoteControlDpCode);
+
+  const state = useReactive({
+    loading: false,
+  });
+
+  return (
+    <Page
+      backText={deviceInfo.name}
+      loading={state.loading}
+      headlineText={I18n.getLang('light_sources_specific_settings_remote_control')}
+    >
+      <Spacer />
+      <Card style={{marginHorizontal: cx(24)}}>
+        <LdvSwitch
+          title={I18n.getLang('light_sources_specific_settings_remote_control')}
+          color="#fff"
+          colorAlpha={1}
+          enable={remoteControl}
+          setEnable={async v => {
+            state.loading = true;
+            await setRemoteControl(v);
+            state.loading = false;
+          }}
+        />
+      </Card>
+    </Page>
+  );
+};
+
+export default RemoteControlPage;

package/src/newModules/remoteControl/Router.ts

@@ -0,0 +1,16 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import RemoteControlPage from "./RemoteControlPage";
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const RemoteControlPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_remote_control,
+    component: RemoteControlPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  },
+]
+
+export default RemoteControlPageRouters

package/src/newModules/sleepWakeUp/Interface.ts

@@ -0,0 +1,70 @@
+export interface WakeUpItem {
+  enable: boolean;
+  weeks: number[];
+  delay: number;
+  hour: number;
+  minute: number;
+  h: number;
+  s: number;
+  v: number;
+  brightness: number;
+  temperature: number;
+  last: number;
+  nodeHex: string;
+  isSleep: boolean;
+  startTime: number;
+  endTime: number;
+  isColorMode: boolean;
+}
+
+export interface WakeUpUIItem extends WakeUpItem {
+  name: string
+  id: number 
+}
+
+export interface WakeUpData {
+  version: number;
+  num: number;
+  nodes: WakeUpItem[];
+}
+
+export interface WakeUpUIData {
+  version: number;
+  num: number;
+  nodes: WakeUpUIItem[];
+}
+
+export interface SleepItem {
+  enable: boolean;
+  weeks: number[];
+  delay: number;
+  hour: number;
+  minute: number;
+  h: number;
+  s: number;
+  v: number;
+  brightness: number;
+  temperature: number;
+  nodeHex: string;
+  isSleep: boolean;
+  startTime: number;
+  endTime: number;
+  isColorMode: boolean;
+}
+
+export interface SleepUIItem extends SleepItem {
+  name: string
+  id: number
+}
+
+export interface SleepData {
+  version: number;
+  num: number;
+  nodes: SleepItem[]
+}
+
+export interface SleepUIData {
+  version: number;
+  num: number;
+  nodes: SleepUIItem[]
+}

package/src/newModules/sleepWakeUp/Router.ts

@@ -0,0 +1,25 @@
+import {NavigationRoute} from "tuya-panel-kit";
+import NewSleepWakeUpPage from './SleepWakeUpPage'
+import NewSleepWakeUpDetailPage from './SleepWakeUpDetailPage'
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const NewSleepWakeUpPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.ui_biz_sleep_wakeUp_new,
+    component: NewSleepWakeUpPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  },
+  {
+    name: ui_biz_routerKey.ui_biz_sleep_wakeUp_edit_new,
+    component: NewSleepWakeUpDetailPage,
+    options: {
+      hideTopbar: true,
+      showOfflineView: false,
+    },
+  }
+]
+
+export default NewSleepWakeUpPageRouters

package/src/newModules/sleepWakeUp/SleepWakeUpActions.ts

@@ -0,0 +1,317 @@
+import { useEffect, 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'
+import { SleepData, SleepItem, SleepUIData, SleepUIItem, WakeUpData, WakeUpItem, WakeUpUIData, WakeUpUIItem } from './Interface'
+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'
+const sleepPlanFeatureId = 'SleepPlan'
+const wakeUpPlanFeatureId = 'WakeUpPlan'
+
+// 接口失败重试
+let retryNumber = 0
+const putFeatureFn = async (devId, featureId, data) => {
+  let status;
+  await putFeature(devId, featureId, data).then(res => {
+    if (!res?.result && retryNumber < 3) {
+      retryNumber += 1
+      putFeatureFn(devId, featureId, data).then()
+    }
+    if (res?.result) {
+      retryNumber = 0
+      status = res?.result
+    }
+  })
+  return status
+}
+let wakeUpTimerId: number | undefined = undefined
+type WakeUpType = (wakeUpDp: string, disableFeature?: boolean) => [WakeUpUIItem[], (wakeUpData: WakeUpUIData) => Promise<Result<any>>, boolean]
+// @ts-ignore
+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 
+    }
+    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)
+
+    return () =>{
+      if(wakeUpTimerId) clearTimeout(wakeUpTimerId)
+    }
+  }, [wakeUp])
+
+  const setWakeUpFn = async (wakeUp: WakeUpUIData) => {
+    const featureData = wakeUp?.nodes.map(item => {
+      return {
+        name: item.name,
+        startTime: JSON.stringify({
+          dp: wakeUpNode2Dp(item)
+        })
+      }
+    })
+    const res = await putFeature(devId, wakeUpPlanFeatureId, featureData || [])
+    if (res.result) {
+      setWakeUp(wakeUpObj2Dp(wakeUp)).then()
+      return {
+        success: true
+      }
+    }
+    return {
+      success: false
+    }
+  }
+  return [wakeUpList, setWakeUpFn, isComplete]
+}
+
+
+const wakeUpDp2Obj = (dp: string): WakeUpData | undefined => {
+  if (!dp || dp?.length <= 6) return
+  const version = hex2Int(dp.slice(0, 2))
+  const num = hex2Int(dp.slice(2, 4))
+  const nodes = spliceByStep(dp.slice(4), 24).map((plan) => {
+    const enable = !!hex2Int(plan.slice(0, 2))
+    const weeks = parseInt(plan.slice(2, 4), 16).toString(2).padStart(8, '0')
+      .split('')
+      .reverse()
+      .map(v => parseInt(v, 10))
+    const delay = hex2Int(plan.slice(4, 6))
+    const hour = hex2Int(plan.slice(6, 8))
+    const minute = hex2Int(plan.slice(8, 10))
+    const h = hex2Int(plan.slice(10, 12)) * 100 + hex2Int(plan.slice(12, 14))
+    const s = hex2Int(plan.slice(14, 16))
+    const v = hex2Int(plan.slice(16, 18))
+    const brightness = hex2Int(plan.slice(18, 20))
+    const temperature = hex2Int(plan.slice(20, 22))
+    const last = hex2Int(plan.slice(22, 24))
+    const endTime = hour * 60 + minute
+    const endMin = endTime - delay * 5
+    const startTime = endMin < 0 ? 1440 + endMin : endMin
+    const cloneWeek = cloneDeep(weeks)
+    cloneWeek.pop()
+    const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
+    const weeksHex = to16(parseInt(weeksValue, 2), 2)
+    const nodeHex = plan.slice(0, 2) + weeksHex + plan.slice(4)
+    return {
+      enable, weeks, delay, hour, minute, h, s, v, brightness, temperature, last, nodeHex, isSleep: false,
+      startTime,
+      endTime,
+      isColorMode: !!(h && s && v)
+    }
+  })
+  return {
+    version,
+    num,
+    nodes
+  }
+}
+
+const wakeUpObj2Dp = (wakeUp: WakeUpData) => {
+  const { version, nodes } = wakeUp
+  const versionHex = to16(version)
+  const numHex = to16(nodes.length)
+  const nodeHex = nodes.map(node => {
+    const enableHex = node.enable ? '01' : '00'
+    const weeksValue = padStart([...node.weeks].reverse().join(''), 8, '0')
+    const weeksHex = to16(parseInt(weeksValue, 2), 2)
+    const delayHex = to16(node.delay)
+    const hourHex = to16(node.hour)
+    const minuteHex = to16(node.minute)
+    const hString = node.h.toString().padStart(4, '0')
+    const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
+    const s = to16(node.s)
+    const v = to16(node.v)
+    const brightness = to16(node.brightness)
+    const temperature = to16(node.temperature)
+    const lastHex = to16(node.last)
+    return `${enableHex}${weeksHex}${delayHex}${hourHex}${minuteHex}${h}${s}${v}${brightness}${temperature}${lastHex}`
+  }).join('')
+  return versionHex + numHex + nodeHex
+}
+
+export const wakeUpNode2Dp = (node: WakeUpItem) =>{
+  const enableHex = node.enable ? '01' : '00'
+  const cloneWeek = cloneDeep(node.weeks)
+  cloneWeek.pop()
+  const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
+  const weeksHex = to16(parseInt(weeksValue, 2), 2)
+  const delayHex = to16(node.delay)
+  const hourHex = to16(node.hour)
+  const minuteHex = to16(node.minute)
+  const hString = node.h.toString().padStart(4, '0')
+  const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
+  const s = to16(node.s)
+  const v = to16(node.v)
+  const brightness = to16(node.brightness)
+  const temperature = to16(node.temperature)
+  const lastHex = to16(node.last)
+  return `${enableHex}${weeksHex}${delayHex}${hourHex}${minuteHex}${h}${s}${v}${brightness}${temperature}${lastHex}`
+}
+
+let sleepTimerId: number | undefined = undefined
+type SleepModeType = (sleepDp: string, disableFeature?: boolean) => [SleepUIItem[], (sleepData: SleepUIData) => Promise<Result<any>>, boolean]
+// @ts-ignore
+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)
+  useEffect(() => {
+    if(disableFeature) {
+      setIsComplete(true)
+      setSleepPlan(sleepDp2Obj(sleepMode)?.nodes || [])
+      return 
+    }
+    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)
+    }
+  }, [sleepMode])
+
+  const setSleepPlanFn = async (sleep: SleepUIData) => {
+    const featureData = sleep?.nodes.map(item => {
+      return {
+        name: item.name,
+        startTime: JSON.stringify({
+          dp: sleepNode2Dp(item)
+        })
+      }
+    })
+    const res = await putFeature(devId, sleepPlanFeatureId, featureData || [])
+    if (res.result) {
+      setSleepMode(sleepObj2Dp(sleep)).then()
+      return {
+        success: true
+      }
+    }
+    return {
+      success: false
+    }
+  }
+  return [sleepPlan, setSleepPlanFn, isComplete]
+}
+
+export const sleepDp2Obj = (dp: string): SleepData | undefined => {
+  if (!dp || dp?.length <= 6) return
+  const version = hex2Int(dp.slice(0, 2))
+  const num = hex2Int(dp.slice(2, 4))
+  const nodes = spliceByStep(dp.slice(4), 22).map(plan => {
+    const enable = !!hex2Int(plan.slice(0, 2))
+    const weeks = parseInt(plan.slice(2, 4), 16).toString(2).padStart(8, '0')
+      .split('')
+      .reverse()
+      .map(v => parseInt(v, 10))
+    const delay = hex2Int(plan.slice(4, 6))
+    const hour = hex2Int(plan.slice(6, 8))
+    const minute = hex2Int(plan.slice(8, 10))
+    const h = hex2Int(plan.slice(10, 12)) * 100 + hex2Int(plan.slice(12, 14))
+    const s = hex2Int(plan.slice(14, 16))
+    const v = hex2Int(plan.slice(16, 18))
+    const brightness = hex2Int(plan.slice(18, 20))
+    const temperature = hex2Int(plan.slice(20, 22))
+    const startTime = hour * 60 + minute
+    const endMin = startTime + delay * 5
+    const endTime = endMin > 1440 ? endMin - 1440 : endMin
+    const cloneWeek = cloneDeep(weeks)
+    cloneWeek.pop()
+    const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
+    const weeksHex = to16(parseInt(weeksValue, 2), 2)
+    const nodeHex = plan.slice(0, 2) + weeksHex + plan.slice(4)
+    return {
+      enable, weeks, delay, hour, minute, h, s, v, brightness, temperature, nodeHex, isSleep: true,
+      startTime,
+      endTime,
+      isColorMode: !!(h && s && v)
+    }
+  })
+  return {
+    version,
+    num,
+    nodes
+  }
+}
+
+export const sleepObj2Dp = (sleep: SleepData) => {
+  const { version, nodes } = sleep
+  const versionHex = to16(version)
+  const numHex = to16(nodes.length)
+  const nodeHex = nodes.map(node => {
+    const enableHex = node.enable ? '01' : '00'
+    const weeksValue = padStart([...node.weeks].reverse().join(''), 8, '0')
+    const weeksHex = to16(parseInt(weeksValue, 2), 2)
+    const delayHex = to16(node.delay)
+    const hourHex = to16(node.hour)
+    const minuteHex = to16(node.minute)
+    const hString = node.h.toString().padStart(4, '0')
+    const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
+    const s = to16(node.s)
+    const v = to16(node.v)
+    const brightness = to16(node.brightness)
+    const temperature = to16(node.temperature)
+    return `${enableHex}${weeksHex}${delayHex}${hourHex}${minuteHex}${h}${s}${v}${brightness}${temperature}`
+  }).join('')
+  return versionHex + numHex + nodeHex
+}
+
+export const sleepNode2Dp = (node: SleepItem) => {
+  const enableHex = node.enable ? '01' : '00'
+  const cloneWeek = cloneDeep(node.weeks)
+  cloneWeek.pop()
+  const weeksValue = padStart([...cloneWeek].join(''), 8, '0')
+  const weeksHex = to16(parseInt(weeksValue, 2), 2)
+  const delayHex = to16(node.delay)
+  const hourHex = to16(node.hour)
+  const minuteHex = to16(node.minute)
+  const hString = node.h.toString().padStart(4, '0')
+  const h = to16(Number(hString.slice(0, 2))) + to16(Number(hString.slice(2, 4)))
+  const s = to16(node.s)
+  const v = to16(node.v)
+  const brightness = to16(node.brightness)
+  const temperature = to16(node.temperature)
+  return `${enableHex}${weeksHex}${delayHex}${hourHex}${minuteHex}${h}${s}${v}${brightness}${temperature}`
+}