@ledvance/ui-biz-bundle 1.1.160 → 1.1.162

package/package.json

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

package/src/modules/music/MusicPageActions.ts

@@ -7,7 +7,7 @@ import { MixLightBean } from '../timeSchedule/mix/MixLightBean'
 import { Formatter } from '@tuya/tuya-panel-lamp-sdk'
 import { DreamMusicDataType, dreamMusicData } from './MusicDataBean'
 import { Result } from '@ledvance/base/src/models/modules/Result'
-import { getFeature, NativeApi } from '@ledvance/base/src/api/native'
+import { getFeature, putFeature, NativeApi } from '@ledvance/base/src/api/native'
 import { parseJSON } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { WorkMode } from '@ledvance/base/src/utils/interface'
 const DreamMusicFormatter = new Formatter.DreamLightMicMusicFormatter()
@@ -32,7 +32,16 @@ export const useWorkMode = (dpKey: string, isFeatureMode?: boolean): [WorkMode,
   useUpdateEffect(() =>{
     setMode(workMode)
   }, [workMode])
-  return [mode, setWorkMode]
+
+  const setWorkModeWithFeature = async (v: WorkMode): Promise<Result<any>> => {
+    const result = await setWorkMode(v)
+    if (isFeatureMode) {
+      await putFeature(devId, 'work_mode', v)
+    }
+    return result
+  }
+
+  return [mode, setWorkModeWithFeature]
 }
 
 export const useMixRgbcw = (mixRgbcwDp: string, mixSwitchDp: string) => {

package/src/newModules/biorhythm/BiorhythmActions.ts

@@ -8,18 +8,19 @@ import { hex2Int, spliceByStep } from '@ledvance/base/src/utils/common'
 import { to16 } from '@tuya/tuya-panel-lamp-sdk/lib/utils'
 import { useUpdateEffect } from 'ahooks'
 import dayjs from 'dayjs'
-import { padStart } from 'lodash'
+import { cloneDeep, padStart } from 'lodash'
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { AsyncStorage } from 'react-native'
 import {
   BiorhythmBean,
   BiorhythmGradientType,
   BiorhythmGradientTypeMap,
   BiorhythmGradientTypeMap2,
   colorTemperatureValue,
-  colorTempPercent,
-  Plan,
+  colorTempPercent, Plan,
   RemoteBiorhythmBean,
 } from './BiorhythmBean'
+import iconList from './iconListData'
 
 type UseBiorhythmType = (dpKey: string, disabledFeature?: boolean) => [BiorhythmBean, SetBiorhythmType];
 type SetBiorhythmType = (biorhythmObj: BiorhythmBean, pushFeature?: boolean) => Promise<Result<any>>;
@@ -401,3 +402,91 @@ function dto2Vo(remoteBiorhythmBean: RemoteBiorhythmBean): BiorhythmBean {
     }),
   }
 }
