@ray-js/lamp-schedule-core 1.0.4-beta-4 → 1.0.4-beta-6

package/lib/conflict/__test__/transform.test.js

@@ -176,8 +176,9 @@ describe('transform', () => {
       expect(result.data).toEqual({
         status: true,
         weeks: [1, 0, 0, 0, 0, 0, 0],
-        startTime: '22:10',
-        endTime: '22:30'
+        startTime: '22:20',
+        // 开始入睡时间 = hour:minute
+        endTime: '22:30' // 淡出至关灯时间 = hour:minute + step*5分钟 = 22:20 + 10 = 22:30
       });
       expect(result.id).toMatch(/^sleep_/);
     });

package/lib/conflict/transform.d.ts

@@ -31,6 +31,9 @@ export declare const wakeUpDataToScheduleList: <T extends TWakeUpNode>(data: T[]
  * 入睡数据转换成适合冲突判断的日程对象
  * @param data TSleepNode
  * @returns Schedule
+ * 入睡任务时间段为开始入睡到淡出至关灯的时间段
+ * startTime = hour:minute（开始入睡时间）
+ * endTime = hour:minute + step*5分钟（淡出至关灯的时间）
  */
 export declare const sleepNodeToSchedule: <T extends TSleepNode>(data: T) => Schedule;
 /**

package/lib/conflict/transform.js

@@ -86,10 +86,13 @@ export const wakeUpDataToScheduleList = data => {
  * 入睡数据转换成适合冲突判断的日程对象
  * @param data TSleepNode
  * @returns Schedule
+ * 入睡任务时间段为开始入睡到淡出至关灯的时间段
+ * startTime = hour:minute（开始入睡时间）
+ * endTime = hour:minute + step*5分钟（淡出至关灯的时间）
  */
 export const sleepNodeToSchedule = data => {
-  const startTime = getPreOffsetTimeByHourMins(data.hour, data.minute, data.step * 5);
-  const endTime = data.time || getTimeFormatStrByHourMins(data.hour, data.minute);
+  const startTime = getTimeFormatStrByHourMins(data.hour, data.minute);
+  const endTime = getBackwardOffsetTimeByHourMins(data.hour, data.minute, (data.step || 0) * 5);
   const _data = {
     status: data.onOff,
     weeks: data.loops.split('').map(item => Number(item)),

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 数据
@@ -237,7 +243,13 @@ export const isInitFn = () => {
 };
 export const useInit = () => {
   const [isInit, setIsInit] = useState(_isInit);
+  const initCheckedRef = useRef(false);
   useEffect(() => {
+    // 如果初始化已经完成，立即更新状态（只检查一次）
+    if (!initCheckedRef.current && _isInit) {
+      initCheckedRef.current = true;
+      setIsInit(true);
+    }
     const callback = () => {
       scheduleLogger.info('useInit: initDone');
       setIsInit(true);
@@ -247,7 +259,7 @@ export const useInit = () => {
       emitter.off('initDone', callback);
     };
   }, []);
-  return isInit || _isInit;
+  return isInit;
 };
 
 /**

package/lib/hooks/useCycleDp.js

@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useBaseLightDp } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 import { getCycleParser } from '../dpParser/cycle';
@@ -9,13 +9,17 @@ export function useCycleDp() {
     updateDp
   } = useBaseLightDp(dpCode);
   const cycleParser = getCycleParser();
+  const _updateDp = useCallback(dpData => {
+    updateDp(cycleParser.formatter(dpData));
+  }, [cycleParser]);
   const _dpValue = useMemo(() => {
+    if (dpValue === null || dpValue === undefined) {
+      return cycleParser.defaultValue;
+    }
     return cycleParser.parser(dpValue);
-  }, [dpValue]);
+  }, [dpValue, cycleParser]);
   return {
     dpValue: _dpValue,
-    updateDp: dpData => {
-      updateDp(cycleParser.formatter(dpData));
-    }
+    updateDp: _updateDp
   };
 }

package/lib/hooks/useRandomDp.js

@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { useBaseLightDp } from './useBaseLightDp';
 import { scheduleDpCodes } from '../config/dpCodes';
 import { getRandomParser } from '../dpParser/random';
@@ -9,13 +9,17 @@ export function useRandomDp() {
     updateDp
   } = useBaseLightDp(dpCode);
   const randomParser = getRandomParser();
+  const _updateDp = useCallback(dpData => {
+    updateDp(randomParser.formatter(dpData));
+  }, [randomParser]);
   const _dpValue = useMemo(() => {
+    if (dpValue === null || dpValue === undefined) {
+      return randomParser.defaultValue;
+    }
     return randomParser.parser(dpValue);
-  }, [dpValue]);
+  }, [dpValue, randomParser]);
   return {
     dpValue: _dpValue,
-    updateDp: dpData => {
-      updateDp(randomParser.formatter(dpData));
-    }
+    updateDp: _updateDp
   };
 }

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-4",
+  "version": "1.0.4-beta-6",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [