@ledvance/group-ui-biz-bundle 1.0.46 → 1.0.48

package/package.json

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

package/src/modules/biorhythm/BiorhythmActions.ts

@@ -7,11 +7,10 @@ import {
   Plan,
 } from './BiorhythmBean'
 import { useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { NativeApi } from '@ledvance/base/src/api/native'
 import {hex2Int, spliceByStep} from '@ledvance/base/src/utils/common'
 import I18n from '@ledvance/base/src/i18n'
 import BiologicalRes from './res/BiologicalRes'
-import dayjs from 'dayjs'
+import { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 
 interface BiorhythmConfig {
   rhythm_mode: BiorhythmBean
@@ -23,12 +22,6 @@ export const useBiorhythm = () => {
   })
 }
 
-export const userOperation = async (deviceId: string, value: boolean) => {
-  const currentTime = dayjs().format('YYYY-MM-DD')
-  const json = JSON.stringify({status: value, suspendTime: value && currentTime || ''})
-  return await NativeApi.putJson(deviceId, 'suspendTime', json)
-}
-
 export function dp2Obj(dp: string): BiorhythmBean {
   if (!dp || dp === '0000000000') {
     return dp2Obj('0000007f0501060000000000000001061e00000000141901090000000000646401140000000000503201171e000000000000')
@@ -75,7 +68,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
     // 分钟
     const minute = hex2Int(hex.slice(0, 2)).toString().padStart(2, '0')
     hex = hex.slice(2)
-    const startTime = `${hour}:${minute}`
+    const time = hour * 60 + minute
     // 色调 (色相)
     hex2Int(hex.slice(0, 4))
     hex = hex.slice(4)
@@ -94,7 +87,7 @@ export function dp2Obj(dp: string): BiorhythmBean {
       id: index,
       enable: enable,
       icon: getNodeIconByIndex(index),
-      startTime: startTime,
+      time,
       name: getNodeNameByIndex(index),
       colorTemperature: colorTemperature,
       brightness: brightness,
@@ -203,9 +196,8 @@ function obj2Dp(obj: BiorhythmBean): string {
   const planListHex = obj.planList
     .map(plan => {
       const enableHex = plan.enable ? '01' : '00'
-      const startTime = plan.startTime.split(':')
-      const hourHex = parseInt(startTime[0]).toString(16).padStart(2, '0')
-      const minuteHex = parseInt(startTime[1]).toString(16).padStart(2, '0')
+      const hourHex = to16(Math.trunc(plan.time / 60))
+      const minuteHex = to16(plan.time % 60)
       const hsvHex = '00000000'
       const brightnessHex = plan.brightness.toString(16).padStart(2, '0')
       const colorTemperatureHex = plan.colorTemperature.toString(16).padStart(2, '0')

package/src/modules/biorhythm/BiorhythmBean.ts

@@ -29,7 +29,7 @@ export interface Plan {
   id: number;
   enable: boolean;
   icon: string;
-  startTime: string;
+  time: number;
   name: string;
   colorTemperature: number;
   brightness: number;
@@ -71,7 +71,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 0,
         icon: icon1,
-        startTime: '06:00',
+        time: 360,
         name: I18n.getLang('bio_ryhthm_default_field_text'),
         colorTemperature: 0,
         brightness: 0,
@@ -91,7 +91,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 1,
         icon: icon12,
-        startTime: '06:30',
+        time: 420,
         name: I18n.getLang('bio_ryhthm_default_field_text2'),
         colorTemperature: 25,
         brightness: 20,
@@ -111,7 +111,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 2,
         icon: icon2,
-        startTime: '09:00',
+        time: 540,
         name: I18n.getLang('bio_ryhthm_default_field_text3'),
         colorTemperature: 100,
         brightness: 100,
@@ -131,7 +131,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 3,
         icon: icon3,
-        startTime: '20:00',
+        time: 1200,
         name: I18n.getLang('bio_ryhthm_default_field_text4'),
         colorTemperature: 50,
         brightness: 80,
@@ -151,7 +151,7 @@ export function getDefBiorhythmUIState(): BiorhythmBean {
       {
         id: 4,
         icon: icon4,
-        startTime: '23:30',
+        time: 1410,
         name: I18n.getLang('bio_ryhthm_default_field_text5'),
         colorTemperature: 0,
         brightness: 0,