@ray-js/lamp-schedule-core 1.0.4-beta-3 → 1.0.4-beta-5

package/lib/dpParser/cycle/index.js

@@ -18,13 +18,13 @@ class CycleTimerParser {
   }))();
   parser(dpValue) {
     try {
-      ScheduleLogger.debug(`CycleTimerParser dpValue: ${dpValue}`);
+      ScheduleLogger.debug(`dpParser ===> CycleTimerParser dpValue: ${dpValue}`);
       if (!dpValue) {
-        ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${CYCLE_TIMING}】: ${dpValue}`);
+        ScheduleLogger.warn(`dpParser ===> 无法解析数据, 请检查数据是否合规1【${CYCLE_TIMING}】: ${dpValue}`);
         return this.defaultValue;
       }
       if (dpValue.length <= 4 || (dpValue.length - 4) % 32 !== 0) {
-        ScheduleLogger.warn(`节点数量不匹配, 请检查数据是否合规【${CYCLE_TIMING}】: ${dpValue}`);
+        ScheduleLogger.warn(`dpParser ===> 节点数量不匹配, 请检查数据是否合规【${CYCLE_TIMING}】: ${dpValue}`);
         return {
           version: 0,
           length: LENGTH,
@@ -92,6 +92,7 @@ class CycleTimerParser {
     }
   }
   formatter(data) {
+    ScheduleLogger.debug('dpParser ===> CycleTimerParser formatter data: ', data);
     const {
       version,
       nodes

package/lib/dpParser/random/index.js

@@ -19,9 +19,9 @@ class RandomTimerParser {
   };
   parser(dpValue) {
     try {
-      ScheduleLogger.debug(`RandomTimerParser dpValue: ${dpValue}`);
+      ScheduleLogger.debug(`dpParser ===> RandomTimerParser dpValue: ${dpValue}`);
       if (!dpValue) {
-        ScheduleLogger.warn(`无法解析数据, 请检查数据是否合规1【${RANDOM_TIMING}】: ${dpValue}`);
+        ScheduleLogger.warn(`dpParser ===> 无法解析数据, 请检查数据是否合规1【${RANDOM_TIMING}】: ${dpValue}`);
         return {
           version: 0,
           length: LENGTH,
@@ -32,7 +32,7 @@ class RandomTimerParser {
       const version = step().value;
       const length = step().value;
       if (!dpValue || (dpValue.length - 4) % 24 !== 0) {
-        console.log('decodeRandomTask 数据有问题，无法解析');
+        console.log('dpParser ===> decodeRandomTask 数据有问题，无法解析');
         // 返回默认值
         return this.defaultValue;
       }
@@ -84,11 +84,12 @@ class RandomTimerParser {
         nodes
       };
     } catch (error) {
-      ScheduleLogger.error('RandomTimerParser parser error', error);
+      ScheduleLogger.error('dpParser ===> RandomTimerParser parser error', error);
       return this.defaultValue;
     }
   }
   formatter(data) {
+    ScheduleLogger.debug('dpParser ===> RandomTimerParser formatter data: ', data);
     try {
       const {
         version,
@@ -128,7 +129,7 @@ class RandomTimerParser {
       }).join('');
       return `${versionStr}${lengthStr}${nodesStr}`;
     } catch (error) {
-      ScheduleLogger.error('RandomTimerParser formatter error', error);
+      ScheduleLogger.error('dpParser ===> RandomTimerParser formatter error', error);
       return '';
     }
   }

package/lib/dpParser/rtcTimer.js

@@ -50,7 +50,7 @@ export class RtcTimerFormatter {
   parser() {
     let val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     if (!val) {
-      ScheduleLogger.warn('RtcTimerFormatter parser，value is empty, return defaultValue', this.defaultValue);
+      ScheduleLogger.warn('dpParser ===> RtcTimerFormatter parser，value is empty, return defaultValue', this.defaultValue);
       return this.defaultValue;
     }
     try {
@@ -66,7 +66,7 @@ export class RtcTimerFormatter {
 
       if (length !== 4 && length !== powerLen && length !== brightLightLen && length !== colourLightLen && length !== mixLightLen) {
         // 数据位数不定, 可能是14位或18位22位26位, 删除定时指令为4位
-        ScheduleLogger.warn('RtcTimerFormatter parser fail:', RTC_TIMER, '=>', val);
+        ScheduleLogger.warn('dpParser ===> RtcTimerFormatter parser fail:', RTC_TIMER, '=>', val);
         return this.defaultValue;
       }
       const step = generateDpStrStep(val);
@@ -178,7 +178,7 @@ export class RtcTimerFormatter {
         status
       };
     } catch (err) {
-      ScheduleLogger.error('RtcTimerFormatter parser fail:', RTC_TIMER, '=>', val, err);
+      ScheduleLogger.error('dpParser ===> RtcTimerFormatter parser fail:', RTC_TIMER, '=>', val, err);
       return this.defaultValue;
     }
   }
@@ -202,7 +202,7 @@ export class RtcTimerFormatter {
         time,
         dps
       } = data;
-      ScheduleLogger.debug('rtcTimer formatter data:', data);
+      ScheduleLogger.debug('dpParser ===> rtcTimer formatter data:', data);
       if (loops) {
         const _dps = {};
         Object.keys(dps).forEach(key => {
@@ -289,18 +289,18 @@ export class RtcTimerFormatter {
           dpDataStr = `${powerStr}`;
         }
         const _res = `${idStr}${typeStr}${repeatStr}${startTimeTypeStr}${startTimeStr}${dpDataStr}`;
-        ScheduleLogger.debug('rtcTimer formatter dpStr1:', dpDataStr);
-        ScheduleLogger.debug('rtcTimer formatter dpStr2:', _res);
+        ScheduleLogger.debug('dpParser ===> rtcTimer formatter dpStr1:', dpDataStr);
+        ScheduleLogger.debug('dpParser ===> rtcTimer formatter dpStr2:', _res);
         return _res;
       }
       const statusStr = status ? '1' : '0';
       const timerIdStr = padStart(Number(timerId).toString(2), 7, '0');
       const idStr = this.to16(parseInt(`${statusStr}${timerIdStr}`, 2), 2);
       const _res = `${idStr}00`;
-      ScheduleLogger.debug('rtcTimer remove formatter2 data:', _res);
+      ScheduleLogger.debug('dpParser ===> rtcTimer remove formatter2 data:', _res);
       return _res;
     } catch (error) {
-      ScheduleLogger.error('rtcTimer formatter error', error);
+      ScheduleLogger.error('dpParser ===> rtcTimer formatter error', error);
       return '';
     }
   }

package/lib/dpParser/sleep/sleepCommon.js

@@ -18,13 +18,13 @@ export class Sleep {
   };
   parser(dpStr) {
     try {
-      scheduleLogger.debug('Sleep parser dpStr: ', dpStr);
+      scheduleLogger.debug('dpParser ===> Sleep parser dpStr: ', dpStr);
       if (!dpStr) {
         return this.defaultValue;
       }
       const dpLength = dpStr.length;
       if (!dpLength || (dpLength - 4) % 22 !== 0) {
-        scheduleLogger.error('数据有问题，无法解析');
+        scheduleLogger.error('dpParser ===> 数据有问题，无法解析');
         return this.defaultValue;
       }
       const step = generateDpStrStep(dpStr);
@@ -73,7 +73,7 @@ export class Sleep {
         nodes
       };
     } catch (error) {
-      scheduleLogger.error('Sleep parser error', error);
+      scheduleLogger.error('dpParser ===> Sleep parser error', error);
       return this.defaultValue;
     }
   }
@@ -81,7 +81,7 @@ export class Sleep {
     try {
       var _data$nodes, _data$nodes2;
       const result = [numToHexString(data.version), numToHexString((_data$nodes = data.nodes) === null || _data$nodes === void 0 ? void 0 : _data$nodes.length)];
-      scheduleLogger.debug('sleep formatter data', data);
+      scheduleLogger.debug('dpParser ===> sleep formatter data', data);
       data === null || data === void 0 || (_data$nodes2 = data.nodes) === null || _data$nodes2 === void 0 || _data$nodes2.forEach(node => {
         // 拆分色相值为百位和十个位
         const hueHundreds = Math.floor(node.hue / 100);
@@ -106,7 +106,7 @@ export class Sleep {
       });
       return result.join('');
     } catch (error) {
-      scheduleLogger.error('sleep formatter error', error);
+      scheduleLogger.error('dpParser ===> sleep formatter error', error);
       return '';
     }
   }

package/lib/dpParser/timerReport.js

@@ -32,7 +32,7 @@ export class TimerReportFormatter {
       });
       return arr;
     } catch (error) {
-      ScheduleLogger.error('TimerReportFormatter parser error', error);
+      ScheduleLogger.error('dpParser ===> TimerReportFormatter parser error', error);
       return this.defaultValue;
     }
   }
@@ -47,7 +47,7 @@ export class TimerReportFormatter {
         return hexStr;
       }).join('');
     } catch (error) {
-      ScheduleLogger.error('TimerReportFormatter formatter error', error);
+      ScheduleLogger.error('dpParser ===> TimerReportFormatter formatter error', error);
       return '';
     }
   }

package/lib/dpParser/wakeup/wakeupCommon.js

@@ -17,7 +17,7 @@ export class WakeUp {
     nodes: []
   };
   parser(dpStr) {
-    scheduleLogger.debug('WakeUp parser dpStr: ', dpStr);
+    scheduleLogger.debug('dpParser ===> WakeUp parser dpStr: ', dpStr);
     if (!dpStr) {
       return this.defaultValue;
     }
@@ -28,7 +28,7 @@ export class WakeUp {
       let number = step(2).value;
       const nodeLen = (_dpStr$slice = dpStr.slice(4)) === null || _dpStr$slice === void 0 ? void 0 : _dpStr$slice.length;
       if (nodeLen % 24 !== 0) {
-        scheduleLogger.error('wakeup dpStr error nodeLen:', nodeLen);
+        scheduleLogger.error('dpParser ===> wakeup dpStr error nodeLen:', nodeLen);
       }
       const nodes = [];
       number = Math.min(number, 4);
@@ -75,7 +75,7 @@ export class WakeUp {
         nodes
       };
     } catch (error) {
-      scheduleLogger.error('wakeup parser error', error);
+      scheduleLogger.error('dpParser ===> wakeup parser error', error);
       return this.defaultValue;
     }
   }
@@ -83,7 +83,7 @@ export class WakeUp {
     try {
       var _data$nodes, _data$nodes2;
       const result = [numToHexString(data.version), numToHexString((_data$nodes = data.nodes) === null || _data$nodes === void 0 ? void 0 : _data$nodes.length)];
-      scheduleLogger.debug('wakeup formatter data', data);
+      scheduleLogger.debug('dpParser ===> wakeup formatter data', data);
       data === null || data === void 0 || (_data$nodes2 = data.nodes) === null || _data$nodes2 === void 0 || _data$nodes2.forEach(node => {
         // 拆分色相值为百位和十个位
         const hueHundreds = Math.floor(node.hue / 100);
@@ -108,7 +108,7 @@ export class WakeUp {
       });
       return result.join('');
     } catch (error) {
-      scheduleLogger.error('wakeup formatter error', error);
+      scheduleLogger.error('dpParser ===> wakeup formatter error', error);
       return '';
     }
   }

package/lib/hooks/__test__/useCommonSupport.test.js

@@ -10,6 +10,7 @@ const onGroupDpDataChangeEventMock = jest.fn();
 const offDpDataChangeMock = jest.fn();
 const offGroupDpDataChangeEventMock = jest.fn();
 const getDeviceInfoMock = jest.fn();
+const getGroupInfoMock = jest.fn();
 const getTimerListWithFlushMock = jest.fn();
 const initDpStateMock = jest.fn();
 jest.mock('../../context/timer/context', () => ({
@@ -48,8 +49,8 @@ jest.mock('@ray-js/ray', () => ({
   getDeviceInfo: function () {
     return getDeviceInfoMock(...arguments);
   },
-  getGroupDpsInfos: function () {
-    return getGroupDpsInfosMock(...arguments);
+  getGroupInfo: function () {
+    return getGroupInfoMock(...arguments);
   },
   registerDeviceListListener: function () {
     return registerDeviceListListenerMock(...arguments);
@@ -121,8 +122,15 @@ describe('useCommonSupport suite', () => {
         }
       });
     });
-    getGroupDpsInfosMock.mockResolvedValue({
-      1: true
+    getGroupInfoMock.mockImplementation(_ref4 => {
+      let {
+        success
+      } = _ref4;
+      return success === null || success === void 0 ? void 0 : success({
+        dps: {
+          1: true
+        }
+      });
     });
   });
   it('initializes device support and sets ready state', async () => {

package/lib/hooks/useCommonSupport.js

@@ -5,7 +5,7 @@ import "core-js/modules/esnext.iterator.every.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.some.js";
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { getDeviceInfo, getGroupDpsInfos, onDpDataChange, onGroupDpDataChangeEvent, registerDeviceListListener, registerGroupChange, offDpDataChange, offGroupDpDataChangeEvent } from '@ray-js/ray';
+import { getDeviceInfo, getGroupInfo, onDpDataChange, onGroupDpDataChangeEvent, registerDeviceListListener, registerGroupChange, offDpDataChange, offGroupDpDataChangeEvent } from '@ray-js/ray';
 import { Support } from '../utils/ScheduleSupport';
 import { useTimerContext } from '../context/timer/context';
 import { scheduleLogger, scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
@@ -161,23 +161,29 @@ export const useScheduleInit = props => {
     const promiseList = Promise.all([initStorage(props.devId, props.groupId), support.init()]);
     promiseList.then(() => {
       if (props.groupId) {
-        // 获取群组 dp 数据
-        getGroupDpsInfos(props.groupId).then(res => {
-          scheduleLogger.debug('getGroupDpsInfos res', res);
-          res && Object.keys(res).length && initDpState(res);
-          supportIns = {
-            isReady: true,
-            support
-          };
-          emitter.emit('initDone');
-          _isInit = true;
-          ScheduleLogger.debug('useSupport: support init success', true);
-          setScheduleState({
-            isReady: true
-          });
-        }).catch(err => {
-          scheduleLogger.error('Failed to get group info groupId:', props.groupId);
-          scheduleLogger.error('Failed to get group info err:', err);
+        getGroupInfo({
+          groupId: props.groupId,
+          success: res => {
+            const dpMap = {};
+            Object.keys(res.dps).forEach(dpId => {
+              const dpCode = getDpCodeByDpId(dpId);
+              dpMap[dpCode] = res.dps[dpId];
+            });
+            dpMap && Object.keys(dpMap).length && initDpState(dpMap);
+            supportIns = {
+              isReady: true,
+              support
+            };
+            emitter.emit('initDone');
+            _isInit = true;
+            ScheduleLogger.debug('useSupport: support init success', true);
+            setScheduleState({
+              isReady: true
+            });
+          },
+          fail: err => {
+            scheduleLogger.error('Failed to get group info groupId:', props.groupId, err);
+          }
         });
       } else {
         // 获取单设备 dp 数据

package/lib/utils/ScheduleLogger.js

@@ -18,7 +18,7 @@ var ELevelColor = /*#__PURE__*/function (ELevelColor) {
   return ELevelColor;
 }(ELevelColor || {});
 export class ScheduleLogger {
-  logLevel = (() => LogLevel.DEBUG)();
+  logLevel = (() => LogLevel.WARN)();
   logPrefix = (() => LOG_PREFIX)();
   setLogLevel(level) {
     this.logLevel = level;
@@ -68,5 +68,4 @@ export class ScheduleLogger {
     console.error(...this.formatMessage(LogLevel.ERROR, message, data));
   }
 }
-export const scheduleLogger = new ScheduleLogger();
-scheduleLogger.setLogLevel(LogLevel.WARN);
+export const scheduleLogger = new ScheduleLogger();

package/lib/utils/ScheduleSupport.js

@@ -1,6 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
-import "core-js/modules/esnext.iterator.every.js";
 import "core-js/modules/esnext.iterator.find.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 /* eslint-disable no-bitwise */
@@ -96,24 +95,42 @@ export class Support {
     return new Promise((resolve, reject) => {
       getGroupInfo({
         groupId,
-        success: res => {
-          var _res$deviceList;
-          this.groupDevInfo = res;
+        success: groupRes => {
+          this.groupDevInfo = groupRes;
           ScheduleLogger.debug('getGroupInfo groupId: ', groupId);
-          ScheduleLogger.debug('getGroupInfo success1: ', res);
-          setScheduleCache(DEV_INFO_KEY, res);
-          // 群组中为空
-          groupId && (devIdOrGroupIdCache === null || devIdOrGroupIdCache === void 0 ? void 0 : devIdOrGroupIdCache.set('', groupId));
-          const dpMap = {};
-          Object.keys(res.dps).forEach(dpId => {
-            const dpCode = getDpCodeByDpId(dpId);
-            dpCode && setDpState(dpCode, res.dps[dpId]);
+          ScheduleLogger.debug('getGroupInfo success1: ', groupRes);
+          const {
+            deviceList = []
+          } = groupRes;
+          const firstDevice = deviceList === null || deviceList === void 0 ? void 0 : deviceList[0];
+          getDeviceInfo({
+            deviceId: firstDevice === null || firstDevice === void 0 ? void 0 : firstDevice.devId,
+            success: deviceInfoRes => {
+              var _res$deviceList;
+              // 从 deviceInfoRes 中筛选出 groupRes 中不存在的数据，合并到 res
+              const filteredDeviceInfo = {};
+              const _deviceInfo = _objectSpread(_objectSpread({}, groupRes), deviceInfoRes);
+              Object.keys(_deviceInfo).forEach(key => {
+                if (!(key in groupRes)) {
+                  filteredDeviceInfo[key] = deviceInfoRes[key];
+                }
+              });
+              const res = _objectSpread(_objectSpread({}, groupRes), filteredDeviceInfo);
+              setScheduleCache(DEV_INFO_KEY, res);
+              // 群组中为空
+              groupId && (devIdOrGroupIdCache === null || devIdOrGroupIdCache === void 0 ? void 0 : devIdOrGroupIdCache.set('', groupId));
+              const dpMap = {};
+              Object.keys(res.dps).forEach(dpId => {
+                const dpCode = getDpCodeByDpId(dpId);
+                dpCode && setDpState(dpCode, res.dps[dpId]);
+              });
+              Object.keys(dpMap).length && initDpState(dpMap);
+              const deviceSchema = (_res$deviceList = res.deviceList) === null || _res$deviceList === void 0 || (_res$deviceList = _res$deviceList[0]) === null || _res$deviceList === void 0 ? void 0 : _res$deviceList.schema;
+              // 融合 deviceSchema 和 groupSchema 数据，优先使用 groupSchema
+              res.schema = [...(res.schema || []), ...(deviceSchema || [])];
+              resolve(true);
+            }
           });
-          Object.keys(dpMap).length && initDpState(dpMap);
-          const deviceSchema = (_res$deviceList = res.deviceList) === null || _res$deviceList === void 0 || (_res$deviceList = _res$deviceList[0]) === null || _res$deviceList === void 0 ? void 0 : _res$deviceList.schema;
-          // 融合 deviceSchema 和 groupSchema 数据，优先使用 groupSchema
-          res.schema = [...(res.schema || []), ...(deviceSchema || [])];
-          resolve(true);
         },
         fail: err => {
           this.groupDevInfo = {};
@@ -213,31 +230,27 @@ export class Support {
   /**
    * @description 判断是否支持云端定时
    */
-  isSupportCloudTimer = devInfo => {
-    var _this$devInfo2;
-    this.devInfo = devInfo !== null && devInfo !== void 0 ? devInfo : this.getCachedDevInfo();
-    if (!this.devInfo) {
-      return false;
-    }
-    // 群组设备需要从设备列表里面判断所有设备都支持定时才会显示
-    if (this.devInfo.groupId) {
+  isSupportCloudTimer = (() => {
+    var _this = this;
+    return function () {
       var _this$devInfo;
-      // @ts-ignore
-      const deviceList = (_this$devInfo = this.devInfo) === null || _this$devInfo === void 0 ? void 0 : _this$devInfo.deviceList;
-      if (!Array.isArray(deviceList) || deviceList.length === 0) return false;
-      const isAllDeviceHasTimer = deviceList.every(d => {
-        var _d$panelConfig;
-        const timer = d === null || d === void 0 || (_d$panelConfig = d.panelConfig) === null || _d$panelConfig === void 0 || (_d$panelConfig = _d$panelConfig.bic) === null || _d$panelConfig === void 0 ? void 0 : _d$panelConfig.find(i => i.code === 'timer');
-        if (!timer) {
-          !this.isIniting && ScheduleLogger.info('isSupportCloudTimer: ', `${d.devId} 不支持云定时`);
-          return false;
+      let devInfo = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      // 从 this.getCachedDevInfo() 中将 devInfo 不存在的数据合并到 this.devInfo
+      const cachedDevInfo = _this.getCachedDevInfo();
+      const filteredDevInfo = {};
+      const _devInfo = _objectSpread(_objectSpread({}, cachedDevInfo), devInfo);
+      Object.keys(_devInfo).forEach(key => {
+        if (!(key in cachedDevInfo)) {
+          filteredDevInfo[key] = devInfo[key];
         }
-        return timer.selected;
       });
-      return isAllDeviceHasTimer;
-    }
-    return ((_this$devInfo2 = this.devInfo) === null || _this$devInfo2 === void 0 || (_this$devInfo2 = _this$devInfo2.panelConfig) === null || _this$devInfo2 === void 0 || (_this$devInfo2 = _this$devInfo2.bic) === null || _this$devInfo2 === void 0 ? void 0 : _this$devInfo2.find(i => i.code === 'timer' && i.selected)) !== undefined;
-  };
+      _this.devInfo = _objectSpread(_objectSpread({}, cachedDevInfo), filteredDevInfo);
+      if (!_this.devInfo) {
+        return false;
+      }
+      return ((_this$devInfo = _this.devInfo) === null || _this$devInfo === void 0 || (_this$devInfo = _this$devInfo.panelConfig) === null || _this$devInfo === void 0 || (_this$devInfo = _this$devInfo.bic) === null || _this$devInfo === void 0 ? void 0 : _this$devInfo.find(i => i.code === 'timer' && i.selected)) !== undefined;
+    };
+  })();
   supportDp = (dpCode, devInfo) => {
     this.devInfo = devInfo !== null && devInfo !== void 0 ? devInfo : this.getCachedDevInfo();
     if (!this.devInfo) {
@@ -267,7 +280,7 @@ export class Support {
    * @return {boolean} - 如果dpCode支持则返回true，否则返回false。
    */
   isSupportDp = (() => {
-    var _this = this;
+    var _this2 = this;
     return function (dpCode) {
       let isForce = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       let devInfo = arguments.length > 2 ? arguments[2] : undefined;
@@ -276,11 +289,11 @@ export class Support {
           return cache[dpCode];
         }
       }
-      if (!_this.isInit) {
+      if (!_this2.isInit) {
         return false;
       }
       // 是否存在相关dp
-      const isDpSupport = _this.supportDp(dpCode, devInfo);
+      const isDpSupport = _this2.supportDp(dpCode, devInfo);
       cache[dpCode] = isDpSupport;
       return isDpSupport;
     };
@@ -352,7 +365,7 @@ export class Support {
    * @returns {boolean} - 是否是 Matter 设备
    */
   isMatterDevice(devInfo, isMatter) {
-    var _this$devInfo3;
+    var _this$devInfo2;
     if (isMatter !== undefined) {
       return isMatter;
     }
@@ -360,30 +373,30 @@ export class Support {
       return !!devInfo.isMatter;
     }
     this.devInfo = this.getCachedDevInfo();
-    return !!((_this$devInfo3 = this.devInfo) !== null && _this$devInfo3 !== void 0 && _this$devInfo3.isMatter);
+    return !!((_this$devInfo2 = this.devInfo) !== null && _this$devInfo2 !== void 0 && _this$devInfo2.isMatter);
   }
 
   /**
    * @description 是否是 涂鸦 Matter 设备
    */
   isTuyaMatterDevice(devInfo) {
-    var _this$devInfo4, _this$devInfo5;
+    var _this$devInfo3, _this$devInfo4;
     if (devInfo) {
       return !!(devInfo !== null && devInfo !== void 0 && devInfo.isMatter && !(devInfo !== null && devInfo !== void 0 && devInfo.isTripartiteMatter));
     }
     this.devInfo = this.getCachedDevInfo();
-    return !!((_this$devInfo4 = this.devInfo) !== null && _this$devInfo4 !== void 0 && _this$devInfo4.isMatter && !((_this$devInfo5 = this.devInfo) !== null && _this$devInfo5 !== void 0 && _this$devInfo5.isTripartiteMatter));
+    return !!((_this$devInfo3 = this.devInfo) !== null && _this$devInfo3 !== void 0 && _this$devInfo3.isMatter && !((_this$devInfo4 = this.devInfo) !== null && _this$devInfo4 !== void 0 && _this$devInfo4.isTripartiteMatter));
   }
 
   /**
    * @description 是否是 三方 Matter 设备
    */
   isTripartiteMatter(devInfo) {
-    var _this$devInfo6;
+    var _this$devInfo5;
     if (devInfo) {
       return !!devInfo.isTripartiteMatter;
     }
     this.devInfo = this.getCachedDevInfo();
-    return !!((_this$devInfo6 = this.devInfo) !== null && _this$devInfo6 !== void 0 && _this$devInfo6.isTripartiteMatter);
+    return !!((_this$devInfo5 = this.devInfo) !== null && _this$devInfo5 !== void 0 && _this$devInfo5.isTripartiteMatter);
   }
 }

package/lib/utils/dpState.js

@@ -1,7 +1,8 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import { scheduleLogger } from './ScheduleLogger';
-const __dpState = {};
+let __dpState = {};
 export const getDpState = dpCode => {
   scheduleLogger.debug('getDpState', dpCode, __dpState);
   return __dpState[dpCode];
@@ -22,6 +23,6 @@ export const getAllDpState = () => {
 };
 export const initDpState = function () {
   let dpState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  Object.assign(__dpState, dpState);
+  __dpState = _objectSpread(_objectSpread({}, __dpState), dpState);
   scheduleLogger.debug('initDpState', __dpState);
 };

package/package.json

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