@ledvance/ui-biz-bundle 1.1.7 → 1.1.9

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -1,7 +1,7 @@
 import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlagPageProps } from "./FlagPage";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
-import { WORK_MODE, parseJSON } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { WORK_MODE, nToHS, parseJSON, toFixed } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import { cloneDeep } from "lodash";
 import { FlagItemInfo, FlagUiInfo, defFlagList } from "./FlagInfo";
 import { hex2Int } from "@ledvance/base/src/utils/common";
@@ -10,6 +10,7 @@ import { useMemo, useState } from "react";
 import { useUpdateEffect } from "ahooks";
 import { NativeApi } from "@ledvance/base/src/api/native";
 import { hsv2Hex } from "@ledvance/base/src/utils";
+import { stripDp2Obj } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneAction";
 
 export interface ExtraParams extends FlagPageProps, FlagOption {
 }
@@ -55,24 +56,21 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
       return setDps({ [flagCode]: hex })
     } else {
       const hex = obj2Dp(flagItem, extra)
-      return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE })
+      return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
     }
   }
   return [flagState, setFlagFn]
 }
 
 export interface FlagOption {
-  isFan?: boolean
-  isUVCFan?: boolean
   isMixLight?: boolean
+  isStringLight?: boolean
   workModeCode: string
 }
 
 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'
@@ -80,34 +78,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 (option?.isFan) {
-      fanEnableHex = (flagItem.fanEnable ? 1 : 0).toString(16).padStart(2, '0')
-      fanSpeedHex = (flagItem.fanSpeed || 1).toString(16).padStart(2, '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
@@ -137,20 +159,27 @@ export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefine
       }
     })
     return result
+  } else if (option?.isStringLight) {
+    const { speed, mode, id, nodes } = stripDp2Obj(dp, true)
+    const colors = nodes.map(node => ({
+      ...node,
+      s: node.s / 10,
+      v: node.v / 10
+    }))
+    return {
+      id,
+      mode,
+      speed,
+      whiteColors: [{ brightness: 100, colorTemp: 0 }],
+      colors
+    }
   } 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)
+    const sliceDp = dp.slice(2)
     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))
+      speed = 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))
@@ -166,8 +195,6 @@ export function dp2Obj(dp: string, option?: FlagOption): FlagItemInfo | undefine
       id,
       mode,
       speed,
-      fanEnable,
-      fanSpeed,
       colors,
       whiteColors
     }

package/src/modules/flags/FlagEditPage.tsx

