@ledvance/group-ui-biz-bundle 1.0.134 → 1.0.136

package/package.json

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

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -333,23 +333,6 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
             </Text>
           </View>
           <Spacer />
-          {/* Today */}
-          <Card style={styles.cardContainer}>
-            <Text style={styles.cardTitle}>
-              {I18n.getLang('consumption_data_field1_headline_text')}
-            </Text>
-            <Spacer height={cx(15)} />
-            <View style={{ flexDirection: 'row', alignItems: 'flex-end' }}>
-              <Text style={[styles.consumptionNum, { fontSize: cx(38), marginRight: cx(8) }]}>
-                {localeNumber(state.isSolarMode ? state.solarTodayElectricity : state.wifiTodayElectricity)}
-              </Text>
-              <Text style={[styles.consumptionNum, { fontSize: cx(22), marginBottom: cx(4) }]}>
-                kWh
-              </Text>
-            </View>
-            <Spacer height={cx(10)} />
-          </Card>
-          <Spacer />
           <Card
             style={styles.cardContainer}
             onPress={() => {
@@ -365,9 +348,17 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
               } as EnergyConsumptionChartProps)
             }}
           >
-            <Text style={styles.cardTitle}>
-              {I18n.getLang('consumption_data_field2_headline_text')}
-            </Text>
+            <View style={{
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+            }}>
+              <Text style={styles.cardTitle}>{I18n.getLang('consumption_data_field2_headline_text')}</Text>
+              <Image
+                source={{ uri: res.energy_consumption_chart}}
+                style={{ width: cx(16), height: cx(16), marginLeft: cx(8) }}
+              />
+            </View>
             <Spacer height={cx(15)} />
             <View style={styles.consumedEnergyContent}>
               <ConsumedEnergyItem
@@ -383,17 +374,23 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
           <Spacer />
           {/* 365 day */}
           <Card style={styles.cardContainer}>
-            <Text style={styles.cardTitle}>
-              {I18n.getLang('consumption_data_field3_headline_text')}
-            </Text>
-            <Spacer height={cx(15)} />
-            <View style={{ flexDirection: 'row', alignItems: 'flex-end' }}>
-              <Text style={[styles.consumptionNum, { fontSize: cx(38), marginRight: cx(8) }]}>
-                {localeNumber(state.isSolarMode ? state.solarTotalElectricity : state.wifiTotalElectricity)}
-              </Text>
-              <Text style={[styles.consumptionNum, { fontSize: cx(22), marginBottom: cx(4) }]}>
-                kWh
-              </Text>
+            <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+              <Text style={styles.cardTitle}>{I18n.getLang('consumption_data_field1_headline_text')}</Text>
+              <View style={{ flexDirection: 'row', alignItems: 'flex-end', marginLeft: cx(10) }}>
+                <Text style={[styles.consumptionNum, { fontSize: cx(30), marginRight: cx(8) }]}>
+                  {localeNumber(state.isSolarMode ? state.solarTodayElectricity : state.wifiTodayElectricity)}
+                </Text>
+                <Text style={[styles.consumptionNum, { fontSize: cx(20), marginBottom: cx(4) }]}>kWh</Text>
+              </View>
+            </View>
+            <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+              <Text style={styles.cardTitle}>{I18n.getLang('consumption_data_field3_headline_text')}</Text>
+              <View style={{ flexDirection: 'row', alignItems: 'flex-end', marginLeft: cx(10) }}>
+                <Text style={[styles.consumptionNum, { fontSize: cx(30), marginRight: cx(8) }]}>
+                  {localeNumber(state.isSolarMode ? state.solarTotalElectricity : state.wifiTotalElectricity)}
+                </Text>
+                <Text style={[styles.consumptionNum, { fontSize: cx(20), marginBottom: cx(4) }]}>kWh</Text>
+              </View>
             </View>
             <Spacer />
             {/* CO2 */}

package/src/modules/flags/FlagItem.tsx

@@ -1,10 +1,11 @@
-import { StyleSheet, View, Text, ViewStyle, Image } from 'react-native'
+import { StyleSheet, View, Text, ViewStyle, Image, TouchableOpacity } from 'react-native'
 import React from 'react'
 import Card from '@ledvance/base/src/components/Card'
-import { SwitchButton, Utils } from 'tuya-panel-kit'
+import { Utils } from 'tuya-panel-kit'
 import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import ThemeType from '@ledvance/base/src/config/themeType'
