@ledvance/ui-biz-bundle 1.1.164 → 1.1.166

package/package.json

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

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -9,16 +9,15 @@ import { useParams } from '@ledvance/base/src/hooks/Hooks'
 import I18n from '@ledvance/base/src/i18n'
 import { useDeviceInfo, useSystemTimeFormate, } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import res from '@ledvance/base/src/res'
-import { xLog } from '@ledvance/base/src/utils'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 import { convertMinutesTo12HourFormat, loopText, showDialog } from '@ledvance/base/src/utils/common'
 import { useNavigation } from '@react-navigation/native'
 import { useDebounceFn, useReactive, useUpdateEffect } from 'ahooks'
 import { useConflictTask } from 'hooks/DeviceDpStateHooks'
 import { cloneDeep, sortBy } from 'lodash'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
-import { FlatList, Image, Linking, ScrollView, Switch, Text, TouchableOpacity, View, AsyncStorage } from 'react-native'
-import { Dialog, Modal, Utils } from 'tuya-panel-kit'
+import React, { useCallback, useMemo, useState } from 'react'
+import { FlatList, Image, Linking, ScrollView, Text, TouchableOpacity, View } from 'react-native'
+import { Dialog, Modal, SwitchButton, Utils } from 'tuya-panel-kit'
 import { ui_biz_routerKey } from '../../navigation/Routers'
 import { replaceImg, useBiorhythm, useStorageBiorhythm } from './BiorhythmActions'
 import {
@@ -243,7 +242,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
         backText={deviceInfo.name}
         onBackClick={navigation.goBack}
         headlineTopContent={
-          <View style={{flexDirection: 'row', justifyContent: 'flex-end'}}>
+          <View style={{flexDirection: 'row', justifyContent: 'flex-end', marginBottom: cx(10)}}>
             <TouchableOpacity
               style={{paddingLeft: cx(16)}}
               onPress={() => {
@@ -274,10 +273,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
             </TouchableOpacity>
           </View>}
         headlineText={I18n.getLang('add_new_trigger_time_system_back_text')}
-        headlineIconContent={<Switch
+        headlineIconContent={<SwitchButton
           value={state.enable}
-          thumbColor={props.theme?.icon.primary}
-          trackColor={{ false: '#00000026', true: '#ff660036' }}
           onValueChange={async enable => {
             const biorhythmTask = {
               startTime: 0,
@@ -542,10 +539,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                           {convertMinutesTo12HourFormat(item.time, is24Hour)}
                         </Text>
                       </View>
-                      <Switch
+                      <SwitchButton
                         value={item.enable}
-                        thumbColor={props.theme?.icon.primary}
-                        trackColor={{ false: '#00000026', true: '#ff660036' }}
                         onValueChange={e => {
                           item.enable = e
                           requestSetBiorhythm()

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -3,7 +3,6 @@ import I18n from '@ledvance/base/src/i18n'
 import { useDp } from '@ledvance/base/src/models/modules/NativePropsSlice'
 import {
   DpReportSataData,
-  DpResultByMonthResData,
   getDataWithSpecified,
   getDpResultByHour,
   getDpResultByMonth,
@@ -148,7 +147,8 @@ export interface PowerDataItem {
   key: string
   chartTitle: string
   time: number,
-  value: number
+  value: number,
+  interval: number,
 }
 
 // 常量抽离（便于维护）
@@ -161,21 +161,6 @@ const RETRY_CONFIG = {
   backoffFactor: 2,
 } as const;
 
-/**
- * 创建一个0值填充的数据点
- * @param timePoint Dayjs对象
- * @returns PowerDataItem
- */
-function createZeroPaddingPoint(timePoint: dayjs.Dayjs): PowerDataItem {
-  const timeMs = timePoint.valueOf();
-  return {
-    key: timePoint.format('HH:mm:ss'),
-    chartTitle: timePoint.format('MM/DD/YYYY HH:mm:ss'),
-    time: timeMs,
-    value: 0,
-  };
-}
-
 /**
  * 获取设备功率数据
  * @param devId 设备ID
@@ -205,7 +190,8 @@ export async function getPowerData(devId: string, powerDpCode: string, interval:
       key: dp.timeStr,
       chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
       time: dp.timeStamp * 1000,
-      value: parseFloat(dp.value) / 10
+      value: parseFloat(dp.value) / 10,
+      interval: interval
     }
   })
 }

package/src/newModules/energyConsumption/EnergyConsumptionChart/PowerChartSection.tsx

@@ -3,12 +3,13 @@ import React from 'react'
 import { Text, TouchableOpacity, View } from 'react-native'
 import PowerLineChart from '../component/PowerLineChart'
 import { EmptyDataView } from './EmptyDataView'
+import { PowerRangeInterval } from '../co2Data'
 
 const INTERVAL_OPTIONS = [
-  { label: 'charttime_type1', value: 24 * 60 },
-  { label: 'charttime_type2', value: 6 * 60 },
-  { label: 'charttime_type3', value: 60 },
-  { label: 'charttime_type4', value: 5 },
+  { label: 'charttime_type1', value: PowerRangeInterval.DAY_1 },
+  { label: 'charttime_type2', value: PowerRangeInterval.HOUR_6 },
+  { label: 'charttime_type3', value: PowerRangeInterval.HOUR_1 },
+  { label: 'charttime_type4', value: PowerRangeInterval.MINUTE_5 },
 ]
 
 export const PowerChartSection = ({ isLandscape, state, actions, styles, theme, chartHeight }) => {

package/src/newModules/energyConsumption/co2Data.ts

@@ -23664,3 +23664,10 @@ export enum ChartType {
   kWh = 'kWh',
   Watt = 'Watt',
 }
+
+export enum PowerRangeInterval {
+  MINUTE_5 = 5,
+  HOUR_1 = 1 * 60,
+  HOUR_6 = 6 * 60,
+  DAY_1 = 24 * 60,
+}

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

@@ -5,6 +5,7 @@ import React, { useRef } from 'react'
 import { View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import { PowerDataItem } from '../EnergyConsumptionActions'
+import { PowerRangeInterval } from '../co2Data'
 import dayjs from 'dayjs'
 
 const { withTheme } = Utils.ThemeUtils
@@ -24,6 +25,8 @@ const GAP_THRESHOLD_MS = 5 * 1000 // 5 秒
  */
 function fillGaps(items: PowerDataItem[]): PowerDataItem[] {
   if (!items || items.length < 2) return items
+  // MINUTE_5 模式下数据点本身间隔约 30s，不做间隙补充
+  if (items[0].interval === PowerRangeInterval.MINUTE_5) return items
   const result: PowerDataItem[] = []
   for (let i = 0; i < items.length; i++) {
     result.push(items[i])
@@ -45,10 +48,11 @@ function fillGaps(items: PowerDataItem[]): PowerDataItem[] {
         }
         const gapDayjs = dayjs(gapTime)
         result.push({
-          key: gapDayjs.format('YYYY-MM-DD HH:mm:ss'),
+          key: gapDayjs.format('MM/DD/YYYY HH:mm:ss'),
           chartTitle: gapDayjs.format('MM/DD/YYYY HH:mm:ss'),
           time: gapTime,
           value: gapValue,
+          interval: cur.interval,
         })
       }
     }
@@ -73,7 +77,18 @@ const PowerLineChart = (props: PowerLineChartProps) => {
       show: true,
       triggerOn: 'mousemove|click',
       trigger: 'axis',
-      position: ['30%', '50%']
+      position: ['30%', '50%'],
+      formatter: function (params) {
+        if (!params || !params.length) return ''
+        var item = params[0]
+        var date = new Date(item.value[0])
+        function pad(num) {
+          return num < 10 ? '0' + num : num
+        }
+        var time = pad(date.getMonth() + 1) + '/' + pad(date.getDate()) + '/' + date.getFullYear() + ' ' +
+          pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds())
+        return (time + '<br/>' + item.marker + item.seriesName + ': ' + '<b>' + item.value[1] + '</b>')
+      }
     },
     grid: {
       right: '5%'

package/src/newModules/timeSchedule/TimeScheduleDetailPage.tsx

@@ -454,59 +454,61 @@ const TimeScheduleDetailPage = (props: { theme?: ThemeType }) => {
         <Spacer height={cx(30)} />
 
         {/* Apply for */}
-        <View style={styles.cardContainer}>
-          <Text style={styles.itemTitle}>
-            {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
-          </Text>
-          <Spacer height={cx(10)} />
-          <View style={[styles.applyContent, { paddingTop: state.selectedSkill.length ? cx(10) : 0 }]}>
-            {state.selectedSkill.length === 0 ? (
-              <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
-            ) : (
-              state.selectedSkill.map(skill => (
-                <View
-                  style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}
-                  key={skill.dp}
+        {(!params.applyForDisabled && params.applyForList.length > 1) && (
+          <View style={styles.cardContainer}>
+            <Text style={styles.itemTitle}>
+              {I18n.getLang('timeschedule_add_schedule_subheadline_text')}
+            </Text>
+            <Spacer height={cx(10)} />
+            <View style={[styles.applyContent, { paddingTop: state.selectedSkill.length ? cx(10) : 0 }]}>
+              {state.selectedSkill.length === 0 ? (
+                <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('timer_ceiling_fan_selectionfield_no_components_text')}</Text>
+              ) : (
+                state.selectedSkill.map(skill => (
+                  <View
+                    style={[styles.applyItem, { marginBottom: cx(10), borderRadius: 4 }]}
+                    key={skill.dp}
+                  >
+                    <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{skill.key}</Text>
+                    {showSelectedIcon && (
+                      <TouchableOpacity
+                        onPress={() => {
+                          state.selectedSkill = state.selectedSkill.filter(s => skill.dp !== s.dp);
+                          state.unSelectedSkill = [...state.unSelectedSkill, skill];
+                        }}
+                        style={{ paddingHorizontal: cx(5) }}
+                      >
+                        <Image
+                          style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
+                          source={{ uri: res.ic_arrows_nav_clear}}
+                        />
+                      </TouchableOpacity>
+                    )}
+                  </View>
+                ))
+              )}
+            </View>
+            {state.unSelectedSkill.map((item: ApplyForItem) => {
+              return (
+                <TouchableOpacity
+                  style={styles.applyItem}
+                  key={item.dp}
+                  onPress={() => {
+                    state.selectedSkill = [...state.selectedSkill, item];
+                    state.unSelectedSkill = state.unSelectedSkill.filter(s => item.dp !== s.dp);
+                  }}
                 >
-                  <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{skill.key}</Text>
-                  {showSelectedIcon && (
-                    <TouchableOpacity
-                      onPress={() => {
-                        state.selectedSkill = state.selectedSkill.filter(s => skill.dp !== s.dp);
-                        state.unSelectedSkill = [...state.unSelectedSkill, skill];
-                      }}
-                      style={{ paddingHorizontal: cx(5) }}
-                    >
-                      <Image
-                        style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                        source={{ uri: res.ic_arrows_nav_clear}}
-                      />
-                    </TouchableOpacity>
-                  )}
-                </View>
-              ))
-            )}
+                  <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{item.key}</Text>
+                  <Image
+                    style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
+                    source={{ uri: res.device_panel_timer_add}}
+                  />
+                </TouchableOpacity>
+              );
+            })}
+            <Spacer />
           </View>
-          {state.unSelectedSkill.map((item: ApplyForItem) => {
-            return (
-              <TouchableOpacity
-                style={styles.applyItem}
-                key={item.dp}
-                onPress={() => {
-                  state.selectedSkill = [...state.selectedSkill, item];
-                  state.unSelectedSkill = state.unSelectedSkill.filter(s => item.dp !== s.dp);
-                }}
-              >
-                <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(12) }}>{item.key}</Text>
-                <Image
-                  style={{ width: cx(16), height: cx(16), tintColor: props.theme?.global.fontColor }}
-                  source={{ uri: res.device_panel_timer_add}}
-                />
-              </TouchableOpacity>
-            );
-          })}
-          <Spacer />
-        </View>
+        )}
 
         {/* device state */}
         <Text style={[styles.itemTitle, styles.cardContainer]}>

package/src/newModules/timeSchedule/components/ManuaSettings.tsx

@@ -101,6 +101,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.name || item.key}
                 color={getBlockColor(item as any)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList = state.applyForList.map((apply, index) => {
@@ -259,6 +261,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.key}
                 color={getBlockColor(item.type)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList[idx].enable = enable;
@@ -329,6 +333,8 @@ function ManualSettings(props: ManualSettingProps) {
             title={state.applyForList[0]?.name || state.applyForList[0]?.key}
             color={getBlockColor()}
             colorAlpha={1}
+            onText={I18n.getLang('routine_push_msg_on')}
+            offText={I18n.getLang('watchapp_entitystate_off')}
             enable={state.applyForList[0]?.enable}
             setEnable={(enable: boolean) => {
               state.applyForList[0].enable = enable;
@@ -408,6 +414,8 @@ function ManualSettings(props: ManualSettingProps) {
                 title={item.key}
                 color={getBlockColor(item.type)}
                 colorAlpha={1}
+                onText={I18n.getLang('routine_push_msg_on')}
+                offText={I18n.getLang('watchapp_entitystate_off')}
                 enable={item.enable}
                 setEnable={(enable: boolean) => {
                   state.applyForList[idx].enable = enable;
@@ -499,6 +507,8 @@ function ManualSettings(props: ManualSettingProps) {
               icon={{ uri: PowerStripIcon[item.index ?? 0] }}
               disabledEdit={true}
               onNameChange={() => { }}
+              onText={I18n.getLang('routine_push_msg_on')}
+              offText={I18n.getLang('watchapp_entitystate_off')}
               enabled={item.enable}
               onSwitchChange={async enable => {
                 state.applyForList = state.applyForList.map((apply, index) => {