@ledvance/ui-biz-bundle 1.1.13 → 1.1.15

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -229,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

@@ -1,12 +1,12 @@
 import React, { useEffect, useMemo } from "react";
 import Page from "@ledvance/base/src/components/Page";
-import { useDeviceId, useDeviceInfo, useFlags, useMoods } from "@ledvance/base/src/models/modules/NativePropsSlice";
+import { useDeviceId, useDeviceInfo, useFlagMode, 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";
 import FlagItem from "./FlagItem";
 import { FlagUiInfo } from "./FlagInfo";
-import { getRemoteFlag, saveFlag, useFlag } from "./FlagActions";
+import { getRemoteFlag, saveFlag, saveFlagMode, useFlag } from "./FlagActions";
 import { useRoute, useNavigation } from '@react-navigation/core'
 import I18n from "@ledvance/base/src/i18n";
 import { useReactive, useUpdateEffect } from "ahooks";
@@ -46,6 +46,7 @@ const FlagPage = () => {
   const [dps, setDps] = useDps()
   const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
+  const [flagMode, setFlagMode] = useFlagMode()
   const [flagState, setFlag] = useFlag((params.isStripLight ? params?.drawToolLight?.drawToolCode : params.sceneDataCode)!!, {
     isMixLight: params.isSupportMixScene,
     isStringLight: params.isStringLight,
@@ -144,6 +145,7 @@ const FlagPage = () => {
     const mood = mode === 'del' ? (newScene.length === 0 ? undefined : newScene[0]) : checkedMood
     const res = await saveFlag(devId, cloneDeep(newScene))
     if (res.success) {
+      updateFlagMode()
       state.flags = cloneDeep(newScene)
       setFlags(cloneDeep(newScene))
       if(mode === 'del' && currentMood.id !== flagState.id){
@@ -165,6 +167,13 @@ const FlagPage = () => {
     }
   }
 
+  const updateFlagMode = () =>{
+    if(!flagMode){
+      saveFlagMode(devId, JSON.stringify(true)).then()
+      setFlagMode(true)
+    }
+  }
+
   return (
     <Page
       headlineText={I18n.getLang('Feature_devicepanel_flags')}
@@ -185,12 +194,13 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={dps[params.workModeCode] === (params.isStripLight ? WORK_MODE.Colour : 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) => {
             if (enable) {
               await setFlag(item)
+              updateFlagMode()
             }
           }}
           onPress={() => {

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){
+        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){
+        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/MoodPage.tsx

@@ -4,7 +4,7 @@ import { Utils } from 'tuya-panel-kit'
 import { ScenePageUIState, SceneUIState } from '../scene/SceneInfo'
 import { getRemoteSceneList, useScene } from '../scene/SceneAction'
 import { SCENE, useWorkMode } from '../../hooks/DeviceDpStateHooks'
-import { isUVCFanDevice, useDeviceInfo } from '@ledvance/base/src/models/modules/NativePropsSlice'
+import { isUVCFanDevice, useDeviceInfo, useFlagMode } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import { useReactive, useUpdateEffect } from 'ahooks'
 import Strings from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
@@ -16,6 +16,7 @@ import CustomListDialog from '@ledvance/base/src/components/CustomListDialog'
 import MoodItem from './MoodItem'
 import { toAddMoodPage, toDynamicMoodEditorPage, toStaticMoodEditorPage } from '../../navigation/tools'
 import { useNavigation, useRoute } from '@react-navigation/core'
+import { saveFlagMode } from '../flags/FlagActions'
 
 const cx = Utils.RatioUtils.convertX
 
@@ -58,6 +59,7 @@ const MoodPage = () => {
   }
   const [sceneId, setScene] = useScene(params.sceneDpCode)
   const [workMode] = useWorkMode(params.workModeDpCode)
+  const [flagMode, setFlagMode] = useFlagMode()
   const deviceInfo = useDeviceInfo()
   const navigation = useNavigation()
   const isUVCFan = isUVCFanDevice()
@@ -143,6 +145,13 @@ const MoodPage = () => {
     return mood
   }, [])
 
+  const updateFlagMode = () =>{
+    if(flagMode && params.isSupportColor){
+      saveFlagMode(deviceInfo.devId, JSON.stringify(false)).then()
+      setFlagMode(false)
+    }
+  }
+
   return (
     <>
       <Page
@@ -226,6 +235,7 @@ const MoodPage = () => {
                     !!params.isFanLamp
                   )
                   state.currentScene = checkMoodData(item)
+                  updateFlagMode()
                   state.loading = false
                 }} />
             )

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 && moduleParams.isSupportColor){
+        saveFlagMode(deviceId, JSON.stringify(false)).then()
+        setFlagMode(false)
+      }
       if (list.length > 0) {
         if (isDelete && currentMood.id === moodId  && workMode === SCENE) {
           const setSceneRes = await setScene(