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

package/package.json

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

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 { useDeviceInfo, useUAGroupInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceInfo, useMoods, useUAGroupInfo } 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";
@@ -40,6 +40,8 @@ const FlagPage = () => {
   const devInfo = useDeviceInfo()
   const uaGroupInfo = useUAGroupInfo()
   const navigation = useNavigation()
+  const [moods, setMoods] = useMoods()
+  const [flags, setFlags] = useFlags()
   const [flagState, setFlag] = useFlag({
     isStripLight: params.isStripLight,
     isStringLight: params.isStringLight,
@@ -47,8 +49,8 @@ const FlagPage = () => {
   })
   const state = useReactive({
     loading: true,
-    flags: [] as FlagUiInfo[],
-    moods: [] as any[]
+    flags: cloneDeep(flags) as FlagUiInfo[],
+    moods: params.isStripLight ? [] : cloneDeep(moods)
   })
   const defParams = {
     workModeDpCode: params.workModeCode,
@@ -79,12 +81,19 @@ 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) {
+    if(!flags?.length){
+      getRemoteFlagInfo().then()
+    }
+    if (params.getRemoteMoodList && !params.isStripLight && !moods?.length) {
       params.getRemoteMoodList(uaGroupInfo.tyGroupId.toString()).then(res => {
         if (res.success && Array.isArray(res.data)) {
           state.moods = res.data
+          setMoods(cloneDeep(res.data))
         }
       })
     }
@@ -101,6 +110,7 @@ const FlagPage = () => {
         })
       }
       state.flags = cloneFlag
+      setFlags(cloneDeep(cloneFlag))
     }
   }
 
@@ -140,6 +150,7 @@ const FlagPage = () => {
     const res = await saveFlag(uaGroupInfo.tyGroupId.toString(), cloneDeep(newScene))
     if (res.success) {
       state.flags = cloneDeep(newScene)
+      setFlags(cloneDeep(newScene))
       if(mode === 'del' && flagState?.flag && (checkedMood.id !== flagState.flag.id)){
         return{
           success: true
@@ -165,6 +176,7 @@ 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) {
@@ -175,7 +187,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagState?.workMode === WorkMode.Scene && flagId === item.id}
+          enable={flagState?.workMode === (params.isStripLight ? WorkMode.COLOUR : 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/StaticMoodEditorPage.tsx

@@ -19,6 +19,8 @@ import { showDeleteMoodDialog } from './tools'
 import { MoodPageProps } from './MoodPage'
 import { Result } from '@ledvance/base/src/models/modules/Result'
 import { ui_biz_routerKey } from '../../navigation/Routers'
+import {hsv2Hex, mapFloatToRange } from '@ledvance/base/src/utils'
+import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -57,7 +59,13 @@ const StaticMoodEditorPage = () => {
   }, [params.mode])
 
   const getColorBlockColor = useCallback(() => {
-    return '#fff'
+    const s = Math.round(mapFloatToRange(state.currentNode.s / 100, 30, 100))
+    if (state.currentNode.isColorNode) {
+      return hsv2Hex(state.currentNode.h, s, 100)
+    }
+    if (moduleParams.isSupportTemperature) {
+      return cctToColor(state.currentNode.colorTemp.toFixed())
+    }
   }, [state.currentNode.colorTemp])
 
   const getButtonStatus = () => {
@@ -248,4 +256,4 @@ const styles = StyleSheet.create({
   },
 })
 
-export default StaticMoodEditorPage
+export default StaticMoodEditorPage