@@ -72,6 +72,7 @@ const FlagEditPage = () => {
     <Page
       backText={I18n.getLang('mesh_device_detail_mode')}
       showBackDialog={true}
+      loading={state.loading}
       backDialogTitle={
         I18n.getLang(params.mode === 'add' ?
           'flag_canceladding' :
@@ -87,7 +88,6 @@ const FlagEditPage = () => {
         if (state.loading) return
         state.loading = true
         const res = await params.modDeleteFlag(params.mode, state.mood)
-        console.log(res, '< --- resss')
         if (res.success) {
           state.loading = false
           navigation.goBack()

package/src/modules/flags/FlagInfo.tsx

@@ -39,7 +39,7 @@ export const defFlagList: FlagUiInfo[] = [
     ],
     colors: [
       {h: 48, s: 100, v: 100},
-      {h: 360, s: 100, v: 86},
+      {h: 360, s: 100, v: 100},
       {h: 0, s: 0, v:0}],
   },
   {
@@ -51,7 +51,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 350, s: 92, v: 78}, {h: 48, s: 100, v: 100}, {h: 25, s: 15, v: 17}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 100, v: 100}, {h: 0, s: 0, v: 0}]
   },
   {
     id: 253,
@@ -62,7 +62,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 355, s: 82, v: 92}, {h: 0, s: 0, v: 100}, {h: 212, s: 100, v: 32}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 212, s: 100, v: 100}]
   },
   {
     id: 252,
@@ -73,7 +73,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 4, s: 87, v: 85}, {h: 4, s: 87, v: 85}, {h: 150, s: 96, v: 41}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 150, s: 96, v: 100}]
   },
   {
     id: 251,
@@ -84,7 +84,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 209, s: 100, v: 72}, {h: 0, s: 0, v: 100}, {h: 209, s: 100, v: 72}]
+    colors: [{h: 209, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 209, s: 100, v: 100}]
   },
   {
     id: 250,
@@ -95,7 +95,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 357, s: 87, v: 66}, {h: 47, s: 100, v: 94}, {h: 357, s: 87, v: 66}]
+    colors: [{h: 357, s: 87, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
   },
   {
     id: 249,
@@ -106,7 +106,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 350, s: 92, v: 78}, {h: 350, s: 92, v: 78}, {h: 0, s: 0, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
   },
   {
     id: 248,
@@ -117,7 +117,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 355, s: 78, v: 93}, {h: 0, s: 0, v: 100}, {h: 355, s: 78, v: 93}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 247,
@@ -128,7 +128,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 353, s: 91, v: 80}, {h: 0, s: 0, v: 100}]
+    colors: [{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
   },
   {
     id: 246,
@@ -139,7 +139,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 133, s: 36, v: 43}, {h: 0, s: 0, v: 100}, {h: 354, s: 80, v: 80}]
+    colors: [{h: 133, s: 36, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 245,
@@ -150,7 +150,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 357, s: 88, v: 93}, {h: 213, s: 93, v: 63}, {h: 0, s: 0, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 213, s: 93, v: 100}, {h: 0, s: 0, v: 100}]
   },
   {
     id: 244,
@@ -161,7 +161,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 4, s: 87, v: 85}, {h: 0, s: 0, v:0}, {h: 4, s: 87, v: 85}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 243,
@@ -172,7 +172,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 350, s: 92, v: 78}, {h: 0, s: 0, v:0}, {h: 350, s: 92, v: 78}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 242,
@@ -183,7 +183,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 217, s: 100, v: 64}, {h: 0, s: 0, v:0}, {h: 350, s: 92, v: 78}]
+    colors: [{h: 217, s: 100, v: 100}, {h: 0, s: 0, v:0}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 241,
@@ -194,7 +194,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 353, s: 91, v: 80}, {h: 48, s: 91, v: 98}, {h: 219, s: 100, v: 49}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 48, s: 91, v: 100}, {h: 219, s: 100, v: 100}]
   },
   {
     id: 240,
@@ -205,7 +205,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 4, s: 87, v: 85}, {h: 0, s: 0, v: 100}, {h: 4, s: 87, v: 85}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 239,
@@ -216,7 +216,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 210, s: 89, v: 46}, {h: 357, s: 72, v: 77}]
+    colors: [{h: 0, s: 0, v: 100}, {h: 210, s: 89, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 238,
@@ -227,7 +227,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 366, s: 83, v: 80}, {h: 212, s: 4, v: 100}, {h: 149, s: 100, v: 54}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 212, s: 4, v: 100}, {h: 149, s: 100, v: 100}]
   },
   {
     id: 237,
@@ -238,7 +238,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 358, s: 90, v: 84}, {h: 0, s: 0, v: 100}, {h: 211, s: 86, v: 49}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 211, s: 86, v: 100}]
   },
   {
     id: 236,
@@ -249,7 +249,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 360, s: 100, v: 100}, {h: 217, s: 100, v: 64}, {h: 0, s: 0, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 217, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
   },
   {
     id: 235,
@@ -260,7 +260,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 220, s: 89, v: 54}, {h: 2, s: 89, v: 90}]
+    colors: [{h: 0, s: 0, v: 100}, {h: 220, s: 89, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 234,
@@ -271,7 +271,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 201, s: 100, v: 65}, {h: 48, s: 99, v: 99}, {h: 201, s: 100, v: 65}]
+    colors: [{h: 201, s: 100, v: 100}, {h: 48, s: 99, v: 100}, {h: 201, s: 100, v: 100}]
   },
   {
     id: 233,
@@ -282,7 +282,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 218, s: 100, v: 35}, {h: 347, s: 93, v: 72}]
+    colors: [{h: 0, s: 0, v: 100}, {h: 218, s: 100, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 232,
@@ -293,6 +293,17 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 348, s: 90, v: 86}, {h: 0, s: 0, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}]
+  },
+  {
+    id: 231,
+    version: 0,
+    mode: SceneNodeTransitionMode.Jump,
+    speed: 70,
+    name: I18n.getLang('flag_leverkusen'),
+    whiteColors: [
+      { brightness: 100, colorTemp: 0},
+    ],
+    colors: [{h: 360, s: 100, v: 100}, {h: 0, s: 0, v: 100}, {h: 60, s: 100, v: 100}]
   },
 ]

package/src/modules/flags/FlagPage.tsx

@@ -24,8 +24,7 @@ export interface FlagPageProps {
   isSupportColor?: boolean
   isSupportBrightness?: boolean
   isSupportTemperature?: boolean
-  isSupportFan?: boolean
-  isSupportUVCFan?: boolean
+  isStringLight?: boolean
   isSupportMixScene?: boolean
   drawToolLight?: { 
     drawToolCode: string
@@ -35,7 +34,7 @@ export interface FlagPageProps {
   getRemoteMoodList?: (devId: string) => Promise<Result<any>>
   sceneDataCode?: string
   workModeCode: string
-  switchLed?: string
+  switchLedCode: string
 }
 
 const FlagPage = () => {
@@ -45,9 +44,8 @@ const FlagPage = () => {
   const navigation = useNavigation()
   const [, setDps] = useDps()
   const [flagState, setFlag] = useFlag((params.sceneDataCode || params?.drawToolLight?.drawToolCode)!!, {
-    isFan: params.isSupportFan,
-    isUVCFan: params.isSupportUVCFan,
     isMixLight: params.isSupportMixScene,
+    isStringLight: params.isStringLight,
     ...params
   })
   const state = useReactive({
@@ -84,7 +82,14 @@ const FlagPage = () => {
   const getRemoteFlagInfo = async () => {
     const res = await getRemoteFlag(devId)
     if (res.success) {
-      state.flags = cloneDeep(res.data) || []
+      let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
+      if(params.drawToolLight){
+        cloneFlag = cloneFlag.map(flag => {
+          flag.colors = flag.colors.reverse()
+          return flag
+        })
+      }
+      state.flags = cloneFlag
     }
   }
 
@@ -124,6 +129,11 @@ const FlagPage = () => {
     const res = await saveFlag(devId, cloneDeep(newScene))
     if (res.success) {
       state.flags = cloneDeep(newScene)
+      if(mode === 'del' && currentMood.id !== flagState.id){
+        return {
+          success: true
+        }
+      }
       if(mood){
         setFlag(mood)
       }else{