hardware-suit - npm Package Compare versions

Comparing version 1.3.4 to 1.3.5

build/main/index.d.ts

@@ -29,1 +29,2 @@ import './utils/string';
 export * from './modules/LampBoardEquip';
+export * from './modules/DoorLockEquip';

build/main/index.js

@@ -42,2 +42,3 @@ "use strict";
 __exportStar(require("./modules/LampBoardEquip"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsb0JBQW9CO0FBQ3BCLDBCQUF3QjtBQUN4QixvREFBa0M7QUFDbEMscURBQW1DO0FBQ25DLGlEQUErQjtBQUMvQixvREFBa0M7QUFFbEMsc0RBQW9DO0FBQ3BDLHNEQUFvQztBQUNwQyx5REFBdUM7QUFDdkMsNkRBQTJDO0FBQzNDLDhEQUE0QztBQUM1QywrREFBNkM7QUFDN0MsMERBQXdDO0FBQ3hDLHdEQUFzQztBQUN0QywyREFBeUM7QUFDekMsNERBQTBDO0FBQzFDLHdEQUFzQztBQUN0Qyx5REFBdUM7QUFDdkMsMkRBQXlDO0FBQ3pDLDBEQUF3QztBQUN4Qyw2REFBMkM7QUFDM0MsOERBQTJDO0FBQzNDLDREQUF5QztBQUN6Qyw0REFBeUM7QUFDekMsMkRBQXdDO0FBQ3hDLDREQUF5QztBQUN6Qyw2REFBMEM7QUFDMUMsd0RBQXFDO0FBQ3JDLDJEQUF3QyJ9
+__exportStar(require("./modules/DoorLockEquip"), exports);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsb0JBQW9CO0FBQ3BCLDBCQUF3QjtBQUN4QixvREFBa0M7QUFDbEMscURBQW1DO0FBQ25DLGlEQUErQjtBQUMvQixvREFBa0M7QUFFbEMsc0RBQW9DO0FBQ3BDLHNEQUFvQztBQUNwQyx5REFBdUM7QUFDdkMsNkRBQTJDO0FBQzNDLDhEQUE0QztBQUM1QywrREFBNkM7QUFDN0MsMERBQXdDO0FBQ3hDLHdEQUFzQztBQUN0QywyREFBeUM7QUFDekMsNERBQTBDO0FBQzFDLHdEQUFzQztBQUN0Qyx5REFBdUM7QUFDdkMsMkRBQXlDO0FBQ3pDLDBEQUF3QztBQUN4Qyw2REFBMkM7QUFDM0MsOERBQTJDO0FBQzNDLDREQUF5QztBQUN6Qyw0REFBeUM7QUFDekMsMkRBQXdDO0FBQ3hDLDREQUF5QztBQUN6Qyw2REFBMEM7QUFDMUMsd0RBQXFDO0FBQ3JDLDJEQUF3QztBQUN4QywwREFBdUMifQ==

build/main/modules/LampBoardEquip.d.ts

@@ -23,2 +23,6 @@ import { BaseEquip } from './BaseEquip';
     /**
+     * 获取按钮列表['00','01','10','11']
+     */
+    get countSwitchBit(): string[];
+    /**
      * 获取亮度值
@@ -46,6 +50,7 @@ * @param index 亮度的索引值
     /**
-     * 触发按钮（置反）
+     * 触发按钮
      * @param index 按钮索引
+     * @param hex 按钮索引
      */
-    setSwitch(index: number): LampBoardEquip;
+    setSwitch(index: number, hex: string): LampBoardEquip;
     /**
@@ -64,2 +69,3 @@ * 设置亮度
     private getSceneDescriptor;
+    private getSceneForCondition;
     /**
@@ -72,3 +78,3 @@ * 获取按钮开关状态
     */
-    getStatusDescriptor(): string;
+    getStatusDescriptor(selectType?: string): string;
     /**
@@ -75,0 +81,0 @@ * 根据状态获取联动条件字节串

build/main/modules/LampBoardEquip.js

@@ -11,3 +11,3 @@ "use strict";
     '01': '开',
-    '10': '置反',
+    '10': '反转现状',
     '11': '保持不变'
@@ -47,2 +47,12 @@ };
     /**
+     * 获取按钮列表['00','01','10','11']
+     */
+    get countSwitchBit() {
+        const switchNum = Number(this.lampBoardStatus.getCount()[1]);
+        const switchCode = converter_1.fillLength(converter_1.toBinary(this.lampBoardStatus.getSwitchStatus(), 16), 8);
+        return new Array(switchNum).fill(1).map((_ele, index) => {
+            return `${switchCode[6 - 2 * index]}${switchCode[7 - 2 * index]}`;
+        });
+    }
+    /**
      * 获取亮度值
@@ -87,15 +97,22 @@ * @param index 亮度的索引值
     /**
-     * 触发按钮（置反）
+     * 触发按钮
      * @param index 按钮索引
+     * @param hex 按钮索引
      */
-    setSwitch(index) {
+    setSwitch(index, hex) {
         const binary = converter_1.toBinary(this.lampBoardStatus.getSwitchStatus(), 16);
         let bits = converter_1.fillLength(binary, 8).split('');
-        if (bits[7 - 2 * index] === '1' && bits[6 - 2 * index] === '0') {
-            bits[7 - 2 * index] = '0';
-            bits[6 - 2 * index] = '0';
+        if (hex) {
+            bits[7 - 2 * index] = hex[1];
+            bits[6 - 2 * index] = hex[0];
         }
         else {
-            bits[7 - 2 * index] = '1';
-            bits[6 - 2 * index] = '0';
+            if (bits[7 - 2 * index] === '1' && bits[6 - 2 * index] === '0') {
+                bits[7 - 2 * index] = '0';
+                bits[6 - 2 * index] = '0';
+            }
+            else {
+                bits[7 - 2 * index] = '1';
+                bits[6 - 2 * index] = '0';
+            }
         }
@@ -128,2 +145,5 @@ this.lampBoardStatus.setSwitchStatus(converter_1.toHex(bits.join(''), 2));
     }
+    getSceneForCondition() {
+        return `情景按钮(${this.countScene.indexOf(true) + 1})被按下`;
+    }
     /**
@@ -133,6 +153,9 @@ * 获取按钮开关状态
     getSwitchDescriptor() {
-        return this.countSwitch.map((ele, index) => {
-            if (!ele)
-                return '关';
-            return `亮度:${this.getBrightness(index)},色温:${this.getColdColor(index)}`;
+        return this.countSwitchBit.map((ele, index) => {
+            if (ele === '01') {
+                return `亮度:${this.getBrightness(index)},色温:${this.getColdColor(index)}`;
+            }
+            else {
+                return SwitchStatusMap[ele];
+            }
         }).join('-');
@@ -143,4 +166,12 @@ }
     */
-    getStatusDescriptor() {
-        return this.getSceneDescriptor() + '-' + this.getSwitchDescriptor();
+    getStatusDescriptor(selectType = '') {
+        if (selectType === 'scene') {
+            return this.getSceneForCondition();
+        }
+        else if (selectType === 'switch') {
+            return this.getSwitchDescriptor();
+        }
+        else {
+            return this.getSceneDescriptor() + '-' + this.getSwitchDescriptor();
+        }
     }
@@ -157,2 +188,2 @@ /**
 exports.LampBoardEquip = LampBoardEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGFtcEJvYXJkRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9MYW1wQm9hcmRFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBd0M7QUFDeEMsK0RBQTREO0FBQzVELGtEQUE0RTtBQUM1RSxpREFBeUQ7QUFFekQsTUFBTSxlQUFlLEdBQVE7SUFDM0IsSUFBSSxFQUFFLEdBQUc7SUFDVCxJQUFJLEVBQUUsR0FBRztJQUNULElBQUksRUFBRSxJQUFJO0lBQ1YsSUFBSSxFQUFFLE1BQU07Q0FDYixDQUFBO0FBQ0QsTUFBTSxjQUFjLEdBQVE7SUFDMUIsR0FBRyxFQUFFLEdBQUc7SUFDUixHQUFHLEVBQUUsR0FBRztDQUNULENBQUE7QUFDRCxNQUFhLGNBQWUsU0FBUSxxQkFBUztJQVUzQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBVjdDLGlCQUFpQjtRQUNqQixhQUFRLEdBQUcsbUJBQW1CLENBQUM7UUFVN0IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLGlDQUFlLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBQ0Q7O01BRUU7SUFDRixJQUFJLFVBQVU7UUFDWixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzVELE1BQU0sU0FBUyxHQUFHLHNCQUFVLENBQUMsb0JBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLGNBQWMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BGLE9BQU8sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGFtcEJvYXJkRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9MYW1wQm9hcmRFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwyQ0FBd0M7QUFDeEMsK0RBQTREO0FBQzVELGtEQUE0RTtBQUM1RSxpREFBeUQ7QUFFekQsTUFBTSxlQUFlLEdBQVE7SUFDM0IsSUFBSSxFQUFFLEdBQUc7SUFDVCxJQUFJLEVBQUUsR0FBRztJQUNULElBQUksRUFBRSxNQUFNO0lBQ1osSUFBSSxFQUFFLE1BQU07Q0FDYixDQUFBO0FBQ0QsTUFBTSxjQUFjLEdBQVE7SUFDMUIsR0FBRyxFQUFFLEdBQUc7SUFDUixHQUFHLEVBQUUsR0FBRztDQUNULENBQUE7QUFDRCxNQUFhLGNBQWUsU0FBUSxxQkFBUztJQVUzQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBVjdDLGlCQUFpQjtRQUNqQixhQUFRLEdBQUcsbUJBQW1CLENBQUM7UUFVN0IsSUFBSSxDQUFDLGVBQWUsR0FBRyxJQUFJLGlDQUFlLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztJQUNsRixDQUFDO0lBQ0Q7O01BRUU7SUFDRixJQUFJLFVBQVU7UUFDWixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzVELE1BQU0sU0FBUyxHQUFHLHNCQUFVLENBQUMsb0JBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLGNBQWMsRUFBRSxFQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BGLE9BQU8sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdB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

build/main/modules/LedLampEquip.d.ts

@@ -84,3 +84,3 @@ import { LampEquip } from './LampEquip';
      */
-    getStatusDescriptor(): "" | "关" | "开";
+    getStatusDescriptor(): string;
     /**
@@ -87,0 +87,0 @@ * 获取设备字节状态字符串

build/main/modules/LedLampEquip.js

@@ -165,8 +165,9 @@ "use strict";
         if (this.isPlainColor()) { // 单色灯
-            return bright ? '开' : '关';
+            return bright ? `亮度:${bright}` : '关';
+            // return bright ? '开' : '关'
         }
         if (this.isBicolor()) { // 双色灯
             const cold = this.getColdColor();
-            // return bright ? `开 - （亮度:${bright}，冷色:${cold}）` : '关'
-            return bright ? `开` : '关';
+            return bright ? `亮度:${bright}，冷色:${cold}` : '关';
+            // return bright ? `开` : '关'
         }
@@ -176,4 +177,4 @@ if (this.isTriColor()) { // 三色灯
             const warm = this.getWarmColor();
-            // return bright ? `开 - （亮度:${bright}，冷色:${cold}，暖色:${warm}）` : '关'
-            return bright ? `开` : '关';
+            return bright ? `亮度:${bright}，冷色:${cold}，暖色:${warm}` : '关';
+            // return bright ? `开` : '关'
         }
@@ -193,2 +194,2 @@ return '';
 exports.LedLampEquip = LedLampEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGVkTGFtcEVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvTGVkTGFtcEVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgsMkNBQXdDO0FBQ3hDLHFEQUFrRDtBQUVsRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILE1BQWEsWUFBYSxTQUFRLHFCQUFTO0lBSXpDOzs7OztPQUtHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztRQVQ1QixVQUFLLEdBQUcscUJBQXFCLENBQUM7UUFVN0MsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLHVCQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUNEOztPQUVHO0lBQ0ksU0FBUztRQUNkLHdEQUF3RDtRQUN4RCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQzNFLENBQUM7SUFDRDs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQ0Q7O09BRUc7SUFDSSxVQUFVO1FBQ2YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUM1RSxDQUFDO0lBQ0Q7O09BRUc7SUFDSSxTQUFTO1FBQ2QsT0FBTyxJQUFJLENBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ2pDLENBQUM7SUFDRDs7O09BR0c7SUFDSSxhQUFhLENBQUMsS0FBYTtRQUNoQyxJQUFJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGVkTGFtcEVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvTGVkTGFtcEVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgsMkNBQXdDO0FBQ3hDLHFEQUFrRDtBQUVsRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILE1BQWEsWUFBYSxTQUFRLHFCQUFTO0lBSXpDOzs7OztPQUtHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztRQVQ1QixVQUFLLEdBQUcscUJBQXFCLENBQUM7UUFVN0MsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLHVCQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUNEOztPQUVHO0lBQ0ksU0FBUztRQUNkLHdEQUF3RDtRQUN4RCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQzNFLENBQUM7SUFDRDs7T0FFRztJQUNJLFlBQVk7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUN6RSxDQUFDO0lBQ0Q7O09BRUc7SUFDSSxVQUFVO1FBQ2YsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUM1RSxDQUFDO0lBQ0Q7O09BRUc7SUFDSSxTQUFTO1FBQ2QsT0FBTyxJQUFJLENBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ2pDLENBQUM7SUFDRDs7O09BR0c7SUFDSSxhQUFhLENBQUMsS0FBYTtRQUNoQyxJQUFJ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

build/main/modules/SwitchMixEquip.d.ts

@@ -149,3 +149,3 @@ import { SwitchMixStatus } from '../entity/SwitchMixStatus';
      */
-    getStatusDescriptor(): string;
+    getStatusDescriptor(selectType: string): string;
     /**
@@ -157,10 +157,10 @@ * 根据状态获取联动条件字节串
     getBytes(): string;
-    get getSwitchInt(): number[];
+    getSwitchType(isBit?: boolean): any[];
+    getSceneList(): number[];
     /**
      * 设置开关的值
-     * @param v 按键值
+     * @param v 按键值0,1,2,3
      * @param index 按键索引
-     * @param t 非主程类型，大于 0 的任意数值
      */
-    setSwitch(v: number, index: number): this;
+    setSwitch(v: number | string, index: number): this;
 }

build/main/modules/SwitchMixEquip.js

@@ -54,3 +54,7 @@ "use strict";
     [SwitchKeyStatus.ON]: '开',
-    [SwitchKeyStatus.OFF]: '关'
+    [SwitchKeyStatus.OFF]: '关',
+    '00': '关',
+    '01': '开',
+    '10': '反转现状',
+    '11': '保持不变'
 };
@@ -349,5 +353,11 @@ const DEFAULT_KEY_COUNT = 0; // 默认按键数
      */
-    getStatusDescriptor() {
+    getStatusDescriptor(selectType) {
         if (this.isCurtain)
             return this.getCurtainPowerStatusDescriptor();
+        if (selectType === 'switch') {
+            return this.getSwitchType(true).map(p => SwitchKeyStatusMap[p]).join(',');
+        }
+        else if (selectType === 'scene') {
+            return `情景按钮(${this.getSceneList().indexOf(1) + 1})被按下`;
+        }
         const power = this.getPowerInt();
@@ -377,6 +387,9 @@ return power.map(p => SwitchKeyStatusMap[p]).join(',');
     }
-    get getSwitchInt() {
+    getSwitchType(isBit = false) {
+        const countList = [...this._keyCountList];
+        const powerInt = isBit ? this.keyDots : this.getPowerInt();
+        if (this.isSocket) {
+            return [powerInt[0]];
+        }
         // 获取单纯开关的状态
-        const countList = [...this._keyCountList];
-        const powerInt = this.getPowerInt();
         if (!countList.length)
@@ -388,8 +401,5 @@ return [];
         // 智能插座只有一个开关
-        if (this.isSocket) {
-            return [powerInt[0]];
-        }
         // 场景主程 带红外对管类面板
         if (this.isSwitchScene || this.isInfrared) {
-            return powerInt.slice(countList[1]);
+            return powerInt.slice(countList[1], countList[0] + countList[1]);
         }
@@ -401,7 +411,19 @@ // // 窗帘主程， 取情景。 2按键取3bit, 4按键取6bit
     }
+    getSceneList() {
+        // 获取单纯开关的状态
+        const countList = [...this._keyCountList];
+        const powerInt = this.getPowerInt();
+        // 场景主程 带红外对管类面板
+        if (this.isSwitchScene || this.isInfrared || this.isScene) {
+            return powerInt.slice(0, countList[1]);
+        }
+        // // 窗帘主程， 取情景。 2按键取3bit, 4按键取6bit
+        if (this.isCurtain)
+            return powerInt;
+        return [];
+    }
     /**
      * 设置开关的值
-     * @param v 按键值
+     * @param v 按键值0,1,2,3
      * @param index 按键索引
-     * @param t 非主程类型，大于 0 的任意数值
      */
@@ -420,2 +442,2 @@ setSwitch(v, index) {
 exports.SwitchMixEquip = SwitchMixEquip;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SwitchMixEquip.js","sourceRoot":"","sources":["../../../src/modules/SwitchMixEquip.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SwitchMixEquip.js","sourceRoot":"","sources":["../../../src/modules/SwitchMixEquip.ts"],"names":[],"mappings":"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"}

build/main/modules/SwitchPlugEquip.d.ts

@@ -13,4 +13,3 @@ import { SwitchMixEquip } from './SwitchMixEquip';
      */
-    getStatusDescriptor(): string;
     getBytes(): string;
 }

build/main/modules/SwitchPlugEquip.js

@@ -36,6 +36,6 @@ "use strict";
      */
-    getStatusDescriptor() {
-        const power = this.getPowerInt();
-        return power.map(p => SwitchPlugStatusMap[p]).join(',');
-    }
+    // getStatusDescriptor () {
+    //   const power = this.getPowerInt()
+    //   return power.map(p => SwitchPlugStatusMap[p]).join(',')
+    // }
     getBytes() {
@@ -50,2 +50,2 @@ let keyDots = [...this.switchStatus.keyDots];
 exports.SwitchPlugEquip = SwitchPlugEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU3dpdGNoUGx1Z0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsaUVBQThEO0FBQzlELHFEQUFrRDtBQUVsRCxJQUFLLFVBR0o7QUFIRCxXQUFLLFVBQVU7SUFDYix1Q0FBTSxDQUFBO0lBQ04seUNBQU8sQ0FBQTtBQUNULENBQUMsRUFISSxVQUFVLEtBQVYsVUFBVSxRQUdkO0FBRUQsTUFBTSxtQkFBbUIsR0FBUTtJQUMvQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUc7Q0FDdEIsQ0FBQTtBQUVELE1BQWEsZUFBZ0IsU0FBUSwrQkFBYztJQUNqRDs7Ozs7T0FLRztJQUNILFlBQVksTUFBYyxFQUFFLFVBQW1CLEVBQUUsZUFBd0I7UUFDdkUsS0FBSyxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsZUFBZSxDQUFDLENBQUE7UUFDMUMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLG1DQUFnQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLEtBQUssR0FBRyxlQUFlLENBQUE7SUFDOUIsQ0FBQztJQUNEOztPQUVHO0lBQ0gsbUJBQW1CO1FBQ2pCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUNoQyxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN6RCxDQUFDO0lBRUQsUUFBUTtRQUNOLElBQUksT0FBTyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzVDLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7UUFDM0IsT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUNuQyxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDdEUsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNsQyxDQUFDO0NBQ0Y7QUEzQkQsMENBMkJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU3dpdGNoUGx1Z0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsaUVBQThEO0FBQzlELHFEQUFrRDtBQUVsRCxJQUFLLFVBR0o7QUFIRCxXQUFLLFVBQVU7SUFDYix1Q0FBTSxDQUFBO0lBQ04seUNBQU8sQ0FBQTtBQUNULENBQUMsRUFISSxVQUFVLEtBQVYsVUFBVSxRQUdkO0FBRUQsTUFBTSxtQkFBbUIsR0FBUTtJQUMvQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUc7Q0FDdEIsQ0FBQTtBQUVELE1BQWEsZUFBZ0IsU0FBUSwrQkFBYztJQUNqRDs7Ozs7T0FLRztJQUNILFlBQVksTUFBYyxFQUFFLFVBQW1CLEVBQUUsZUFBd0I7UUFDdkUsS0FBSyxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsZUFBZSxDQUFDLENBQUE7UUFDMUMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLG1DQUFnQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLEtBQUssR0FBRyxlQUFlLENBQUE7SUFDOUIsQ0FBQztJQUNEOztPQUVHO0lBQ0gsMkJBQTJCO0lBQzNCLHFDQUFxQztJQUNyQyw0REFBNEQ7SUFDNUQsSUFBSTtJQUVKLFFBQVE7UUFDTixJQUFJLE9BQU8sR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUM1QyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQzNCLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDbkMsTUFBTSxNQUFNLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ3RFLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDbEMsQ0FBQztDQUNGO0FBM0JELDBDQTJCQyJ9

build/main/modules/WireConditionEquip.js

@@ -277,2 +277,4 @@ "use strict";
                 return constant_1.WireModeDescriptorMap[constant_1.WireMode.HOT];
+            if (constant_1.WireModeMap[constant_1.WireMode.ON] === modeValue)
+                return constant_1.WireModeDescriptorMap[constant_1.WireMode.ON];
         }
@@ -283,2 +285,2 @@ return constant_1.WireModeDescriptorMap[constant_1.WireMode.OFF];
 exports.WireConditionEquip = WireConditionEquip;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WireConditionEquip.js","sourceRoot":"","sources":["../../../src/modules/WireConditionEquip.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WireConditionEquip.js","sourceRoot":"","sources":["../../../src/modules/WireConditionEquip.ts"],"names":[],"mappings":"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"}

build/main/utils/Descriptor.d.ts

@@ -63,3 +63,3 @@ import { Converter } from './converter';
      */
-    getSocketSwitchDescriptor(status: string, deviceType: string, deviceChildType?: string): string;
+    getSocketSwitchDescriptor(status: string, deviceType: string, deviceChildType?: string, selectType?: string): string;
     /**
@@ -85,3 +85,3 @@ * 获取窗帘状态描述
      */
-    getLedDescriptor(status: string, deviceType: string, deviceChildType: string): string;
+    getLedDescriptor(status: string, deviceType: string, deviceChildType: string, selectType?: string): string;
     /**
@@ -102,2 +102,9 @@ * 获取传感状态描述
     /**
+     * 门锁状态描述
+     * @param status
+     * @param deviceType
+     * @param deviceChildType
+     */
+    getDoorLockDescriptor(status: string, deviceType: string, deviceChildType: string): string;
+    /**
      * 获取设备状态描述
@@ -107,4 +114,5 @@ * @param status 状态 16位字符串
      * @param deviceChildType 设备子类型
+     * @param selectType 描述类型，scene/switch
      */
-    getStatusDescriptor(status: string, deviceType: string, deviceChildType: string): string;
+    getStatusDescriptor(status: string, deviceType: string, deviceChildType: string, selectType?: string): string;
 }
@@ -111,0 +119,0 @@ /**

build/main/utils/Descriptor.js

@@ -35,2 +35,3 @@ "use strict";
 const LampBoardEquip_1 = require("../modules/LampBoardEquip");
+const DoorLockEquip_1 = require("../modules/DoorLockEquip");
 /**
@@ -133,3 +134,3 @@ * 状态描述器
      */
-    getSocketSwitchDescriptor(status, deviceType, deviceChildType) {
+    getSocketSwitchDescriptor(status, deviceType, deviceChildType, selectType = '') {
         const socketStatus = new SocketStatus_1.SocketStatus(status);
@@ -144,3 +145,3 @@ if (!deviceChildType) {
             const equip = factory.create();
-            return equip.getStatusDescriptor();
+            return equip.getStatusDescriptor(selectType);
         }
@@ -183,3 +184,3 @@ return '';
      */
-    getLedDescriptor(status, deviceType, deviceChildType) {
+    getLedDescriptor(status, deviceType, deviceChildType, selectType = '') {
         const lampStatus = new LampStatus_1.LampStatus(status);
@@ -196,3 +197,3 @@ if (!deviceChildType) {
             const lampboardLedEquip = new LampBoardEquip_1.LampBoardEquip(status, deviceType, deviceChildType);
-            return lampboardLedEquip.getStatusDescriptor();
+            return lampboardLedEquip.getStatusDescriptor(selectType);
         }
@@ -254,2 +255,12 @@ return '';
     /**
+     * 门锁状态描述
+     * @param status
+     * @param deviceType
+     * @param deviceChildType
+     */
+    getDoorLockDescriptor(status, deviceType, deviceChildType) {
+        const condition = new DoorLockEquip_1.DoorLockEquip(status, deviceType, deviceChildType);
+        return condition.getStatusDescriptor();
+    }
+    /**
      * 获取设备状态描述
@@ -259,4 +270,5 @@ * @param status 状态 16位字符串
      * @param deviceChildType 设备子类型
+     * @param selectType 描述类型，scene/switch
      */
-    getStatusDescriptor(status, deviceType, deviceChildType) {
+    getStatusDescriptor(status, deviceType, deviceChildType, selectType = '') {
         const deviceTypeKey = Array.from(Object.keys(this.Suiter)).find(suitKey => {
@@ -268,3 +280,3 @@ const suitKeyCapital = suitKey.toCapital();
         if (this[statusMethodName]) {
-            return this[statusMethodName].call(this, status, deviceType, deviceChildType);
+            return this[statusMethodName].call(this, status, deviceType, deviceChildType, selectType);
         }
@@ -280,2 +292,2 @@ return '';
 exports.Descriptor = new _Descriptor();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVzY3JpcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9EZXNjcmlwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBb0Q7QUFDcEQsMkNBQXdDO0FBQ3hDLDBEQUFnRTtBQUNoRSxxREFBa0Q7QUFDbEQsZ0VBQTZEO0FBQzdELHlEQUFzRDtBQUV0RCwwREFBdUQ7QUFDdkQsc0VBQW1FO0FBQ25FLHdEQUFxRDtBQUVyRCwwREFBdUQ7QUFDdkQsd0RBQXFEO0FBRXJELDhEQUEyRDtBQUUzRDs7R0FFRztBQUNILE1BQWEsV0FBVztJQU90QjtRQUxnQixXQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ1osZUFBVSxHQUFHLEVBQUUsQ0FBQztRQUNoQixjQUFTLEdBQUcsRUFBRSxDQUFDO1FBSTdCLElBQUksQ0FBQyxNQUFNLEdBQUcsZ0JBQU0sQ0FBQztRQUNyQixJQUFJLENBQUMsVUFBVSxHQUFHLG1CQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxrQkFBUyxDQUFDO1FBQzNCLElBQUksQ0FBQyxTQUFTLEdBQUcscUJBQVMsQ0FBQztRQUMzQixJQUFJLENBQUMsU0FBUyxHQUFHLHFCQUFTLENBQUM7SUFDN0IsQ0FBQztJQUVPLFNBQVMsQ0FBQyxHQUFXO1FBQzNCLE9BQU8sR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUMxQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLGdCQUFnQixDQUFDLFVBQWtCLEVBQUUsZUFBd0I7UUFDbEUsSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNmLE9BQU8sQ0FBQyxJQUFJLENBQUMsK0JBQStCLENBQUMsQ0FBQztZQUM5QyxPQUFPLEVBQUUsQ0FBQztTQUNYO1FBQ0QsT0FBTyxlQUFlO1lBQ3BCLENBQUMsQ0FBQyxH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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVzY3JpcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9EZXNjcmlwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBb0Q7QUFDcEQsMkNBQXdDO0FBQ3hDLDBEQUFnRTtBQUNoRSxxREFBa0Q7QUFDbEQsZ0VBQTZEO0FBQzdELHlEQUFzRDtBQUV0RCwwREFBdUQ7QUFDdkQsc0VBQW1FO0FBQ25FLHdEQUFxRDtBQUVyRCwwREFBdUQ7QUFDdkQsd0RBQXFEO0FBRXJELDhEQUEyRDtBQUMzRCw0REFBeUQ7QUFFekQ7O0dBRUc7QUFDSCxNQUFhLFdBQVc7SUFPdEI7UUFMZ0IsV0FBTSxHQUFHLEVBQUUsQ0FBQztRQUNaLGVBQVUsR0FBRyxFQUFFLENBQUM7UUFDaEIsY0FBUyxHQUFHLEVBQUUsQ0FBQztRQUk3QixJQUFJLENBQUMsTUFBTSxHQUFHLGdCQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLFVBQVUsR0FBRyxtQkFBVSxDQUFDO1FBQzdCLElBQUksQ0FBQyxTQUFTLEdBQUcsa0JBQVMsQ0FBQztRQUMzQixJQUFJLENBQUMsU0FBUyxHQUFHLHFCQUFTLENBQUM7UUFDM0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxxQkFBUyxDQUFDO0lBQzdCLENBQUM7SUFFTyxTQUFTLENBQUMsR0FBVztRQUMzQixPQUFPLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxnQkFBZ0IsQ0FBQyxVQUFrQixFQUFFLGVBQXdCO1FBQ2xFLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLCtCQUErQixDQUFDLENBQUM7WUFDOUMsT0FBTyxFQUFFLENBQUM7U0FDWDtRQUNELE9BQU8sZUFBZTtZQUNw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

package.json

 {
   "name": "hardware-suit",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "hardware-suit javascript library",
@@ -5,0 +5,0 @@ "main": "dist/hardware-suit.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1899961

increased by2.95%

Number of package files

121

increased by3.42%

Lines of code

20316

increased by2.6%

No dependency changes