@ledvance/base 1.3.62 → 1.3.65

package/src/models/TuyaApi.ts

@@ -1,6 +1,8 @@
 import {commonApi} from '@tuya/tuya-panel-api'
 import { IGetDpResultByHourResponse, IGetDpResultByMonthResponse } from '@tuya/tuya-panel-api/lib/common/interface'
 import {sendAppEvent} from "../api/native";
+import {retryWithBackoff} from "../utils/index";
+import {TYSdk} from "tuya-panel-kit";
 
 export interface PagingResult<T> {
   data: T
@@ -148,3 +150,133 @@ export async function getDpResultByHour(
     }
   }
 }
+
+/**
+ * 获取设备所有数据点记录（支持失败重试）
+ * @param commonApi API实例
+ * @param devId 设备ID
+ * @param dpIds 数据点ID，如 '19'
+ * @param sortType 排序方式
+ * @param retryOptions 重试选项
+ * @returns 所有数据点记录
+ */
+export async function getAllDpReportLogs(
+  devId: string,
+  dpIds: string[],
+  sortType: 'ASC' | 'DESC' = 'ASC',
+  retryOptions: {
+    maxRetries?: number;
+    initialDelay?: number;
+    maxDelay?: number;
+    backoffFactor?: number;
+  } = {}
+): Promise<DpReportSataData[]> {
+  const limit = 100; // 每次请求的数据量
+  let offset = 1;
+  let hasNext = true;
+  const allDps: DpReportSataData[] = [];
+
+  while (hasNext) {
+    try {
+      // 使用重试函数包装API调用
+      const res: DpReportSataResData = await retryWithBackoff(
+        () => commonApi.statApi.getDpReportLog({
+          devId,
+          dpIds: dpIds.join(','),
+          offset,
+          limit,
+          sortType
+        }),
+        {
+          ...retryOptions,
+          // 自定义判断哪些错误需要重试
+          shouldRetry: (error) => {
+            // 网络错误、超时错误或服务器错误(5xx)通常需要重试
+            const isNetworkError = error.name === 'NetworkError' ||
+              error.name === 'TimeoutError' ||
+              (error.response && error.response.status >= 500);
+
+            // 对于特定的业务错误码也可以在这里添加判断
+            return isNetworkError;
+          }
+        }
+      );
+
+      allDps.push(...res.dps);
+
+      if (res.hasNext) {
+        offset += limit;
+      } else {
+        hasNext = false;
+      }
+    } catch (error) {
+      console.error('获取数据点记录失败，不再继续获取:', error);
+      hasNext = false;
+    }
+  }
+
+  return allDps;
+}
+
+export const saveDeviceExtInfo = async (devId: string, key: string, value: string): Promise<boolean> => {
+  try {
+    return await new Promise<any>((resolve, reject) => {
+      TYSdk.native.apiRNRequest(
+        {
+          v: "1.0",
+          postData: {
+            value: value,
+            key: key,
+            devId: devId
+          },
+          a: "tuya.m.solution.device.storage.save"
+        },
+        (success: any) => {
+          console.log('tuya.m.solution.device.storage.save success', success)
+          resolve(success)
+        },
+        (error: any) => {
+          console.log('tuya.m.solution.device.storage.save error', error)
+          reject(error)
+        }
+      )
+    })
+  } catch (error) {
+    console.log('saveDeviceExtInfo error', error)
+    return false
+  }
+}
+
+export const getDeviceExtInfo = async (devId: string, key: string): Promise<string | null> => {
+  try {
+    const success = await new Promise<any>((resolve, reject) => {
+      TYSdk.native.apiRNRequest(
+        {
+          v: "1.0",
+          postData: {
+            "key": key,
+            "devId": devId
+          },
+          a: "tuya.m.solution.device.storage.get"
+        },
+        (success: any) => {
+          console.log('tuya.m.solution.device.storage.get success', success)
+          resolve(success)
+        },
+        (error: any) => {
+          console.log('tuya.m.solution.device.storage.get error', error)
+          reject(error)
+        }
+      )
+    })
+
+    let data = success
+    if (typeof success === 'string') {
+      data = JSON.parse(success)
+    }
+    return data.value
+  } catch (error) {
+    console.log('getDeviceExtInfo error', error)
+    return null
+  }
+}

package/src/models/modules/NativePropsSlice.tsx

@@ -24,6 +24,7 @@ export interface NativeProps {
   is24HourClock: boolean
   timeZone: string
   gestureControlValues: GestureControlType
+  newPalette?: boolean
 }
 
 interface FlagModeState {
@@ -87,7 +88,8 @@ const initialState: NativeProps = {
   timeZone: 'Europe/Berlin',
   gestureControlValues: {
     isEnd: false
-  }
+  },
+  newPalette: false
 }
 
 // energy generation
@@ -188,6 +190,9 @@ const nativePropsSlice = createSlice({
       keys.forEach(key => {
         state.gestureControlValues[key] = action.payload[key]
       })
+    },
+    setNewPalette(state, action: PayloadAction<boolean>) {
+      state.newPalette = action.payload
     }
   },
 })
@@ -479,6 +484,10 @@ function useGestureControl<K extends keyof GestureControlType>(key: K): [Gesture
   return [value]
 }
 