+
+export const replaceImg = (img) => {
+  const item = iconList?.find(val => val.id === Number(img))
+  switch (img) {
+    case 'rhythm_icon1':
+    case '31':
+      return { icon: res.biorhythom_icon1, iconId: 1 }
+    case 'rhythm_icon2':
+    case '33':
+      return { icon: res.biorhythom_icon5, iconId: 5 }
+    case 'rhythm_icon3':
+    case '35':
+      return { icon: res.biorhythom_icon2, iconId: 2 }
+    case 'rhythm_icon4':
+    case '32':
+      return { icon: res.biorhythom_icon9, iconId: 9 }
+    case 'rhythm_icon12':
+    case '39':
+      return { icon: res.biorhythom_icon3, iconId: 3 }
+    default:
+      return { icon: item?.icon, iconId: item?.id }
+  }
+}
+
+export function useStorageBiorhythm(): [[], (key, enable: boolean, gradient: BiorhythmGradientType, weeks: number[], planList: Plan[]) => void, (key) => void, (key) => {
+  weeks: number[];
+  planList: Plan[];
+  enable: boolean;
+  gradient: BiorhythmGradientType
+}] {
+  const [storageBiorhythms, setStorageBiorhythms] = useState([])
+  useEffect(() => {
+    AsyncStorage.getItem('BIORHYTHM_STORAGE').then(res => {
+      if (res) {
+        const storageBiorhythms = JSON.parse(res)
+        setStorageBiorhythms(storageBiorhythms)
+        xLog('AsyncStorage getBiorhythm', storageBiorhythms)
+      }
+    })
+  }, [])
+
+  const saveBiorhythm = useCallback((key, enable: boolean, gradient: BiorhythmGradientType, weeks: number[], planList: Plan[]) => {
+    const newPlanList = planList?.map(item => {
+      return { ...item, icon: `${item.icon}` }
+    }).sort((a, b) => a.time - b.time)
+    const biorhythm = cloneDeep({
+      key: key,
+      enable: enable,
+      weeks: weeks,
+      gradient: gradient,
+      planList: newPlanList,
+    })
+    const newStorageBiorhythms = storageBiorhythms.filter(item => item.key !== key)
+    newStorageBiorhythms.unshift(biorhythm)
+    setStorageBiorhythms(newStorageBiorhythms)
+    xLog('AsyncStorage saveBiorhythm', newStorageBiorhythms)
+    AsyncStorage.setItem('BIORHYTHM_STORAGE', JSON.stringify(newStorageBiorhythms), (error) => {
+      xLog('AsyncStorage saveBiorhythm error', error)
+    }).then()
+  }, [storageBiorhythms])
+
+  const removeBiorhythm = useCallback((key) => {
+    const newStorageBiorhythms = storageBiorhythms.filter(item => item.key !== key)
+    setStorageBiorhythms(newStorageBiorhythms)
+    AsyncStorage.setItem('BIORHYTHM_STORAGE', JSON.stringify(newStorageBiorhythms)).then(res => {
+      xLog('AsyncStorage removeBiorhythm res', res)
+    })
+  }, [storageBiorhythms])
+
+  const applyBiorhythm = useCallback((key) => {
+    const newBiorhythm = storageBiorhythms.find(item => item.key === key)
+    const planList = newBiorhythm.planList?.map((it, index) => {
+      return {
+        ...it,
+        index: it.index ?? index,
+        icon: replaceImg(it?.iconId || it?.icon)?.icon,
+        iconId: replaceImg(it?.iconId || it?.icon)?.iconId,
+      }
+    })
+    return {
+      weeks: newBiorhythm.weeks,
+      planList: planList,
+      enable: newBiorhythm.enable,
+      gradient: newBiorhythm.gradient,
+    }
+  }, [storageBiorhythms])
+  return [storageBiorhythms, saveBiorhythm, removeBiorhythm, applyBiorhythm]
+}

package/src/newModules/biorhythm/BiorhythmPage.tsx

@@ -1,5 +1,6 @@
 import Card from '@ledvance/base/src/components/Card'
 import DeleteButton from '@ledvance/base/src/components/DeleteButton'
+import InfoText from '@ledvance/base/src/components/InfoText'
 import Page from '@ledvance/base/src/components/Page'
 import Spacer from '@ledvance/base/src/components/Spacer'
 import LdvWeekView from '@ledvance/base/src/components/weekSelect'
