@ledvance/group-ui-biz-bundle 1.0.24 → 1.0.26

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -1,13 +1,12 @@
 import { useFeatureHook } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { SceneNodeTransitionMode } from "@ledvance/group-ui-biz-bundle/src/modules/mood/SceneInfo";
 import { parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import { cloneDeep } from "lodash";
 import { FlagItemInfo, FlagUiInfo, defFlagList, def2FlagList, def3FlagList } from "./FlagInfo";
-import { hex2Int } from "@ledvance/base/src/utils/common";
-import { spliceByStep } from "@ledvance/base/src/utils/common";
 import { NativeApi } from "@ledvance/base/src/api/native";
 import { hsv2Hex } from "@ledvance/base/src/utils";
 import { WorkMode } from "@ledvance/base/src/utils/interface";
+import { Utils } from '@tuya/tuya-panel-lamp-sdk'
+const { nToHS, toFixed } = Utils
 
 interface  LightType {
   isStringLight?: boolean
@@ -48,7 +47,7 @@ export const useFlag: UseFlagType = (params) => {
         dps[workModeDpCode] = WorkMode.Colour
       }else{
         if(sceneStatus){
-          dps[sceneStatus.sceneDataDpCode] = flag ? obj2Dp(flag, {isMixLight: params.isMixLight}) : ''
+          dps[sceneStatus.sceneDataDpCode] =  flag ? obj2Dp(flag, {isMixLight: params.isMixLight, isStringLight: params.isStringLight}) : ''
           dps[workModeDpCode] = WorkMode.Scene
         }
       }
@@ -60,16 +59,13 @@ export const useFlag: UseFlagType = (params) => {
 }
 
 export interface FlagOption {
-  isFan?: boolean
-  isUVCFan?: boolean
   isMixLight?: boolean
+  isStringLight?: boolean
 }
 
 export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
-  let fanEnableHex = ''
-  let fanSpeedHex = ''
   const version = '00'
-  const idHex = flagItem.id.toString(16).padStart(2, '0')
+  const idHex = nToHS(flagItem.id)
   if (option?.isMixLight) {
     const whiteEnable = '01'
     const whiteNum = '01'
@@ -77,36 +73,58 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
     const whiteHex = whiteEnable + whiteNum + whiteStatus + flagItem.whiteColors.map(colors => {
       const speed = '00'
       const mode = '00'
-      const bHex = (colors.brightness * 10).toString(16).padStart(4, '0')
-      const tHex = (colors.colorTemp * 10).toString(16).padStart(4, '0')
+      const bHex = nToHS(colors.brightness * 10, 4)
+      const tHex = nToHS(colors.colorTemp * 10, 4)
       return speed + speed + mode + bHex + tHex
     }).join('')
     const colorEnable = '01'
-    const colorNum = flagItem.colors.length.toString(16).padStart(2, '0')
+    const colorNum = nToHS(flagItem.colors.length)
     const colorStatus = '03'
     const colorHex = colorEnable + colorNum + colorStatus + flagItem.colors.map(item => {
-      const speed = flagItem.speed.toString(16).padStart(2, '0')
-      const mode = flagItem.mode.toString(16).padStart(2, '0')
-      const hHex = item.h.toString(16).padStart(4, '0')
-      const sHex = (item.s * 10).toString(16).padStart(4, '0')
-      const vHex = (item.v * 10).toString(16).padStart(4, '0')
+      const speed = nToHS(flagItem.speed)
+      const mode = nToHS(flagItem.mode)
+      const hHex = nToHS(item.h, 4)
+      const sHex = nToHS(item.s * 10, 4)
+      const vHex = nToHS(item.v * 10, 4)
       return speed + speed + mode + hHex + sHex + vHex
     }).join('')
     return version + idHex + whiteHex + colorHex
+  } else if (option?.isStringLight) {
+    const version = '00'
+    const idHex = nToHS(flagItem.id)
+    const expand = 0
+    const reserved1 = 0
+    const reserved2 = 0
+    const loop = 0
+    const excessive = 0
+    const direction = 0
+    const segmented = 0
+    const modeHex = nToHS(10)
+    const intervalTimeHex = nToHS(flagItem.speed)
+    const changeTimeHex = nToHS(flagItem.speed)
+    const optionAHex = nToHS(
+      parseInt(
+        `${segmented}${loop}${excessive}${direction}${toFixed(
+          expand.toString(2),
+          2
+        )}${reserved1}${reserved2}`,
+        2
+      )
+    );
+    const optionBHex = nToHS(0)
+    const optionCHex = nToHS(0)
+    const nodeHex = flagItem.colors.map(node => {
+      return `${nToHS(node.v)}${nToHS(node.h, 4)}${nToHS(node.s)}${nToHS(0, 4)}${nToHS(0, 4)}`
+    }).join('')
+    return version + idHex + modeHex + intervalTimeHex + changeTimeHex + optionAHex + optionBHex + optionCHex + nodeHex
   } else {
-    if (!flagItem.speed) {
-      flagItem.speed = 12
-    }
-    if (!flagItem.mode) {
-      flagItem.mode = 0
-    }
-    const switchingIntervalHex = (option?.isUVCFan ? 101 - flagItem.speed : flagItem.speed).toString(16).padStart(2, '0')
-    const transitionTimeHex = (option?.isUVCFan ? 101 - flagItem.speed : flagItem.speed).toString(16).padStart(2, '0')
-    const transitionModeHex = flagItem.mode.toString(16).padStart(2, '0')
-    const hex = idHex + fanEnableHex + fanSpeedHex + flagItem.colors.map(color => {
-      const hHex = Math.round(color.h).toString(16).padStart(4, '0')
-      const sHex = Math.round(color.s * 10).toString(16).padStart(4, '0')
-      const vHex = Math.round(color.v * 10).toString(16).padStart(4, '0')
+    const switchingIntervalHex = nToHS(flagItem.speed)
+    const transitionTimeHex = nToHS(flagItem.speed)
+    const transitionModeHex = nToHS(flagItem.mode)
+    const hex = idHex + flagItem.colors.map(color => {
+      const hHex = nToHS(Math.round(color.h), 4)
+      const sHex = nToHS(Math.round(color.s * 10), 4)
+      const vHex = nToHS(Math.round(color.v * 10), 4)
       const brightnessHex = '0000'
       const colorTempHex = '0000'
       return switchingIntervalHex + transitionTimeHex + transitionModeHex + hHex + sHex + vHex + brightnessHex + colorTempHex
@@ -115,63 +133,6 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
   }
 }
 
-export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefined {
-  if (!dp) return
-  const result = {} as FlagItemInfo
-  if (option?.isMixLight) {
-    result.version = hex2Int(dp.slice(0, 2))
-    result.id = hex2Int(dp.slice(2, 4))
-    let lampHex = dp.slice(16)
-    result.whiteColors = [
-      { brightness: hex2Int(lampHex.slice(0, 4)) / 10, colorTemp: hex2Int(lampHex.slice(4, 8)) / 10 }
-    ]
-    lampHex = lampHex.slice(14)
-    result.colors = spliceByStep(lampHex, 18).map(lamp => {
-      result.speed = hex2Int(lamp.slice(0, 2))
-      result.mode = hex2Int(lamp.slice(4, 6))
-      return {
-        h: hex2Int(lamp.slice(6, 10)),
-        s: hex2Int(lamp.slice(10, 14)) / 10,
-        v: hex2Int(lamp.slice(14, 18)) / 10
-      }
-    })
-    return result
-  } else {
-    const id = hex2Int(dp.slice(0, 2))
-    let fanEnable: any = undefined
-    let fanSpeed: any = undefined
-    if (option?.isFan) {
-      fanEnable = hex2Int(dp.slice(2, 4)) === 1
-      fanSpeed = hex2Int(dp.slice(4, 6))
-    }
-    const c = option?.isFan ? 6 : 2
-    const sliceDp = dp.slice(c)
-    let mode = SceneNodeTransitionMode.Jump
-    let speed = 70
-    const colors = spliceByStep(sliceDp, 26).map(nodeHex => {
-      speed = option?.isUVCFan ? 101 - hex2Int(nodeHex.slice(0, 2)) : hex2Int(nodeHex.slice(0, 2))
-      mode = hex2Int(nodeHex.slice(4, 6))
-      const h = hex2Int(nodeHex.slice(6, 10))
-      const s = hex2Int(nodeHex.slice(10, 14))
-      const v = hex2Int(nodeHex.slice(14, 18))
-      return {
-        h,
-        s: s / 10,
-        v: v / 10
-      }
-    })
-    const whiteColors = [{ brightness: 100, colorTemp: 0 }]
-    return {
-      id,
-      mode,
-      speed,
-      colors,
-      whiteColors
-    }
-  }
-
-}
-
 interface defFlagOption {
   isDef2?: boolean
   isDef3?: boolean

package/src/modules/flags/FlagEditPage.tsx

@@ -11,7 +11,7 @@ import TextField from '@ledvance/base/src/components/TextField'
 import Card from '@ledvance/base/src/components/Card'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import TextButton from '@ledvance/base/src/components/TextButton'
-import { hex2Hsv, hsv2Hex } from '@ledvance/base/src/utils'
+import { hsv2Hex } from '@ledvance/base/src/utils'
 import { cloneDeep, find, isEqual } from 'lodash'
 import { FlagUiInfo } from './FlagInfo'
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView'

package/src/modules/flags/FlagPage.tsx

@@ -58,7 +58,7 @@ const FlagPage = () => {
   const defParams = {
     workModeDpCode: params.workModeCode,
     switchLedDpCode: params.switchLedCode,
-    workMode: WorkMode.Scene,
+    workMode: params.isStripLight ? WorkMode.Colour : WorkMode.Scene,
     sceneStatus: !params.isStripLight && params.sceneDataCode ? {
       sceneDataDpCode: params.sceneDataCode
     } : undefined,
@@ -192,7 +192,6 @@ const FlagPage = () => {
       flagId: flag?.id
     })
   }
-
   return (
     <Page
       headlineText={I18n.getLang('Feature_devicepanel_flags')}
@@ -216,6 +215,7 @@ const FlagPage = () => {
         onChangeText={(v)=>{
           state.searchText = v
         }}
+        placeholder={I18n.getLang('country_selection_textfield_headline_search')}
       />
       <FlatList
         data={state.flags}

package/src/modules/mood/MoodPage.tsx

@@ -195,7 +195,7 @@ const MoodPage = () => {
   }
 
   const updateFlagMode = () =>{
-    if(flagMode && params.isSupportColor){
+    if(flagMode?.flagMode && params.isSupportColor){
       saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify({
         flagMode: false,
         flagId: undefined
@@ -274,7 +274,7 @@ const MoodPage = () => {
           renderItem={({ item }) => {
             return (
               <MoodItem
-                enable={switchLed && workMode === WorkMode.Scene && scene?.scene?.id === item.id}
+                enable={switchLed && workMode === WorkMode.Scene && scene?.scene?.id === item.id && !flagMode?.flagMode}
                 mood={item}
                 onPress={() => {
                   navigationRoute(item.nodes.length === 1, 'edit', item)

package/src/modules/timer/TimerAction.ts

@@ -1,8 +1,9 @@
-import { useFeatureHook } from '@ledvance/base/src/models/modules/NativePropsSlice'
-import { Result } from '@ledvance/base/src/models/modules/Result'
+import {useFeatureHook} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {Result} from '@ledvance/base/src/models/modules/Result'
 import dayjs from 'dayjs'
-import { useCountDown, useReactive } from 'ahooks'
-import { useEffect, useMemo } from 'react'
+import {useCountDown, useReactive} from 'ahooks'
+import {useEffect, useMemo} from 'react'
+import {I18nKey} from "../../../.yalc/@ledvance/base/src/i18n/index";
 
 export interface TimerTask {
   name: string
@@ -15,8 +16,8 @@ export interface TimerTask {
     enable: boolean
   }
   status: TaskStatus
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export enum TaskStatus {
@@ -154,14 +155,21 @@ export interface TimerSettableDp {
     code: string
     enable: boolean
   }
-  stringOn: string
-  stringOff: string
+  stringOn: I18nKey
+  stringOff: I18nKey
 }
 
 export interface TimerPageParams {
   timerSettableDps: TimerSettableDp[]
 }
 
+export function timeFormatToRealTime(mCountdown: number) {
+  const date = new Date()
+  const now = date.getTime()
+  const after = new Date(now + mCountdown * 1000)
+  return `${after.getHours()}:${after.getMinutes().toString().padStart(2, '0')}`
+}
+
 export function timeFormat(time: number): string {
   let hour = Math.trunc(time / 3600)
   const beforeMin = (time % 3600) / 60

package/src/modules/timer/TimerPage.tsx

@@ -8,7 +8,7 @@ import LdvPickerView from '@ledvance/base/src/components/ldvPickerView'
 import { useReactive } from 'ahooks'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
-import { TaskStatus, timeFormat, TimerPageParams, TimerTask, useTimerTasks } from './TimerAction'
+import {TaskStatus, timeFormat, timeFormatToRealTime, TimerPageParams, TimerTask, useTimerTasks} from './TimerAction'
 import { cloneDeep, groupBy } from 'lodash'
 import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import GroupBizRes from '../../res/GroupBizRes'
@@ -188,7 +188,7 @@ const TimerPage = () => {
                   </View>
                   <Spacer height={cx(32)}/>
                   <Text
-                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormat(startedTasks[0].timeLeft))}</Text>
+                      style={[styles.activeTaskDesc, { textAlign: 'center' }]}>{I18n.formatValue(startedTasks[0].dp.enable ? startedTasks[0].stringOff : startedTasks[0].stringOn, timeFormatToRealTime(startedTasks[0].timeLeft))}</Text>
                   <Spacer height={cx(32)}/>
                   <TextButton
                       text={I18n.getLang('auto_scan_system_cancel')}
@@ -241,7 +241,7 @@ function ActiveTimerItem(task: TimerTask, onCancel: () => void) {
       <Spacer/>
       <View style={{ marginHorizontal: cx(20) }}>
         <Text style={styles.activeTaskDesc}>{
-          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormat(task.timeLeft))
+          I18n.formatValue(task.dp.enable ? task.stringOff : task.stringOn, timeFormatToRealTime(task.timeLeft))
         }</Text>
       </View>
       <Spacer height={cx(22)}/>
@@ -339,7 +339,7 @@ const styles = StyleSheet.create({
     fontSize: cx(14),
   },
   activeTasBtn: {
-    width: cx(75),
+    width: 'auto',
     height: cx(36),
     padding: 0,
     backgroundColor: '#666',