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

package/lib/conflict/index.d.ts

@@ -38,5 +38,5 @@ export declare class Conflict {
      * 当进入面板后，初始化需要冲突判断的计划数据，便于后续增删改冲突判断
      * @param scheduleList - 需要冲突判断的计划数据
      */
-    static init(scheduleList: TFoldScheduleList): void;
+    static init(scheduleList: TFoldScheduleList, forceInit?: boolean): void;
 }

package/lib/conflict/index.js

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "core-js/modules/es.json.stringify.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.find.js";
 import { scheduleLogger } from '../utils/ScheduleLogger';
@@ -112,12 +113,18 @@ export class Conflict {
    * @param scheduleList - 需要冲突判断的计划数据
    */
   static init(scheduleList) {
+    let forceInit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     if (!Array.isArray(scheduleList)) {
       return;
     }
     const instance = ScheduleDataManager.getInstance();
     const _scheduleList = transScheduleListToConflictList(scheduleList);
     scheduleLogger.debug('Conflict.init scheduleList, _scheduleList:', scheduleList, _scheduleList);
-    instance.setData(_scheduleList);
+    if (forceInit) {
+      instance.setDataWithClear(_scheduleList);
+    } else {
+      instance.setData(_scheduleList);
+    }
+    scheduleLogger.debug('Conflict.init instance.getData()', JSON.stringify(instance.getData()));
   }
 }

package/lib/conflict/scheduleDataManager.d.ts

