@ledvance/base 1.3.26 → 1.3.28

package/src/models/TuyaApi.ts

@@ -1,4 +1,5 @@
 import {commonApi} from '@tuya/tuya-panel-api'
+import { IGetDpResultByHourResponse, IGetDpResultByMonthResponse } from '@tuya/tuya-panel-api/lib/common/interface'
 
 export interface PagingResult<T> {
   data: T
@@ -25,7 +26,7 @@ export async function getDpReportSataData(
   offset: number,
   limit: number,
   sortType?: 'ASC' | 'DESC',
-): Promise<DpReportSataResData> {
+): Promise<DpReportSataResData | undefined> {
   const params = {
     devId: deviceId,
     dpIds: dpIds.join(','),
@@ -33,7 +34,20 @@ export async function getDpReportSataData(
     limit: limit,
     sortType: sortType || 'DESC',
   }
-  return commonApi.statApi.getDpReportLog(params)
+  const maxRetries = 3; // 设置重试次数的最大值
+  let retry = 0;
+
+  while (retry <= maxRetries) {
+    try {
+      const res = await commonApi.statApi.getDpReportLog(params);
+      return res;
+    } catch (err) {
+      retry++;
+      if (retry > maxRetries) {
+        return undefined;
+      }
+    }
+  }
 }
 
 export interface DpResultByMonthResData {
@@ -46,13 +60,26 @@ export async function getDpResultByMonth(
   devId: string,
   dpId: string,
   type: 'sum' | 'minux' | 'mac',
-): Promise<DpResultByMonthResData> {
+): Promise<IGetDpResultByMonthResponse | undefined> {
   const params = {
     devId,
     dpId,
     type,
   }
-  return commonApi.statApi.getDpResultByMonth(params) as any
+  const maxRetries = 3; // 设置重试次数的最大值
+  let retry = 0;
+
+  while (retry <= maxRetries) {
+    try {
+      const res = await commonApi.statApi.getDpResultByMonth(params);
+      return res;
+    } catch (err) {
+      retry++;
+      if (retry > maxRetries) {
+        return undefined;
+      }
+    }
+  }
 }
 
 export interface DpResultByDataWithSpecifiedResData {
@@ -66,7 +93,7 @@ export async function getDataWithSpecified(
   startDay: string,
   endDay: string,
   type: 'sum' | 'minux' | 'avg',
-): Promise<DpResultByDataWithSpecifiedResData> {
+): Promise<DpResultByDataWithSpecifiedResData | undefined> {
   const params = {
     devId,
     dpId,
@@ -74,7 +101,20 @@ export async function getDataWithSpecified(
     endDay,
     type,
   }
-  return commonApi.statApi.getDataWithSpecified(params) as any
+  const maxRetries = 3; // 设置重试次数的最大值
+  let retry = 0;
+
+  while (retry <= maxRetries) {
+    try {
+      const res = await commonApi.statApi.getDataWithSpecified(params);
+      return res;
+    } catch (err) {
+      retry++;
+      if (retry > maxRetries) {
+        return undefined;
+      }
+    }
+  }
 }
 
 export async function getDpResultByHour(
@@ -82,12 +122,25 @@ export async function getDpResultByHour(
   dpId: string,
   date: string,
   type: 'sum' | 'minux' | 'avg',
-): Promise<DpResultByDataWithSpecifiedResData> {
+): Promise<IGetDpResultByHourResponse | undefined> {
   const params = {
     devId,
     dpId,
     date,
     type,
   }
-  return commonApi.statApi.getDpResultByHour(params) as any
+  const maxRetries = 3; // 设置重试次数的最大值
+  let retry = 0;
+
+  while (retry <= maxRetries) {
+    try {
+      const res = await commonApi.statApi.getDpResultByHour(params);
+      return res;
+    } catch (err) {
+      retry++;
+      if (retry > maxRetries) {
+        return undefined;
+      }
+    }
+  }
 }

package/src/models/modules/NativePropsSlice.tsx

@@ -22,6 +22,7 @@ export interface NativeProps {
   flagModeState: FlagModeState
   is24HourClock: boolean
   timeZone: string
+  gestureControlValues: GestureControlType
 }
 
 interface FlagModeState {
@@ -46,6 +47,13 @@ export interface UAGroupInfo {
   icon?: string
 }
 
+export interface GestureControlType {
+  isEnd: boolean
+  switch?: boolean
+  hue?: number
+  brightness?: number
+}
+
 const initialState: NativeProps = {
   familyName: '',
   role: 2,
@@ -73,7 +81,10 @@ const initialState: NativeProps = {
     flagId: undefined
   },
   is24HourClock: true,
-  timeZone: 'Europe/Berlin'
+  timeZone: 'Europe/Berlin',
+  gestureControlValues: {
+    isEnd: false
+  }
 }
 
 // energy generation
@@ -164,6 +175,12 @@ const nativePropsSlice = createSlice({
     },
     setTimeZone(state, action: PayloadAction<any>) {
       state.timeZone = action.payload
+    },
+    setGestrueControlValues(state, action: PayloadAction<any>) {
+      const keys = Object.keys(action.payload)
+      keys.forEach(key => {
+        state.gestureControlValues[key] = action.payload[key]
+      })
     }
   },
 })
@@ -419,7 +436,7 @@ export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
   valueMapToDpValue?: (v: T) => any,
   getExtraDps?: (v: T) => any,
   getExtraConfig?: (v: T) => any,
-): [T, (value: T) => Promise<Result<any>>] {
+): [T, (value: T, extraDps?: any, extraConfig?: any) => Promise<Result<any>>] {
   const [featureHook, setFH] = useGroupConfigFeature<GC, T>(featureKey)
   const setFeatureHook = useCallback(async (value: T, extraDps?: any, extraConfig?: any) => {
     const dpValue = valueMapToDpValue ? valueMapToDpValue(value) : value
@@ -432,6 +449,20 @@ export function useFeatureHook<GC, T extends PropertyValueTypes<GC>>(
   return [featureHook ?? defValue, setFeatureHook]
 }
 
+function useGestureControl<K extends keyof GestureControlType>(key: K): [GestureControlType[K]] {
+  const value = useSelector((store) => {
+    const rawValue = store.ldvModules.gestureControlValues[key]
+    // 根据特定键的类型处理转换
+    if (['switch', 'isEnd'].includes(key) && typeof rawValue === 'number') {
+      return (rawValue === 1) as GestureControlType[K]
+    }
+
+    return rawValue as GestureControlType[K]
+  })
+
+  return [value]
+}
+
 export const useFanMaxSpeed = () => {
   const { productId } = useDeviceInfo()
   return fanProductList.includes(productId) ? 20 : 3
@@ -457,6 +488,7 @@ export const {
   setSystemTimeFormat,
   setTimeZone,
   setEnergieverbrauch,
+  setGestrueControlValues,
 } = nativePropsSlice.actions
 
 export {
@@ -481,4 +513,5 @@ export {
   useTimeZone,
   useTimeZoneCity,
   useEnergieverbrauch,
+  useGestureControl
 }

package/src/res/index.ts

@@ -79,5 +79,17 @@ export default {
   ic_water_alert_free: require('./pic_water_alert_free.png'),
   flag_icon: require('./flag_icon.png'),
   arrow_temp_up: require('./arrow_temp_up.png'),
-  arrow_temp_down: require('./arrow_temp_down.png')
-}
+  arrow_temp_down: require('./arrow_temp_down.png'),
+  arrow_left: require('./materialiconsOutlinedArrowsNavKeyboardArrowLeft.png'),
+  arrow_right: require('./materialiconsOutlinedArrowsNavKeyboardArrowRight.png'),
+  ringdown: require('./src_res_ringdown.png'),
+  halfcircle: require('./src_res_halfcircle.png'),
+  coloring: require('./src_res_colorring.png'),
+  all: require('./src_res_all.png'),
+  half: require('./src_res_half.png'),
+  halfborder: require('./src_res_halfborder.png'),
+  un_like: require('./src_res_unlike.png'),
+  like: require('./src_res_like.png'),
+  cycle: require('./src_res_cycle.png'),
+  minus: require('./src_res_minus.png'),
+}

package/src/utils/common.ts

@@ -396,3 +396,41 @@ export function withErrorHandling<T extends any[], R>(
     }
   }
 }
+
+export function isConflictTask(task1, task2) {
+  // 检查两个时间段是否有重叠
+  function checkOverlap(start1, end1, start2, end2) {
+    return (start1 <= end2 && start2 <= end1);
+  }
+  // 检查一周的每一天
+  for (let i = 0; i < 7; i++) {
+    // 如果 task1 在该天执行
+    if (Number(task1.weeks[i]) === 1) {
+      const [start1, end1] = [task1.startTime, task1.endTime];
+      const task1CrossDay = start1 > end1;
+
+      // 如果 task2 在该天或跨天执行
+      for (let j = 0; j < 7; j++) {
+        if (Number(task2.weeks[j]) === 1) {
+          const [start2, end2] = [task2.startTime, task2.endTime];
+          const task2CrossDay = start2 > end2;
+          // 检查当前天是否有重叠
+          if (i === j && checkOverlap(start1, end1, start2, end2)) {
+            return true;
+          }
+
+          // 检查 task1 跨天并延伸到次日的情况
+          if (task1CrossDay && ((i + 1) % 7 === j) && checkOverlap(0, end1, start2, end2)) {
+            return true;
+          }
+
+          // 检查 task2 跨天并延伸到次日的情况
+          if (task2CrossDay && ((j + 1) % 7 === i) && checkOverlap(0, end2, start1, end1)) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+  return false;
+}

package/src/utils/interface.ts

@@ -7,7 +7,8 @@ export enum WorkMode {
   Night = 'night',
   Disinfect = 'disinfect',
   Rhythm = 'rhythm',
-  Plan = 'plan'
+  Plan = 'plan',
+  LoveScene = 'love_scene'
 }
 
 export type Category = 'light' | 'socket' | 'fan' | 'mainLight' | 'secondaryLight'
@@ -53,5 +54,39 @@ export interface JudgeTimeScheduleProps {
 
 export enum SceneStatusType {
   Mood = 'Mood',
-  Flag = 'Flag'
+  Flag = 'Flag',
+  Scene = 'Scene',
+  DIY = 'DIY'
+}
+
+export enum AdjustType {
+  WHITE = '00',
+  COLOUR = '01',
+  LOVE = '03'
+}
+
+export interface HSV {
+  h: number
+  s: number
+  v: number
+}
+
+export interface DiySceneInfo {
+  id: number
+  type: 'Static' | 'Dynamic' | 'DIY'
+  name: string
+  speed?: number
+  nodes: DiySceneNode[]
+  duration?: number
+  mode?: number
+  h?: number
+  s?: number
+  v?: number
+  colorTemp?: number
+  brightness?: number
+}
+
+export interface DiySceneNode {
+  top: HSV
+  bottom: HSV
 }

package/translateKey.txt

@@ -922,6 +922,41 @@ energyconsumption_emptydata
 date_type
 cancel_dialog_leave_unsaved_vacation_note
 mood_string_mode_light_show
+mood_strip_mode_favorite
+mood_overview_field_chip_diy
+love_mood_alert_title
+love_mood_alert_content
+mood_strip_default_mood_focus
+mood_strip_default_mood_lavender
+mood_strip_default_mood_lavender_true_colors
+mood_strip_default_mood_night_light
+mood_strip_default_mood_cozy
+mood_strip_default_mood_atmosphere
+mood_strip_default_mood_relax
+mood_strip_default_mood_sky
+mood_strip_default_mood_ocean
+mood_strip_default_mood_warmth
+mood_strip_default_mood_romance
+mood_strip_default_mood_jungle
+mood_strip_default_mood_sunset
+mood_strip_default_mood_missing
+mood_strip_default_mood_party
+mood_strip_default_mood_rainbow
+mood_strip_default_mood_meditation
+mood_strip_default_mood_wake_time
+mood_strip_default_mood_spring
+mood_strip_default_mood_halloween
+mood_strip_default_mood_christmas
+mood_strip_default_mood_noble
+mood_strip_default_mood_energy
+mood_strip_default_mood_deep_dive
+mood_strip_default_mood_mojito
+mood_strip_default_mood_forest
+mood_strip_default_mood_cyberpunk
+mood_strip_default_mood_summer
+mood_strip_default_mood_fall
+mood_strip_default_mood_club
+mood_strip_default_mood_candlelight
 thermostat_scene
 thermostat_vacationplan
 thermostat_automatictab
@@ -935,4 +970,4 @@ thermostat_editscene
 thermostat_inputlosteditscene
 thermostat_infocancelscene
 thermostat_cancelscene
-thermostat_deletescene
+thermostat_deletescene