@ledvance/ui-biz-bundle 1.1.11 → 1.1.13

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "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 })

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, mapFloatToRange } from '@ledvance/base/src/utils'
+import { hex2Hsv, hsv2Hex } from '@ledvance/base/src/utils'
 import { cloneDeep, find, isEqual } from 'lodash'
 import { FlagUiInfo } from './FlagInfo'
 import ColorAdjustView from '@ledvance/base/src/components/ColorAdjustView'
@@ -60,8 +60,8 @@ const FlagEditPage = () => {
     if(isMainLight){
       return cctToColor(state.currentWhiteNode.colorTemp, Math.max(...[state.currentWhiteNode.brightness, 50]))
     }
-    const s = Math.round(mapFloatToRange(state.currentNode.s / 100, 30, 100))
-    return hsv2Hex(state.currentNode.h, s, 100)
+    const { h, s, v} = state.currentNode
+    return hsv2Hex(h, s, v)
   }, [state.currentNode, state.currentWhiteNode])
 
   const nameRepeat = useMemo(() => {
@@ -162,7 +162,6 @@ const FlagEditPage = () => {
               <Text style={styles.light}>
                 {I18n.getLang(params.moduleParams.isSupportMixScene ? 'light_sources_tile_sec_lighting_headline' : 'light_sources_tile_tw_lighting_headline')}
               </Text>
-              <View style={[styles.preview, { backgroundColor: getColorBlockColor() }]} />
             </View>
             <Spacer height={cx(10)} />
             <LdvSlider
@@ -274,6 +273,7 @@ const FlagEditPage = () => {
               s={state.currentNode.s}
               v={state.currentNode.v}
               reserveSV={true}
+              minBrightness={0}
               onHSVChange={(h, s, v) => {
                 if (state.colorPaintBucketSelected) {
                   state.mood.colors = state.mood.colors.map(() => (

package/src/modules/flags/FlagPage.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
-import { useDeviceId, useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceId, useDeviceInfo, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { FlatList } from "react-native";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { Utils } from "tuya-panel-kit";
@@ -9,7 +9,7 @@ import { FlagUiInfo } from "./FlagInfo";
 import { getRemoteFlag, saveFlag, useFlag } from "./FlagActions";
 import { useRoute, useNavigation } from '@react-navigation/core'
 import I18n from "@ledvance/base/src/i18n";
-import { useReactive } from "ahooks";
+import { useReactive, useUpdateEffect } from "ahooks";
 import { cloneDeep, difference, isEqual, last, map, range } from "lodash";
 import { ui_biz_routerKey} from "../../navigation/Routers";
 import res from "@ledvance/base/src/res";
@@ -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 {
@@ -44,6 +44,8 @@ const FlagPage = () => {
   const devId = useDeviceId()
   const navigation = useNavigation()
   const [dps, setDps] = useDps()
+  const [moods, setMoods] = useMoods()
+  const [flags, setFlags] = useFlags()
   const [flagState, setFlag] = useFlag((params.isStripLight ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
     isMixLight: params.isSupportMixScene,
     isStringLight: params.isStringLight,
@@ -51,13 +53,13 @@ const FlagPage = () => {
   })
   const state = useReactive({
     loading: true,
-    flags: [] as FlagUiInfo[],
-    moods: [] as any[]
+    flags: cloneDeep(flags) as FlagUiInfo[],
+    moods: params.isStripLight ? [] : cloneDeep(moods)
   })
   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
@@ -71,16 +73,27 @@ const FlagPage = () => {
 
   useEffect(() => {
     if(!devId) return 
-    getRemoteFlagInfo().then()
-    if(params.getRemoteMoodList){
+    if(!flags?.length){
+      getRemoteFlagInfo().then()
+    }
+    if(params.getRemoteMoodList && !moods?.length){
       params.getRemoteMoodList(devId).then(res =>{
         if(res.success && Array.isArray(res.data)){
           state.moods = res.data
+          setMoods(cloneDeep(res.data))
         }
       })
     }
   }, [devId])
 
+  useUpdateEffect(() =>{
+    state.moods = params.isStripLight ? [] : cloneDeep(moods)
+  }, [JSON.stringify(moods)])
+
+  useUpdateEffect(() =>{
+    state.flags = cloneDeep(flags)
+  }, [JSON.stringify(flags)])
+
   const getRemoteFlagInfo = async () => {
     const res = await getRemoteFlag(devId)
     if (res.success) {
@@ -92,6 +105,7 @@ const FlagPage = () => {
         })
       }
       state.flags = cloneFlag
+      setFlags(cloneDeep(cloneFlag))
     }
   }
 
@@ -131,6 +145,7 @@ const FlagPage = () => {
     const res = await saveFlag(devId, cloneDeep(newScene))
     if (res.success) {
       state.flags = cloneDeep(newScene)
+      setFlags(cloneDeep(newScene))
       if(mode === 'del' && currentMood.id !== flagState.id){
         return {
           success: true
@@ -170,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) => {