@ledvance/ui-biz-bundle 1.1.12 → 1.1.14

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "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, nToHS, parseJSON, toFixed } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { ColorUtils, 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";
@@ -9,7 +9,6 @@ import { spliceByStep } from "@ledvance/base/src/utils/common";
 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 {
@@ -52,8 +51,8 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
 
   const setFlagFn = (flagItem: FlagItemInfo) => {
     if (extra.drawToolLight) {
-      const hex = extra.drawToolLight.drawToolObj2dp(flagItem.colors.map(item => hsv2Hex(item.h, item.s, item.v)))
-      return setDps({ [flagCode]: hex })
+      const hex = extra.drawToolLight.drawToolObj2dp(flagItem.colors.map(item => ColorUtils.hsv2hex(item.h, item.s, item.v)))
+      return setDps({ [flagCode]: hex , [extra.switchLedCode]: true})
     } else {
       const hex = obj2Dp(flagItem, extra)
       return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
@@ -230,3 +229,10 @@ export function saveFlag(devId: string, flagInfo: FlagUiInfo[]) {
   return NativeApi.putJson(devId, featureId, JSON.stringify(flagInfo))
 }
 
+export function getFlagMode(groupId: string){
+  return NativeApi.getJson(groupId, 'flagMode')
+}
+
+export function saveFlagMode(groupId: string, v:string){
+  return NativeApi.putJson(groupId, 'flagMode', v)
+}

package/src/modules/flags/FlagEditPage.tsx

@@ -394,6 +394,8 @@ const styles = StyleSheet.create({
     flex: 1,
     height: cx(40),
     borderRadius: cx(8),
+    borderWidth: 1,
+    borderColor: '#ccc'
   },
   nodeDeleteBtn: {
     width: cx(24),

package/src/modules/flags/FlagPage.tsx

@@ -17,7 +17,7 @@ import { hsv2Hex } from "@ledvance/base/src/utils";
 import { SceneNodeTransitionMode } from "@ledvance/ui-biz-bundle/src/modules/scene/SceneInfo";
 import { Result } from "@ledvance/base/src/models/modules/Result";
 import { useDps } from "@ledvance/base/src/models/modules/NativePropsSlice";
-import { WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
+import { ColorUtils, WORK_MODE } from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 const cx = Utils.RatioUtils.convertX
 
 export interface FlagPageProps {
@@ -59,7 +59,7 @@ const FlagPage = () => {
   const flagId = useMemo(() =>{
     if(flagState.colors !== undefined){
       const flag = state.flags.find(item => {
-        const hexColors = item.colors.map(c => hsv2Hex(c.h, c.s, c.v).toLocaleUpperCase())
+        const hexColors = item.colors.map(c => ColorUtils.hsv2hex(c.h, c.s, c.v).toLocaleUpperCase())
         return isEqual(hexColors, flagState.colors)
       })
       return flag?.id
@@ -105,7 +105,7 @@ const FlagPage = () => {
         })
       }
       state.flags = cloneFlag
-      setFlags(cloneFlag)
+      setFlags(cloneDeep(cloneFlag))
     }
   }
 
@@ -185,7 +185,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={dps[params.workModeCode] === WORK_MODE.SCENE && flagId === item.id}
+          enable={dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.Colour : WORK_MODE.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/DynamicMoodEditorPage.tsx

@@ -18,7 +18,7 @@ import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import {Utils} from 'tuya-panel-kit'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
 import {saveScene, useScene} from '../scene/SceneAction'
-import {isUVCFanDevice, useDeviceId, useFanMaxSpeed, useRole} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {isUVCFanDevice, useDeviceId, useFanMaxSpeed, useFlagMode} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import {SceneNodeInfo, SceneNodeTransitionMode} from '../scene/SceneInfo'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
@@ -27,6 +27,7 @@ import {toSelectPage} from '../../navigation/tools'
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
 import {showDeleteMoodDialog} from './tools'
 import {ui_biz_routerKey} from '../../navigation/Routers'
+import { saveFlagMode } from 'modules/flags/FlagActions'
 const cx = Utils.RatioUtils.convertX
 interface DynamicMoodEditorPageState extends StaticMoodEditorPageState {
   paintBucketSelected: boolean
@@ -39,8 +40,8 @@ const DynamicMoodEditorPage = () => {
   const deviceId = useDeviceId()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
   const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
+  const [flagMode, setFlagMode] = useFlagMode()
   const isUVCFan = isUVCFanDevice()
-  const role = useRole()
   const state = useReactive<DynamicMoodEditorPageState>({
     headline: '',
     mood: params.currentMood,
@@ -100,6 +101,10 @@ const DynamicMoodEditorPage = () => {
       isUVCFan
     )
     if (saveRes.success) {
+      if(flagMode && params.isSupportColor){
+        saveFlagMode(deviceId, JSON.stringify(false)).then()
+        setFlagMode(false)
+      }
       if (list.length > 0) {
         if (isDelete && currentMood.id === moodId && workMode === SCENE) {
           const setSceneRes = await setScene(
@@ -124,6 +129,7 @@ const DynamicMoodEditorPage = () => {
           )
           console.log('设置修改后的场景结果', setSceneRes)
         }
+        
       } else {
         await setWorkMode(moduleParams.isOnlyRGBLamp ? COLOUR : WHITE)
         console.log('Mood被清空，将work_mode设置成white')

package/src/modules/mood/FantasyMoodEditPage.tsx

@@ -16,7 +16,7 @@ import Spacer from '@ledvance/base/src/components/Spacer'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import { Utils } from 'tuya-panel-kit'
 import LdvSlider from '@ledvance/base/src/components/ldvSlider'
-import { useDeviceId } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceId, useFlagMode } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import { stringLightSceneMode, stripLightSceneMode, StripSceneUIState, StripNodeInfo, StripLightSceneMode } from '../scene/SceneInfo'
 import TextFieldStyleButton from '@ledvance/base/src/components/TextFieldStyleButton'
@@ -26,6 +26,7 @@ import { ui_biz_routerKey } from '../../navigation/Routers'
 import { FantasyMoodPageProps } from './FantasyMood'
 import Segmented from '@ledvance/base/src/components/Segmented'
 import { saveFantasyScene, useFantasyScene } from '../scene/SceneAction'
+import { saveFlagMode } from 'modules/flags/FlagActions'
 const cx = Utils.RatioUtils.convertX
 
 interface FantasyMoodEditPageState {
@@ -50,7 +51,8 @@ const FantasyMoodEditPage = () => {
   const moduleParams = params.moduleParams
   const deviceId = useDeviceId()
   const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
-  const [, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, params.moduleParams.switchLedDpCode, moduleParams.isStringLight)
+  const [flagMode, setFlagMode] = useFlagMode()
+  const [fantasyId, setFantasyScene] = useFantasyScene(params.moduleParams.sceneDpCode, params.moduleParams.workModeDpCode, params.moduleParams.switchLedDpCode, moduleParams.isStringLight)
   const state = useReactive<FantasyMoodEditPageState>({
     headline: '',
     mood: params.currentMood,
@@ -105,8 +107,13 @@ const FantasyMoodEditPage = () => {
         })
     const saveRes = await saveFantasyScene(deviceId, params.moduleParams.featureId, list, moduleParams.isStringLight)
     if (saveRes.success) {
+      if(flagMode && params.isSupportColor){
+        saveFlagMode(deviceId, JSON.stringify(false)).then()
+        setFlagMode(false)
+      }
       if (list.length > 0) {
-        if (isDelete  && workMode === SCENE) {
+        if (isDelete && workMode === SCENE) {
+          if(currentMood.id !== fantasyId) return
           await setFantasyScene(list[0])
         } else {
           await setFantasyScene(currentMood)

package/src/modules/mood/StaticMoodEditorPage.tsx

@@ -15,13 +15,14 @@ import res from '@ledvance/base/src/res'
 import {cloneDeep, find, isEqual} from 'lodash'
 import TextButton from '@ledvance/base/src/components/TextButton'
 import {saveScene, useScene} from '../scene/SceneAction'
-import {useDeviceId, useFanMaxSpeed} from '@ledvance/base/src/models/modules/NativePropsSlice'
+import {useDeviceId, useFanMaxSpeed, useFlagMode} from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {SceneNodeInfo, SceneUIState} from '../scene/SceneInfo'
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import FanAdjustView from '@ledvance/base/src/components/FanAdjustView'
 import {showDeleteMoodDialog} from './tools'
 import {MoodPageProps} from './MoodPage'
 import {ui_biz_routerKey} from '../../navigation/Routers'
+import { saveFlagMode } from 'modules/flags/FlagActions'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -47,7 +48,7 @@ const StaticMoodEditorPage = () => {
   const deviceId = useDeviceId()
   const [moodId, setScene] = useScene(moduleParams.sceneDpCode)
   const [workMode, setWorkMode] = useWorkMode(moduleParams.workModeDpCode)
-
+  const [flagMode, setFlagMode] = useFlagMode()
   const state = useReactive<StaticMoodEditorPageState>({
     headline: '',
     mood: params.currentMood,
@@ -101,6 +102,10 @@ const StaticMoodEditorPage = () => {
       !!moduleParams.isFanLamp,
     )
     if (saveRes.success) {
+      if(flagMode && params.isSupportColor){
+        saveFlagMode(deviceId, JSON.stringify(false)).then()
+        setFlagMode(false)
+      }
       if (list.length > 0) {
         if (isDelete && currentMood.id === moodId  && workMode === SCENE) {
           const setSceneRes = await setScene(