@ray-js/lamp-schedule-core 1.0.5-beta.1 → 1.0.5-beta.3

package/lib/config/dpCodes.d.ts

@@ -19,7 +19,7 @@ export declare const scheduleDpCodes: {
     readonly CYCLE_TIMING: "cycle_timing";
     /** 通用本地定时 */
     readonly LOCAL_TIMER: "local_timer";
-    /** 灯带本地定时 */
+    /** 灯带本地定时 Beacon */
     readonly STRIP_LOCAL_TIMER: "strip_local_timer";
     /** 定时同步 一般用于 Beacon */
     readonly TIMER_SYNC: "timer_sync";
@@ -33,6 +33,23 @@ export declare const scheduleDpCodes: {
     readonly BRIGHTNESS: "bright_value";
     /** 彩光 */
     readonly COLOUR_DATA: "colour_data";
+    /** 彩光原始数据 Beacon */
+    readonly COLOUR_DATA_RAW: "colour_data_raw";
+    /** 亮度调节 Beacon */
+    readonly BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    /** ------ 风扇灯 Beacon DP -------- */
+    /** 风扇模式 Beacon */
+    readonly FAN_MODE: "fan_mode";
+    /** 风向 Beacon */
+    readonly FAN_DIRECTION: "fan_direction";
+    /** 摇头 Beacon */
+    readonly SHAKE: "shake";
+    readonly WHITE_SWITCH: "white_switch";
+    readonly COLOUR_SWITCH: "colour_switch";
+    readonly FAN_SWITCH: "fan_switch";
+    readonly FAN_SPEED: "fan_speed";
+    readonly FAN_BEEP: "fan_beep";
+    readonly STRIP_SCENE: "strip_scene";
     /** 模式 */
     readonly WORK_MODE: "work_mode";
 };

package/lib/config/dpCodes.js

@@ -22,7 +22,7 @@ export const scheduleDpCodes = {
   [EScheduleType.CYCLE_TIMING]: 'cycle_timing',
   /** 通用本地定时 */
   [EScheduleType.LOCAL_TIMER]: 'local_timer',
-  /** 灯带本地定时 */
+  /** 灯带本地定时 Beacon */
   [EScheduleType.STRIP_LOCAL_TIMER]: 'strip_local_timer',
   /** 定时同步 一般用于 Beacon */
   [EScheduleType.TIMER_SYNC]: 'timer_sync',
@@ -36,6 +36,39 @@ export const scheduleDpCodes = {
   BRIGHTNESS: 'bright_value',
   /** 彩光 */
   COLOUR_DATA: 'colour_data',
+  /** 彩光原始数据 Beacon */
+  COLOUR_DATA_RAW: 'colour_data_raw',
+  /** 亮度调节 Beacon */
+  BRIGHT_ADJUST_DATA: 'bright_adjust_data',
+  /** ------ 风扇灯 Beacon DP -------- */
+  /** 风扇模式 Beacon */
+  FAN_MODE: 'fan_mode',
+  // 枚举值: fresh, nature
+  /** 风向 Beacon */
+  FAN_DIRECTION: 'fan_direction',
+  // 枚举值: forward, reverse
+  /** 摇头 Beacon */
+  SHAKE: 'shake',
+  // boolean
+  // 主灯开关
+  WHITE_SWITCH: 'white_switch',
+  // boolean
+  // 氛围灯开关
+  COLOUR_SWITCH: 'colour_switch',
+  // boolean
+  // 风扇开关
+  FAN_SWITCH: 'fan_switch',
+  // boolean
+  // 风扇速度
+  FAN_SPEED: 'fan_speed',
+  // number 1-100
+  // 声音
+  FAN_BEEP: 'fan_beep',
+  // boolean
+  // 情景
+  STRIP_SCENE: 'strip_scene',
+  // beacon mesh情景功能，支持速度，亮度编辑
+
   /** 模式 */
   WORK_MODE: 'work_mode'
 };

package/lib/dpParser/brightAdjustData.d.ts

@@ -0,0 +1,10 @@
+import { TBrightAdjustData } from '../types';
+export declare class BrightAdjustDataFormatter {
+    parser(dpValue: string): TBrightAdjustData;
+    formatter(data: TBrightAdjustData): string;
+}
+export declare const brightAdjustDataParser: {
+    parser: (dpValue: string) => TBrightAdjustData;
+    formatter: (data: TBrightAdjustData) => string;
+};
+export declare const getBrightAdjustDataParser: () => BrightAdjustDataFormatter;

package/lib/dpParser/brightAdjustData.js

@@ -0,0 +1,43 @@
+/* eslint-disable no-console */
+
+import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+export class BrightAdjustDataFormatter {
+  parser(dpValue) {
+    try {
+      ScheduleLogger.debug('dpParser ===> BrightAdjustDataFormatter parser dpValue:', dpValue);
+      if (!dpValue || dpValue.length < 6) {
+        return {
+          mode: 0,
+          brightness: 0
+        };
+      }
+      const mode = parseInt(dpValue.substring(0, 2), 16);
+      const brightness = parseInt(dpValue.substring(2, 6), 16);
+      return {
+        mode,
+        brightness
+      };
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> BrightAdjustDataFormatter parser error:', error);
+      return {
+        mode: 0,
+        brightness: 0
+      };
+    }
+  }
+  formatter(data) {
+    try {
+      ScheduleLogger.debug('dpParser ===> BrightAdjustDataFormatter formatter data:', data);
+      const modeStr = data.mode.toString(16).padStart(2, '0');
+      const brightnessStr = data.brightness.toString(16).padStart(4, '0');
+      return `${modeStr}${brightnessStr}`;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> BrightAdjustDataFormatter formatter error:', error);
+      return '';
+    }
+  }
+}
+export const brightAdjustDataParser = new BrightAdjustDataFormatter();
+export const getBrightAdjustDataParser = () => {
+  return brightAdjustDataParser;
+};

package/lib/dpParser/colourDataRaw.d.ts

@@ -0,0 +1,14 @@
+import { TColourDataRaw } from '../types';
+export declare class ColourDataRawFormatter {
+    parser(dpValue: string): TColourDataRaw;
+    formatter(data: {
+        hue: number;
+        saturation: number;
+        value: number;
+    } | TColourDataRaw): string;
+}
+export declare const colourDataRawParser: {
+    parser: (dpValue: string) => TColourDataRaw;
+    formatter: (data: any) => string;
+};
+export declare const getColourDataRawParser: () => ColourDataRawFormatter;

package/lib/dpParser/colourDataRaw.js

@@ -0,0 +1,56 @@
+/* eslint-disable no-console */
+import { numToHexString } from '@ray-js/panel-sdk/lib/utils';
+import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+const toHex = function (value) {
+  let len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+  return numToHexString(value).padStart(len, '0');
+};
+export class ColourDataRawFormatter {
+  parser(dpValue) {
+    try {
+      ScheduleLogger.debug('dpParser ===> ColourDataRawFormatter parser dpValue:', dpValue);
+      if (!dpValue || dpValue.length < 8) {
+        return {
+          hue: 0,
+          saturation: 1000,
+          value: 1000
+        };
+      }
+      const hue = parseInt(dpValue.substring(0, 4), 16);
+      const saturation = parseInt(dpValue.substring(4, 6), 16) * 10;
+      const value = parseInt(dpValue.substring(6, 8), 16) * 10;
+      return {
+        hue,
+        saturation,
+        value
+      };
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> ColourDataRawFormatter parser error:', error);
+      return {
+        hue: 0,
+        saturation: 1000,
+        value: 1000
+      };
+    }
+  }
+  formatter(data) {
+    try {
+      ScheduleLogger.debug('dpParser ===> ColourDataRawFormatter formatter data:', data);
+      // 兼容两种数据格式: { hue, saturation, value } 或 { h, s, v }
+      const h = 'hue' in data ? data.hue : data.h;
+      const s = 'saturation' in data ? data.saturation : data.s;
+      const v = 'value' in data ? data.value : data.v;
+      const hStr = toHex(Math.floor(h), 4);
+      const sStr = toHex(Math.floor(s / 10), 2);
+      const vStr = toHex(Math.floor(v / 10), 2);
+      return `${hStr}${sStr}${vStr}`;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> ColourDataRawFormatter formatter error:', error);
+      return '';
+    }
+  }
+}
+export const colourDataRawParser = new ColourDataRawFormatter();
+export const getColourDataRawParser = () => {
+  return colourDataRawParser;
+};

package/lib/dpParser/index.d.ts

@@ -7,6 +7,9 @@ export { rtcTimerParser, getRtcParser } from './rtcTimer';
 export { cycleParser, getCycleParser } from './cycle';
 export { wakeupParserCommon as wakeupParser, getWakeUpParser, WakeUpParser } from './wakeup';
 export { timerReportParser } from './timerReport';
+export { stripLocalTimerParser, getStripLocalTimerParser } from './stripLocalTimer';
+export { brightAdjustDataParser, getBrightAdjustDataParser } from './brightAdjustData';
+export { colourDataRawParser, getColourDataRawParser } from './colourDataRaw';
 type DpCode = keyof typeof scheduleDpCodes;
 /**
  * 自动匹配 dp 解析函数

package/lib/dpParser/index.js

@@ -7,6 +7,9 @@ import { getSleepParser } from './sleep';
 import { rtcTimerParser } from './rtcTimer';
 import { timerReportParser } from './timerReport';
 import { getWakeUpParser } from './wakeup';
+import { stripLocalTimerParser } from './stripLocalTimer';
+import { brightAdjustDataParser } from './brightAdjustData';
+import { colourDataRawParser } from './colourDataRaw';
 export { randomParser, getRandomParser } from './random';
 export { rhythmParser, getRhythmParser } from './rhythms';
 export { sleepParserCommon as sleepParser, getSleepParser, SleepParser, sleepParserSigmesh } from './sleep';
@@ -14,6 +17,9 @@ export { rtcTimerParser, getRtcParser } from './rtcTimer';
 export { cycleParser, getCycleParser } from './cycle';
 export { wakeupParserCommon as wakeupParser, getWakeUpParser, WakeUpParser } from './wakeup';
 export { timerReportParser } from './timerReport';
+export { stripLocalTimerParser, getStripLocalTimerParser } from './stripLocalTimer';
+export { brightAdjustDataParser, getBrightAdjustDataParser } from './brightAdjustData';
+export { colourDataRawParser, getColourDataRawParser } from './colourDataRaw';
 /**
  * 自动匹配 dp 解析函数
  *
@@ -37,6 +43,13 @@ export const autoDispatchTransDpFun = dpCode => {
       return timerReportParser;
     case scheduleDpCodes.WAKE_UP_MODE:
       return getWakeUpParser();
+    // Beacon 设备专属 dp
+    case scheduleDpCodes.STRIP_LOCAL_TIMER:
+      return stripLocalTimerParser;
+    case scheduleDpCodes.BRIGHT_ADJUST_DATA:
+      return brightAdjustDataParser;
+    case scheduleDpCodes.COLOUR_DATA_RAW:
+      return colourDataRawParser;
     default:
       return null;
   }

package/lib/dpParser/stripLocalTimer.d.ts

@@ -0,0 +1,41 @@
+/**
+ * 用法
+ * const stripLocalTimerTrans = new StripLocalTimerTransformer();
+ * // 解析dp
+ *  const result = stripLocalTimerTrans.parser(dpStr);
+ * // 格式化
+ * const dpStr = stripLocalTimerTrans.formatter({xxx: xxx})
+ * */
+import { Transformer } from '@ray-js/panel-sdk/lib/protocols/lamp/interface';
+export type TStripLocalTimerData = {
+    timerId: number;
+    time: number;
+    loops: string;
+    power?: boolean;
+    status: boolean;
+    brightness?: number;
+    temperature?: number;
+    hue?: number;
+    saturation?: number;
+    value?: number;
+    mode: number;
+    dps: Record<string, any>;
+    speed?: number;
+    fanMode?: number;
+    direction?: number;
+    shake?: number;
+    sceneId?: number;
+};
+export declare class StripLocalTimerTransformer implements Transformer<TStripLocalTimerData> {
+    defaultValue: TStripLocalTimerData;
+    uuid: string;
+    constructor(uuid?: string, defaultValue?: TStripLocalTimerData);
+    equal(source: string, target: string): boolean;
+    parser(value: string): TStripLocalTimerData;
+    isUndefined(value: any): boolean;
+    to16(value: number, length?: number): string;
+    binTo16(bin: string, len?: number): string;
+    formatter(data: TStripLocalTimerData): string;
+}
+export declare const stripLocalTimerParser: StripLocalTimerTransformer;
+export declare const getStripLocalTimerParser: () => StripLocalTimerTransformer;

package/lib/dpParser/stripLocalTimer.js

@@ -0,0 +1,275 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+import "core-js/modules/esnext.iterator.reduce.js";
+// Beacon 灯带本地定时标准dp解析工具函数
+/**
+ * 用法
+ * const stripLocalTimerTrans = new StripLocalTimerTransformer();
+ * // 解析dp
+ *  const result = stripLocalTimerTrans.parser(dpStr);
+ * // 格式化
+ * const dpStr = stripLocalTimerTrans.formatter({xxx: xxx})
+ * */
+
+import { isNumber } from 'lodash-es';
+import { generateDpStrStep } from '@ray-js/panel-sdk/lib/utils';
+import dayjs from 'dayjs';
+import { scheduleLogger } from '../utils/ScheduleLogger';
+import { scheduleDpCodes } from '../config/dpCodes';
+const getArray = array => Array.isArray(array) ? array : [];
+export class StripLocalTimerTransformer {
+  defaultValue = {
+    timerId: 0,
+    time: 0,
+    loops: '0000000',
+    power: true,
+    // 设备开关 switch_led
+    status: true,
+    // 使能 0 关闭  1开启 应该对应 status
+    brightness: 0,
+    temperature: 0,
+    sceneId: 0,
+    hue: 0,
+    saturation: 0,
+    value: 0,
+    mode: 0,
+    dps: {
+      switch_led: true
+    }
+  };
+  constructor() {
+    let uuid = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'strip_local_timer';
+    let defaultValue = arguments.length > 1 ? arguments[1] : undefined;
+    this.uuid = uuid;
+    if (defaultValue) {
+      this.defaultValue = defaultValue;
+    }
+  }
+
+  // 比较两个值是否一致
+  equal(source, target) {
+    return source === target;
+  }
+  parser(value) {
+    const {
+      length
+    } = value;
+    if (!length) {
+      scheduleLogger.warn('数据有问题，无法解析');
+      return this.defaultValue;
+    }
+    const step = generateDpStrStep(value);
+    const step2 = () => step().value;
+    const opt = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+    const id = parseInt(opt.slice(0, 3).join('').padStart(8, '0'), 2);
+    const status = !!opt[4];
+    const week1 = opt.slice(5).join('');
+    const opt1 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+    const week2 = opt1.slice(0, 4).join('');
+    const weeks = (week1 + week2).padStart(8, '0').split('').reverse().map(v => parseInt(v, 10));
+    const time1 = parseInt(opt1.slice(4).join('').padStart(8, '0'), 2);
+    const time2 = step2();
+    const time = time1 + time2;
+    const opt2 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+    const mode = parseInt(opt2.slice(0, 3).join('').padStart(8, '0'), 2);
+    let power = true;
+    // mode 1 开关模式
+    if (mode === 1) {
+      power = +step2() === 1;
+      return {
+        timerId: id,
+        status,
+        loops: weeks.join(''),
+        time,
+        mode,
+        power,
+        dps: {
+          [scheduleDpCodes.SWITCH_LED]: power
+        }
+      };
+    }
+    // mode 2 白光模式
+    if (mode === 2) {
+      const brightness = step2();
+      const temperature = step2();
+      return {
+        timerId: id,
+        status,
+        loops: weeks.join(''),
+        time,
+        mode,
+        power,
+        brightness: brightness * 10,
+        temperature: temperature * 10,
+        dps: {
+          [scheduleDpCodes.SWITCH_LED]: power,
+          [scheduleDpCodes.BRIGHTNESS]: brightness * 10,
+          [scheduleDpCodes.TEMPERATURE]: temperature * 10
+        }
+      };
+    }
+    // mode 3 场景模式
+    if (mode === 3) {
+      const sceneId = step2();
+      return {
+        timerId: id,
+        status,
+        loops: weeks.join(''),
+        time,
+        mode,
+        power,
+        sceneId,
+        dps: {
+          [scheduleDpCodes.SWITCH_LED]: power
+        }
+      };
+    }
+    // mode 5 风扇模式
+    if (mode === 5) {
+      const speed = step2();
+      const fanMode = step2();
+      const direction = step2();
+      const shake = step2();
+      return {
+        timerId: id,
+        status,
+        loops: weeks.join(''),
+        time,
+        mode,
+        power,
+        speed,
+        fanMode,
+        direction,
+        shake,
+        dps: {
+          [scheduleDpCodes.FAN_SPEED]: speed,
+          [scheduleDpCodes.FAN_MODE]: fanMode,
+          [scheduleDpCodes.FAN_DIRECTION]: direction,
+          [scheduleDpCodes.SHAKE]: shake
+        }
+      };
+    }
+    // mode 4 彩光模式
+    const hue1 = parseInt(opt2.slice(4).join('').padStart(8, '0'), 2);
+    const opt3 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+    const hue2 = parseInt(opt3.slice(0, 2).join('').padStart(8, '0'), 2);
+    const hue = +hue1 + +hue2;
+    const sat1 = parseInt(opt3.slice(2).join('').padStart(8, '0'), 2);
+    const opt4 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+    const sat2 = parseInt(opt4.slice(0, 1).join('').padStart(8, '0'), 2);
+    const saturation = parseInt((sat1 + sat2).toString().padStart(8, '0'), 2);
+    const hueValue = parseInt(opt4.slice(1).join('').padStart(8, '0'), 2);
+    return {
+      timerId: id,
+      status,
+      loops: weeks.join(''),
+      time,
+      mode,
+      hue: hue * 10,
+      saturation,
+      value: hueValue,
+      dps: {
+        [scheduleDpCodes.SWITCH_LED]: true,
+        [scheduleDpCodes.COLOUR_DATA]: {
+          hue: Math.round(hue * 10),
+          saturation: Math.round(saturation),
+          value: Math.round(hueValue)
+        }
+      }
+    };
+  }
+  isUndefined(value) {
+    return value === undefined || value === null;
+  }
+  to16(value) {
+    let length = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+    let result = Number(value || 0).toString(16);
+    if (result.length < length) {
+      result = result.padStart(length, '0');
+    }
+    return result;
+  }
+  binTo16(bin) {
+    let len = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+    const num = parseInt(bin, 2);
+    return this.to16(num, len);
+  }
+  formatter(data) {
+    const {
+      timerId,
+      status,
+      loops,
+      time,
+      power,
+      brightness,
+      temperature,
+      speed,
+      fanMode,
+      direction,
+      shake,
+      hue,
+      saturation,
+      value,
+      dps = {}
+    } = data;
+    const timeNum = isNumber(time) ? Number(time) : (time === null || time === void 0 ? void 0 : time.split(':').reduce((acc, curr) => acc * 60 + Number(curr), 0)) || 0;
+    const now = dayjs();
+    const _version = this.to16(0); // 版本号
+    const _week = this.to16(now.day()); // 星期
+    const mins = now.hour() * 60 + now.minute();
+    const _currentTime = this.to16(mins, 4); // 当前时刻
+    const _second = this.to16(now.second()); // 当前秒
+    const enableBin = parseInt(`${status ? 1 : 0}`, 10).toString(2); // 使能位 开启/关闭
+    const idBin = parseInt(`${timerId}`, 10).toString(2).padStart(7, '0');
+    const _enableId = this.binTo16(`${enableBin}${idBin}`); // 定时任务ID
+    const _weeks = this.binTo16([...getArray(loops.split(''))].reverse().join(''), 2); // 周N
+    const _time = this.to16(timeNum, 4); // 时刻设置的定时时间
+    let mode = 1;
+    if (!this.isUndefined(dps.speed) && !this.isUndefined(dps.fanMode) && !this.isUndefined(dps.direction) && !this.isUndefined(dps.shake)) {
+      mode = 5;
+    } else if (!this.isUndefined(dps.hue) && !this.isUndefined(dps.saturation) && !this.isUndefined(dps.value)) {
+      mode = 4;
+    } else if (!this.isUndefined(dps.colour_data)) {
+      mode = 3;
+    } else if (!this.isUndefined(dps.brightness) && !this.isUndefined(dps.temperature)) {
+      mode = 2;
+    } else {
+      mode = 1;
+    }
+    const _mode = this.to16(mode); // 控制类型 只支持开关模式
+    let _action = ''; // 设备动作 开/关
+    // power 设备开关
+    if (power) {
+      switch (mode) {
+        case 1:
+          // 开/关
+          _action = '01';
+          break;
+        case 2:
+          // 白光模式
+          _action = `${this.to16(brightness || 0)}${this.to16(temperature || 0)}`;
+          break;
+        case 3:
+          // 场景
+          _action = `${this.to16(timerId)}`;
+          break;
+        case 4:
+          // 彩光模式
+          // 未进行过测试，请注意此功能是否正确
+          _action = `${this.to16(hue || 0)}${this.to16(saturation || 0)}${this.to16(value || 0)}`;
+          break;
+        case 5:
+          // 风扇
+          _action = `${this.to16(speed || 0)}${this.to16(fanMode || 0)}${this.to16(direction || 0)}${this.to16(shake || 0)}`;
+          break;
+        default:
+          _action = '';
+      }
+    } else {
+      _action = '00';
+    }
+    return `${_version}${_week}${_currentTime}${_second}${_enableId}${_weeks}${_time}${_mode}${_action}`;
+  }
+}
+export const stripLocalTimerParser = new StripLocalTimerTransformer();
+export const getStripLocalTimerParser = () => new StripLocalTimerTransformer();

package/lib/hooks/useCycleDp.js

@@ -11,7 +11,7 @@ export function useCycleDp() {
   } = useBaseLightDp(dpCode);
   const cycleParser = getCycleParser();
   const _updateDp = useCallback(dpData => {
-    scheduleLogger.debug('useCycleDp updateDp', dpData);
+    scheduleLogger.debug('=== useCycleDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
     updateDp(cycleParser.formatter(dpData));
   }, [cycleParser]);
   const _dpValue = useMemo(() => {

package/lib/hooks/useDPByProtocol.d.ts

@@ -18,5 +18,16 @@ export declare const useDPByProtocol: () => {
     readonly TEMPERATURE: "temp_value";
     readonly BRIGHTNESS: "bright_value";
     readonly COLOUR_DATA: "colour_data";
+    readonly COLOUR_DATA_RAW: "colour_data_raw";
+    readonly BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    readonly FAN_MODE: "fan_mode";
+    readonly FAN_DIRECTION: "fan_direction";
+    readonly SHAKE: "shake";
+    readonly WHITE_SWITCH: "white_switch";
+    readonly COLOUR_SWITCH: "colour_switch";
+    readonly FAN_SWITCH: "fan_switch";
+    readonly FAN_SPEED: "fan_speed";
+    readonly FAN_BEEP: "fan_beep";
+    readonly STRIP_SCENE: "strip_scene";
     readonly WORK_MODE: "work_mode";
 };

package/lib/hooks/useRandomDp.js

@@ -11,7 +11,7 @@ export function useRandomDp() {
   } = useBaseLightDp(dpCode);
   const randomParser = getRandomParser();
   const _updateDp = useCallback(dpData => {
-    scheduleLogger.debug('useRandomDp updateDp', dpData);
+    scheduleLogger.debug('=== useRandomDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
     updateDp(randomParser.formatter(dpData));
   }, [randomParser]);
   const _dpValue = useMemo(() => {

package/lib/hooks/useRhythmsDp.js

@@ -18,7 +18,7 @@ export function useRhythmsDp() {
   return {
     dpValue: _dpValue,
     updateDp: dpData => {
-      scheduleLogger.debug('useRhythmsDp updateDp', dpData);
+      scheduleLogger.debug('=== useRhythmsDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
       updateDp(rhythmParser.formatter(dpData));
     }
   };

package/lib/hooks/useSleepDp.js

@@ -16,7 +16,7 @@ export function useSleepDp() {
   return {
     dpValue: _dpValue,
     updateDp: dpData => {
-      scheduleLogger.debug('useSleepDp updateDp', dpData);
+      scheduleLogger.debug('=== useSleepDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
       updateDp(sleepParser.formatter(dpData));
     }
   };

package/lib/hooks/useTimerDp.d.ts

@@ -1,5 +1,6 @@
 import { TRtcTimer } from '../types';
-export declare function useTimerDp(dpCode?: "rtc_timer"): {
-    dpValue: TRtcTimer;
-    updateDp: (dps: TRtcTimer) => void;
+import { TStripLocalTimerData } from '../dpParser/stripLocalTimer';
+export declare function useTimerDp(): {
+    dpValue: TRtcTimer | TStripLocalTimerData;
+    updateDp: (dps: TRtcTimer | TStripLocalTimerData) => void;
 };

package/lib/hooks/useTimerDp.js

@@ -3,23 +3,40 @@ import { useMemo } from 'react';
 import { useBaseLightDp } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 import { rtcTimerParser } from '../dpParser/rtcTimer';
+import { useSupport } from './useCommonSupport';
+import { stripLocalTimerParser } from '../dpParser/stripLocalTimer';
+import { scheduleLogger } from '../utils/ScheduleLogger';
+
 // 本地定时dp下发
 export function useTimerDp() {
-  let dpCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.RTC_TIMER;
+  const support = useSupport();
+  const isSupportStripLocalTimer = support.isSupportDp(scheduleDpCodes.STRIP_LOCAL_TIMER);
+  const isSupportRtcTimer = support.isSupportDp(scheduleDpCodes.RTC_TIMER);
+  const _doCode = isSupportStripLocalTimer ? scheduleDpCodes.STRIP_LOCAL_TIMER : scheduleDpCodes.RTC_TIMER;
   const {
     dpValue,
     updateDp
-  } = useBaseLightDp(dpCode);
+  } = useBaseLightDp(_doCode);
   const _dpValue = useMemo(() => {
     if (typeof dpValue === 'string') {
+      if (isSupportStripLocalTimer) {
+        return stripLocalTimerParser.parser(dpValue);
+      }
       return rtcTimerParser.parser(dpValue);
     }
     return dpValue;
   }, [dpValue, rtcTimerParser]);
   return {
     dpValue: _dpValue,
-    updateDp: rtcTimerDp => {
-      updateDp(rtcTimerParser.formatter(rtcTimerDp));
+    updateDp: timerDp => {
+      scheduleLogger.debug('=== useTimerDp updateDp dpCode:', _doCode, 'timerDp: ', timerDp);
+      if (isSupportStripLocalTimer) {
+        updateDp(stripLocalTimerParser.formatter(timerDp));
+      } else if (isSupportRtcTimer) {
+        updateDp(rtcTimerParser.formatter(timerDp));
+      } else {
+        scheduleLogger.error('useTimerDp updateDp', '不支持的定时器类型', _doCode);
+      }
     }
   };
 }

package/lib/hooks/useTimerReportDp.js

@@ -25,6 +25,7 @@ export function useTimerReportDp() {
     isSupport,
     dpValue: _dpValue,
     updateDp: timerReportDp => {
+      ScheduleLogger.debug('=== useTimerReportDp updateDp dpCode:', dpCode, 'timerReportDp: ', timerReportDp);
       updateDp(timerReportParser.formatter(timerReportDp));
     }
   };

package/lib/hooks/useWakeUpDp.js

@@ -16,7 +16,7 @@ export function useWakeUpDp() {
   return {
     dpValue: _dpValue,
     updateDp: dpData => {
-      scheduleLogger.debug('useWakeUpDp updateDp', dpData);
+      scheduleLogger.debug('=== useWakeUpDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
       updateDp(wakeUpParser.formatter(dpData));
     }
   };

package/lib/hooks/useWakeupDp.js

@@ -16,7 +16,7 @@ export function useWakeUpDp() {
   return {
     dpValue: _dpValue,
     updateDp: dpData => {
-      scheduleLogger.debug('useWakeUpDp updateDp', dpData);
+      scheduleLogger.debug('=== useWakeUpDp updateDp dpCode:', dpCode, 'dpData: ', dpData);
       updateDp(wakeUpParser.formatter(dpData));
     }
   };

package/lib/types/timer.d.ts

@@ -107,3 +107,14 @@ export type TTimerReport = {
     id: string | number;
     status: boolean;
 };
+/** bright_adjust_data 相关类型 - Beacon 亮度调节 */
+export type TBrightAdjustData = {
+    mode: number;
+    brightness: number;
+};
+/** colour_data_raw 相关类型 - Beacon 彩光原始数据 */
+export type TColourDataRaw = {
+    hue: number;
+    saturation: number;
+    value: number;
+};

package/lib/utils/ScheduleDataSync.js

@@ -119,6 +119,7 @@ export const navigateToMainApp = (route, params, callback) => {
     // @ts-ignore
     events: {
       [functionalTransDataEventKey](data) {
+        scheduleLogger.info('=== get data from main app', data);
         callback && callback(data);
       }
     },

package/lib/utils/ScheduleSupport.d.ts

@@ -115,6 +115,10 @@ export declare class Support {
      * 是否是蓝牙设备
      * */
     isBleDevice: (devInfo?: TDeviceInfo) => boolean;
+    /**
+     * @description 判断是否是 Beacon Device
+     */
+    isBeaconDevice: (devInfo?: TDeviceInfo) => boolean;
     /**
      * @description 是否是 Matter 设备
      * @param {TDeviceInfo} devInfo - 设备信息

package/lib/utils/ScheduleSupport.js

@@ -369,6 +369,13 @@ export class Support {
     return this.hasCapability(DeviceCapability.BLUETOOTH, devInfo) || this.hasCapability(DeviceCapability.BLEMESH, devInfo) || this.hasCapability(DeviceCapability.SIGMESH, devInfo);
   };
 
+  /**
+   * @description 判断是否是 Beacon Device
+   */
+  isBeaconDevice = devInfo => {
+    return this.hasCapability(DeviceCapability.BEACON, devInfo);
+  };
+
   /**
    * @description 是否是 Matter 设备
    * @param {TDeviceInfo} devInfo - 设备信息

package/lib/utils/getDPByProtocol.d.ts

@@ -18,6 +18,17 @@ export declare const getDPByProtocol: () => {
     readonly TEMPERATURE: "temp_value";
     readonly BRIGHTNESS: "bright_value";
     readonly COLOUR_DATA: "colour_data";
+    readonly COLOUR_DATA_RAW: "colour_data_raw";
+    readonly BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    readonly FAN_MODE: "fan_mode";
+    readonly FAN_DIRECTION: "fan_direction";
+    readonly SHAKE: "shake";
+    readonly WHITE_SWITCH: "white_switch";
+    readonly COLOUR_SWITCH: "colour_switch";
+    readonly FAN_SWITCH: "fan_switch";
+    readonly FAN_SPEED: "fan_speed";
+    readonly FAN_BEEP: "fan_beep";
+    readonly STRIP_SCENE: "strip_scene";
     readonly WORK_MODE: "work_mode";
 } | {
     SWITCH_LED: "switch";
@@ -39,5 +50,16 @@ export declare const getDPByProtocol: () => {
     TIMER_REPORT: "timer_report";
     RTC_TIMER: "rtc_timer";
     COLOUR_DATA: "colour_data";
+    COLOUR_DATA_RAW: "colour_data_raw";
+    BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    FAN_MODE: "fan_mode";
+    FAN_DIRECTION: "fan_direction";
+    SHAKE: "shake";
+    WHITE_SWITCH: "white_switch";
+    COLOUR_SWITCH: "colour_switch";
+    FAN_SWITCH: "fan_switch";
+    FAN_SPEED: "fan_speed";
+    FAN_BEEP: "fan_beep";
+    STRIP_SCENE: "strip_scene";
     WORK_MODE: "work_mode";
 };

package/lib/utils/matterDeviceUtils.d.ts

@@ -33,6 +33,17 @@ export declare const getDPByProtocol: (schema?: {
     readonly TEMPERATURE: "temp_value";
     readonly BRIGHTNESS: "bright_value";
     readonly COLOUR_DATA: "colour_data";
+    readonly COLOUR_DATA_RAW: "colour_data_raw";
+    readonly BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    readonly FAN_MODE: "fan_mode";
+    readonly FAN_DIRECTION: "fan_direction";
+    readonly SHAKE: "shake";
+    readonly WHITE_SWITCH: "white_switch";
+    readonly COLOUR_SWITCH: "colour_switch";
+    readonly FAN_SWITCH: "fan_switch";
+    readonly FAN_SPEED: "fan_speed";
+    readonly FAN_BEEP: "fan_beep";
+    readonly STRIP_SCENE: "strip_scene";
     readonly WORK_MODE: "work_mode";
 } | {
     SWITCH_LED: "switch";
@@ -54,5 +65,16 @@ export declare const getDPByProtocol: (schema?: {
     TIMER_REPORT: "timer_report";
     RTC_TIMER: "rtc_timer";
     COLOUR_DATA: "colour_data";
+    COLOUR_DATA_RAW: "colour_data_raw";
+    BRIGHT_ADJUST_DATA: "bright_adjust_data";
+    FAN_MODE: "fan_mode";
+    FAN_DIRECTION: "fan_direction";
+    SHAKE: "shake";
+    WHITE_SWITCH: "white_switch";
+    COLOUR_SWITCH: "colour_switch";
+    FAN_SWITCH: "fan_switch";
+    FAN_SPEED: "fan_speed";
+    FAN_BEEP: "fan_beep";
+    STRIP_SCENE: "strip_scene";
     WORK_MODE: "work_mode";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-schedule-core",
-  "version": "1.0.5-beta.1",
+  "version": "1.0.5-beta.3",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [