@ledvance/ui-biz-bundle 1.1.142 → 1.1.143

package/src/newModules/biorhythm/IconSelect.tsx

@@ -1,88 +1,88 @@
-import { useNavigation, useRoute } from '@react-navigation/native'
-import React, { useEffect, useState } from 'react'
-import { Image, ScrollView, Text, TouchableOpacity, View } from 'react-native'
-import { Utils } from 'tuya-panel-kit'
-import iconList from '../biorhythm/iconListData'
-import LDVTopBar from '@ledvance/base/src/components/ldvTopBar'
-import I18n from '@ledvance/base/src/i18n'
-import ThemeType from '@ledvance/base/src/config/themeType'
-
-const cx = Utils.RatioUtils.convertX
-const { withTheme } = Utils.ThemeUtils
-
-interface SceneDetailPageParams {
-  backText?: string
-  id: any
-  setIcon: (id) => void,
-  iconIdList: any
-}
-
-function IconSelect(props: { theme?: ThemeType }) {
-  const [list, setList] = useState(iconList)
-  const navigation = useNavigation()
-  const params = useRoute().params as SceneDetailPageParams
-  const setColor = id => {
-    const newList = list?.map(item => {
-      return {
-        ...item,
-        selectStatus: item?.id === id,
-      }
-    })
-    setList(newList)
-  }
-  useEffect(() => {
-    const iconIdList = params?.iconIdList
-    const iconId = params?.id
-    const newList = list?.map(item => {
-      return {
-        ...item,
-        selectStatus: item?.id === iconId,
-        disabled: iconIdList?.some(val => val === item?.id && val !== iconId),
-      }
-    })
-    setList(newList)
-  }, [])
-  useEffect(() =>{
-    console.log(list, '< --- listttt')
-  }, [list])
-  return (
-    <View style={{ flex: 1, flexDirection: 'column' }}>
-      <LDVTopBar
-        title={params.backText ?? I18n.getLang('add_new_trigger_time_system_back_text')}
-        onBackPress={() => {
-          navigation.goBack()
-        }}
-      />
-      <ScrollView nestedScrollEnabled={true} style={{ marginHorizontal: cx(24) }}>
-        <View style={{ marginTop: cx(40), marginBottom: cx(20) }}>
-          <Text style={{ fontSize: cx(24), color: props.theme?.global.brand }}>{I18n.getLang('add_new_trigger_time_icon_selection_headline_text')}</Text>
-        </View>
-        <View
-          style={{ flexDirection: 'row', flex: 1, flexWrap: 'wrap', justifyContent: 'space-between', alignItems: 'flex-start' }}>
-          {list?.map(item => {
-            return <TouchableOpacity
-              onPress={() => {
-                setColor(item?.id)
-                params?.setIcon(item?.id)
-              }}
-              disabled={item?.disabled}
-              key={item.id}
-            >
-              <Image
-                source={{ uri: item?.icon }}
-                style={{
-                  width: cx(32),
-                  height: cx(32),
-                  margin: cx(10),
-                  tintColor: item?.selectStatus ? props.theme?.icon.primary : item?.disabled && props.theme?.icon.disable || props.theme?.icon.normal,
-                }}
-              />
-            </TouchableOpacity>
-          })}
-        </View>
-      </ScrollView>
-    </View>
-  )
-}
-
-export default withTheme(IconSelect)
+import { useNavigation, useRoute } from '@react-navigation/native'
+import React, { useEffect, useState } from 'react'
+import { Image, ScrollView, Text, TouchableOpacity, View } from 'react-native'
+import { Utils } from 'tuya-panel-kit'
+import iconList from '../biorhythm/iconListData'
+import LDVTopBar from '@ledvance/base/src/components/ldvTopBar'
+import I18n from '@ledvance/base/src/i18n'
+import ThemeType from '@ledvance/base/src/config/themeType'
+
+const cx = Utils.RatioUtils.convertX
+const { withTheme } = Utils.ThemeUtils
+
+interface SceneDetailPageParams {
+  backText?: string
+  id: any
+  setIcon: (id) => void,
+  iconIdList: any
+}
+
+function IconSelect(props: { theme?: ThemeType }) {
+  const [list, setList] = useState(iconList)
+  const navigation = useNavigation()
+  const params = useRoute().params as SceneDetailPageParams
+  const setColor = id => {
+    const newList = list?.map(item => {
+      return {
+        ...item,
+        selectStatus: item?.id === id,
+      }
+    })
+    setList(newList)
+  }
+  useEffect(() => {
+    const iconIdList = params?.iconIdList
+    const iconId = params?.id
+    const newList = list?.map(item => {
+      return {
+        ...item,
+        selectStatus: item?.id === iconId,
+        disabled: iconIdList?.some(val => val === item?.id && val !== iconId),
+      }
+    })
+    setList(newList)
+  }, [])
+  useEffect(() =>{
+    console.log(list, '< --- listttt')
+  }, [list])
+  return (
+    <View style={{ flex: 1, flexDirection: 'column' }}>
+      <LDVTopBar
+        title={params.backText ?? I18n.getLang('add_new_trigger_time_system_back_text')}
+        onBackPress={() => {
+          navigation.goBack()
+        }}
+      />
+      <ScrollView nestedScrollEnabled={true} style={{ marginHorizontal: cx(24) }}>
+        <View style={{ marginTop: cx(40), marginBottom: cx(20) }}>
+          <Text style={{ fontSize: cx(24), color: props.theme?.global.brand }}>{I18n.getLang('add_new_trigger_time_icon_selection_headline_text')}</Text>
+        </View>
+        <View
+          style={{ flexDirection: 'row', flex: 1, flexWrap: 'wrap', justifyContent: 'space-between', alignItems: 'flex-start' }}>
+          {list?.map(item => {
+            return <TouchableOpacity
+              onPress={() => {
+                setColor(item?.id)
+                params?.setIcon(item?.id)
+              }}
+              disabled={item?.disabled}
+              key={item.id}
+            >
+              <Image
+                source={{ uri: item?.icon }}
+                style={{
+                  width: cx(32),
+                  height: cx(32),
+                  margin: cx(10),
+                  tintColor: item?.selectStatus ? props.theme?.icon.primary : item?.disabled && props.theme?.icon.disable || props.theme?.icon.normal,
+                }}
+              />
+            </TouchableOpacity>
+          })}
+        </View>
+      </ScrollView>
+    </View>
+  )
+}
+
+export default withTheme(IconSelect)