+import res from "@ledvance/base/src/res"
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -31,6 +32,7 @@ const FlagItem = (props: RecommendMoodItemProps) => {
       flexDirection: 'row',
       marginHorizontal: cx(16),
       justifyContent: 'space-between',
+      alignItems: 'center',
     },
     headText: {
       color: props.theme?.global.fontColor,
@@ -39,6 +41,13 @@ const FlagItem = (props: RecommendMoodItemProps) => {
       lineHeight: cx(20),
       flex: 1
     },
+    checkbox: {
+      width: cx(45),
+      height: cx(45),
+      marginTop: cx(-5),
+      marginBottom: cx(-10),
+      fontWeight: 'bold',
+    },
     gradientItem: {
       alignItems: 'center',
     },
@@ -58,10 +67,9 @@ const FlagItem = (props: RecommendMoodItemProps) => {
             {props.title ? <Text style={styles.headText}>{props.title}</Text> : undefined}
             {props.icon ? <Image source={icon} style={{ width: cx(60), aspectRatio: 2.14, marginRight: cx(10) }} /> : undefined}
           </View>
-          <SwitchButton
-            thumbStyle={{ elevation: 0 }}
-            value={props.enable}
-            onValueChange={props.onSwitch} />
+          <TouchableOpacity style={styles.checkbox} onPress={() => props.onSwitch(!props.enable)}>
+            <Image source={{ uri: res.ic_check}} width={cx(44)} height={cx(44)} style={[styles.checkbox, { tintColor: props.enable ? props.theme?.icon.primary : props.theme?.icon.disable}]} />
+          </TouchableOpacity>
         </View>
         <Spacer />
         <View style={styles.gradientItem}>

package/src/modules/mood_new/MoodItem.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
-import { StyleSheet, Text, View, ViewProps, ViewStyle, Image } from 'react-native';
-import { SwitchButton, Utils } from 'tuya-panel-kit';
+import { StyleSheet, Text, View, ViewProps, ViewStyle, Image, TouchableOpacity } from 'react-native';
+import { Utils } from 'tuya-panel-kit';
 import { hsv2Hex } from '@ledvance/base/src/utils';
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils';
 import { mapFloatToRange } from '@ledvance/base/src/utils';
@@ -50,6 +50,7 @@ const MoodItem = (props: MoodItemProps) => {
     headline: {
       flexDirection: 'row',
       marginHorizontal: cx(16),
+      alignItems: 'center',
     },
     headText: {
       flex: 1,
@@ -58,6 +59,13 @@ const MoodItem = (props: MoodItemProps) => {
       fontFamily: 'helvetica_neue_lt_std_bd',
       lineHeight: cx(20),
     },
+    checkbox: {
+      width: cx(45),
+      height: cx(45),
+      marginTop: cx(-5),
+      marginBottom: cx(-10),
+      fontWeight: 'bold',
+    },
     moodTypeItem: {
       flexDirection: 'row',
     },
@@ -83,11 +91,9 @@ const MoodItem = (props: MoodItemProps) => {
         <Spacer height={cx(16)} />
         <View style={styles.headline}>
           <Text style={styles.headText}>{mood.name}</Text>
-          <SwitchButton
-            thumbStyle={{ elevation: 0 }}
-            value={props.enable}
-            onValueChange={props.onSwitch}
-          />
+          <TouchableOpacity style={styles.checkbox} onPress={() => props.onSwitch(!props.enable)}>
+            <Image source={{ uri: res.ic_check}} width={cx(44)} height={cx(44)} style={[styles.checkbox, { tintColor: props.enable ? props.theme?.icon.primary : props.theme?.icon.disable}]} />
+          </TouchableOpacity>
         </View>
         <Spacer />
         <MixMoodColorsLine mixSubLight={mood.mainLamp} isMix={isMix} type={mood.mainLamp.mode === gradientMode ? 'gradient' : 'separate'}/>

package/src/modules/switchInching/SwitchInching.tsx

@@ -167,7 +167,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
                 const newSwitchInchingItem = {
                   ...state.switchInchingItem,
                   enable: v,
-                  time
+                  time: time < 2 ? 2 : time
                 }
                 updateState({ switchInchingItem: newSwitchInchingItem })
                 await saveInchingConfig(newSwitchInchingItem)
@@ -192,6 +192,7 @@ const SwitchInching = (props: { theme?: ThemeType }) => {
             ]}
             setHour={m => updateTime(m, undefined)}
             setMinute={s => updateTime(undefined, s)}
+            minMinute={timeRef.current.minute === '00' ? 2 : 0}
             maxHour={61}
           />
         </View>

package/src/modules/timeSchedule/TimeScheduleActions.ts

@@ -4,6 +4,7 @@ import {flatMapDeep} from "lodash";
 import {ColorList} from '@ledvance/base/src/components/StripAdjustView';
 import {parseJSON} from "@tuya/tuya-panel-lamp-sdk/lib/utils";
 import {AdjustType} from "@ledvance/base/src/utils/interface";
+import { TimeScheduleDetailPageParams } from './TimeScheduleDetailPage'
 
 export const defDeviceData = {
   h: 0,
@@ -45,8 +46,10 @@ export const defMoodStripDeviceData = {
   adjustType: AdjustType.COLOUR
 }
 
-export const defShutterDeviceData = {
-  percentControl: 100
+export const defShutterDeviceData = (props: TimeScheduleDetailPageParams) => {
+  return {
+    percentControl: (props.suggestValue !== undefined && !props.suggestValue) ? 0 : 100
+  }
 }
 
 export const defOsramFanLightDeviceData = {

package/src/modules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -701,7 +701,7 @@ const getDefaultManual = (props: TimeScheduleDetailPageParams): ComponentConfig
     [DeviceType.MixLight]: defMixDeviceData,
     [DeviceType.FanLight]: defFanLightDeviceData,
     [DeviceType.MoodStrip]: defMoodStripDeviceData,
-    [DeviceType.Shutter]: defShutterDeviceData,
+    [DeviceType.Shutter]: defShutterDeviceData(props),
     [DeviceType.OsramFanLight]: defOsramFanLightDeviceData,
     [DeviceType.LightSource]: defDeviceData,
   };