@ledvance/base 1.3.102 → 1.3.104

package/src/models/TuyaApi.ts

@@ -1,8 +1,13 @@
-import {commonApi} from '@tuya/tuya-panel-api'
-import { Dp, IGetDpResultByHourResponse, IGetDpResultByMonthResponse, IGetLogInSpecifiedTimeResponse } from '@tuya/tuya-panel-api/lib/common/interface'
-import {sendAppEvent} from "../api/native";
-import {retryWithBackoff} from "../utils/index";
-import {TYSdk} from "tuya-panel-kit";
+import { commonApi } from '@tuya/tuya-panel-api'
+import {
+  Dp,
+  IGetDpResultByHourResponse,
+  IGetDpResultByMonthResponse,
+  IGetLogInSpecifiedTimeResponse
+} from '@tuya/tuya-panel-api/lib/common/interface'
+import { retryWithBackoff } from '@utils'
+import { TYSdk } from 'tuya-panel-kit'
+import { sendAppEvent } from '../api/native'
 
 export interface PagingResult<T> {
   data: T
@@ -69,23 +74,25 @@ export async function getDpResultByMonth(
     dpId,
     type,
   }
-  const maxRetries = 3; // 设置重试次数的最大值
-  let retry = 0;
+  return await retryWithBackoff(
+    () => commonApi.statApi.getDpResultByMonth(params),
+    {
+      // 自定义判断哪些错误需要重试
+      shouldRetry: (error) => {
+        if (error.errorCode === 'DPID_NOT_SUPPORT_STATISTICS_ERROR') {
+          sendAppEvent('RN_ERROR', { message: `code: ${error.errorCode}, deviceId: ${devId}` })
+        }
+        // 网络错误、超时错误或服务器错误(5xx)通常需要重试
+        const isNetworkError = error.name === 'NetworkError' ||
+          error.name === 'TimeoutError' ||
+          error.errorCode === '103';
 
-  while (retry <= maxRetries) {
-    try {
-      const res = await commonApi.statApi.getDpResultByMonth(params);
-      return res;
-    } catch (err) {
-      if (err.errorCode === 'DPID_NOT_SUPPORT_STATISTICS_ERROR') {
-        sendAppEvent('RN_ERROR', { message: `code: ${err.errorCode}, deviceId: ${devId}` })
-      }
-      retry++;
-      if (retry > maxRetries) {
-        return undefined;
+        // 对于特定的业务错误码也可以在这里添加判断
+        const isFrequencyError = error.errorCode === 'FREQUENCY_LIMIT_ERROR';
+        return isNetworkError || isFrequencyError;
       }
     }
-  }
+  );
 }
 
 export interface DpResultByDataWithSpecifiedResData {
@@ -107,20 +114,25 @@ export async function getDataWithSpecified(
     endDay,
     type,
   }
-  const maxRetries = 3; // 设置重试次数的最大值
-  let retry = 0;
+  return await retryWithBackoff(
+    () => commonApi.statApi.getDataWithSpecified(params),
+    {
+      // 自定义判断哪些错误需要重试
+      shouldRetry: (error) => {
+        if (error.errorCode === 'DPID_NOT_SUPPORT_STATISTICS_ERROR') {
+          sendAppEvent('RN_ERROR', { message: `code: ${error.errorCode}, deviceId: ${devId}` })
+        }
+        // 网络错误、超时错误或服务器错误(5xx)通常需要重试
+        const isNetworkError = error.name === 'NetworkError' ||
+          error.name === 'TimeoutError' ||
+          error.errorCode === '103';
 
-  while (retry <= maxRetries) {
-    try {
-      const res = await commonApi.statApi.getDataWithSpecified(params);
-      return res;
-    } catch (err) {
-      retry++;
-      if (retry > maxRetries) {
-        return undefined;
+        // 对于特定的业务错误码也可以在这里添加判断
+        const isFrequencyError = error.errorCode === 'FREQUENCY_LIMIT_ERROR';
+        return isNetworkError || isFrequencyError;
       }
     }
-  }
+  );
 }
 
 export async function getDpResultByHour(
@@ -135,20 +147,25 @@ export async function getDpResultByHour(
     date,
     type,
   }
-  const maxRetries = 3; // 设置重试次数的最大值
-  let retry = 0;
+  return await retryWithBackoff(
+    () => commonApi.statApi.getDpResultByHour(params),
+    {
+      // 自定义判断哪些错误需要重试
+      shouldRetry: (error) => {
+        if (error.errorCode === 'DPID_NOT_SUPPORT_STATISTICS_ERROR') {
+          sendAppEvent('RN_ERROR', { message: `code: ${error.errorCode}, deviceId: ${devId}` })
+        }
+        // 网络错误、超时错误或服务器错误(5xx)通常需要重试
+        const isNetworkError = error.name === 'NetworkError' ||
+          error.name === 'TimeoutError' ||
+          error.errorCode === '103';
 
-  while (retry <= maxRetries) {
-    try {
-      const res = await commonApi.statApi.getDpResultByHour(params);
-      return res;
-    } catch (err) {
-      retry++;
-      if (retry > maxRetries) {
-        return undefined;
+        // 对于特定的业务错误码也可以在这里添加判断
+        const isFrequencyError = error.errorCode === 'FREQUENCY_LIMIT_ERROR';
+        return isNetworkError || isFrequencyError;
       }
     }
-  }
+  );
 }
 
 /**
@@ -194,7 +211,7 @@ export async function getAllDpReportLogs(
             // 网络错误、超时错误或服务器错误(5xx)通常需要重试
             const isNetworkError = error.name === 'NetworkError' ||
               error.name === 'TimeoutError' ||
-              (error.response && error.response.status >= 500);
+              error.errorCode === '103';
 
             // 对于特定的业务错误码也可以在这里添加判断
             return isNetworkError;
@@ -256,7 +273,7 @@ export async function getSpecifiedTimeDpReportLogs(
             // 网络错误、超时错误或服务器错误(5xx)通常需要重试
             const isNetworkError = error.name === 'NetworkError' ||
               error.name === 'TimeoutError' ||
-              (error.response && error.response.status >= 500);
+              error.errorCode === '103';
 
             // 对于特定的业务错误码也可以在这里添加判断
             return isNetworkError;

package/src/models/modules/NativePropsSlice.tsx

@@ -25,6 +25,7 @@ export interface NativeProps {
   timeZone: string
   gestureControlValues: GestureControlType
   newPalette?: boolean
+  isPad?: boolean
 }
 
 interface FlagModeState {
@@ -89,7 +90,8 @@ const initialState: NativeProps = {
   gestureControlValues: {
     isEnd: false
   },
-  newPalette: false
+  newPalette: false,
+  isPad: false
 }
 
 // energy generation
@@ -193,7 +195,10 @@ const nativePropsSlice = createSlice({
     },
     setNewPalette(state, action: PayloadAction<boolean>) {
       state.newPalette = action.payload
-    }
+    },
+    setIsPad(state, action: PayloadAction<boolean>) {
+      state.isPad = action.payload
+    },
   },
 })
 
@@ -488,6 +493,10 @@ const useNewPalette  = () => {
   return useSelector(store => store.ldvModules.newPalette)
 }
 
+const useIsPad = () => {
+  return useSelector(store => store.ldvModules.isPad)
+}
+
 export const useFanMaxSpeed = () => {
   const { productId } = useDeviceInfo()
   return fanProductList.includes(productId) ? 20 : 3
@@ -515,6 +524,7 @@ export const {
   setEnergieverbrauch,
   setGestureControlValues,
   setNewPalette,
+  setIsPad,
 } = nativePropsSlice.actions
 
 export {
@@ -542,5 +552,6 @@ export {
   useEnergieverbrauch,
   useGestureControl,
   useDeviceCategory,
-  useNewPalette
+  useNewPalette,
+  useIsPad,
 }

package/translateKey.txt

@@ -1285,4 +1285,12 @@ infobutton_fixedtimecycle
 infobutton_randomtimecycle
 infobutton_timer
 infobutton_poweronbehavior
-infobutton_history
+infobutton_history
+country_JO
+country_CV
+country_PA
+country_northern_ireland
+country_wales
+country_BA
+country_north_macedonia
+country_werder_bremen