+const useNewPalette  = () => {
+  return useSelector(store => store.ldvModules.newPalette)
+}
+
 export const useFanMaxSpeed = () => {
   const { productId } = useDeviceInfo()
   return fanProductList.includes(productId) ? 20 : 3
@@ -505,6 +514,7 @@ export const {
   setTimeZone,
   setEnergieverbrauch,
   setGestureControlValues,
+  setNewPalette,
 } = nativePropsSlice.actions
 
 export {
@@ -531,5 +541,6 @@ export {
   useTimeZoneCity,
   useEnergieverbrauch,
   useGestureControl,
-  useDeviceCategory
+  useDeviceCategory,
+  useNewPalette
 }

package/src/utils/common.ts

@@ -19,17 +19,49 @@ export const loopsText = [
   I18n.getLang('timeschedule_add_schedule_weekday6_text'),
 ]
 
-export const loopText = (loop, time = '') => {
-  let isToday = true
+/**
+ * 根据循环设置和时间生成循环文本描述
+ * @param {number[]|string[]} loop - 表示每周哪几天启用的数组，1表示启用，0表示不启用
+ * @param {string} time - 可选的时间字符串，格式为 "HH:MM"
+ * @returns {string} 格式化后的循环文本
+ */
+export const loopText = (loop: number[] | string[], time: string = ''): string => {
+  // 判断是否为今天（如果提供了时间）
+  let isToday = true;
   if (time) {
-    const currentTime = dayjs()
-    const targetTime = dayjs().set('hour', parseInt(time.split(':')[0])).set('minute', parseInt(time.split(':')[1]));
-    const isBeforeCurrentTime = targetTime.isBefore(currentTime)
-    isToday = !isBeforeCurrentTime
+    const [hours, minutes] = time.split(':').map(Number);
+    const currentTime = dayjs();
+    const targetTime = dayjs().set('hour', hours).set('minute', minutes);
+    isToday = !targetTime.isBefore(currentTime);
   }
-  const loopStrArray = loopsText.filter((_item, index) => Number(loop[index]) === 1)
-  return loopStrArray.length === 0 ? (I18n.getLang(isToday ? 'motion_detection_time_schedule_notifications_field_weekdays_text2' : 'motion_detection_time_schedule_notifications_field_weekdays_text3')) : loopStrArray.length === 7 ? I18n.getLang('motion_detection_time_schedule_notifications_field_weekdays_text4') : loopStrArray.join(' ')
-}
+
+  // 将循环数组转换为带有启用状态的对象数组
+  const weekdaysWithStatus = loopsText.map((title, index) => ({
+    title,
+    enable: Number(loop[index]) === 1
+  }));
+
+  // 将周日移到数组末尾（如果需要按周一到周日的顺序显示）
+  const first = weekdaysWithStatus.shift();
+  first && weekdaysWithStatus.push(first);
+
+  // 获取已启用的星期几
+  const enabledWeekdays = weekdaysWithStatus
+    .filter(item => item.enable)
+    .map(item => item.title);
+
+  // 根据启用的天数返回不同的文本
+  switch (enabledWeekdays.length) {
+    case 0:
+      return I18n.getLang(isToday
+        ? 'motion_detection_time_schedule_notifications_field_weekdays_text2'
+        : 'motion_detection_time_schedule_notifications_field_weekdays_text3');
+    case 7:
+      return I18n.getLang('motion_detection_time_schedule_notifications_field_weekdays_text4');
+    default:
+      return enabledWeekdays.join(' ');
+  }
+};
 
 const tommorrow = () => {
   const text = I18n.getLang('feature_summary_frequency_txt_2').split(' ')

package/src/utils/index.ts

@@ -189,3 +189,61 @@ export function abbreviateMonths(str: string) {
 export function overDays(date: string, days: number): boolean {
   return dayjs().diff(dayjs(date), 'days') >= days
 }
+
+
+/**
+ * 通用重试函数，支持指数退避算法
+ * @param fn 需要重试的异步函数
+ * @param options 重试选项
+ * @returns 异步函数的结果
+ */
+export async function retryWithBackoff<T>(
+  fn: () => Promise<T>,
+  options: {
+    maxRetries?: number;       // 最大重试次数
+    initialDelay?: number;     // 初始延迟时间(毫秒)
+    maxDelay?: number;         // 最大延迟时间(毫秒)
+    backoffFactor?: number;    // 退避因子
+    shouldRetry?: (error: any) => boolean; // 自定义判断是否应该重试的函数
+  } = {}
+): Promise<T> {
+  const {
+    maxRetries = 3,
+    initialDelay = 1000,
+    maxDelay = 30000,
+    backoffFactor = 2,
+    shouldRetry = () => true
+  } = options;
+
+  let retries = 0;
+  let delay = initialDelay;
+
+  const execute = async (): Promise<T> => {
+    try {
+      return await fn();
+    } catch (error) {
+      if (retries >= maxRetries || !shouldRetry(error)) {
+        throw error;
+      }
+
+      retries++;
+
+      // 计算下一次重试的延迟时间（指数退避）
+      delay = Math.min(delay * backoffFactor, maxDelay);
+
+      // 添加一些随机性，避免多个请求同时重试
+      const jitter = delay * 0.2 * Math.random();
+      const actualDelay = delay + jitter;
+
+      console.log(`请求失败，${retries}/${maxRetries} 次重试，等待 ${Math.round(actualDelay)}ms...`, error);
+
+      // 等待延迟时间
+      await new Promise(resolve => setTimeout(resolve, actualDelay));
+
+      // 递归重试
+      return execute();
+    }
+  };
+
+  return execute();
+}