@ledvance/group-ui-biz-bundle 1.0.138 → 1.0.140

package/package.json

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

package/src/modules/energyConsumption/EnergyConsumptionChart/LandscapeView.tsx

@@ -1,32 +1,44 @@
 import I18n from '@ledvance/base/src/i18n'
 import res from '@ledvance/base/src/res'
-import React from 'react'
-import { Image, Text, TouchableOpacity, View } from 'react-native'
+import React, { useEffect } from 'react'
+import { BackHandler, Image, Text, TouchableOpacity, View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import { ChartSection } from './ChartSection'
 
-const { convertX: cx, width } = Utils.RatioUtils
+const { convertX: cx } = Utils.RatioUtils
 
-export const LandscapeView = ({ state, actions, params, styles, theme, screenWidth, screenHeight }) => (
-  <View style={[styles.landscapeContainer, { width: screenWidth, height: screenHeight }]}>
-    <View style={styles.landscapeHeader}>
-      <Text style={styles.landscapeTitle}>
-        {I18n.getLang('chartdisplay_energy')}
-      </Text>
-      <TouchableOpacity onPress={actions.toggleLandscape}>
-        <Image source={{ uri: res.screen_normal }} style={styles.normalScreenIcon}/>
-      </TouchableOpacity>
-    </View>
+export const LandscapeView = ({ state, actions, params, styles, theme, screenWidth, screenHeight }) => {
+  useEffect(() => {
+    const onBack = () => {
+      actions.toggleLandscape()
+      return true
+    }
+    BackHandler.addEventListener('hardwareBackPress', onBack)
+    return () => {
+      BackHandler.removeEventListener('hardwareBackPress', onBack)
+    }
+  }, [])
+  return (
+    <View style={[styles.landscapeContainer, { width: screenWidth, height: screenHeight }]}>
+      <View style={styles.landscapeHeader}>
+        <Text style={styles.landscapeTitle}>
+          {I18n.getLang('chartdisplay_energy')}
+        </Text>
+        <TouchableOpacity onPress={actions.toggleLandscape}>
+          <Image source={{ uri: res.screen_normal }} style={styles.normalScreenIcon}/>
+        </TouchableOpacity>
+      </View>
 
-    <View style={styles.landscapeContent}>
-      <ChartSection
-        state={state}
-        actions={actions}
-        params={params}
-        styles={styles}
-        theme={theme}
-        chartHeight={screenHeight - cx(110)}
-      />
+      <View style={styles.landscapeContent}>
+        <ChartSection
+          state={state}
+          actions={actions}
+          params={params}
+          styles={styles}
+          theme={theme}
+          chartHeight={screenHeight - cx(110)}
+        />
+      </View>
     </View>
-  </View>
-)
+  )
+}

package/src/modules/energyConsumption/EnergyConsumptionChart/styles.ts

@@ -30,7 +30,7 @@ export const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
     backgroundColor: theme?.global.background,
     // width: cx(height + 20),
     paddingVertical: cx(30),
-    paddingHorizontal: cx(20),
+    paddingHorizontal: cx(50),
   },
   landscapeHeader: {
     flexDirection: 'row',

package/src/modules/fixedTimeForPlug/FixedTimeForPlugPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React, {useCallback, useMemo} from "react";
 import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import {useNavigation, useRoute} from '@react-navigation/native'
@@ -215,6 +216,7 @@ const FixedTimeForPlugPage = (props: { theme?: ThemeType}) => {
       headlineText={I18n.getLang('fixedTimeCycle_socket_headline')}
       headlineIcon={!isMaxNum && res.device_panel_schedule_add || undefined}
       onHeadlineIconClick={() => onAddOrEditItem('add')}
+      info={<FeatureInfo title={I18n.getLang('fixedTimeCycle_socket_headline')} content={I18n.getLang('infobutton_fixedtimecycle')} />}
       loading={state.loading}
     >
       {fixedTimeList.length > 0 ? renderList() : renderEmpty()}

package/src/modules/fixedTimingForLight/FixedTimingForLightPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import Page from "@ledvance/base/src/components/Page";
 import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useNavigation, useRoute} from '@react-navigation/native'
@@ -217,6 +218,7 @@ const FixedTimeForLightPage =  (props: { theme?: ThemeType}) => {
       headlineText={I18n.getLang('fixedTimeCycle_socket_headline')}
       headlineIcon={!isMaxNum && res.device_panel_schedule_add || undefined}
       onHeadlineIconClick={() => onAddOrEditItem('add')}
+      info={<FeatureInfo title={I18n.getLang('fixedTimeCycle_socket_headline')} content={I18n.getLang('infobutton_fixedtimecycle')} />}
       loading={state.loading}
     >
       {fixedTimingList.length > 0 ? renderList() : renderEmpty()}

package/src/modules/powerOnBehavior/LightBehaviorPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React from 'react'
 import {ScrollView, StyleSheet, Text, View} from 'react-native'
 import {useReactive, useUpdateEffect} from 'ahooks'
@@ -77,6 +78,7 @@ const LightBehaviorPage = (props: { theme?: ThemeType }) => {
     <Page
       backText={uaGroupInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
+      info={<FeatureInfo title={I18n.getLang('light_sources_specific_settings_power_off')} content={I18n.getLang('infobutton_poweronbehavior')} />}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>
         <View>

package/src/modules/powerOnBehavior/PlugBehaviorPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React from 'react'
 import {ScrollView, StyleSheet} from 'react-native'
 import Page from '@ledvance/base/src/components/Page'
@@ -44,6 +45,7 @@ const PlugBehaviorPage = () => {
     <Page
       backText={uaGroupInfo.name}
       headlineText={I18n.getLang('light_sources_specific_settings_power_off')}
+      info={<FeatureInfo title={I18n.getLang('light_sources_specific_settings_power_off')} content={I18n.getLang('infobutton_poweronbehavior')} />}
       loading={state.loading}>
       <ScrollView style={styles.root} nestedScrollEnabled={true}>
         {params.powerBehaviorKeys.length > 1 && <>

package/src/modules/randomTimeForPlug/RandomTimeForPlugPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import Page from "@ledvance/base/src/components/Page";
 import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useNavigation, useRoute} from '@react-navigation/native'
@@ -218,6 +219,7 @@ const RandomTimeForPlugPage = (props: { theme?: ThemeType}) => {
       headlineText={I18n.getLang('randomtimecycle_sockets_headline_text')}
       headlineIcon={!isMaxNum && res.device_panel_schedule_add || undefined}
       onHeadlineIconClick={() => onAddOrEditItem('add')}
+      info={<FeatureInfo title={I18n.getLang('randomtimecycle_sockets_headline_text')} content={I18n.getLang('infobutton_randomtimecycle')} />}
       loading={state.loading}
     >
       {randomTimeList.length > 0 ? renderList() : renderEmpty()}

package/src/modules/randomTimingForLight/RandomTimingForLightPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import Page from "@ledvance/base/src/components/Page";
 import {useUAGroupInfo} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useNavigation, useRoute} from '@react-navigation/native'
@@ -221,6 +222,7 @@ const RandomTimeForLightPage = (props: { theme?: ThemeType}) => {
       headlineText={I18n.getLang('randomtimecycle_sockets_headline_text')}
       headlineIcon={!isMaxNum && res.device_panel_schedule_add || undefined}
       onHeadlineIconClick={() => onAddOrEditItem('add')}
+      info={<FeatureInfo title={I18n.getLang('randomtimecycle_sockets_headline_text')} content={I18n.getLang('infobutton_randomtimecycle')} />}
       loading={state.loading}
     >
       {randomTimingList.length > 0 ? renderList() : renderEmpty()}

package/src/modules/timeSchedule/TimeSchedulePage.tsx

@@ -18,6 +18,7 @@ import {ui_biz_routerKey} from "../../navigation/Routers";
 import {ApplyForItem} from '@ledvance/base/src/utils/interface';
 import ThemeType from '@ledvance/base/src/config/themeType'
 import {showDialog} from '@ledvance/base/src/utils/common';
+import FeatureInfo from "@ledvance/base/src/components/FeatureInfo"
 
 const { convertX: cx } = Utils.RatioUtils;
 const { withTheme } = Utils.ThemeUtils
@@ -149,6 +150,7 @@ const TimeSchedulePage = (props: { theme?: ThemeType }) => {
       onHeadlineIconClick={() => {
         navigateToEdit('add');
       }}
+      info={<FeatureInfo title={I18n.getLang('timeschedule_overview_headline_text')} content={I18n.getLang('infobutton_timeschedule')} />}
       loading={state.loading}
     >
       <ScrollView nestedScrollEnabled={true}>

package/src/modules/timer/TimerPage.tsx

@@ -1,3 +1,4 @@
+import FeatureInfo from '@ledvance/base/src/components/FeatureInfo'
 import React, {useEffect} from 'react'
 import {FlatList, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View} from 'react-native'
 import I18n from '@ledvance/base/src/i18n'
@@ -166,6 +167,7 @@ const TimerPage = (props: { theme?: ThemeType }) => {
     <Page
       backText={uaGroupInfo.name}
       headlineText={I18n.getLang('timer_nightplug_headline_text')}
+      info={<FeatureInfo title={I18n.getLang('timer_nightplug_headline_text')} content={I18n.getLang('infobutton_timer')} />}
       loading={state.loading}>
       <ScrollView
         style={styles.root}