@ray-js/lamp-schedule-core 1.0.0-beta-2 → 1.0.0-beta-4

package/lib/dpParser/rtcTimer.js

@@ -225,9 +225,10 @@ export class RtcTimerFormatter {
          */
         if (_dps[EDpCodes.switch_led] === false) {
           dpDataStr = '00';
-        } else if (Object.keys(_dps).includes(EDpCodes.colour_data) && Object.keys(_dps).includes(EDpCodes.temp_value)) {
+        } else if (Object.keys(_dps).includes(EDpCodes.colour_data) && Object.keys(_dps).includes(EDpCodes.bright_value)) {
+          var _dps$EDpCodes$temp_va;
           const bright_value = _dps[EDpCodes.bright_value];
-          const temp_value = _dps[EDpCodes.temp_value];
+          const temp_value = (_dps$EDpCodes$temp_va = _dps[EDpCodes.temp_value]) !== null && _dps$EDpCodes$temp_va !== void 0 ? _dps$EDpCodes$temp_va : 1000;
           const {
             hue,
             saturation,
@@ -250,9 +251,9 @@ export class RtcTimerFormatter {
           const valueStr = this.to16(value, 2);
           dpDataStr = `03${hueStr}${saturationStr}${valueStr}`;
         } else if (Object.keys(_dps).includes(EDpCodes.bright_value)) {
-          var _dps$EDpCodes$bright_, _dps$EDpCodes$temp_va;
+          var _dps$EDpCodes$bright_, _dps$EDpCodes$temp_va2;
           const bright_value = (_dps$EDpCodes$bright_ = _dps[EDpCodes.bright_value]) !== null && _dps$EDpCodes$bright_ !== void 0 ? _dps$EDpCodes$bright_ : 100;
-          const temp_value = (_dps$EDpCodes$temp_va = _dps[EDpCodes.temp_value]) !== null && _dps$EDpCodes$temp_va !== void 0 ? _dps$EDpCodes$temp_va : 0;
+          const temp_value = (_dps$EDpCodes$temp_va2 = _dps[EDpCodes.temp_value]) !== null && _dps$EDpCodes$temp_va2 !== void 0 ? _dps$EDpCodes$temp_va2 : 0;
           const brightStr = this.to16(bright_value, 2);
           const temperatureStr = this.to16(temp_value, 2);
           dpDataStr = `02${brightStr}${temperatureStr}`;

package/lib/hooks/useBaseLightDp.d.ts

@@ -10,12 +10,21 @@ type TDpRes<T> = {
 };
 export declare function useBaseLightDp<T>(dpCode: string, defaultDpValue?: T): TDpRes<T>;
 export declare const getDpDataByMesh: (dpCodes?: string[]) => void;
+export declare const fetchDpData: (dpCodes?: string[]) => void;
 /**
- * 主动拉取 dp 数据
+ * 主动拉取 dp 数据, 仅支持 sigmesh 设备
  * @param dpCodes dpCode 数组
  * @returns refresh 刷新 dp 数据
  */
 export declare const useFetchDpDataByMesh: (dpCodes: string[]) => {
     refresh: () => void;
 };
+/**
+ * 主动拉取 dp 数据, 不限制协议
+ * @param dpCodes dpCode 数组
+ * @returns refresh 刷新 dp 数据
+ */
+export declare const useFetchDpData: (dpCodes: string[]) => {
+    refresh: () => void;
+};
 export {};

package/lib/hooks/useBaseLightDp.js

@@ -134,8 +134,48 @@ export const getDpDataByMesh = function () {
     scheduleLogger.error('getDpDataByMesh 调用失败:', error);
   }
 };
+
+// 查询设备的 DP
+export const fetchDpData = function () {
+  let dpCodes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (!Array.isArray(dpCodes)) {
+    scheduleLogger.error('fetchDpData: 参数dpCodes必须是数组');
+    return;
+  }
+  if (dpCodes.length >= 5) {
+    scheduleLogger.warn('fetchDpData: 单次查询 dp 数过多，dp 可能响应不及时，请分次查询');
+  }
+  scheduleLogger.debug('fetchDpData 开始查询DP参数 dpCodes:', dpCodes);
+  const deviceData = devIdOrGroupIdCache.get();
+  const deviceId = deviceData === null || deviceData === void 0 ? void 0 : deviceData.devId;
+  if (!deviceId) {
+    scheduleLogger.error('fetchDpData: 未能获取到deviceId');
+    return;
+  }
+  const dpIds = dpCodes.map(item => getDpIdByDpCode(item)).filter(i => !!i).map(String); // 简化字符串转换
+
+  if (dpIds.length === 0) {
+    scheduleLogger.warn('fetchDpData', dpCodes, '未匹配到 dp');
+    return;
+  }
+  scheduleLogger.debug('fetchDpData 查询DP转换后参数 dpIds:', dpIds);
+  try {
+    queryDps({
+      deviceId,
+      dpIds,
+      success: e => {
+        scheduleLogger.debug('fetchDpData 查询DP参数 success:', e);
+      },
+      fail: err => {
+        scheduleLogger.warn('fetchDpData 查询DP参数 fail:', err);
+      }
+    });
+  } catch (error) {
+    scheduleLogger.error('fetchDpData 调用失败:', error);
+  }
+};
 /**
- * 主动拉取 dp 数据
+ * 主动拉取 dp 数据, 仅支持 sigmesh 设备
  * @param dpCodes dpCode 数组
  * @returns refresh 刷新 dp 数据
  */
@@ -148,7 +188,7 @@ export const useFetchDpDataByMesh = dpCodes => {
       return;
     }
     scheduleLogger.debug('getDpDataByMeshFn get:', dpCodes);
-    getDpDataByMesh(dpCodes);
+    fetchDpData(dpCodes);
   };
   useEffect(() => {
     const isSigMeshDevice = support === null || support === void 0 ? void 0 : support.isSigMeshDevice();
@@ -162,4 +202,23 @@ export const useFetchDpDataByMesh = dpCodes => {
   return {
     refresh: getDpDataByMeshFn
   };
+};
+
+/**
+ * 主动拉取 dp 数据, 不限制协议
+ * @param dpCodes dpCode 数组
+ * @returns refresh 刷新 dp 数据
+ */
+export const useFetchDpData = dpCodes => {
+  const getDpDataFn = () => {
+    scheduleLogger.debug('getDpDataFn get:', dpCodes);
+    fetchDpData(dpCodes);
+  };
+  useEffect(() => {
+    scheduleLogger.debug('useFetchDpData get:', dpCodes);
+    getDpDataFn();
+  }, [dpCodes.join(',')]);
+  return {
+    refresh: getDpDataFn
+  };
 };

package/lib/hooks/useCountdownDp.js

@@ -1,4 +1,4 @@
-import { useBaseLightDp, useFetchDpDataByMesh } from './useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 export function useCountdownDp() {
   let dpCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.COUNTDOWN;
@@ -21,7 +21,7 @@ export const useCountdownDpPull = function () {
   let countdownCode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : scheduleDpCodes.COUNTDOWN;
   const {
     refresh
-  } = useFetchDpDataByMesh([countdownCode]);
+  } = useFetchDpData([countdownCode]);
   return {
     refresh
   };

package/lib/hooks/useTimerReportDp.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
 import { useMemo } from 'react';
-import { useBaseLightDp, useFetchDpDataByMesh } from './useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
 import { timerReportParser } from '../dpParser';
@@ -41,7 +41,7 @@ export const useTimerReportDpPull = function () {
   ScheduleLogger.debug('useTimerReportDpPull 执行');
   const {
     refresh
-  } = useFetchDpDataByMesh([timerReport]);
+  } = useFetchDpData([timerReport]);
   return {
     refresh
   };

package/lib/index.d.ts

@@ -19,7 +19,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 /** Conflict 冲突判断 */
 export { transScheduleListToConflictList } from './conflict/transform';

package/lib/index.js

@@ -24,7 +24,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 
 /** Conflict 冲突判断 */

package/package.json

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