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

package/lib/conflict/ConflictResolver.js

@@ -237,7 +237,7 @@ function mergeListByOtherId(list) {
   return Object.values(mergedData);
 }
 
-// 冲突检测核心函数（修改后的版本）
+// 冲突检测核心函数
 export function checkConflicts(scheduleList, currentSchedule) {
   let rule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultRule;
   const currentRanges = convertToTimeRanges([currentSchedule]);
@@ -260,6 +260,11 @@ export function checkConflicts(scheduleList, currentSchedule) {
         const currentPreId = current === null || current === void 0 || (_current$originalSche = current.originalSchedule) === null || _current$originalSche === void 0 ? void 0 : _current$originalSche.prevId;
         const currentId = current === null || current === void 0 || (_current$originalSche2 = current.originalSchedule) === null || _current$originalSche2 === void 0 ? void 0 : _current$originalSche2.id;
         const otherId = other.id;
+        // 针对定时，如果当前定时自身修改 且 与自身冲突  则忽略
+        if (currentPreId && currentId === currentPreId && current.type === 'timer') {
+          return;
+        }
+        // FIXME:还是存在bug
         // 如果当前定时自身修改 且 与自身冲突 并且其他定时不等于当前定时id 则忽略
         if (currentPreId && currentId === currentPreId && otherId !== currentId) {
           return;

package/lib/conflict/transform.js

@@ -23,10 +23,15 @@ export const timerDataToSchedule = data => {
     status: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : false,
     weeks: data.loops.split('').map(item => Number(item)),
     startTime: data.time,
-    endTime: data.time
+    endTime: data.time,
+    dps: data.dps,
+    aliasName: data.aliasName || '',
+    isAppPush: data.isAppPush || false,
+    id: (data === null || data === void 0 ? void 0 : data.id) || data.timerId
   };
+  const timerId = `${EScheduleFunctionType.TIMER}_${_data.id}`;
   return {
-    id: objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
+    id: timerId || objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
     type: EScheduleFunctionType.TIMER,
     data: _data
   };

package/lib/dpParser/rtcTimer.js

@@ -31,6 +31,8 @@ var EDpCodes = /*#__PURE__*/function (EDpCodes) {
   EDpCodes["colour_data"] = "colour_data";
   EDpCodes["temp_value"] = "temp_value";
   EDpCodes["switch_led"] = "switch_led";
+  EDpCodes["bright_value1"] = "bright_value1";
+  EDpCodes["temp_value1"] = "temp_value1";
   return EDpCodes;
 }(EDpCodes || {});
 export class RtcTimerFormatter {
@@ -94,7 +96,7 @@ export class RtcTimerFormatter {
            A=0x06，节能，
            A=0x07，太阳能
         */
-        step(2).value;
+        const dataType = step(2).value;
         let dps = {}; // 设备动作
         // 白光模式 dp
         if (length === brightLightLen) {
@@ -105,17 +107,31 @@ export class RtcTimerFormatter {
             [EDpCodes.temp_value]: temp_value
           };
         } else if (length === colourLightLen) {
-          // 彩光模式dp
-          const hue = step(4).value;
-          const saturation = step(2).value;
-          const _value = step(2).value;
-          dps = {
-            [EDpCodes.colour_data]: {
-              hue,
-              saturation,
-              value: _value
-            }
-          };
+          // 混光 混白光
+          if (dataType === 9) {
+            const bright_value = step(2).value;
+            const temp_value = step(2).value;
+            const bright_value1 = step(2).value;
+            const temp_value1 = step(2).value;
+            dps = {
+              [EDpCodes.bright_value]: bright_value,
+              [EDpCodes.temp_value]: temp_value,
+              [EDpCodes.bright_value1]: bright_value1,
+              [EDpCodes.temp_value1]: temp_value1
+            };
+          } else {
+            // 彩光模式dp
+            const hue = step(4).value;
+            const saturation = step(2).value;
+            const _value = step(2).value;
+            dps = {
+              [EDpCodes.colour_data]: {
+                hue,
+                saturation,
+                value: _value
+              }
+            };
+          }
         } else if (length === mixLightLen) {
           // 混光模式
           const hue = step(4).value;
@@ -250,10 +266,21 @@ export class RtcTimerFormatter {
           const saturationStr = this.to16(saturation, 2);
           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_va2;
+        } else if (Object.keys(_dps).includes(EDpCodes.bright_value) && Object.keys(_dps).includes(EDpCodes.bright_value1)) {
+          var _dps$EDpCodes$bright_, _dps$EDpCodes$temp_va2, _dps$EDpCodes$bright_2, _dps$EDpCodes$temp_va3;
           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_va2 = _dps[EDpCodes.temp_value]) !== null && _dps$EDpCodes$temp_va2 !== void 0 ? _dps$EDpCodes$temp_va2 : 0;
+          const bright_value1 = (_dps$EDpCodes$bright_2 = _dps[EDpCodes.bright_value1]) !== null && _dps$EDpCodes$bright_2 !== void 0 ? _dps$EDpCodes$bright_2 : 100;
+          const temp_value1 = (_dps$EDpCodes$temp_va3 = _dps[EDpCodes.temp_value1]) !== null && _dps$EDpCodes$temp_va3 !== void 0 ? _dps$EDpCodes$temp_va3 : 0;
+          const brightStr = this.to16(bright_value, 2);
+          const temperatureStr = this.to16(temp_value, 2);
+          const brightStr1 = this.to16(bright_value1, 2);
+          const temperatureStr1 = this.to16(temp_value1, 2);
+          dpDataStr = `09${brightStr}${temperatureStr}${brightStr1}${temperatureStr1}`;
+        } else if (Object.keys(_dps).includes(EDpCodes.bright_value)) {
+          var _dps$EDpCodes$bright_3, _dps$EDpCodes$temp_va4;
+          const bright_value = (_dps$EDpCodes$bright_3 = _dps[EDpCodes.bright_value]) !== null && _dps$EDpCodes$bright_3 !== void 0 ? _dps$EDpCodes$bright_3 : 100;
+          const temp_value = (_dps$EDpCodes$temp_va4 = _dps[EDpCodes.temp_value]) !== null && _dps$EDpCodes$temp_va4 !== void 0 ? _dps$EDpCodes$temp_va4 : 0;
           const brightStr = this.to16(bright_value, 2);
           const temperatureStr = this.to16(temp_value, 2);
           dpDataStr = `02${brightStr}${temperatureStr}`;

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, useFetchDpData } 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/types/timer.d.ts

@@ -92,6 +92,8 @@ export type TRtcTimerDp = {
     };
     bright_value?: number;
     temp_value?: number;
+    bright_value1?: number;
+    temp_value1?: number;
 };
 export type TRtcTimer = {
     timerId?: string;

package/lib/utils/objectToId.js

@@ -24,7 +24,9 @@ export const objectToId = function (obj) {
   // 简单哈希算法
   let hash = 5381;
   for (let i = 0; i < str.length; i++) {
+    // eslint-disable-next-line no-bitwise
     hash = (hash << 5) + hash + str.charCodeAt(i);
+    // eslint-disable-next-line operator-assignment, no-bitwise
     hash = hash & hash; // 转换为32位整数
   }
 

package/package.json

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