@ledvance/group-ui-biz-bundle 1.0.107 → 1.0.109

package/package.json

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

package/src/modules/childLock/ChildLockPage.tsx

@@ -1,14 +1,15 @@
 import React from 'react'
-import {SwitchButton, Utils} from "tuya-panel-kit";
+import {Utils} from "tuya-panel-kit";
 import Page from "@ledvance/base/src/components/Page";
 import I18n from "@ledvance/base/src/i18n/index";
 import {useDeviceInfo, useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useReactive} from "ahooks";
-import Spacer from "@ledvance/base/src/components/Spacer";
 import {View, Text, StyleSheet, Image} from "react-native";
 import {Result} from "@ledvance/base/src/models/modules/Result";
 import res from "@ledvance/base/src/res";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import Card from "@ledvance/base/src/components/Card";
+import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -40,36 +41,6 @@ const ChildLockPage = (props: { theme?: ThemeType }) => {
       marginRight: cx(5),
       tintColor: props.theme?.global.fontColor
     },
-    titleBGView: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingHorizontal: cx(16),
-      marginHorizontal: cx(24),
-    },
-    colorBlock: {
-      width: cx(20),
-      height: cx(20),
-      marginStart: cx(12),
-      borderRadius: cx(4),
-    },
-    title: {
-      color: props.theme?.global.fontColor,
-      fontSize: cx(14),
-      fontFamily: 'helvetica_neue_lt_std_bd',
-      paddingVertical: cx(16),
-    },
-    shadow: {
-      shadowColor: props.theme?.card.shadowColor,
-      shadowOpacity: 0.2,
-      shadowRadius: 8,
-      elevation:8,
-      shadowOffset: {
-        width: 0,
-        height: 4,
-      },
-      backgroundColor: props.theme?.card.background,
-      borderRadius: 8,
-    },
   })
 
   return (<Page
@@ -82,18 +53,20 @@ const ChildLockPage = (props: { theme?: ThemeType }) => {
         {I18n.getLang('childlock_overview_description_text')}
       </Text>
     </View>
-    <View style={[styles.titleBGView, styles.shadow]}>
-      <Text style={styles.title}>{I18n.getLang('sockets_specific_settings_child_lock')}</Text>
-      <View style={[styles.colorBlock, { backgroundColor: 'red', opacity: 0 }]} />
-      <Spacer style={{ flex: 1 }} height={0} width={0} />
-      <SwitchButton value={childLock} onValueChange={async v => {
-        state.loading = true
-        await setChildLock(v, undefined, {
-          'controlLock': v
-        })
-        state.loading = false
-      } } />
-    </View>
+    <Card style={{marginHorizontal: cx(24)}}>
+      <LdvSwitch
+        title={I18n.getLang('sockets_specific_settings_child_lock')}
+        colorAlpha={1}
+        enable={childLock}
+        setEnable={async (enable: boolean) => {
+          state.loading = true
+          await setChildLock(enable, undefined, {
+            'controlLock': enable
+          })
+          state.loading = false
+        }}
+      />
+    </Card>
   </Page>)
 }
 

package/src/modules/diyScene/DiySceneEditorPage.tsx

@@ -203,9 +203,9 @@ const DiySceneEditorPage = (props: { theme?: ThemeType }) => {
         state.sceneInfo.type !== 'DIY' && <TouchableOpacity onPress={() => {
           toggleLoveScene(state.sceneInfo.id)
         }}>
-          {isLove ? <Image source={res.like} style={{width: cx(24), height: cx(24)}}/>
+          {isLove ? <Image source={res.like} style={{width: cx(30), height: cx(26)}}/>
             : <Image source={res.un_like}
-                     style={{width: cx(24), height: cx(24), tintColor: props.theme?.global.fontColor}}/>}
+                     style={{width: cx(30), height: cx(26), tintColor: props.theme?.global.fontColor}}/>}
           </TouchableOpacity>
       }
       rightButtonIcon={canSaveMoodData ? res.ic_check : res.ic_uncheck}

package/src/modules/energyConsumption/EnergyConsumptionActions.ts

@@ -7,12 +7,13 @@ import {
 } from "@ledvance/base/src/models/TuyaApi";
 import { overDays } from "@ledvance/base/src/utils";
 import { exportCsvFile, loopsText, monthFormat, monthFormatShort } from "@ledvance/base/src/utils/common";
-import { DateType } from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/co2Data";
-import { OverviewItem } from "@ledvance/group-ui-biz-bundle/src/modules/energyConsumption/EnergyConsumptionPage";
+import { DateType } from "./co2Data";
+import { OverviewItem } from "./EnergyConsumptionPage";
 import dayjs from "dayjs";
 import { isNumber } from "lodash";
 import { EnergyData, UnitList } from "./component/EnergyModal";
 import I18n from "@ledvance/base/src/i18n";
