@ledvance/ui-biz-bundle 1.1.26 → 1.1.27

package/package.json

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

package/src/modules/flags/FlagPage.tsx

@@ -216,7 +216,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagMode && dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id}
+          enable={flagMode?.flagMode && dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.COLOUR : WORK_MODE.SCENE) && flagId === item.id}
           title={item.name}
           icon={item.icon}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}

package/src/modules/mood/FantasyMood.tsx

@@ -3,7 +3,7 @@ import Page from '@ledvance/base/src/components/Page'
 import { Utils } from 'tuya-panel-kit'
 import { StripScenePageUIState, StripSceneUIState } from '../scene/SceneInfo'
 import { getRemoteFantasyScene, useFantasyScene } from '../scene/SceneAction'
-import { useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { useDeviceInfo, useFlagMode } 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'
@@ -13,6 +13,7 @@ import FantasyMoodItem from './FantasyMoodItem'
 import { useNavigation, useRoute } from '@react-navigation/core'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { SCENE, useWorkMode } from 'hooks/DeviceDpStateHooks'
+import { saveFlagMode } from '../flags/FlagActions'
 const cx = Utils.RatioUtils.convertX
 
 interface MoodPageUIState extends StripScenePageUIState {
@@ -43,6 +44,7 @@ const FantasyMoodPage = () => {
   }
   const [sceneId, setScene] = useFantasyScene(params.sceneDpCode, params.workModeDpCode, params.switchLedDpCode, params.isStringLight)
   const [workMode] = useWorkMode(params.workModeDpCode)
+  const [flagMode, setFlagMode] = useFlagMode()
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
 
@@ -86,6 +88,19 @@ const FantasyMoodPage = () => {
     return state.currentScene?.id === id &&  workMode === SCENE
   }, [state.currentScene?.id, workMode])
 
+  const updateFlagMode = () =>{
+    if(flagMode && params.isSupportColor){
+      saveFlagMode(deviceInfo.devId, JSON.stringify({
+        flagMode: false,
+        flagId: undefined
+      })).then()
+      setFlagMode({
+        flagMode: false,
+        flagId: undefined
+      })
+    }
+  }
+
   return (
     <>
       <Page
@@ -111,6 +126,7 @@ const FantasyMoodPage = () => {
                   if (getSwitchEnable(item.id)) return
                   state.loading = true
                   await setScene(item)
+                  updateFlagMode()
                   state.loading = false
                 }} />
             )