@ledvance/ui-biz-bundle 1.1.15 → 1.1.17

package/package.json

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

package/src/modules/flags/FlagActions.ts

@@ -52,7 +52,7 @@ export const useFlag: UseFlagType = (flagCode, extra) => {
   const setFlagFn = (flagItem: FlagItemInfo) => {
     if (extra.drawToolLight) {
       const hex = extra.drawToolLight.drawToolObj2dp(flagItem.colors.map(item => ColorUtils.hsv2hex(item.h, item.s, item.v)))
-      return setDps({ [flagCode]: hex , [extra.switchLedCode]: true})
+      return setDps({ [flagCode]: hex , [extra.switchLedCode]: true, [extra.workModeCode]: WORK_MODE.COLOUR})
     } else {
       const hex = obj2Dp(flagItem, extra)
       return setDps({ [flagCode]: hex, [extra.workModeCode]: WORK_MODE.SCENE, [extra.switchLedCode]: true })
@@ -229,10 +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 getFlagMode(devId: string){
+  return NativeApi.getJson(devId, 'flagMode')
 }
 
-export function saveFlagMode(groupId: string, v:string){
-  return NativeApi.putJson(groupId, 'flagMode', v)
+export function saveFlagMode(devId: string, v:string){
+  return NativeApi.putJson(devId, 'flagMode', v)
 }

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 "@ledvance/ui-biz-bundle/src/modules/scene/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{
@@ -95,7 +95,7 @@ export const defFlagList: FlagUiInfo[] = [
     whiteColors: [
       { brightness: 100, colorTemp: 0},
     ],
-    colors: [{h: 357, s: 87, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
+    colors: [{h: 360, s: 100, v: 100}, {h: 47, s: 100, v: 100}, {h: 357, s: 87, v: 100}]
   },
   {
     id: 249,
@@ -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

@@ -196,6 +196,7 @@ const FlagPage = () => {
         renderItem={({ item }) => <FlagItem
           enable={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))}
           onSwitch={async (enable) => {
             if (enable) {