@ledvance/base 1.3.67 → 1.3.71

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.67",
+  "version": "1.3.71",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/components/weekSelect.tsx

@@ -8,6 +8,10 @@ const { withTheme } = Utils.ThemeUtils
 
 const repeatPeriod = [
   {
+    index: 1,
+    title: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
+    enabled: false,
+  }, {
     index: 2,
     title: I18n.getLang('timeschedule_add_schedule_weekday1_text'),
     enabled: false,
@@ -31,18 +35,14 @@ const repeatPeriod = [
     index: 7,
     title: I18n.getLang('timeschedule_add_schedule_weekday6_text'),
     enabled: false,
-  }, {
-    index: 1,
-    title: I18n.getLang('timeschedule_add_schedule_weekday7_text'),
-    enabled: false,
   },
 ]
 
-export const setDataSource = (loop: number[] | string[] | string) => {
-  return repeatPeriod.map(item => {
+export const setDataSource = (loop) => {
+  return repeatPeriod.map((item, index) => {
     return {
       ...item,
-      enabled: [1, '1'].includes(loop[item.index - 1]),
+      enabled: loop[index] === 1,
     }
   })
 }

package/src/composeLayout.tsx

@@ -10,7 +10,7 @@ import {
   NativeProps,
   setGroupDevices,
   setGroupNativeProps,
-  setNativeProps, setNewPalette,
+  setNativeProps,
   setSystemTimeFormat,
   setTimeZone,
   UAGroupInfo,
@@ -26,7 +26,6 @@ interface Props {
   ldvDevInfo: LdvDevInfo
   uaGroupInfo: UAGroupInfoProps
   colorScheme?: string
-  newPalette?: boolean
 }
 
 interface LdvDevInfo extends DeviceInfo {
@@ -131,8 +130,6 @@ const composeLayout = (component: React.ComponentType) => {
       getTimeZone().then(timeZone => {
         dispatch(setTimeZone(timeZone))
       })
-
-      dispatch(setNewPalette(!!props.newPalette || true))
     }
 
     initReduxDeviceNativeProps(ldvDevInfo: LdvDevInfo) {

package/src/utils/common.ts

@@ -19,49 +19,17 @@ export const loopsText = [
   I18n.getLang('timeschedule_add_schedule_weekday6_text'),
 ]
 
-/**
- * 根据循环设置和时间生成循环文本描述
- * @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;
+export const loopText = (loop, time = '') => {
+  let isToday = true
   if (time) {
-    const [hours, minutes] = time.split(':').map(Number);
-    const currentTime = dayjs();
-    const targetTime = dayjs().set('hour', hours).set('minute', minutes);
-    isToday = !targetTime.isBefore(currentTime);
+    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 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 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 tommorrow = () => {
   const text = I18n.getLang('feature_summary_frequency_txt_2').split(' ')

package/src/utils/index.ts

@@ -189,61 +189,3 @@ 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();
-}