@ledvance/ui-biz-bundle 1.1.142 → 1.1.144

package/src/newModules/energyConsumption/component/NewBarChart.tsx

@@ -1,179 +1,183 @@
-import React, {useMemo, useRef} from 'react';
-import {View} from 'react-native';
-import ECharts from '@ledvance/react-native-echarts-pro';
-import I18n from "@ledvance/base/src/i18n";
-import ThemeType from "@ledvance/base/src/config/themeType";
-import {Utils} from "tuya-panel-kit";
-import {OverviewItem} from "../EnergyConsumptionPage";
+import ThemeType from '@ledvance/base/src/config/themeType'
+import I18n from '@ledvance/base/src/i18n'
+import ECharts from '@ledvance/react-native-echarts-pro'
+import React, { useMemo, useRef } from 'react'
+import { View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import { OverviewItem } from '../EnergyConsumptionPage'
+
+const { withTheme } = Utils.ThemeUtils
+const cx = Utils.RatioUtils.convertX
 
-const {withTheme} = Utils.ThemeUtils
-const cx = Utils.RatioUtils.convertX;
 interface BarChartProps {
-    theme?: ThemeType
-    data: OverviewItem[],
-    price: number,
-    unit: string,
-    height: number
+  theme?: ThemeType
+  data: OverviewItem[],
+  price: number,
+  unit: string,
+  height: number,
 }
 
 const BarChartWithTouch = (props: BarChartProps) => {
-    const echarts = useRef();
-    const {data, height, price, unit, theme} = props;
-    const dataX = data?.map(item => {
-        return item.chartTitle;
-    });
-    const dataKwhY = data?.map(item => {
-        return Number(item.value);
-    });
-    const dataPriceY = data?.map(item => {
-        return ((isNaN(Number(item.value)) ? 0 : Number(item.value)) * price).toFixed(2);
-    });
-    const maxValue = useMemo(() => {
-        let max = Math.max(...dataKwhY)
-        if (max < 0.1) {
-            max += 0.02
-            max = max - (max % 0.02)
-        } else if (max < 1) {
-            max += 0.2
-            max = max - (max % 0.2)
-        } else if (max < 10) {
-            max = Math.ceil(max) + 2
-            max = max - (max % 2)
-        }
-        return max
-    }, [dataKwhY]);
-    const gridRight = useMemo(() => {
-        const max = Math.max(...dataPriceY.map(it => Number(it)))
-        return max > 999 ? '15%' : '10%'
-    }, [dataPriceY])
-    const option = {
-        tooltip: {
-            show: true,
-            triggerOn: 'click',
-            trigger: 'axis',
-        },
-        legend: {
-            show: true,
-            data: ['kWh', unit],
-            textStyle: {
-                color: theme?.global.fontColor,
-            }
+  const echarts = useRef()
+  const { data, height, price, unit, theme } = props
+  const dataX = data?.map(item => {
+    return item.chartTitle
+  })
+  const dataKwhY = data?.map(item => {
+    return Number(item.value)
+  })
+  const dataPriceY = data?.map(item => {
+    return ((isNaN(Number(item.value)) ? 0 : Number(item.value)) * price).toFixed(2)
+  })
+  const maxValue = useMemo(() => {
+    let max = Math.max(...dataKwhY)
+    if (max < 0.1) {
+      max += 0.02
+      max = max - (max % 0.02)
+    } else if (max < 1) {
+      max += 0.2
+      max = max - (max % 0.2)
+    } else if (max < 10) {
+      max = Math.ceil(max) + 2
+      max = max - (max % 2)
+    }
+    return max
+  }, [dataKwhY])
+
+  const gridRight = useMemo(() => {
+    const max = Math.max(...dataPriceY.map(it => Number(it)))
+    return max > 999 ? '15%' : '10%'
+  }, [dataPriceY])
+  const option = {
+    tooltip: {
+      show: true,
+      triggerOn: 'click',
+      trigger: 'axis',
+    },
+    legend: {
+      show: true,
+      data: ['kWh', unit],
+      textStyle: {
+        color: theme?.global.fontColor,
+      }
+    },
+    grid: {
+      right: gridRight,
+    },
+    xAxis: {
+      data: dataX,
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        show: true,
+        color: props.theme?.global.secondFontColor,
+        interval: 'auto',
+        rotate: 45,
+        align: 'right',
+        verticalAlign: 'top'
+      }
+    },
+    yAxis: [{
+      type: 'value',
+      name: I18n.getLang('consumption_data_annual_bar_chart_text'),
+      max: Math.max(maxValue, 0.02),
+      min: 0,
+      position: 'left',
+      axisLabel: {
+        formatter: function (value) {
+          const kwh = parseFloat(value)
+          let toFixed = 2
+          if (kwh >= 100) {
+            toFixed = 0
+          } else if (kwh >= 10) {
+            toFixed = 1
+          }
+          return kwh.toFixed(toFixed)
         },
-        grid: {
-            right: gridRight,
+        color: props.theme?.global.secondFontColor,
+      },
+      nameTextStyle: {
+        fontSize: 14,
+        align: 'left',
+        padding: [0, 0, 0, cx(-30)],
+        color: props.theme?.global.secondFontColor,
+      },
+    }, {
+      type: 'value',
+      name: I18n.formatValue('format_unit', unit),
+      position: 'right',
+      alignTicks: true,
+      max: Math.ceil(price ? maxValue * price * 1.4 : 0),
+      min: 0,
+      minInterval: 1,
+      axisLabel: {
+        formatter: function (value) {
+          const price = parseFloat(value)
+          let toFixed = 2
+          if (price >= 100) {
+            toFixed = 0
+          } else if (price >= 10) {
+            toFixed = 1
+          }
+          return price.toFixed(toFixed)
         },
-        xAxis: {
-            data: dataX,
-            axisTick: {
-                show: false,
-            },
-            axisLabel: {
-                show: true,
-                color: props.theme?.global.secondFontColor,
-                interval: 0,
-            }
+        color: props.theme?.global.secondFontColor,
+      },
+      nameTextStyle: {
+        fontSize: 14,
+        align: 'right',
+        padding: [0, cx(-30), 0, 0],
+        color: props.theme?.global.secondFontColor,
+      },
+    }],
+    series: [
+      {
+        name: 'kWh',
+        type: 'bar',
+        data: dataKwhY,
+        itemStyle: {
+          emphasis: {
+            color: '#FFC2A9', // Color when bar is clicked
+          },
+          color: '#FFC2A9',
+          borderRadius: 2,
         },
-        yAxis: [{
-            type: 'value',
-            name: I18n.getLang('consumption_data_annual_bar_chart_text'),
-            max: Math.max(maxValue, 0.02),
-            min: 0,
-            position: 'left',
-            axisLabel: {
-                formatter: function (value) {
-                    const kwh=parseFloat(value);
-                    let toFixed = 2;
-                    if (kwh >= 100) {
-                        toFixed = 0;
-                    } else if (kwh >= 10) {
-                        toFixed = 1;
-                    }
-                    return kwh.toFixed(toFixed);
-                },
-                color:props.theme?.global.secondFontColor,
-            },
-            nameTextStyle: {
-                fontSize: 14,
-                align:'left',
-                padding: [0, 0, 0, cx(-30)],
-                color: props.theme?.global.secondFontColor,
-            },
-        }, {
-            type: 'value',
-            name: I18n.formatValue('format_unit', unit),
-            position: 'right',
-            alignTicks: true,
-            max: Math.ceil(price ? maxValue * price * 1.4 : 0),
-            min: 0,
-            minInterval: 1,
-            axisLabel: {
-                formatter: function (value) {
-                    const price=parseFloat(value);
-                    let toFixed = 2;
-                    if (price >= 100) {
-                        toFixed = 0;
-                    } else if (price >= 10) {
-                        toFixed = 1;
-                    }
-                    return price.toFixed(toFixed);
-                },
-                color:props.theme?.global.secondFontColor,
-            },
-            nameTextStyle: {
-                fontSize: 14,
-                align:'right',
-                padding: [0, cx(-30), 0, 0],
-                color: props.theme?.global.secondFontColor,
-            },
-        }],
-        series: [
-            {
-                name: 'kWh',
-                type: 'bar',
-                data: dataKwhY,
-                itemStyle: {
-                    emphasis: {
-                        color: '#FFC2A9', // Color when bar is clicked
-                    },
-                    color: '#FFC2A9',
-                    borderRadius: 2,
-                },
-                barMaxWidth: 10,
-                select: {
-                    itemStyle: {
-                        borderColor: '#FFC2A9',
-                    }
-                },
-                selectedMode: 'single',
-            },
-            {
-                name: unit,
-                type: 'line',
-                data: dataPriceY,
-                yAxisIndex: 1,
-                smooth: true,
-                showSymbol: false,
-                color: '#F49431',
-                selectedMode: "single",
-            }
-        ],
-        dataZoom: {
-            start: 0,
-            type: "inside",
-            maxValueSpan: 5,
-            zoomLock: true,
+        barMaxWidth: 10,
+        select: {
+          itemStyle: {
+            borderColor: '#FFC2A9',
+          }
         },
-        customMapData: {}
-    };
-    return (
-        <View style={{flex: 1}}>
-            <ECharts
-                option={option}
-                ref={echarts}
-                height={height}
-            />
-        </View>
-    );
-};
+        selectedMode: 'single',
+      },
+      {
+        name: unit,
+        type: 'line',
+        data: dataPriceY,
+        yAxisIndex: 1,
+        smooth: true,
+        showSymbol: false,
+        color: '#F49431',
+        selectedMode: 'single',
+      }
+    ],
+    dataZoom: {
+      start: 0,
+      type: 'inside',
+      zoomLock: true,
+    },
+    customMapData: {}
+  }
+  return (
+    <View style={{ flex: 1 }}>
+      <ECharts
+        option={option}
+        ref={echarts}
+        height={height}
+      />
+    </View>
+  )
+}
 
 export default withTheme(BarChartWithTouch)

package/src/newModules/energyConsumption/component/PowerLineChart.tsx

@@ -0,0 +1,101 @@
+import ThemeType from '@ledvance/base/src/config/themeType'
+import I18n from '@ledvance/base/src/i18n'
+import ECharts from '@ledvance/react-native-echarts-pro'
+import React, { useRef } from 'react'
+import { View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import { PowerDataItem } from '../EnergyConsumptionActions'
+
+const { withTheme } = Utils.ThemeUtils
+const cx = Utils.RatioUtils.convertX
+
+interface PowerLineChartProps {
+  theme?: ThemeType
+  data: PowerDataItem[],
+  height: number
+}
+
+const PowerLineChart = (props: PowerLineChartProps) => {
+  const echarts = useRef()
+  const { data, height } = props
+
+  const values = data?.map(item => ([item.time, item.value]))
+
+  const option = {
+    tooltip: {
+      show: true,
+      triggerOn: 'mousemove|click',
+      trigger: 'axis',
+    },
+    grid: {
+      right: 0
+    },
+    xAxis: {
+      type: 'time',
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        show: true,
+        color: props.theme?.global.secondFontColor,
+        interval: 'auto',
+        rotate: 45,
+        align: 'right',
+        verticalAlign: 'top'
+      }
+    },
+    yAxis: [{
+      type: 'value',
+      name: I18n.formatValue('format_unit', 'W'),
+      position: 'left',
+      axisLabel: {
+        formatter: function (value) {
+          const power = parseFloat(value)
+          let toFixed = 2
+          if (power >= 100) {
+            toFixed = 0
+          } else if (power >= 10) {
+            toFixed = 1
+          }
+          return power.toFixed(toFixed)
+        },
+        color: props.theme?.global.secondFontColor,
+      },
+      nameTextStyle: {
+        fontSize: 14,
+        align: 'left',
+        padding: [0, 0, 0, cx(-30)],
+        color: props.theme?.global.secondFontColor,
+      },
+    }],
+    series: [
+      {
+        name: I18n.getLang('consumption_data_field2_value_text1'),
+        type: 'line',
+        data: values,
+        areaStyle: {},
+        showSymbol: false,
+        color: '#F49431',
+        selectedMode: 'single',
+      },
+    ],
+    dataZoom: {
+      start: 0,
+      type: 'inside',
+      zoomLock: false,
+      filterMode: 'none'
+    },
+    customMapData: {}
+  }
+  return (
+    <View style={{ flex: 1 }}>
+      <ECharts
+        option={option}
+        ref={echarts}
+        height={height}
+      />
+    </View>
+  )
+}
+
+export default withTheme(PowerLineChart)

package/src/newModules/energyConsumption/res/index.ts

@@ -0,0 +1,3 @@
+export default {
+  energyChart: require('./energy-chart.png')
+}

package/src/newModules/fixedTime/FixedTimeDetailPage.tsx

@@ -11,7 +11,7 @@ import { TimerPicker, Utils } from "tuya-panel-kit";
 import DeleteButton from "@ledvance/base/src/components/DeleteButton";
 import Spacer from "@ledvance/base/src/components/Spacer";
 import { convertMinutesTo12HourFormat, loopText, showDialog } from "@ledvance/base/src/utils/common";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import LdvPickerView from "@ledvance/base/src/components/LdvPickerView";
 import LampAdjustView from '@ledvance/base/src/components/LampAdjustView'
 import Card from "@ledvance/base/src/components/Card";
 import LdvSwitch from "@ledvance/base/src/components/ldvSwitch";

package/src/newModules/sleepWakeUp/SleepWakeUpDetailPage.tsx

@@ -7,7 +7,7 @@ import res from '@ledvance/base/src/res';
 import { TimerPicker, Utils } from 'tuya-panel-kit';
 import { useReactive, useUpdateEffect } from 'ahooks';
 import TextField from '@ledvance/base/src/components/TextField';
-import LdvPickerView from '@ledvance/base/src/components/ldvPickerView';
+import LdvPickerView from '@ledvance/base/src/components/LdvPickerView';
 import LdvWeekView from '@ledvance/base/src/components/weekSelect';
 import {
   convertMinutesTo12HourFormat,

package/src/newModules/swithInching/SwithInching.tsx

@@ -4,7 +4,7 @@ import Page from "@ledvance/base/src/components/Page";
 import { useDeviceInfo } from "@ledvance/base/src/models/modules/NativePropsSlice";
 import { useNavigation } from '@react-navigation/native'
 import { SwitchButton, Utils, Dialog } from "tuya-panel-kit";
-import LdvPickerView from "@ledvance/base/src/components/ldvPickerView";
+import LdvPickerView from "@ledvance/base/src/components/LdvPickerView";
 import I18n from '@ledvance/base/src/i18n'
 import { SwitchInchingItem, SwitchInchingPageParams, useSwitchInching, defSwitchInching, useCountdowns } from "./SwithInchingAction";
 import { useParams } from "@ledvance/base/src/hooks/Hooks";

package/src/newModules/timeSchedule/TimeScheduleActions.ts

@@ -49,20 +49,20 @@ export const defOsramFanLightDeviceData = {
 }
 
 export const getTimeSchedule = async (deviceId: string): Promise<Timer[]> => {
-  const res = await NativeApi.getAllTaskTimer(deviceId);
-  if (res.success && Array.isArray(res.data)) {
-    return res.data.map(item => ({
-      id: item?.mTimerId,
-      name: item?.remark,
-      loops: item?.mLoops,
-      time: item?.mTime,
-      dps: parseJSON(item?.mValue),
-      enable: !!Number(item?.mStatus),
+  const res = await NativeApi.timerList(deviceId)
+  if (res.result && Array.isArray(res.value)) {
+    return res.value.map(item => ({
+      id: item?.id,
+      name: item?.aliasName,
+      loops: item?.loops,
+      time: item?.time,
+      dps: parseJSON(item?.dps),
+      enable: !!Number(item?.status),
       notification: item?.isAppPush,
-    }));
+    }))
   }
-  return [];
-};
+  return []
+}
 
 export const manageTimeSchedule = async (deviceId: string, schedule: Timer, mode: TimerActions) => {
   const res = await NativeApi.manageTimer(

package/tsconfig.json

@@ -1,51 +1,78 @@
 {
-    "compilerOptions": {
-        /* Basic Options */
-        "target": "ES2017",
-        /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-        "module": "commonjs",
-        /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-        "jsx": "react",
-        /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ES2017",
+    "lib": [
+      "es2017"
+    ],
+    /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+    "module": "commonjs",
+    /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "jsx": "react",
+    /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
 
-        /* Strict Type-Checking Options */
-        /* "strict": true                         /* Enable all strict type-checking options. */
-        "noImplicitAny": false,
-        /* Raise error on expressions and declarations with an implied 'any' type. */
-        "strictNullChecks": true,
-        /* Enable strict null checks. */
+    /* Strict Type-Checking Options */
+    /* "strict": true                         /* Enable all strict type-checking options. */
+    "noImplicitAny": false,
+    /* Raise error on expressions and declarations with an implied 'any' type. */
+    "strictNullChecks": true,
+    /* Enable strict null checks. */
 
-        /* Additional Checks */
-        "noUnusedLocals": true,
-        /* Report errors on unused locals. */
-        "noUnusedParameters": true,
-        /* Report errors on unused parameters. */
+    /* Additional Checks */
+    "noUnusedLocals": true,
+    /* Report errors on unused locals. */
+    "noUnusedParameters": true,
+    /* Report errors on unused parameters. */
 
-        /* .d.ts config */
-        "declaration": true,
-        "emitDeclarationOnly": true,
-
-        /* Module Resolution Options */
-        "moduleResolution": "node",
-        /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
-        "types": ["react", "react-native"],
-        /* Type declaration files to be included in compilation. */
-        "typeRoots": ["@types/*.d.ts"],
-        "allowSyntheticDefaultImports": true,
-        /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-        "esModuleInterop": true,
-        /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-        "baseUrl": "./src",
-        "paths": {
-            "@api": ["./api"],
-            "@components": ["./components"],
-            "@config": ["./config"],
-            "@i18n": ["./i18n"],
-            "@models": ["./models"],
-            "@res": ["./res"],
-            "@utils": ["./utils"]
-        }
-    },
-    "include": ["src/**/*.ts","src/**/*.tsx"],
-    "exclude": ["node_modules",".yalc"]
+    /* .d.ts config */
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    /* Module Resolution Options */
+    "moduleResolution": "node",
+    /* Specify module resolution strategy: 'node' (Node.js) or 'classic'  */
+    "types": [
+      "react",
+      "react-native"
+    ],
+    /* Type declaration files to be included in compilation. */
+    "typeRoots": [
+      "@types/*.d.ts"
+    ],
+    "allowSyntheticDefaultImports": true,
+    /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,
+    /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "baseUrl": "./src",
+    "paths": {
+      "@api": [
+        "./api"
+      ],
+      "@components": [
+        "./components"
+      ],
+      "@config": [
+        "./config"
+      ],
+      "@i18n": [
+        "./i18n"
+      ],
+      "@models": [
+        "./models"
+      ],
+      "@res": [
+        "./res"
+      ],
+      "@utils": [
+        "./utils"
+      ]
+    }
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules",
+    ".yalc"
+  ]
 }