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

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "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,12 +1,12 @@
 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, useFlagMode, 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";
 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 } from "ahooks";
@@ -42,6 +42,7 @@ const FlagPage = () => {
   const navigation = useNavigation()
   const [moods, setMoods] = useMoods()
   const [flags, setFlags] = useFlags()
+  const [flagMode, setFlagMode] = useFlagMode()
   const [flagState, setFlag] = useFlag({
     isStripLight: params.isStripLight,
     isStringLight: params.isStringLight,
@@ -81,10 +82,6 @@ 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(() => {
     if(!flags?.length){
       getRemoteFlagInfo().then()
@@ -129,7 +126,6 @@ const FlagPage = () => {
     const checkedMood: FlagUiInfo = {
       ...currentMood,
     }
-
     let newScene: FlagUiInfo[] = []
     if (mode === 'add') {
       newScene = [
@@ -156,6 +152,7 @@ const FlagPage = () => {
           success: true
         }
       }
+      updateFlagMode()
       return setFlag({
         ...defParams,
         flag: cloneDeep(mood)
@@ -166,6 +163,13 @@ const FlagPage = () => {
     }
   }
 
+  const updateFlagMode = () =>{
+    if(!flagMode){
+      saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify(true)).then()
+      setFlagMode(true)
+    }
+  }
+
   return (
     <Page
       headlineText={I18n.getLang('Feature_devicepanel_flags')}
@@ -187,7 +191,7 @@ const FlagPage = () => {
       <FlatList
         data={state.flags}
         renderItem={({ item }) => <FlagItem
-          enable={flagState?.workMode === (params.isStripLight ? WorkMode.COLOUR : 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) => {
@@ -196,6 +200,7 @@ const FlagPage = () => {
                 ...defParams,
                 flag: cloneDeep(item),
               })
+              updateFlagMode()
             }
           }}
           onPress={() => {

package/src/modules/mood/AddMoodPage.tsx

@@ -80,6 +80,7 @@ const AddMoodPage = () => {
                         routeParams.isStatic,
                         moduleParams
                       ) : recommendMood2SceneUIState(item),
+                      moods: routeParams.moods,
                       moduleParams,
                       modDeleteMood: routeParams.modDeleteMood
                     })
@@ -93,6 +94,7 @@ const AddMoodPage = () => {
                         routeParams.isStatic,
                         moduleParams
                       ) : recommendMood2SceneUIState(item),
+                      moods: routeParams.moods,
                       moduleParams,
                       modDeleteMood: routeParams.modDeleteMood
                     })
@@ -823,4 +825,4 @@ function getRecommendMoods(
       },
     ]
   }
-}
+}

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,12 @@ const MoodPage = () => {
     if (res.success) {
       state.scenes = cloneDeep(newScene)
       setMoods(cloneDeep(newScene))
+      updateFlagMode()
+      if(mode === 'del' && currentMood.id !== scene?.scene?.id){
+        return {
+          success: true
+        }
+      }
       return setScene({
         scene: cloneDeep(mood),
         sceneDataDpCode: params.sceneDataDpCode,
@@ -184,6 +192,13 @@ const MoodPage = () => {
     }
   }
 
+  const updateFlagMode = () =>{
+    if(flagMode && params.isSupportColor){
+      saveFlagMode(uaGroupInfo.tyGroupId.toString(), JSON.stringify(false)).then()
+      setFlagMode(false)
+    }
+  }
+
   const onAddMoodDialogItemClick = useCallback((isStatic: boolean, _: number) => {
     if (!!state.scenes) {
       navigationRoute(isStatic, 'add')
@@ -266,6 +281,7 @@ const MoodPage = () => {
                     workMode: WorkMode.Scene,
                     switchLedDpCode: params.switchLedDpCode
                   })
+                  updateFlagMode()
                   state.loading = false
                 }} />
             )