@ledvance/group-ui-biz-bundle 1.0.5 → 1.0.7

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -40,22 +40,23 @@ type UseFlagType = (params: LightType) => [FlagDataType | undefined, (flagData:
 
 export const useFlag: UseFlagType = (params) => {
   return useFeatureHook<FlagConfigType, FlagDataType | undefined>('flagSceneConfig', undefined, undefined, (flagData) =>{
-    console.log(flagData, '< -- flagData')
     if(flagData){
       const dps = {}
-      const { flag, drawToolStatus, sceneStatus, switchLedDpCode, workMode, workModeDpCode} = flagData
+      const { flag, drawToolStatus, sceneStatus, switchLedDpCode, workModeDpCode} = flagData
       if(params.isStripLight && drawToolStatus){
         dps[drawToolStatus.drawToolCode] = flag ? drawToolStatus.drawToolObj2dp(flag.colors.map(hsv => hsv2Hex(hsv.h, hsv.s, hsv.v))) : ''
+        dps[workModeDpCode] = WorkMode.Colour
       }else{
         if(sceneStatus){
           dps[sceneStatus.sceneDataDpCode] = flag ? obj2Dp(flag, {isMixLight: params.isMixLight}) : ''
+          dps[workModeDpCode] = WorkMode.Scene
         }
       }
       dps[switchLedDpCode] = true
-      dps[workModeDpCode] = workMode
+      
       return dps
     }
-  }, flagData => ({workMode: flagData?.workMode, switchLed: true}))
+  }, flagData => ({workMode: (params.isStripLight && flagData?.drawToolStatus) ? WorkMode.Colour : WorkMode.Scene, switchLed: true}))
 }
 
 export interface FlagOption {

package/src/modules/flags/FlagInfo.tsx

@@ -1,5 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
-import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
+import { SceneNodeTransitionMode } from "../mood/SceneInfo";
 
 type HSV = {
   h: number 

package/src/modules/flags/FlagPage.tsx

@@ -54,7 +54,7 @@ const FlagPage = () => {
     workModeDpCode: params.workModeCode,
     switchLedDpCode: params.switchLedCode,
     workMode: WorkMode.Scene,
-    sceneStatus: !params.isSupportMixScene && params.sceneDataCode ? {
+    sceneStatus: !params.isStripLight && params.sceneDataCode ? {
       sceneDataDpCode: params.sceneDataCode
     } : undefined,
     drawToolStatus: params.isStripLight && params.drawToolLight ? {
@@ -66,15 +66,11 @@ const FlagPage = () => {
     if (flagState && state.flags?.length) {
       const { flag } = flagState
       if(params.isStripLight && flag?.colors !== undefined){
-      
+        const v = state.flags.find(item => {
+          return isEqual(item.colors, flag?.colors)
+        })
+        return v?.id
       }
-      // if (flag?.colors !== undefined) {
-      //   const flag = state.flags.find(item => {
-      //     const hexColors = item.colors.map(c => hsv2Hex(c.h, c.s, c.v).toLocaleUpperCase())
-      //     return isEqual(hexColors, flag.colors)
-      //   })
-      //   return flag?.id
-      // }
       if (flag?.id !== undefined) {
         return flag.id
       }
@@ -83,10 +79,6 @@ const FlagPage = () => {
     return -1
   }, [JSON.stringify(flagState), JSON.stringify(state.flags)])
 
-  useEffect(() =>{
-    console.log(flagState, '< --- flagstate')
-    console.log(state.flags, '< --- state.flags')
-  }, [flagState, JSON.stringify(state.flags)])
   useEffect(() => {
     getRemoteFlagInfo().then()
     if (params.getRemoteMoodList && !params.isStripLight) {
@@ -102,7 +94,7 @@ const FlagPage = () => {
     const res = await getRemoteFlag(uaGroupInfo.tyGroupId.toString())
     if (res.success) {
       let cloneFlag: FlagUiInfo[] = cloneDeep(res.data) || []
-      if(params.drawToolLight){
+      if(!params.drawToolLight){
         cloneFlag = cloneFlag.map(flag => {
           flag.colors = flag.colors.reverse()
           return flag
@@ -173,7 +165,6 @@ const FlagPage = () => {
           ...state.flags,
           ...state.moods
         ], 'id')
-        console.log(useIds, '< --- useIds')
         const idRange = range(0, 256)
         const unuseId = last(difference(idRange, useIds))
         if (unuseId !== undefined) {
@@ -184,7 +175,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagId === item.id}
+          enable={flagState?.workMode === WorkMode.Scene && flagId === item.id}
           title={item.name}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
           onSwitch={async (enable) => {

package/src/modules/mood/SceneAction.ts

@@ -53,7 +53,7 @@ export function useScene(params: LightType): [SceneDataType | undefined, (scene?
   return useFeatureHook<SceneDataConfigType, SceneDataType | undefined>('sceneConfig', undefined, undefined, (scene) => {
     if (scene) {
       const isFantasy = params.isStringLight || params.isStripLight
-      console.log(scene.scene, isFantasy, '< --- scene')  
+      console.log(scene.scene, isFantasy, '< --- scene')
       const dps = {}
       // @ts-ignore
       dps[scene.sceneDataDpCode] = scene.scene ? (isFantasy ? stripObj2Dp(scene.scene, params.isStringLight) : obj2Dp(scene.scene, params.isSupportFan, params.isSupportUVC)) : ''
@@ -225,6 +225,12 @@ export function obj2Dp(scene: SceneInfo, isFan: boolean = false, isUVCFan?: bool
     fanEnableHex = (scene.fanEnable ? 1 : 0).toString(16).padStart(2, '0')
     fanSpeedHex = (scene.fanSpeed || 1).toString(16).padStart(2, '0')
   }
+  if (!scene.speed) {
+    scene.speed = 12
+  }
+  if (!scene.mode) {
+    scene.mode = 0
+  }
   const hex = idHex + fanEnableHex + fanSpeedHex + scene.nodes?.map(node => {
     const switchingIntervalHex = (isUVCFan ? 101 - scene.speed : scene.speed).toString(16).padStart(2, '0')
     const transitionTimeHex = (isUVCFan ? 101 - scene.speed : scene.speed).toString(16).padStart(2, '0')