package/src/newModules/biorhythm/Router.ts

@@ -1,34 +1,34 @@
-import {NavigationRoute} from "tuya-panel-kit";
-import BiorhythmPage from "./BiorhythmPage";
-import BiorhythmEditPage from "./BiorhythmEditPage";
-import BiorhythmIconSelectPage from "./IconSelect"
-import {ui_biz_routerKey} from "../../navigation/Routers";
-
-const BiorhythmPageRouters: NavigationRoute[] = [
-  {
-    name: ui_biz_routerKey.bi_biz_biological,
-    component: BiorhythmPage,
-    options:{
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  },
-  {
-    name: ui_biz_routerKey.bi_biz_biological_edit,
-    component: BiorhythmEditPage,
-    options:{
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  },
-  {
-    name: ui_biz_routerKey.bi_biz_biological_icon_select,
-    component: BiorhythmIconSelectPage,
-    options:{
-      hideTopbar: true,
-      showOfflineView: false,
-    }
-  },
-]
-
+import {NavigationRoute} from "tuya-panel-kit";
+import BiorhythmPage from "./BiorhythmPage";
+import BiorhythmEditPage from "./BiorhythmEditPage";
+import BiorhythmIconSelectPage from "./IconSelect"
+import {ui_biz_routerKey} from "../../navigation/Routers";
+
+const BiorhythmPageRouters: NavigationRoute[] = [
+  {
+    name: ui_biz_routerKey.bi_biz_biological,
+    component: BiorhythmPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.bi_biz_biological_edit,
+    component: BiorhythmEditPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+  {
+    name: ui_biz_routerKey.bi_biz_biological_icon_select,
+    component: BiorhythmIconSelectPage,
+    options:{
+      hideTopbar: true,
+      showOfflineView: false,
+    }
+  },
+]
+
 export default BiorhythmPageRouters

package/src/newModules/biorhythm/iconListData.ts

@@ -1,30 +1,30 @@
-import res from '@ledvance/base/src/res'
-
-const iconList = [
-  {id: 1, icon: res.biorhythom_icon1, selectStatus: false, disabled: false},
-  {id: 2, icon: res.biorhythom_icon2, selectStatus: false, disabled: false},
-  {id: 3, icon: res.biorhythom_icon3, selectStatus: false, disabled: false},
-  {id: 4, icon: res.biorhythom_icon4, selectStatus: false, disabled: false},
-  {id: 5, icon: res.biorhythom_icon5, selectStatus: false, disabled: false},
-  {id: 6, icon: res.biorhythom_icon6, selectStatus: false, disabled: false},
-  {id: 7, icon: res.biorhythom_icon7, selectStatus: false, disabled: false},
-  {id: 8, icon: res.biorhythom_icon8, selectStatus: false, disabled: false},
-  {id: 9, icon: res.biorhythom_icon9, selectStatus: false, disabled: false},
-  {id: 10, icon: res.biorhythom_icon10, selectStatus: false, disabled: false},
-  {id: 11, icon: res.biorhythom_icon11, selectStatus: false, disabled: false},
-  {id: 12, icon: res.biorhythom_icon12, selectStatus: false, disabled: false},
-  {id: 13, icon: res.biorhythom_icon13, selectStatus: false, disabled: false},
-  {id: 14, icon: res.biorhythom_icon14, selectStatus: false, disabled: false},
-  {id: 15, icon: res.biorhythom_icon15, selectStatus: false, disabled: false},
-  {id: 16, icon: res.biorhythom_icon16, selectStatus: false, disabled: false},
-  {id: 17, icon: res.biorhythom_icon17, selectStatus: false, disabled: false},
-  {id: 18, icon: res.biorhythom_icon18, selectStatus: false, disabled: false},
-  {id: 19, icon: res.biorhythom_icon19, selectStatus: false, disabled: false},
-  {id: 20, icon: res.biorhythom_icon20, selectStatus: false, disabled: false},
-  {id: 21, icon: res.biorhythom_icon21, selectStatus: false, disabled: false},
-  {id: 22, icon: res.biorhythom_icon22, selectStatus: false, disabled: false},
-  {id: 23, icon: res.biorhythom_icon23, selectStatus: false, disabled: false},
-  {id: 24, icon: res.biorhythom_icon24, selectStatus: false, disabled: false},
-]
-
-export default iconList
+import res from '@ledvance/base/src/res'
+
+const iconList = [
+  {id: 1, icon: res.biorhythom_icon1, selectStatus: false, disabled: false},
+  {id: 2, icon: res.biorhythom_icon2, selectStatus: false, disabled: false},
+  {id: 3, icon: res.biorhythom_icon3, selectStatus: false, disabled: false},
+  {id: 4, icon: res.biorhythom_icon4, selectStatus: false, disabled: false},
+  {id: 5, icon: res.biorhythom_icon5, selectStatus: false, disabled: false},
+  {id: 6, icon: res.biorhythom_icon6, selectStatus: false, disabled: false},
+  {id: 7, icon: res.biorhythom_icon7, selectStatus: false, disabled: false},
+  {id: 8, icon: res.biorhythom_icon8, selectStatus: false, disabled: false},
+  {id: 9, icon: res.biorhythom_icon9, selectStatus: false, disabled: false},
+  {id: 10, icon: res.biorhythom_icon10, selectStatus: false, disabled: false},
+  {id: 11, icon: res.biorhythom_icon11, selectStatus: false, disabled: false},
+  {id: 12, icon: res.biorhythom_icon12, selectStatus: false, disabled: false},
+  {id: 13, icon: res.biorhythom_icon13, selectStatus: false, disabled: false},
+  {id: 14, icon: res.biorhythom_icon14, selectStatus: false, disabled: false},
+  {id: 15, icon: res.biorhythom_icon15, selectStatus: false, disabled: false},
+  {id: 16, icon: res.biorhythom_icon16, selectStatus: false, disabled: false},
+  {id: 17, icon: res.biorhythom_icon17, selectStatus: false, disabled: false},
+  {id: 18, icon: res.biorhythom_icon18, selectStatus: false, disabled: false},
+  {id: 19, icon: res.biorhythom_icon19, selectStatus: false, disabled: false},
+  {id: 20, icon: res.biorhythom_icon20, selectStatus: false, disabled: false},
+  {id: 21, icon: res.biorhythom_icon21, selectStatus: false, disabled: false},
+  {id: 22, icon: res.biorhythom_icon22, selectStatus: false, disabled: false},
+  {id: 23, icon: res.biorhythom_icon23, selectStatus: false, disabled: false},
+  {id: 24, icon: res.biorhythom_icon24, selectStatus: false, disabled: false},
+]
+
+export default iconList

package/src/newModules/biorhythm/pIdList.ts

@@ -1,36 +1,36 @@
-const pIdList = [
-  '2tb7pu47xmtakusc',
-  'jde6i6cjuqafvhep',
-  'nertorg6rigv9kcs',
-  'upbvn0aceeduokg8',
-  'vz1ecmcefgtcjmze',
-  '9pub2u7xzwe3luhn',
-  'eyqghznptocb0c09',
-  'qrj3ubhrz2udkkp3',
-  'edlnwro9m0jhogfk',
-  'qaf91tzgkjhzxdlg',
-  'yy0mpo6vahmhhnyx',
-  'pfdsrf1aa9p2iqm7',
-  'aanbfdroxoikeemq',
-  'n19x26xmhzsoduoc',
-  'cnwub7a6xrvr8tg1',
-  'ix2a1uedckqziihs',
-  'hlodwjcku419f9q3',
-  'ntdbtyr4e5rk0nva',
-  'ck9ujelnqptkc2gu',
-  'poor3eeaue1xtmtj',
-  'f84gfg5bqwopeh6b',
-  '11w17umtgr8i7pzr',
-  'bivme7hztqwtansf',
-  '3eeippeoos24ebym',
-  'greysrcf5qraouxc',
-  'zadmgcev0sjzfzxx',
-  'wdk5pdrtqlguvbhx',
-  'rfzv1m0tt7bczqaf',
-  'qusibjjgjyarjs6w',
-  'hqad0c0jizozhhzl',
-  'bvctkpyefwowjfnh',
-  'z7g5wwtayzypqhdo',
-]
-
+const pIdList = [
+  '2tb7pu47xmtakusc',
+  'jde6i6cjuqafvhep',
+  'nertorg6rigv9kcs',
+  'upbvn0aceeduokg8',
+  'vz1ecmcefgtcjmze',
+  '9pub2u7xzwe3luhn',
+  'eyqghznptocb0c09',
+  'qrj3ubhrz2udkkp3',
+  'edlnwro9m0jhogfk',
+  'qaf91tzgkjhzxdlg',
+  'yy0mpo6vahmhhnyx',
+  'pfdsrf1aa9p2iqm7',
+  'aanbfdroxoikeemq',
+  'n19x26xmhzsoduoc',
+  'cnwub7a6xrvr8tg1',
+  'ix2a1uedckqziihs',
+  'hlodwjcku419f9q3',
+  'ntdbtyr4e5rk0nva',
+  'ck9ujelnqptkc2gu',
+  'poor3eeaue1xtmtj',
+  'f84gfg5bqwopeh6b',
+  '11w17umtgr8i7pzr',
+  'bivme7hztqwtansf',
+  '3eeippeoos24ebym',
+  'greysrcf5qraouxc',
+  'zadmgcev0sjzfzxx',
+  'wdk5pdrtqlguvbhx',
+  'rfzv1m0tt7bczqaf',
+  'qusibjjgjyarjs6w',
+  'hqad0c0jizozhhzl',
+  'bvctkpyefwowjfnh',
+  'z7g5wwtayzypqhdo',
+]
+
 export default pIdList

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -1,19 +1,24 @@
-import {useDp} from "@ledvance/base/src/models/modules/NativePropsSlice";
-import {exportCsvFile, localeNumber, loopsText, monthFormat, monthFormatShort} from "@ledvance/base/src/utils/common";
-import {EnergyData} from "./component/EnergyModal";
-import {NativeApi} from "@ledvance/base/src/api/native";
+import { NativeApi } from '@ledvance/base/src/api/native'
+import I18n from '@ledvance/base/src/i18n'
+import { useDp } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {
+  DpReportSataData,
   DpResultByMonthResData,
   getDataWithSpecified,
   getDpResultByHour,
-  getDpResultByMonth
-} from "@ledvance/base/src/models/TuyaApi";
-import {DateType} from "./co2Data";
-import {OverviewItem} from "./EnergyConsumptionPage";
-import {overDays} from "@ledvance/base/src/utils/index";
-import dayjs from "dayjs";
-import {isEmpty} from "lodash";
-import I18n from "@ledvance/base/src/i18n";
+  getDpResultByMonth,
+  getSpecifiedTimeDpReportLogs
+} from '@ledvance/base/src/models/TuyaApi'
+import { exportCsvFile, localeNumber, loopsText, monthFormat, monthFormatShort } from '@ledvance/base/src/utils/common'
+import { overDays, xLog } from '@ledvance/base/src/utils'
+import dayjs from 'dayjs'
+import CustomParseFormat from 'dayjs/plugin/customParseFormat'
+import { isEmpty } from 'lodash'
+import { DateType } from './co2Data'
+import { EnergyData } from './component/EnergyModal'
+import { OverviewItem } from './EnergyConsumptionPage'
+
+dayjs.extend(CustomParseFormat)
 
 export function useElectricCurrent(dpCode: string): number {
   const current = useDp<number, any>(dpCode)[0] || 0
@@ -21,12 +26,12 @@ export function useElectricCurrent(dpCode: string): number {
 }
 
 export function useVoltage(dpCode: string): number {
-  const voltage = useDp<number, any>(dpCode)[0] / 10 || 0;
+  const voltage = useDp<number, any>(dpCode)[0] / 10 || 0
   return localeNumber(voltage, 1)
 }
 
 export function usePower(dpCode: string): number {
-  const power = useDp<number, any>(dpCode)[0] / 10 || 0;
+  const power = useDp<number, any>(dpCode)[0] / 10 || 0
   return localeNumber(power, 1)
 }
 
@@ -44,7 +49,7 @@ export async function getElectricity(devId: string, addEleDpCode: string, date:
       res = await getDpResultByYearMonth(devId, addEleDpCode, date)
       break
     case DateType.Day:
-      res = await getDpResultByDate(devId, addEleDpCode, date);
+      res = await getDpResultByDate(devId, addEleDpCode, date)
       break
   }
   return res
@@ -52,19 +57,19 @@ export async function getElectricity(devId: string, addEleDpCode: string, date:
 
 let dpResultByMonthCache: DpResultByMonthResData | undefined = undefined
 const getDpResultByYear = async (devId: string, addEleDpCode: string, dateStr: string): Promise<OverviewItem[]> => {
-  let res: DpResultByMonthResData | undefined;
+  let res: DpResultByMonthResData | undefined
   if (!dpResultByMonthCache) {
     dpResultByMonthCache = await getDpResultByMonth(devId, addEleDpCode, 'sum')
   }
-  res = dpResultByMonthCache;
+  res = dpResultByMonthCache
   if (!isEmpty(res)) {
     if (!isEmpty(res.years)) {
-      const year = dateStr;
+      const year = dateStr
       const curMonth = res.years[year]
-      if (!curMonth){
-        return [];
+      if (!curMonth) {
+        return []
       }
-      const curMonthList = Object.keys(curMonth).sort((a, b) => parseInt(b) - parseInt(a));
+      const curMonthList = Object.keys(curMonth).sort((a, b) => parseInt(b) - parseInt(a))
       return curMonthList.map(month => {
         return {
           key: `${monthFormat(month)} ${year}`,
@@ -88,15 +93,15 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
     const dayList = res.result
     return Object.keys(dayList).filter(v => Number(dayList[v]) > 0).map(time => {
       // 提取年、月和日
-      const year = time.slice(0, 4);
-      const month = time.slice(4, 6);
-      const day = time.slice(6, 8);
+      const year = time.slice(0, 4)
+      const month = time.slice(4, 6)
+      const day = time.slice(6, 8)
 
       // 格式化为 'YYYY/MM/DD' 格式
       const formattedDate = `${year}/${month}/${day}`
       const dateStr = `${day}/${month}/${year}`
-      const dateObj = dayjs(formattedDate, "YYYY/MM/DD");
-      const dayOfWeek = dateObj.day() % 7;
+      const dateObj = dayjs(formattedDate, 'YYYY/MM/DD')
+      const dayOfWeek = dateObj.day() % 7
       const key = `${dateStr} (${loopsText[dayOfWeek]})`
       return {
         key,
@@ -112,7 +117,7 @@ const getDpResultByYearMonth = async (devId: string, addEleDpCode: string, dateS
 
 const getDpResultByDate = async (devId: string, addEleDpCode: string, date: string): Promise<OverviewItem[]> => {
   if (overDays(date, 7)) {
-    console.log("getDpResultByDate overDays true")
+    console.log('getDpResultByDate overDays true')
     return []
   }
   const res = await getDpResultByHour(devId, addEleDpCode, date, 'sum')
@@ -121,7 +126,7 @@ const getDpResultByDate = async (devId: string, addEleDpCode: string, date: stri
   }
   const list: Array<OverviewItem> = []
   const resData = Object.keys(res)?.map(val => {
-    return {key: Number(val?.slice(8, 10)), value: Number(res[val])}
+    return { key: Number(val?.slice(8, 10)), value: Number(res[val]) }
   })
   for (let i = 0; i <= 23; i++) {
     const hourData = resData?.find(val => val?.key === i)
@@ -137,6 +142,39 @@ const getDpResultByDate = async (devId: string, addEleDpCode: string, date: stri
   return list
 }
 
+export interface PowerDataItem {
+  key: string
+  chartTitle: string
+  value: number
+}
+
+export async function getPowerData(devId: string, powerDpCode: string, interval: number): Promise<PowerDataItem[]> {
+  const now = dayjs()
+  const startTime = now.add(-1 * interval, 'minute').valueOf().toString()
+  const endTime = now.valueOf().toString()
+  const dpResult = await getSpecifiedTimeDpReportLogs(
+    devId,
+    [powerDpCode],
+    'ASC',
+    startTime,
+    endTime,
+    {
+      maxRetries: 5,
+      initialDelay: 1000,
+      maxDelay: 30000,
+      backoffFactor: 2
+    }
+  ) as DpReportSataData[]
+  xLog('powerData', dpResult)
+  return dpResult.map(dp => {
+    return {
+      key: dp.timeStr,
+      chartTitle: dayjs.unix(dp.timeStamp).format('HH:mm:ss'),
+      value: parseFloat(dp.value) / 10
+    }
+  })
+}
+
 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 = 'EnergyConsumption'