+import {NativeApi} from "@ledvance/base/src/api/native";
 
 interface LightConfig {
   energyConsumption?: EnergyData
@@ -177,4 +178,29 @@ export const exportEnergyCsv = (values: any[][], unit: string) => {
   const headers = [I18n.getLang('date'), `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')} (kWh)`, `Price(${unit})`]
   const functionName = `${I18n.getLang('consumption_data_annual_bar_chart_system_back_text')}`
   exportCsvFile(headers, values, functionName)
-}
+}
+
+const EnergyGenerationId = 'EnergyGeneration'
+
+export interface EnergyHistory {
+  time: number
+  generationMode: boolean
+  type: 'Consumption' | 'Generation'
+  value: number
+}
+
+export interface EnergyGeneration {
+  generationMode: boolean
+  totalElectricity: number
+  history: EnergyHistory[]
+}
+
+export async function getEnergyGenerationValue(devId: string): Promise<EnergyGeneration | undefined> {
+  const res = await NativeApi.getJson(devId, EnergyGenerationId)
+  if (res.success && res.data) {
+    return JSON.parse(res.data)
+  } else {
+    console.log('getEnergyGenerationValue failed', res)
+    return undefined
+  }
+}

package/src/modules/energyConsumption/EnergyConsumptionPage.tsx

@@ -13,14 +13,14 @@ import { useReactive, useUpdateEffect } from 'ahooks';
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { DpResultByMonthResData, getDpResultByMonth } from '@ledvance/base/src/models/TuyaApi';
 import { useTimeZoneCity } from '@ledvance/base/src/models/modules/NativePropsSlice';
-import { flattenDeep, isNumber, sumBy } from 'lodash';
+import {flattenDeep, isNumber, sum, sumBy} from 'lodash';
 import {
   exchangeNumber,
   localeNumber,
   monthFormat,
   monthFormatShort,
 } from '@ledvance/base/src/utils/common';
-import { unitDivision, useEnergyConsumption } from './EnergyConsumptionActions';
+import {getEnergyGenerationValue, unitDivision, useEnergyConsumption} from './EnergyConsumptionActions';
 import EnergyPopup, { EnergyData } from './component/EnergyModal';
 import { carbonDioxideEmission, countryAndRegion } from './co2Data';
 import { EnergyConsumptionDetailProps } from './EnergyConsumptionDetail';
@@ -49,7 +49,7 @@ export interface OverviewItem {
   headlineText: string;
   chartTitle: string;
 }
-export type PopupType = 'co2' | 'money' | 'unit' | '';
+export type PopupType = 'co2' | 'money' | 'unit' | ''
 
 interface EnergyConsumptionState {
   solarTodayElectricity: string
@@ -118,13 +118,23 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
     const solarPromise = params.solarPlugGroup.map(devId =>
       getDpResultByMonth(devId, params.addEleDpCode, 'sum').catch(error => ({ error }))
     );
+    const solarEnergyGenerationPromise = params.solarPlugGroup.map(devId =>
+      getEnergyGenerationValue(devId)
+    );
     const wifiPromise = params.wifiPlugGroup.map(devId =>
       getDpResultByMonth(devId, params.addEleDpCode, 'sum').catch(error => ({ error }))
     );
+    const wifiEnergyGenerationPromise = params.wifiPlugGroup.map(devId =>
+      getEnergyGenerationValue(devId)
+    );
     state.loading = true
     const solarRes = await Promise.all(solarPromise);
     const wifiRes = await Promise.all(wifiPromise)
+    const solarEnergyGenerationRes = await Promise.all(solarEnergyGenerationPromise);
+    const wifiEnergyGenerationRes = await Promise.all(wifiEnergyGenerationPromise);
     state.loading = false
+    const solarEnergy: number = sum(solarEnergyGenerationRes.map(item => item?.totalElectricity || 0))
+    const wifiEnergy: number = sum(wifiEnergyGenerationRes.map(item => item?.totalElectricity || 0))
     // @ts-ignore
     const solarGroup: DpResultByMonthResData[] = solarRes.filter(v => !v.error);
     // @ts-ignore
@@ -133,10 +143,10 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
     const solarData = getMergeData(solarGroup)
     const wifiData = getMergeData(wifiGroup)
     state.solarTodayElectricity = solarData.thisDay
-    state.solarTotalElectricity = solarData.sum
+    state.solarTotalElectricity = Math.max(Number(solarData.sum) - solarEnergy, 0).toFixed(2)
     state.solarOverviewList = flattenDeep(solarData.overviewList)
     state.wifiTodayElectricity = wifiData.thisDay
-    state.wifiTotalElectricity = wifiData.sum
+    state.wifiTotalElectricity = Math.max(Number(wifiData.sum) - wifiEnergy, 0).toFixed(2)
     state.wifiOverviewList = flattenDeep(wifiData.overviewList)
   };
 
