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

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,10 @@ 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";
     /** 模式 */
     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,10 @@ export const scheduleDpCodes = {
   BRIGHTNESS: 'bright_value',
   /** 彩光 */
   COLOUR_DATA: 'colour_data',
+  /** 彩光原始数据 Beacon */
+  COLOUR_DATA_RAW: 'colour_data_raw',
+  /** 亮度调节 Beacon */
+  BRIGHT_ADJUST_DATA: 'bright_adjust_data',
   /** 模式 */
   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,10 @@
+import { TStripLocalTimerData } from '../types';
+export declare class StripLocalTimerFormatter {
+    parser(dpValue: string): Partial<TStripLocalTimerData>;
+    formatter(data: TStripLocalTimerData): string;
+}
+export declare const stripLocalTimerParser: {
+    parser: (dpValue: string) => Partial<TStripLocalTimerData>;
+    formatter: (data: TStripLocalTimerData) => string;
+};
+export declare const getStripLocalTimerParser: () => StripLocalTimerFormatter;

package/lib/dpParser/stripLocalTimer.js

@@ -0,0 +1,107 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.map.js";
+/* eslint-disable no-console */
+import padStart from 'lodash/padStart';
+import { generateDpStrStep, 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 StripLocalTimerFormatter {
+  parser(dpValue) {
+    try {
+      ScheduleLogger.debug('dpParser ===> StripLocalTimerFormatter parser dpValue:', dpValue);
+      if (!dpValue) {
+        return {};
+      }
+      const step = generateDpStrStep(dpValue);
+      const step2 = () => step(2).value;
+      const step4 = () => step(4).value;
+      step2();
+      step2();
+      step4();
+      step2();
+      const opt = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+      const timerId = parseInt(opt.slice(0, 4).join(''), 2);
+      const time1 = opt.slice(4).join('');
+      const opt1 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+      const time2 = parseInt(opt1.slice(0, 4).join('').padStart(8, '0'), 2);
+      const time = parseInt(time1 + time2, 2);
+      const opt2 = Array.from(step2().toString(2).padStart(8, '0')).map(i => Number(i));
+      const status = !!opt2[0];
+      const repeat = opt2.slice(1, 8).join('');
+      const mode = step2();
+      const result = {
+        timerId,
+        status,
+        time,
+        repeat,
+        mode
+      };
+      if (mode === 1) {
+        const lampPower = step2() === 1;
+        result.power = lampPower;
+      } else if (mode === 2) {
+        const brightness = step2();
+        const temperature = step2();
+        result.brightness = brightness;
+        result.temperature = temperature;
+      } else if (mode === 3) {
+        const sceneId = step2();
+        result.sceneId = sceneId;
+      } else if (mode === 4) {
+        const hue = step4();
+        const saturation = step2();
+        const value = step2();
+        result.hue = hue;
+        result.saturation = saturation;
+        result.value = value;
+      }
+      return result;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> StripLocalTimerFormatter parser error:', error);
+      return {};
+    }
+  }
+  formatter(data) {
+    try {
+      ScheduleLogger.debug('dpParser ===> StripLocalTimerFormatter formatter data:', data);
+      const now = new Date();
+      const dayStr = toHex(now.getDay(), 2);
+      const minuteStr = toHex(now.getMinutes() + now.getHours() * 60, 4);
+      const secondStr = toHex(now.getSeconds(), 2);
+      const statusStr = data.status ? '1' : '0';
+      const timerIdStr = padStart(data.timerId.toString(2), 7, '0');
+      const idStr = toHex(parseInt(`${statusStr}${timerIdStr}`, 2), 2);
+      const repeatStr = toHex(parseInt(data.repeat.split('').reverse().join(''), 2), 2);
+      const startTimeStr = toHex(data.time, 4);
+      let dpDataStr = '';
+      if (data.power !== undefined) {
+        const powerStr = data.power ? '01' : '00';
+        dpDataStr = `01${powerStr}`;
+      } else if (data.hue !== undefined) {
+        const hueStr = toHex(data.hue, 4);
+        const saturationStr = toHex(data.saturation || 0);
+        const valueStr = toHex(data.value || 0);
+        dpDataStr = `04${hueStr}${saturationStr}${valueStr}`;
+      } else if (data.sceneId !== undefined) {
+        const sceneStr = toHex(data.sceneId);
+        dpDataStr = `03${sceneStr}`;
+      } else if (data.brightness !== undefined) {
+        const brightStr = toHex(data.brightness);
+        const temperatureStr = toHex(data.temperature || 0);
+        dpDataStr = `02${brightStr}${temperatureStr}`;
+      }
+      const modeStr = dpDataStr.substring(0, 2);
+      return `${'00'}${dayStr}${minuteStr}${secondStr}${idStr}${repeatStr}${startTimeStr}${modeStr}${dpDataStr}`;
+    } catch (error) {
+      ScheduleLogger.error('dpParser ===> StripLocalTimerFormatter formatter error:', error);
+      return '';
+    }
+  }
+}
+export const stripLocalTimerParser = new StripLocalTimerFormatter();
+export const getStripLocalTimerParser = () => {
+  return stripLocalTimerParser;
+};

package/lib/hooks/useDPByProtocol.d.ts

@@ -18,5 +18,7 @@ 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 WORK_MODE: "work_mode";
 };

package/lib/types/timer.d.ts

@@ -107,3 +107,45 @@ export type TTimerReport = {
     id: string | number;
     status: boolean;
 };
+/** strip_local_timer 相关类型 - Beacon 灯带本地定时 */
+export type TStripLocalTimerDataPower = {
+    power: boolean;
+};
+export type TStripLocalTimerDataBright = {
+    brightness: number;
+    temperature: number;
+};
+export type TStripLocalTimerDataColor = {
+    hue: number;
+    saturation: number;
+    value: number;
+};
+export type TStripLocalTimerDataScene = {
+    sceneId: number;
+};
+export type TStripLocalTimerDpData = TStripLocalTimerDataPower | TStripLocalTimerDataBright | TStripLocalTimerDataColor | TStripLocalTimerDataScene;
+export type TStripLocalTimerData = {
+    timerId: number;
+    status: boolean;
+    time: number;
+    repeat: string;
+    power?: boolean;
+    brightness?: number;
+    temperature?: number;
+    sceneId?: number;
+    hue?: number;
+    saturation?: number;
+    value?: number;
+    mode: number;
+};
+/** 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/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,8 @@ 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 WORK_MODE: "work_mode";
 } | {
     SWITCH_LED: "switch";
@@ -39,5 +41,7 @@ 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";
     WORK_MODE: "work_mode";
 };

package/lib/utils/matterDeviceUtils.d.ts

@@ -33,6 +33,8 @@ 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 WORK_MODE: "work_mode";
 } | {
     SWITCH_LED: "switch";
@@ -54,5 +56,7 @@ 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";
     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.2",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [