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

package/package.json

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

package/src/modules/flags/FlagInfo.tsx

@@ -1,4 +1,5 @@
 import I18n from "@ledvance/base/src/i18n";
+import res from "@ledvance/base/src/res";
 import { SceneNodeTransitionMode } from "../mood/SceneInfo";
 
 type HSV = {
@@ -19,8 +20,7 @@ export interface FlagItemInfo {
   speed: number
   colors: HSV[]
   whiteColors: BT []
-  fanEnable?: boolean
-  fanSpeed?: number
+  icon?: number | string
 }
 
 export interface FlagUiInfo extends FlagItemInfo{
@@ -301,6 +301,7 @@ export const defFlagList: FlagUiInfo[] = [
     mode: SceneNodeTransitionMode.Jump,
     speed: 70,
     name: I18n.getLang('flag_leverkusen'),
+    icon: res.leverkusen_icon,
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],

package/src/modules/flags/FlagItem.tsx

@@ -1,4 +1,4 @@
-import { StyleSheet, View, Text, ViewStyle } from 'react-native'
+import { StyleSheet, View, Text, ViewStyle, Image } from 'react-native'
 import React from 'react'
 import Card from '@ledvance/base/src/components/Card'
 import { SwitchButton, Utils } from 'tuya-panel-kit'
@@ -11,12 +11,15 @@ interface RecommendMoodItemProps {
   enable: boolean
   title: string
   colors: string[]
+  icon?: number | string
   style?: ViewStyle
   onPress?: () => void
   onSwitch: (enable: boolean) => void
 }
 
 export default function FlagItem(props: RecommendMoodItemProps) {
+  const icon = typeof props.icon === 'number' ? props.icon : { uri: props.icon }
+
   return (
     <Card
       style={[styles.card, props.style]}
@@ -24,7 +27,10 @@ export default function FlagItem(props: RecommendMoodItemProps) {
       <View>
         <Spacer height={cx(16)} />
         <View style={styles.headline}>
-          <Text style={styles.headText}>{props.title}</Text>
+          <View style={{ flexDirection: 'row', flex: 1, paddingRight: cx(5), justifyContent: 'flex-start' }}>
+            <Text style={styles.headText}>{props.title}</Text>
+            {props.icon && <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} />}
+          </View>
           <SwitchButton
             thumbStyle={{ elevation: 0 }}
             value={props.enable}
@@ -50,13 +56,14 @@ const styles = StyleSheet.create({
   headline: {
     flexDirection: 'row',
     marginHorizontal: cx(16),
+    justifyContent: 'space-between',
   },
   headText: {
-    flex: 1,
     color: '#000',
     fontSize: cx(16),
     fontFamily: 'helvetica_neue_lt_std_bd',
     lineHeight: cx(20),
+    flex: 1
   },
   gradientItem: {
     alignItems: 'center',

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, useFlags, 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')}
@@ -189,6 +193,7 @@ const FlagPage = () => {
         renderItem={({ item }) => <FlagItem
           enable={flagState?.workMode === (params.isStripLight ? WorkMode.Colour : WorkMode.Scene) && flagId === item.id}
           title={item.name}
+          icon={item.icon}
           colors={item.colors.map(item => hsv2Hex(item.h, item.s, item.v))}
           onSwitch={async (enable) => {
             if (enable) {
@@ -196,6 +201,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

@@ -173,10 +173,7 @@ 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)
-      }
+      updateFlagMode()
       if(mode === 'del' && currentMood.id !== scene?.scene?.id){
         return {
           success: true
@@ -195,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')
@@ -277,6 +281,7 @@ const MoodPage = () => {
                     workMode: WorkMode.Scene,
                     switchLedDpCode: params.switchLedDpCode
                   })
+                  updateFlagMode()
                   state.loading = false
                 }} />
             )