@@ -458,19 +468,19 @@ const EnergyConsumptionPage = (props: { theme?: ThemeType }) => {
           <Spacer height={cx(30)} />
           {/* Annual overview */}
           <OverView
-              style={{marginHorizontal: cx(24)}}
-              headlineText={I18n.getLang('consumption_data_field4_headline_text')}
-              headlineClick={() => {
-                navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
-                  headlineText: chartHeadline,
-                  chartData: state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList,
-                  price: state.price,
-                  unit: state.unit,
-                  addEleDpCode: params.addEleDpCode,
-                  date: (new Date()).getFullYear().toString(),
-                  deviceIdGroup: state.isSolarMode ? params.solarPlugGroup : params.wifiPlugGroup,
-                } as EnergyConsumptionChartProps)
-              }}
+            style={{marginHorizontal: cx(24)}}
+            headlineText={I18n.getLang('consumption_data_field4_headline_text')}
+            headlineClick={() => {
+              navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_chart, {
+                headlineText: chartHeadline,
+                chartData: state.isSolarMode ? state.solarOverviewList : state.wifiOverviewList,
+                price: state.price,
+                unit: state.unit,
+                addEleDpCode: params.addEleDpCode,
+                date: (new Date()).getFullYear().toString(),
+                deviceIdGroup: state.isSolarMode ? params.solarPlugGroup : params.wifiPlugGroup,
+              } as EnergyConsumptionChartProps)
+            }}
             overviewItemClick={(item) => {
               navigation.navigate(ui_biz_routerKey.group_ui_biz_energy_consumption_detail, {
                 addEleDpCode: params.addEleDpCode,

package/src/modules/overchargeSwitch/OverchargeSwitchPage.tsx

@@ -1,13 +1,15 @@
 import React from 'react'
-import {SwitchButton, Utils} from "tuya-panel-kit";
+import {Utils} from "tuya-panel-kit";
 import Page from "@ledvance/base/src/components/Page";
 import I18n from "@ledvance/base/src/i18n/index";
 import {useDeviceInfo, useFeatureHook} from "@ledvance/base/src/models/modules/NativePropsSlice";
 import {useReactive} from "ahooks";
 import Spacer from "@ledvance/base/src/components/Spacer";
-import {StyleSheet, Text, View} from "react-native";
+import {StyleSheet, Text} from "react-native";
 import {Result} from "@ledvance/base/src/models/modules/Result";
 import ThemeType from '@ledvance/base/src/config/themeType'
+import Card from "@ledvance/base/src/components/Card";
+import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -28,55 +30,34 @@ const OverchargeSwitchPage = (props: { theme?: ThemeType }) => {
   })
 
   const styles = StyleSheet.create({
-    titleBGView: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      paddingHorizontal: cx(16),
-      marginHorizontal: cx(24),
-      marginTop: cx(30)
-    },
     title: {
       color: props.theme?.global.fontColor,
-      fontSize: cx(14),
+      fontSize: cx(16),
+      fontWeight: 'bold',
       fontFamily: 'helvetica_neue_lt_std_bd',
-      paddingVertical: cx(16),
-    },
-    desc: {
-      color: props.theme?.global.fontColor,
-    },
-    shadow: {
-      shadowColor: props.theme?.card.shadowColor,
-      shadowOpacity: 0.2,
-      shadowRadius: 8,
-      elevation:8,
-      shadowOffset: {
-        width: 0,
-        height: 4,
-      },
-      backgroundColor: props.theme?.card.background,
-      borderRadius: 8,
+      paddingTop: cx(16),
+      paddingHorizontal: cx(16),
     },
   })
 
   return (<Page
     backText={devInfo.name}
     loading={state.loading}>
-    <View style={[styles.titleBGView, styles.shadow]}>
-      <View style={{ flex: 7 }}>
-        <View>
-          <Text style={styles.title}>{I18n.getLang('switch_overcharge_headline_text')}</Text>
-        </View>
-        <View style={{ paddingBottom: cx(16) }}>
-          <Text style={styles.desc}>{I18n.getLang('switch_overcharge_headline_description')}</Text>
-        </View>
-      </View>
-      <Spacer style={{ flex: 1 }} height={0} width={0} />
-      <SwitchButton value={overchargeSwitch} onValueChange={async v => {
-        state.loading = true
-        await setOverchargeSwitch(v)
-        state.loading = false
-      } } />
-    </View>
+    <Spacer height={cx(24)}/>
+    <Card style={{marginHorizontal: cx(24)}}>
+      <Text style={styles.title}>{I18n.getLang('switch_overcharge_headline_text')}</Text>
+      <LdvSwitch
+        title={I18n.getLang('switch_overcharge_headline_description')}
+        titleStyle={{fontWeight: 'normal', fontSize: cx(14)}}
+        colorAlpha={1}
+        enable={overchargeSwitch}
+        setEnable={async (v) => {
+          state.loading = true
+          await setOverchargeSwitch(v)
+          state.loading = false
+        }}
+      />
+    </Card>
   </Page>)
 }