@@ -1,9 +1,11 @@
 import { Schedule } from './type';
 export declare class ScheduleDataManager {
+    private constructor();
     static instance: ScheduleDataManager;
     static list: Record<string, any>[];
     static getInstance(): ScheduleDataManager;
     getData(): Record<string, any>[];
+    setDataWithClear(value: Record<string, any>[] | Record<string, any>): void;
     setData(value: Record<string, any>[] | Record<string, any>): void;
     clearData(): void;
     deleteData(current: Schedule): void;

package/lib/conflict/scheduleDataManager.js

@@ -1,8 +1,12 @@
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
+import { scheduleLogger } from '../utils/ScheduleLogger';
 // 统一管理 计划 数据列表，用来判断是否存在冲突
 export class ScheduleDataManager {
+  // 私有构造函数，防止外部直接实例化
+  // eslint-disable-next-line no-useless-constructor, @typescript-eslint/no-empty-function
+  constructor() {}
   static list = [];
   static getInstance() {
     if (!ScheduleDataManager.instance) {
@@ -11,9 +15,20 @@ export class ScheduleDataManager {
     return ScheduleDataManager.instance;
   }
   getData() {
+    scheduleLogger.debug('ScheduleDataManager.getData', ScheduleDataManager.list);
     return ScheduleDataManager.list;
   }
+  setDataWithClear(value) {
+    scheduleLogger.debug('ScheduleDataManager.setDataWithClear pre', value);
+    if (!value) {
+      return;
+    }
+    ScheduleDataManager.list = [];
+    this.setData(value);
+    scheduleLogger.debug('ScheduleDataManager.setDataWithClear post', ScheduleDataManager.list);
+  }
   setData(value) {
+    scheduleLogger.debug('ScheduleDataManager.setData pre', value);
     if (!value) {
       return;
     }
@@ -49,26 +64,32 @@ export class ScheduleDataManager {
     const idsToAdd = new Set(itemsMap.keys());
     const filteredList = ScheduleDataManager.list.filter(item => !idsToAdd.has(item.id));
     ScheduleDataManager.list = [...filteredList, ...itemsMap.values()];
+    scheduleLogger.debug('ScheduleDataManager.setData post', ScheduleDataManager.list);
   }
   clearData() {
+    scheduleLogger.debug('ScheduleDataManager.clearData pre', ScheduleDataManager.list);
     ScheduleDataManager.list = [];
   }
   deleteData(current) {
     if (!current) {
       return;
     }
+    scheduleLogger.debug('ScheduleDataManager.deleteData pre', current);
     const index = ScheduleDataManager.list.findIndex(item => item.id === current.id);
     if (index !== -1) {
       ScheduleDataManager.list.splice(index, 1);
     }
+    scheduleLogger.debug('ScheduleDataManager.deleteData post', ScheduleDataManager.list);
   }
 
   // 添加remove方法作为deleteData的别名，用于测试
   remove(id) {
     const index = ScheduleDataManager.list.findIndex(item => item.id === id);
+    scheduleLogger.debug('ScheduleDataManager.remove pre', id, index);
     if (index !== -1) {
       ScheduleDataManager.list.splice(index, 1);
     }
+    scheduleLogger.debug('ScheduleDataManager.remove post', ScheduleDataManager.list);
   }
 }
 export default ScheduleDataManager;

package/lib/conflict/transform.js

@@ -1,15 +1,13 @@
 import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.filter.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import dayjs from 'dayjs';
 import { cloneDeep } from 'lodash-es';
 import { objectToId } from '../utils/objectToId';
-import { getBackwardOffsetTimeByHourMins, getPreOffsetTimeByHourMins, getTimerStrByMinutes } from '../utils/time';
+import { getBackwardOffsetTimeByHourMins, getPreOffsetTimeByHourMins, getTimerStrByMinutes, getTimeFormatStrByHourMins } from '../utils/time';
 import { EScheduleFunctionType } from '../types';
 import { scheduleLogger } from '../utils/ScheduleLogger';
-const numAddZero = num => {
-  return +num < 10 ? `0${+num}` : +num;
-};
 
 /**
  * TTimerDataAdd => Schedule
@@ -91,12 +89,12 @@ export const wakeUpDataToScheduleList = data => {
  */
 export const sleepNodeToSchedule = data => {
   const startTime = getPreOffsetTimeByHourMins(data.hour, data.minute, data.step * 5);
-  scheduleLogger.debug('sleepNodeToSchedule:', data, startTime);
+  const endTime = data.time || getTimeFormatStrByHourMins(data.hour, data.minute);
   const _data = {
     status: data.onOff,
     weeks: data.loops.split('').map(item => Number(item)),
     startTime,
-    endTime: data.time
+    endTime
   };
   return {
     id: objectToId(_data, `${EScheduleFunctionType.SLEEP}_`),
@@ -259,5 +257,11 @@ export const transScheduleListToConflictList = foldScheduleList => {
   } catch (error) {
     scheduleLogger.error('transScheduleListToConflictList', error);
   }
-  return arr;
+  return arr.filter(item => {
+    var _item$data, _item$data2;
+    if ((item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 ? void 0 : _item$data.status) === undefined) {
+      scheduleLogger.error('transScheduleListToConflictList', item, 'status 为 undefined');
+    }
+    return (item === null || item === void 0 || (_item$data2 = item.data) === null || _item$data2 === void 0 ? void 0 : _item$data2.status) === true;
+  });
 };

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/utils/ScheduleCloudProperty.js

@@ -87,20 +87,6 @@ export const getAll = () => {
     groupId
   } = devIdOrGroupIdCache.get();
   return new Promise((resolve, reject) => {
-    // 对外使用
-    // getGroupProperty({
-    //   groupId,
-    //   success(res) {
-    //     console.warn('getGroupProperty res:', res);
-    //     resolve({
-    //       properties: res?.result || res || {},
-    //     });
-    //   },
-    //   fail(err) {
-    //     console.warn('getGroupProperty err:', err);
-    //     reject(err);
-    //   },
-    // });
     if (!groupId) {
       getDeviceProperty({
         deviceId: devId,

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/dpState.js

@@ -22,6 +22,6 @@ export const getAllDpState = () => {
 };
 export const initDpState = function () {
   let dpState = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  Object.assign(+new Date(), __dpState, dpState);
+  Object.assign(__dpState, dpState);
   scheduleLogger.debug('initDpState', __dpState);
 };

package/package.json

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