@ledvance/group-ui-biz-bundle 1.0.8 → 1.0.10

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -200,3 +200,11 @@ 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

@@ -393,6 +393,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

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
-import { useDeviceInfo, useMoods, useUAGroupInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceInfo, useFlags, 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";
@@ -110,7 +110,7 @@ const FlagPage = () => {
         })
       }
       state.flags = cloneFlag
-      setFlags(cloneFlag)
+      setFlags(cloneDeep(cloneFlag))
     }
   }
 
@@ -187,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/MoodPage.tsx

@@ -4,7 +4,7 @@ import { Utils } from 'tuya-panel-kit'
 import { SceneMode, ScenePageUIState, SceneUIState, StripSceneUIState } from './SceneInfo'
 import { getRemoteSceneList, saveScene, useScene, useSwitchLed, useWorkMode } from './SceneAction'
 import { WorkMode } from '@ledvance/base/src/utils/interface'
-import { useDeviceInfo, useMoods, useUAGroupInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceInfo, useFlagMode, useMoods, useUAGroupInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { useReactive } from 'ahooks'
 import Strings from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
@@ -17,6 +17,7 @@ import MoodItem from './MoodItem'
 import { useNavigation, useRoute } from '@react-navigation/core'
 import { cloneDeep } from 'lodash'
 import { ui_biz_routerKey } from '../../navigation/Routers'
+import { saveFlagMode } from '../flags/FlagActions'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -61,6 +62,7 @@ const MoodPage = () => {
   const [moods, setMoods] = useMoods()
   const [workMode] = useWorkMode()
   const [switchLed] = useSwitchLed()
+  const [flagMode, setFlagMode] = useFlagMode()
   const state = useReactive<MoodPageUIState>({
     currentScene: undefined,
     staticTagChecked: true,
@@ -171,6 +173,15 @@ const MoodPage = () => {
     if (res.success) {
       state.scenes = cloneDeep(newScene)
       setMoods(cloneDeep(newScene))
+      if(flagMode && params.isSupportColor){
+        saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify(false)).then()
+        setFlagMode(false)
+      }
+      if(mode === 'del' && currentMood.id !== scene?.scene?.id){
+        return {
+          success: true
+        }
+      }
       return setScene({
         scene: cloneDeep(mood),
         sceneDataDpCode: params.sceneDataDpCode,

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