@ledvance/ui-biz-bundle 1.1.33 → 1.1.35

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -57,19 +57,7 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
           setDps({ [flagCode]: hex})
         }, idx * 50)
       })
-      const extraDps = {}
-      if(extra.isCeilingLight){
-        const whiteHex = obj2Dp(flagItem, extra)
-        extraDps[extra.switchLedCode] = true,
-        extraDps[extra.rgbcSwitchLedCode!] = true
-        extraDps[extra.rgbcWorkModeCode!] = WORK_MODE.COLOUR
-        extraDps[extra.workModeCode] = WORK_MODE.SCENE
-        extraDps[extra.sceneDataCode!!] = whiteHex
-      }else{
-        extraDps[extra.switchLedCode] = true 
-        extraDps[extra.workModeCode] = WORK_MODE.COLOUR
-      }
-      return setDps(extraDps)
+      return setDps({ [extra.switchLedCode]: true, [extra.workModeCode]: WORK_MODE.COLOUR})
     } else {
       const hex = obj2Dp(flagItem, extra)
       return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
@@ -81,7 +69,6 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
 export interface FlagOption {
   isMixLight?: boolean
   isStringLight?: boolean
-  isCeilingLight?: boolean
   workModeCode: string
 }
 
@@ -142,8 +129,8 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
   } else {
     const switchingIntervalHex = nToHS(flagItem.speed)
     const transitionTimeHex = nToHS(flagItem.speed)
-    const transitionModeHex = nToHS(option?.isCeilingLight ? SceneNodeTransitionMode.Static : flagItem.mode)
-    const colorHex = flagItem.colors.map(color => {
+    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)
@@ -151,9 +138,6 @@ export function obj2Dp(flagItem: FlagItemInfo, option?: FlagOption): string {
       const colorTempHex = '0000'
       return switchingIntervalHex + transitionTimeHex + transitionModeHex + hHex + sHex + vHex + brightnessHex + colorTempHex
     }).join('')
-    const whiteColor = flagItem.whiteColors[0]
-    const whiteHex = switchingIntervalHex + transitionTimeHex + transitionModeHex + '0000' + '0000' + '0000' + nToHS(whiteColor?.brightness * 10, 4) + nToHS(whiteColor?.colorTemp * 10, 4)
-    const hex = idHex + (option?.isCeilingLight ? whiteHex : colorHex)
     return hex
   }
 }

package/src/modules/flags/FlagInfo.tsx

@@ -270,7 +270,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 220, s: 89, v: 100}, {h: 360, s: 100, v: 100}]
+    colors: [{h: 220, s: 89, v: 100},{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 234,
@@ -314,7 +314,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 211, s: 100, v: 100}, {h: 50, s: 100, v: 100}]
+    colors: [{h: 50, s: 100, v: 100}, {h: 211, s: 100, v: 100}]
   },
 ]
 
@@ -609,7 +609,7 @@ export const def2FlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 211, s: 100, v: 100}, {h: 50, s: 100, v: 100}]
+    colors: [{h: 50, s: 100, v: 100}, {h: 211, s: 100, v: 100}]
   },
 ]
 
@@ -859,7 +859,7 @@ export const def3FlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 0, s: 0, v: 100}, {h: 220, s: 89, v: 100}, {h: 360, s: 100, v: 100}]
+    colors: [{h: 220, s: 89, v: 100},{h: 0, s: 0, v: 100}, {h: 360, s: 100, v: 100}]
   },
   {
     id: 234,
@@ -903,6 +903,6 @@ export const def3FlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 211, s: 100, v: 100}, {h: 50, s: 100, v: 100}]
+    colors: [{h: 50, s: 100, v: 100}, {h: 211, s: 100, v: 100}]
   },
 ]

package/src/modules/flags/FlagPage.tsx

@@ -27,7 +27,6 @@ export interface FlagPageProps {
   isSupportTemperature?: boolean
   isStringLight?: boolean
   isStripLight?: boolean
-  isCeilingLight?: boolean
   isSupportMixScene?: boolean
   drawToolLight?: { 
     drawToolCode: string
@@ -38,8 +37,6 @@ export interface FlagPageProps {
   sceneDataCode?: string
   workModeCode: string
   switchLedCode: string
-  rgbcWorkModeCode?: string 
-  rgbcSwitchLedCode?: string 
 }
 
 const FlagPage = () => {
@@ -51,10 +48,9 @@ const FlagPage = () => {
   const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
   const [flagMode, setFlagMode] = useFlagMode()
-  const [flagState, setFlag] = useFlag(((params.isStripLight || params.isCeilingLight) ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
+  const [flagState, setFlag] = useFlag((params.isStripLight ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
     isMixLight: params.isSupportMixScene,
     isStringLight: params.isStringLight,
-    isCeilingLight: params.isCeilingLight,
     ...params
   })
   const state = useReactive({