@@ -8,17 +9,18 @@ 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 as showCommonDialog } from '@ledvance/base/src/utils/common'
+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, useMemo } from 'react'
-import { FlatList, Image, Linking, ScrollView, Switch, Text, TouchableOpacity, View } from 'react-native'
+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 { ui_biz_routerKey } from '../../navigation/Routers'
-import { useBiorhythm } from './BiorhythmActions'
+import { replaceImg, useBiorhythm, useStorageBiorhythm } from './BiorhythmActions'
 import {
   BiorhythmBean,
   BiorhythmGradientType,
@@ -64,6 +66,8 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
   const is24Hour = useSystemTimeFormate()
   const devicesJudge = pIdList.some(val => val === productId)
   const [checkConflict, resolveConflict] = useConflictTask(params.conflictDps)
+  const [storageBiorhythms, saveStorageBiorhythms, removeStorageBiorhythm, applyStorageBiorhythm] = useStorageBiorhythm()
+  const [biorhythmListVisible, setBiorhythmListVisible] = useState(false)
 
   const state = useReactive<UIState>({
     ...biorhythm,
@@ -163,29 +167,6 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
     run()
   }, [state.flag])
 
-  const replaceImg = (img) => {
-    const item = iconList?.find(val => val.id === Number(img))
-    switch (img) {
-      case 'rhythm_icon1':
-      case '31':
-        return { icon: res.biorhythom_icon1, iconId: 1 }
-      case 'rhythm_icon2':
-      case '33':
-        return { icon: res.biorhythom_icon5, iconId: 5 }
-      case 'rhythm_icon3':
-      case '35':
-        return { icon: res.biorhythom_icon2, iconId: 2 }
-      case 'rhythm_icon4':
-      case '32':
-        return { icon: res.biorhythom_icon9, iconId: 9 }
-      case 'rhythm_icon12':
-      case '39':
-        return { icon: res.biorhythom_icon3, iconId: 3 }
-      default:
-        return { icon: item?.icon, iconId: item?.id }
-    }
-  }
-
   useUpdateEffect(() => {
     const planList = biorhythm.planList?.map(item => {
       return {
@@ -261,6 +242,26 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
       <Page
         backText={deviceInfo.name}
         onBackClick={navigation.goBack}
+        headlineTopContent={<View style={{ flexDirection: 'row', width: '100%', justifyContent: 'space-between' }}>
+          <DeleteButton style={{flex: 1}} text={I18n.getLang('biorhythm_save_as')} onPress={() => {
+            Dialog.prompt({
+              title: I18n.getLang('biorhythm_save_title'),
+              placeholder: I18n.getLang('biorhythm_save_placeholder'),
+              defaultValue: `${deviceInfo.name}`,
+              cancelText: I18n.getLang('auto_scan_system_cancel'),
+              confirmText: I18n.getLang('auto_scan_system_wifi_confirm'),
+              inputWrapperStyle: {backgroundColor: props.theme?.textInput.background, borderRadius: cx(10)},
+              autoFocus: true,
+              onConfirm: (data, { close }) => {
+                saveStorageBiorhythms(data, state.enable, state.gradient, state.weeks, state.planList)
+                close()
+              }
+            })
+          }} />
+          <DeleteButton style={{flex: 1}} text={I18n.getLang('biorhythm_load')} onPress={() => {
+            setBiorhythmListVisible(true)
+          }} />
+        </View>}
         headlineText={I18n.getLang('add_new_trigger_time_system_back_text')}
         headlineIconContent={<Switch
           value={state.enable}
@@ -275,7 +276,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
               channel: 1
             }
             if (enable && checkConflict(biorhythmTask)) {
-              return showCommonDialog({
+              return showDialog({
                 method: 'confirm',
                 title: I18n.getLang('conflict_dialog_active_item_bio_rhythm_titel'),
                 subTitle: I18n.getLang('conflict_dialog_active_item_bio_rhythm_description'),
@@ -580,7 +581,7 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
                       // fontFamily: 'helvetica_neue_lt_std_roman',
                     }}
                     onPress={() => {
-                      showCommonDialog({
+                      showDialog({
                         method: 'confirm',
                         title: I18n.getLang('bio_ryhthm_reset_description_text'),
                         onConfirm: (_, { close }) => {
@@ -645,6 +646,54 @@ const BiorhythmPage = (props: { theme?: ThemeType }) => {
           showGradientTypeSelectModal(false)
         }}
       />
+      <Modal visible={biorhythmListVisible} onMaskPress={() => {setBiorhythmListVisible(false)}}>
+        <View style={{ height: cx(300), padding: cx(16), backgroundColor: props.theme?.card.background }}>
+          {
+            storageBiorhythms.length === 0 ? (
+              <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+                <InfoText
+                  textStyle={{ flex: undefined }}
+                  icon={res.ic_info}
+                  text={I18n.getLang('energyconsumption_emptydata')}
+                />
+              </View>
+            ) : (
+              <FlatList
+                data={storageBiorhythms}
+                renderItem={({ item }) => {
+                  return <View style={{ padding: cx(5), flexDirection: 'row' }}>
+                    <Text style={{ flex: 1, color: props.theme?.global.fontColor }}>{item.key}</Text>
+                    <TouchableOpacity style={{width: cx(24), height: cx(24), marginRight: cx(20)}} onPress={() => {
+                      showDialog({
+                        method: 'confirm',
+                        title: I18n.getLang('biorhythm_delete_tips'),
+                        onConfirm: (_, { close }) => {
+                          removeStorageBiorhythm(item.key)
+                          close()
+                        }
+                      })
+                    }}>
+                      <Image source={{ uri: res.delete}} style={{width: cx(24), height: cx(24), tintColor: props.theme?.global.warning}} />
+                    </TouchableOpacity>
+                    <TouchableOpacity style={{width: cx(24), height: cx(24), marginRight: cx(10)}} onPress={() => {
+                      const newBiorhythm = applyStorageBiorhythm(item.key)
+                      state.enable = newBiorhythm.enable
+                      state.gradient = newBiorhythm.gradient
+                      state.weeks = newBiorhythm.weeks
+                      state.planList = newBiorhythm.planList
+                      run()
+                      setBiorhythmListVisible(false)
+                    }}>
+                      <Image source={{ uri:res.ic_checked}} style={{width: cx(24), height: cx(24), tintColor: props.theme?.icon.normal}} />
+                    </TouchableOpacity>
+                  </View>
+                }}
+                keyExtractor={(item) => `${item.key}`}
+              />
+            )
+          }
+        </View>
+      </Modal>
     </>
   )
 }

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

@@ -65,6 +65,7 @@ export const getStyles = (theme: ThemeType | undefined) => StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItems: 'center',
+    paddingHorizontal: cx(28),
   },
   landscapeTitle: {
     color: theme?.global.fontColor,

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

@@ -5,10 +5,57 @@ import React, { useRef } from 'react'
 import { View } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import { PowerDataItem } from '../EnergyConsumptionActions'
+import dayjs from 'dayjs'
 
 const { withTheme } = Utils.ThemeUtils
 const cx = Utils.RatioUtils.convertX
 
+/** 相邻两点时间差超过该阈值（ms）时插入补充点 */
+const GAP_THRESHOLD_MS = 5 * 1000 // 5 秒
+
+/**
+ * 在时间间隔较大的相邻点之间插入一个"间隙补充点"，模拟阶梯式折线效果。
+ *
+ * 插入规则（基于值的变化方向）：
+ *   - 值下降（cur > next）：在 cur.time + 1s 处插入 next.value
+ *     → 表示值在前点之后立刻跌落，后续一直保持新低值直到 next 点
+ *   - 值上升（cur <= next）：在 next.time - 1s 处插入 cur.value
+ *     → 表示值一直保持旧值平稳，在 next 点前 1 秒才结束
+ */
+function fillGaps(items: PowerDataItem[]): PowerDataItem[] {
+  if (!items || items.length < 2) return items
+  const result: PowerDataItem[] = []
+  for (let i = 0; i < items.length; i++) {
+    result.push(items[i])
+    if (i < items.length - 1) {
+      const cur = items[i]
+      const next = items[i + 1]
+      const diffMs = next.time - cur.time
+      if (diffMs > GAP_THRESHOLD_MS) {
+        let gapTime: number
+        let gapValue: number
+        if (cur.value > next.value) {
+          // 值下降：立刻跌落 —— 在前点后 1 秒插入 next.value
+          gapTime = cur.time + 1000
+          gapValue = next.value
+        } else {
+          // 值上升（或相等）：保持旧值 —— 在后点前 1 秒插入 cur.value
+          gapTime = next.time - 1000
+          gapValue = cur.value
+        }
+        const gapDayjs = dayjs(gapTime)
+        result.push({
+          key: gapDayjs.format('YYYY-MM-DD HH:mm:ss'),
+          chartTitle: gapDayjs.format('MM/DD/YYYY HH:mm:ss'),
+          time: gapTime,
+          value: gapValue,
+        })
+      }
+    }
+  }
+  return result
+}
+
 interface PowerLineChartProps {
   theme?: ThemeType
   data: PowerDataItem[],
@@ -19,7 +66,7 @@ const PowerLineChart = (props: PowerLineChartProps) => {
   const echarts = useRef()
   const { data, height } = props
 
-  const values = data?.map(item => ([item.time, item.value]))
+  const values = fillGaps(data)?.map(item => ([item.time, item.value]))
 
   const option = {
     tooltip: {