hardware-suit - npm Package Compare versions

Comparing version 1.1.29 to 1.1.31

build/main/entity/CurtainStatus.js

@@ -8,3 +8,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-10-12 17:28:56
+ * @Last Modified time: 2020-12-18 11:03:16
  */
@@ -11,0 +11,0 @@ const Status_1 = require("./Status");

build/main/entity/SwitchSceneStatus.d.ts

@@ -7,6 +7,9 @@ import { SwitchStatus } from './SwitchStatus';
     state: string;
-    normalState: string;
+    extraState: string;
+    extraCount: number;
+    extraKeyDots: string[];
     constructor(status: string, count?: Array<number>, typeIndex?: string);
-    setDots(): void;
-    getState(): string;
+    setExtraKeyDots(v: string, index: number): SwitchSceneStatus;
+    getExtraKeyDotByIndex(index: number): string | undefined;
+    getExtraState(): string;
 }

build/main/entity/SwitchSceneStatus.js

@@ -6,3 +6,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-17 15:44:05
+ * @Last Modified time: 2020-12-17 16:57:01
  */
@@ -16,16 +16,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 class SwitchSceneStatus extends SwitchStatus_1.SwitchStatus {
-    // normalKeyDots: string[];
     constructor(status, count, typeIndex) {
         super(status, count, typeIndex);
         this.state = '';
-        this.normalState = status.slice(2, 4);
-        // this.normalKeyDots = this.__parseKeyDots(this.normalState)
+        this.extraCount = this.count[1] || 0;
+        this.extraState = status.slice(2, 4);
+        this.extraKeyDots = this.__parseKeyDots(this.extraState, this.extraCount);
     }
-    setDots() {
+    setExtraKeyDots(v, index) {
+        if (index + 1 > this.extraCount)
+            return this;
+        this.extraKeyDots[index] = v.toEven();
+        return this;
     }
-    getState() {
-        return this.state;
+    getExtraKeyDotByIndex(index) {
+        if (index + 1 > this.extraCount)
+            return;
+        return this.extraKeyDots[index];
     }
+    getExtraState() {
+        return this.extraState;
+    }
 }
 exports.SwitchSceneStatus = SwitchSceneStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU2NlbmVTdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW50aXR5L1N3aXRjaFNjZW5lU3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgsaURBQThDO0FBQzlDOztHQUVHO0FBQ0gsTUFBYSxpQkFBa0IsU0FBUSwyQkFBWTtJQUdqRCwyQkFBMkI7SUFDM0IsWUFBYSxNQUFjLEVBQUUsS0FBcUIsRUFBRSxTQUFrQjtRQUNwRSxLQUFLLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQTtRQUoxQixVQUFLLEdBQVcsRUFBRSxDQUFDO1FBS3hCLElBQUksQ0FBQyxXQUFXLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDckMsNkRBQTZEO0lBQy9ELENBQUM7SUFFRCxPQUFPO0lBRVAsQ0FBQztJQUNELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUE7SUFDbkIsQ0FBQztDQUNGO0FBaEJELDhDQWdCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU2NlbmVTdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW50aXR5L1N3aXRjaFNjZW5lU3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgsaURBQThDO0FBQzlDOztHQUVHO0FBQ0gsTUFBYSxpQkFBa0IsU0FBUSwyQkFBWTtJQUtqRCxZQUFhLE1BQWMsRUFBRSxLQUFxQixFQUFFLFNBQWtCO1FBQ3BFLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFBO1FBTDFCLFVBQUssR0FBVyxFQUFFLENBQUM7UUFNeEIsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNwQyxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3BDLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUMzRSxDQUFDO0lBRUQsZUFBZSxDQUFFLENBQVMsRUFBRSxLQUFhO1FBQ3ZDLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU8sSUFBSSxDQUFBO1FBQzVDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBQ3JDLE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUVELHFCQUFxQixDQUFFLEtBQWE7UUFDbEMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVO1lBQUUsT0FBTTtRQUN2QyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDakMsQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUE7SUFDeEIsQ0FBQztDQUNGO0FBMUJELDhDQTBCQyJ9

build/main/entity/SwitchStatus.d.ts

 import { Status } from './Status';
 /**
- * TODO 开关
+ * 开关 或 情景状态
  */
 export declare class SwitchStatus extends Status {
     state: string;
-    keyDots: string[];
     typeIndex: string;
@@ -12,11 +11,26 @@ count: number[];
     constructor(status: string, count?: Array<number>, typeIndex?: string);
+    get keyDots(): string[];
+    /**
+     * 解析按键坑位状态码
+     * @param state 16进制状态码
+     * @param count 按键数
+     */
     __parseKeyDots(state: string, count: number): string[];
     /**
-     * 获取按键坑位，二进制码
+     * 获取主程按键坑位，二进制码
      * 反转数组 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
      */
     private getKeyDots;
-    setKeyDot(v: string, index: number): void;
+    /**
+     * 设置按键值
+     * @param v 二进制值
+     * @param index 索引
+     */
+    setKeyDot(v: string, index: number): SwitchStatus;
+    /**
+     * 获取按键值
+     * @param index 索引
+     */
     getKeyDotByIndex(index: number): string | undefined;
     getState(): string;
 }

build/main/entity/SwitchStatus.js

@@ -6,3 +6,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-17 15:43:49
+ * @Last Modified time: 2020-12-18 14:51:22
  */
@@ -14,3 +14,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
- * TODO 开关
+ * 开关 或 情景状态
  */
@@ -21,3 +21,3 @@ class SwitchStatus extends Status_1.Status {
         this.state = '';
-        this.count = [1]; // 按键数
+        this.count = [1]; // 按键数列表 [3, 3] ---> 开关 3， 情景 3
         this.state = status.slice(0, 2) || '00';
@@ -27,7 +27,16 @@ this.count = count || [1];
         this.typeIndex = typeIndex || '';
-        this.keyDots = this.getKeyDots();
+        // this.keyDots = this.getKeyDots()
     }
+    // 按键字节位
+    get keyDots() {
+        return this.getKeyDots();
+    }
+    /**
+     * 解析按键坑位状态码
+     * @param state 16进制状态码
+     * @param count 按键数
+     */
     __parseKeyDots(state, count) {
         let keyList = [];
-        const converter = new converter_1.Converter(state, 16);
+        const converter = new converter_1.Converter(state || '00', 16);
         const bits = converter.fillBinary(converter.toBinary());
@@ -42,3 +51,3 @@ let i = 0;
     /**
-     * 获取按键坑位，二进制码
+     * 获取主程按键坑位，二进制码
      * 反转数组 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
@@ -49,7 +58,17 @@ */
     }
+    /**
+     * 设置按键值
+     * @param v 二进制值
+     * @param index 索引
+     */
     setKeyDot(v, index) {
         if (index + 1 > this._count)
-            return;
+            return this;
         this.keyDots[index] = v.toEven();
+        return this;
     }
+    /**
+     * 获取按键值
+     * @param index 索引
+     */
     getKeyDotByIndex(index) {
@@ -65,2 +84,2 @@ if (index + 1 > this._count)
 exports.SwitchStatus = SwitchStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCxrREFBK0M7QUFDL0MscUNBQWtDO0FBQ2xDOztHQUVHO0FBQ0gsTUFBYSxZQUFhLFNBQVEsZUFBTTtJQU10QyxZQUFhLE1BQWMsRUFBRSxLQUFxQixFQUFFLFNBQWtCO1FBQ3BFLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQU5SLFVBQUssR0FBVyxFQUFFLENBQUM7UUFHMUIsVUFBSyxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNO1FBSTNCLElBQUksQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFBO1FBQ3ZDLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDekIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzNCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxJQUFJLEVBQUUsQ0FBQTtRQUNoQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBQ0QsY0FBYyxDQUFFLEtBQWEsRUFBRSxLQUFhO1FBQzFDLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNoQixNQUFNLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQzFDLE1BQU0sSUFBSSxHQUFHLFNBQVMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUE7UUFDdkQsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ1QsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEtBQUssRUFBRSxLQUFLLEVBQUUsRUFBRTtZQUMxQyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO1lBQ3JDLENBQUMsSUFBSSxDQUFDLENBQUE7U0FDUDtRQUNELE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQzFCLENBQUM7SUFDRDs7O09BR0c7SUFDSyxVQUFVO1FBQ2hCLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNyRCxDQUFDO0lBQ0QsU0FBUyxDQUFFLENBQVMsRUFBRSxLQUFhO1FBQ2pDLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTTtZQUFFLE9BQU07UUFDbkMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUE7SUFDbEMsQ0FBQztJQUNELGdCQUFnQixDQUFFLEtBQWE7UUFDN0IsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTTtRQUNuQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUNELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUE7SUFDbkIsQ0FBQztDQUNGO0FBM0NELG9DQTJDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCxrREFBK0M7QUFDL0MscUNBQWtDO0FBQ2xDOztHQUVHO0FBQ0gsTUFBYSxZQUFhLFNBQVEsZUFBTTtJQU10QyxZQUFhLE1BQWMsRUFBRSxLQUFxQixFQUFFLFNBQWtCO1FBQ3BFLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQU5SLFVBQUssR0FBVyxFQUFFLENBQUM7UUFHMUIsVUFBSyxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQywrQkFBK0I7UUFJcEQsSUFBSSxDQUFDLEtBQUssR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUE7UUFDdkMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN6QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDM0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLElBQUksRUFBRSxDQUFBO1FBQ2hDLG1DQUFtQztJQUNyQyxDQUFDO0lBQ0QsUUFBUTtJQUNSLElBQUksT0FBTztRQUNULE9BQU8sSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFBO0lBQzFCLENBQUM7SUFDRDs7OztPQUlHO0lBQ0gsY0FBYyxDQUFFLEtBQWEsRUFBRSxLQUFhO1FBQzFDLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNoQixNQUFNLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFBO1FBQ3ZELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNULEtBQUssSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssR0FBRyxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtZQUNyQyxDQUFDLElBQUksQ0FBQyxDQUFBO1NBQ1A7UUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUMxQixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0ssVUFBVTtRQUNoQixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDckQsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxTQUFTLENBQUUsQ0FBUyxFQUFFLEtBQWE7UUFDakMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTyxJQUFJLENBQUE7UUFDeEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUE7UUFDaEMsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUUsS0FBYTtRQUM3QixJQUFJLEtBQUssR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU07WUFBRSxPQUFNO1FBQ25DLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM1QixDQUFDO0lBQ0QsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQTtJQUNuQixDQUFDO0NBQ0Y7QUE5REQsb0NBOERDIn0=

build/main/index.d.ts

@@ -11,6 +11,9 @@ import './utils/string';
 export * from './modules/AirConditionEquip';
+export * from './modules/WireConditionEquip';
 export * from './modules/HumidityEquip';
 export * from './modules/SwitchEquip';
+export * from './modules/SwitchMixEquip';
+export * from './modules/SwitchPlugEquip';
 export * from './modules/SocketEquip';
 export * from './modules/CurtainEquip';
 export * from './modules/CardPowerEquip';

build/main/index.js

@@ -24,7 +24,10 @@ "use strict";
 __exportStar(require("./modules/AirConditionEquip"), exports);
+__exportStar(require("./modules/WireConditionEquip"), exports);
 __exportStar(require("./modules/HumidityEquip"), exports);
 __exportStar(require("./modules/SwitchEquip"), exports);
+__exportStar(require("./modules/SwitchMixEquip"), exports);
+__exportStar(require("./modules/SwitchPlugEquip"), exports);
 __exportStar(require("./modules/SocketEquip"), exports);
 __exportStar(require("./modules/CurtainEquip"), exports);
 __exportStar(require("./modules/CardPowerEquip"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsb0JBQW9CO0FBQ3BCLDBCQUF3QjtBQUN4QixvREFBa0M7QUFDbEMscURBQW1DO0FBQ25DLGlEQUErQjtBQUMvQixvREFBa0M7QUFFbEMsc0RBQW9DO0FBQ3BDLHNEQUFvQztBQUNwQyx5REFBdUM7QUFDdkMsNkRBQTJDO0FBQzNDLDhEQUE0QztBQUM1QywwREFBd0M7QUFDeEMsd0RBQXNDO0FBQ3RDLHdEQUFzQztBQUN0Qyx5REFBdUM7QUFDdkMsMkRBQXlDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUEsb0JBQW9CO0FBQ3BCLDBCQUF3QjtBQUN4QixvREFBa0M7QUFDbEMscURBQW1DO0FBQ25DLGlEQUErQjtBQUMvQixvREFBa0M7QUFFbEMsc0RBQW9DO0FBQ3BDLHNEQUFvQztBQUNwQyx5REFBdUM7QUFDdkMsNkRBQTJDO0FBQzNDLDhEQUE0QztBQUM1QywrREFBNkM7QUFDN0MsMERBQXdDO0FBQ3hDLHdEQUFzQztBQUN0QywyREFBeUM7QUFDekMsNERBQTBDO0FBQzFDLHdEQUFzQztBQUN0Qyx5REFBdUM7QUFDdkMsMkRBQXlDIn0=

build/main/modules/CurtainEquip.d.ts

@@ -25,3 +25,9 @@ import { BaseEquip } from './BaseEquip';
     constructor(status: string, deviceType?: string, deviceChildType?: string);
+    get curStatus(): string;
+    get curStatusInt(): number;
     /**
+     * 获取按键电源/活跃状态
+     */
+    getPower(): number[];
+    /**
      * 设置状态
@@ -44,5 +50,9 @@ * @param status 状态值 （0 关， 1 暂停， 2 开）
     /**
+     * 获取窗帘状态
+     */
+    getStatusDescriptor(): any;
+    /**
      * 获取状态字节串
      */
-    getbytes(): string;
+    getBytes(): string;
 }

build/main/modules/CurtainEquip.js

@@ -9,8 +9,13 @@ "use strict";
  */
-var Operation;
-(function (Operation) {
-    Operation[Operation["STOP"] = 0] = "STOP";
-    Operation[Operation["PAUSE"] = 1] = "PAUSE";
-    Operation[Operation["OPEN"] = 2] = "OPEN";
-})(Operation || (Operation = {}));
+var CurtainStatusEnum;
+(function (CurtainStatusEnum) {
+    CurtainStatusEnum[CurtainStatusEnum["STOP"] = 0] = "STOP";
+    CurtainStatusEnum[CurtainStatusEnum["PAUSE"] = 1] = "PAUSE";
+    CurtainStatusEnum[CurtainStatusEnum["OPEN"] = 2] = "OPEN";
+})(CurtainStatusEnum || (CurtainStatusEnum = {}));
+const CurtainStatusMap = {
+    [CurtainStatusEnum.STOP]: '关',
+    [CurtainStatusEnum.PAUSE]: '暂停',
+    [CurtainStatusEnum.OPEN]: '开'
+};
 /**
@@ -40,3 +45,19 @@ * 窗帘套件
     }
+    get curStatus() {
+        return this.curtainStatus.getStatus();
+    }
+    get curStatusInt() {
+        return +new this.Converter(this.curStatus, 2).toDecimal();
+    }
     /**
+     * 获取按键电源/活跃状态
+     */
+    getPower() {
+        const v = this.curStatusInt;
+        let power = [0, 0, 0];
+        if (v >= 0)
+            power[v] = 1;
+        return power;
+    }
+    /**
      * 设置状态
@@ -55,3 +76,3 @@ * @param status 状态值 （0 关， 1 暂停， 2 开）
     open() {
-        return this.setStatus(Operation.OPEN);
+        return this.setStatus(CurtainStatusEnum.OPEN);
     }
@@ -62,3 +83,3 @@ /**
     pause() {
-        return this.setStatus(Operation.PAUSE);
+        return this.setStatus(CurtainStatusEnum.PAUSE);
     }
@@ -69,8 +90,14 @@ /**
     stop() {
-        return this.setStatus(Operation.STOP);
+        return this.setStatus(CurtainStatusEnum.STOP);
     }
     /**
+     * 获取窗帘状态
+     */
+    getStatusDescriptor() {
+        return CurtainStatusMap[this.curStatusInt] || '';
+    }
+    /**
      * 获取状态字节串
      */
-    getbytes() {
+    getBytes() {
         return this.bytes.format(this.curtainStatus.getStatus());
@@ -80,2 +107,2 @@ }
 exports.CurtainEquip = CurtainEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VydGFpbkVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvQ3VydGFpbkVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF3QztBQUN4QywyREFBd0Q7QUFFdkQ7O0dBRUc7QUFDSCxJQUFLLFNBSUw7QUFKQSxXQUFLLFNBQVM7SUFDYix5Q0FBUSxDQUFBO0lBQ1IsMkNBQVMsQ0FBQTtJQUNULHlDQUFRLENBQUE7QUFDVixDQUFDLEVBSkssU0FBUyxLQUFULFNBQVMsUUFJZDtBQUVEOzs7Ozs7Ozs7OztHQVdHO0FBRUgsTUFBYSxZQUFhLFNBQVEscUJBQVM7SUFJekM7Ozs7O09BS0c7SUFDSCxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBVDVCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQVUzQyxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksNkJBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksU0FBUyxDQUFFLE1BQWM7UUFDOUIsSUFBSSxNQUFNLEdBQUcsQ0FBQyxJQUFJLE1BQU0sR0FBRyxDQUFDO1lBQUUsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLGlDQUFpQyxDQUFDLENBQUE7UUFDcEYsSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFBO1FBQy9FLE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUVEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUNEOztPQUVHO0lBQ0ksS0FBSztRQUNWLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDeEMsQ0FBQztJQUVEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDdkMsQ0FBQztJQUVEOztPQUVHO0lBQ0ksUUFBUTtRQUNiLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQzFELENBQUM7Q0FDRjtBQW5ERCxvQ0FtREMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VydGFpbkVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvQ3VydGFpbkVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF3QztBQUN4QywyREFBd0Q7QUFFdkQ7O0dBRUc7QUFDSCxJQUFLLGlCQUlMO0FBSkEsV0FBSyxpQkFBaUI7SUFDckIseURBQVEsQ0FBQTtJQUNSLDJEQUFTLENBQUE7SUFDVCx5REFBUSxDQUFBO0FBQ1YsQ0FBQyxFQUpLLGlCQUFpQixLQUFqQixpQkFBaUIsUUFJdEI7QUFFRCxNQUFNLGdCQUFnQixHQUFPO0lBQzNCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRztJQUM3QixDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUk7SUFDL0IsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO0NBQzlCLENBQUE7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUVILE1BQWEsWUFBYSxTQUFRLHFCQUFTO0lBSXpDOzs7OztPQUtHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztRQVQ1QixVQUFLLEdBQUcsbUJBQW1CLENBQUM7UUFVM0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUN2QyxDQUFDO0lBRUQsSUFBSSxZQUFZO1FBQ2QsT0FBTyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBQzNELENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVE7UUFDTixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFBO1FBQzNCLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDO1lBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN4QixPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7SUFFRDs7O09BR0c7SUFDSSxTQUFTLENBQUUsTUFBYztRQUM5QixJQUFJLE1BQU0sR0FBRyxDQUFDLElBQUksTUFBTSxHQUFHLENBQUM7WUFBRSxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUNwRixJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDL0UsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFBO0lBQy9DLENBQUM7SUFDRDs7T0FFRztJQUNJLEtBQUs7UUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUVEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUMvQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxtQkFBbUI7UUFDakIsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2xELENBQUM7SUFDRDs7T0FFRztJQUNJLFFBQVE7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUMxRCxDQUFDO0NBQ0Y7QUEzRUQsb0NBMkVDIn0=

build/main/modules/SwitchEquip.d.ts

@@ -14,2 +14,6 @@ import { SwitchStatus } from '../entity/SwitchStatus';
      * 开关类型标志
+     * {
+     *   normal: 1,
+     *   scene: 0
+     * }
      */
@@ -19,2 +23,3 @@ get keyTypes(): any;
      * 按键
+     * ['00', '01', '10', '11']
      */
@@ -21,0 +26,0 @@ get keyDots(): string[];

build/main/modules/SwitchEquip.js

@@ -8,3 +8,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-17 15:44:24
+ * @Last Modified time: 2020-12-17 17:00:40
  */
@@ -47,2 +47,6 @@ const SwitchStatus_1 = require("../entity/SwitchStatus");
      * 开关类型标志
+     * {
+     *   normal: 1,
+     *   scene: 0
+     * }
      */
@@ -65,5 +69,5 @@ get keyTypes() {
      * 按键
+     * ['00', '01', '10', '11']
      */
     get keyDots() {
-        // ['00', '01', '10', '11']
         return this.switchStatus.keyDots;
@@ -104,3 +108,3 @@ }
         const keyDots = this.switchStatus.keyDots.reverse();
-        const status = new this.Converter(keyDots.join(''), 2).toHex();
+        const status = new this.Converter(keyDots.join('') || '00', 2).toHex();
         return this.bytes.format(status);
@@ -110,2 +114,2 @@ }
 exports.SwitchEquip = SwitchEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9Td2l0Y2hFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNILHlEQUFzRDtBQUN0RCwyQ0FBd0M7QUFFeEMsSUFBSyxlQUdKO0FBSEQsV0FBSyxlQUFlO0lBQ2xCLGlEQUFNLENBQUE7SUFDTixtREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUhJLGVBQWUsS0FBZixlQUFlLFFBR25CO0FBRUQsYUFBYTtBQUNiLElBQUssa0JBR0o7QUFIRCxXQUFLLGtCQUFrQjtJQUNyQiwrREFBVSxDQUFBO0lBQ1YsNkRBQVMsQ0FBQSxDQUFDLEtBQUs7QUFDakIsQ0FBQyxFQUhJLGtCQUFrQixLQUFsQixrQkFBa0IsUUFHdEI7QUFFRCxNQUFNLHFCQUFxQixHQUFPO0lBQ2hDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUTtJQUNyQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU87Q0FDcEMsQ0FBQTtBQUVELE1BQU0sa0JBQWtCLEdBQVE7SUFDOUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRztJQUN6QixDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHO0NBQzNCLENBQUE7QUFFRCxNQUFhLFdBQVksU0FBUSxxQkFBUztJQUl4QyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBRjNCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQUczQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsd0JBQXdCLENBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBQ25GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSwyQkFBWSxDQUFDLE1B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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9Td2l0Y2hFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNILHlEQUFzRDtBQUN0RCwyQ0FBd0M7QUFFeEMsSUFBSyxlQUdKO0FBSEQsV0FBSyxlQUFlO0lBQ2xCLGlEQUFNLENBQUE7SUFDTixtREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUhJLGVBQWUsS0FBZixlQUFlLFFBR25CO0FBRUQsYUFBYTtBQUNiLElBQUssa0JBR0o7QUFIRCxXQUFLLGtCQUFrQjtJQUNyQiwrREFBVSxDQUFBO0lBQ1YsNkRBQVMsQ0FBQSxDQUFDLEtBQUs7QUFDakIsQ0FBQyxFQUhJLGtCQUFrQixLQUFsQixrQkFBa0IsUUFHdEI7QUFFRCxNQUFNLHFCQUFxQixHQUFPO0lBQ2hDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUTtJQUNyQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU87Q0FDcEMsQ0FBQTtBQUVELE1BQU0sa0JBQWtCLEdBQVE7SUFDOUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRztJQUN6QixDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHO0NBQzNCLENBQUE7QUFFRCxNQUFhLFdBQVksU0FBUSxxQkFBUztJQUl4QyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBRjNCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQUczQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsd0JBQXdCLENBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBQ25GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSwyQkFBWSxDQUFDLE1B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

build/main/utils/converter.js

@@ -90,3 +90,3 @@ "use strict";
     fillBinary(value = '') {
-        return this.fill(8, value);
+        return this.fill((this.value.length || 1) * 8, value);
     }
@@ -100,2 +100,2 @@ }
 exports.fillLength = _fillLength;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2NvbnZlcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7O0dBTUc7QUFDSCxNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQWEsRUFBRSxJQUFZLEVBQUUsRUFBVSxFQUFVLEVBQUU7SUFDOUQsT0FBTyxRQUFRLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUM7QUFFRixNQUFNLFNBQVMsR0FBRyxDQUFDLEtBQWEsRUFBRSxJQUFZLEVBQVUsRUFBRTtJQUN4RCxPQUFPLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQzdCLENBQUMsQ0FBQztBQUVGLE1BQU0sUUFBUSxHQUFHLENBQUMsS0FBYSxFQUFFLElBQVksRUFBVSxFQUFFO0lBQ3ZELE9BQU8sR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDN0IsQ0FBQyxDQUFDO0FBRUYsTUFBTSxVQUFVLEdBQUcsQ0FBQyxLQUFhLEVBQUUsSUFBWSxFQUFVLEVBQUU7SUFDekQsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkMsT0FBTyxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBYSxFQUFFLElBQVksRUFBVSxFQUFFO0lBQ3JELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLE9BQU8sS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztBQUNoRCxDQUFDLENBQUM7QUFFRixNQUFNLFdBQVcsR0FBRyxDQUFDLEtBQXNCLEVBQUUsR0FBVyxFQUFVLEVBQUU7SUFDbEUsT0FBTyxDQUFDLElBQUksS0FBSyxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3JFLENBQUMsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBYSxTQUFTO0lBR3BCOzs7O09BSUc7SUFDSCxZQUFZLEtBQWEsRUFBRSxJQUFZO1FBUHZCLFVBQUssR0FBVyxFQUFFLENBQUM7UUFDbkIsU0FBSSxHQUFXLEVBQUUsQ0FBQztRQU9oQyxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsSUFBSSxFQUFFO1lBQ25CLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNuQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRDs7T0FFRztJQUNJLFFBQVE7UUFDYixPQUFPLFNBQVMsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxQyxDQUFDO0lBQ0Q7O09BRUc7SUFDSSxPQUFPO1FBQ1osT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUNEOztPQUVHO0lBQ0ksU0FBUztRQUNkLE9BQU8sVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFDRDs7T0FFRztJQUNJLGVBQWU7UUFDcEIsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDeEMsQ0FBQztJQUNEOztPQUVHO0lBQ0ksS0FBSztRQUNWLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFDRDs7Ozs7T0FLRztJQUNJLElBQUksQ0FBQyxHQUFXLEVBQUUsUUFBZ0IsRUFBRTtRQUN6QyxPQUFPLFdBQVcsQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBQ00sVUFBVSxDQUFFLFFBQWdCLEVBQUU7UUFDbkMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUM1QixDQUFDO0NBQ0Y7QUExREQsOEJBMERDO0FBRVksUUFBQSxRQUFRLEdBQUcsU0FBUyxDQUFDO0FBQ3JCLFFBQUEsT0FBTyxHQUFHLFFBQVEsQ0FBQztBQUNuQixRQUFBLFNBQVMsR0FBRyxVQUFVLENBQUM7QUFDdkIsUUFBQSxLQUFLLEdBQUcsTUFBTSxDQUFDO0FBQ2YsUUFBQSxVQUFVLEdBQUcsV0FBVyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVydGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2NvbnZlcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7O0dBTUc7QUFDSCxNQUFNLEdBQUcsR0FBRyxDQUFDLEtBQWEsRUFBRSxJQUFZLEVBQUUsRUFBVSxFQUFVLEVBQUU7SUFDOUQsT0FBTyxRQUFRLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUM1QyxDQUFDLENBQUM7QUFFRixNQUFNLFNBQVMsR0FBRyxDQUFDLEtBQWEsRUFBRSxJQUFZLEVBQVUsRUFBRTtJQUN4RCxPQUFPLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQzdCLENBQUMsQ0FBQztBQUVGLE1BQU0sUUFBUSxHQUFHLENBQUMsS0FBYSxFQUFFLElBQVksRUFBVSxFQUFFO0lBQ3ZELE9BQU8sR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7QUFDN0IsQ0FBQyxDQUFDO0FBRUYsTUFBTSxVQUFVLEdBQUcsQ0FBQyxLQUFhLEVBQUUsSUFBWSxFQUFVLEVBQUU7SUFDekQsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDbkMsT0FBTyxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLE1BQU0sTUFBTSxHQUFHLENBQUMsS0FBYSxFQUFFLElBQVksRUFBVSxFQUFFO0lBQ3JELE1BQU0sS0FBSyxHQUFHLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLE9BQU8sS0FBSyxDQUFDLE1BQU0sR0FBRyxD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

build/main/utils/Descriptor.d.ts

@@ -59,3 +59,3 @@ import { Converter } from './converter';
     /**
-     * 获取开关状态描述
+     * TODO 获取开关状态描述
      * @param status 状态码 16位字符串
@@ -67,2 +67,9 @@ * @param deviceType 设备主类型
     /**
+     * 获取窗帘状态描述
+     * @param status 状态码 16位字符串
+     * @param deviceType 设备主类型
+     * @param deviceChildType 设备子类型
+     */
+    getSmartSwitchDescriptor(status: string, deviceType: string, deviceChildType?: string): string;
+    /**
      * 获取灯状态描述
@@ -76,2 +83,9 @@ * @param status 状态
     /**
+     * 线控器状态描述
+     * @param status
+     * @param deviceType
+     * @param deviceChildType
+     */
+    getWireControlDescriptor(status: string, deviceType: string, deviceChildType: string): string;
+    /**
      * 获取设备状态描述
@@ -78,0 +92,0 @@ * @param status 状态 16位字符串

build/main/utils/Descriptor.js

@@ -30,2 +30,5 @@ "use strict";
 const CardPowerEquip_1 = require("../modules/CardPowerEquip");
+const SwitchMixEquip_1 = require("../modules/SwitchMixEquip");
+const CurtainEquip_1 = require("../modules/CurtainEquip");
+const WireConditionEquip_1 = require("../modules/WireConditionEquip");
 /**
@@ -131,3 +134,3 @@ * 状态描述器
     /**
-     * 获取开关状态描述
+     * TODO 获取开关状态描述
      * @param status 状态码 16位字符串
@@ -148,21 +151,41 @@ * @param deviceType 设备主类型
         }
-        if (TypeHints.isTouchSocketSwitch(deviceChildType)) {
-            const statusBitStr = converter_1.fillLength(socketStatus.getTouchStatus(), bitlen);
-            return this.getDescriptors(deviceType, statusBitStr);
+        // if (TypeHints.isTouchSocketSwitch(deviceChildType)) {
+        //   const statusBitStr = fillLength(socketStatus.getTouchStatus(), bitlen);
+        //   return this.getDescriptors(deviceType, statusBitStr);
+        // }
+        // if (TypeHints.isNormalSocketSwitch(deviceChildType)) {
+        //   const statusBitStr = fillLength(socketStatus.getTouchStatus(), bitlen);
+        //   return this.getDescriptors(deviceType, statusBitStr);
+        // }
+        // if (TypeHints.isMixSocketSwitch(deviceChildType)) {
+        //   const statusBitStr = fillLength(socketStatus.getMixupStatus(), bitlen);
+        //   return this.getDescriptors(deviceType, statusBitStr);
+        // }
+        // if (TypeHints.isSceneSocketSwitch(deviceChildType)) {
+        //   const statusBitStr = fillLength(socketStatus.getSceneStatus(), bitlen);
+        //   return this.getDescriptors(deviceType, statusBitStr);
+        // }
+        // if (TypeHints.isXkeySocketSwitch(deviceChildType)) {
+        //   return socketStatus.getTouchStatus() === '00' ? '关' : '开'
+        // }
+        // console.log('deviceChildType === ', deviceChildType, TypeHints.isXkeySocketSwitch(deviceChildType, deviceType))
+        if (TypeHints.isXkeySocketSwitch(deviceChildType, deviceType)) {
+            // return socketStatus.getTouchStatus() === '00' ? '关' : '开'
+            const equip = new SwitchMixEquip_1.SwitchMixEquip(status, deviceType, deviceChildType);
+            return equip.getStatusDescriptor();
         }
-        if (TypeHints.isNormalSocketSwitch(deviceChildType)) {
-            const statusBitStr = converter_1.fillLength(socketStatus.getTouchStatus(), bitlen);
-            return this.getDescriptors(deviceType, statusBitStr);
+        return '';
+    }
+    /**
+     * 获取窗帘状态描述
+     * @param status 状态码 16位字符串
+     * @param deviceType 设备主类型
+     * @param deviceChildType 设备子类型
+     */
+    getSmartSwitchDescriptor(status, deviceType, deviceChildType) {
+        const TypeHints = this.TypeHints;
+        if (TypeHints.isCurtainSmartSwitch(deviceChildType, deviceType)) {
+            const curtain = new CurtainEquip_1.CurtainEquip(status, deviceType, deviceChildType);
+            return curtain.getStatusDescriptor();
         }
-        if (TypeHints.isMixSocketSwitch(deviceChildType)) {
-            const statusBitStr = converter_1.fillLength(socketStatus.getMixupStatus(), bitlen);
-            return this.getDescriptors(deviceType, statusBitStr);
-        }
-        if (TypeHints.isSceneSocketSwitch(deviceChildType)) {
-            const statusBitStr = converter_1.fillLength(socketStatus.getSceneStatus(), bitlen);
-            return this.getDescriptors(deviceType, statusBitStr);
-        }
-        if (TypeHints.isXkeySocketSwitch(deviceChildType)) {
-            return socketStatus.getTouchStatus() === '00' ? '关' : '开';
-        }
         return '';
@@ -215,2 +238,16 @@ }
     /**
+     * 线控器状态描述
+     * @param status
+     * @param deviceType
+     * @param deviceChildType
+     */
+    getWireControlDescriptor(status, deviceType, deviceChildType) {
+        const TypeHints = this.TypeHints;
+        if (TypeHints.isAcWireControl(deviceChildType, deviceType)) {
+            const condition = new WireConditionEquip_1.WireConditionEquip(status, deviceType, deviceChildType);
+            return condition.getStatusDescriptor();
+        }
+        return '';
+    }
+    /**
      * 获取设备状态描述
@@ -239,2 +276,2 @@ * @param status 状态 16位字符串
 exports.Descriptor = new _Descriptor();
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Descriptor.js","sourceRoot":"","sources":["../../../src/utils/Descriptor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Descriptor.js","sourceRoot":"","sources":["../../../src/utils/Descriptor.ts"],"names":[],"mappings":"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"}

build/main/utils/suiter.d.ts

@@ -84,4 +84,2 @@ /**
             '0401': string;
-            '0402': string;
-            '0403': string;
             '0412': string;
@@ -96,3 +94,2 @@ '0413': string;
             '0426': string;
-            '0427': string;
             '0428': string;
@@ -104,9 +101,11 @@ '0431': string;
             '0436': string;
-            '04122': string;
             '0441': string;
             '0442': string;
             '0443': string;
+            '0461': string;
+            '0462': string;
             '0451': string;
             '0452': string;
-            '0462': string;
+            '0471': string;
+            '04101': string;
             '0480': string;
@@ -119,2 +118,5 @@ '0481': string;
             '0492': string;
+            '04111': string;
+            '04121': string;
+            '04122': string;
         };
@@ -131,9 +133,5 @@ status: {
             root: string[];
-            touch: string[];
-            scene: string[];
             settableScene: string[];
             mix: string[];
             mixup: string[];
-            normal: string[];
-            simple: string[];
             plug: string[];
@@ -182,5 +180,10 @@ xkey: string[];
      * 开关类设备
+     * @deprecated
      * @namespace Suiter.switchgear
      */
-    switchgear: {
+    /**
+     * 智能开关
+     * @namespace Suiter.smartSwitch
+     */
+    smartSwitch: {
         type: {
@@ -191,2 +194,6 @@ '05': string;
         };
+        group: {
+            root: string[];
+            curtain: string[];
+        };
         status: {
@@ -345,3 +352,3 @@ '0500': string;
     };
-    wireControlPanel: {
+    wireControl: {
         type: {
@@ -348,0 +355,0 @@ 13: string;

build/main/utils/suiter.js

@@ -32,11 +32,11 @@ "use strict";
             '0112': '2路滑条调光',
-            '0113': '3路滑条',
-            '0114': '',
-            '0115': '',
-            '0116': '',
+            '0113': '3路滑条调光',
+            '0114': '4路滑条调光',
+            '0115': '5路滑条调光',
+            '0116': '6路滑条调光',
             '0119': '单 + 双',
-            '0120': '',
-            '0121': '',
-            '0122': '',
-            '0132': '',
+            '0120': '单 + 三',
+            '0121': '双 + 三',
+            '0122': '单 + 双 + 三',
+            '0132': '单线供电调光器',
             '0133': '风扇灯'
@@ -99,8 +99,9 @@ },
             '04': '插座开关',
-            '0401': '智能插座',
-            '0402': '单线开关',
-            '0403': '触摸开关',
-            '0412': '智能插座',
-            '0413': '智能插座',
-            '0414': '智能插座',
+            '0401': '1路智能插座',
+            // '0402': '单线开关'（停用）,
+            // '0403': '触摸开关'（停用）,
+            '0412': '2路智能插座',
+            '0413': '3路智能插座',
+            '0414': '4路智能插座',
+            // 触摸开关
             '0421': '1路开关',
@@ -110,6 +111,6 @@ '0422': '2路开关',
             '0424': '4路开关',
-            '0425': '触摸开关',
-            '0426': '触摸开关',
-            '0427': '触摸开关',
-            '0428': '触摸开关',
+            '0425': '5路开关',
+            '0426': '6路开关',
+            // '0427': '触摸开关',
+            '0428': '8路开关',
             '0431': '1路情景开关',
@@ -120,16 +121,21 @@ '0432': '2路情景开关',
             '0436': '6键情景开关',
+            '0441': '1路开关 + 3路情景',
+            '0442': '2路开关 + 3路情景',
+            '0443': '3路开关 + 3路情景',
+            '0461': '1路开关 + 1路情景',
+            '0462': '2路开关 + 2路情景',
+            '0451': '1键单线开关',
+            '0452': '2键单线开关',
+            '0471': '1路开关 + 雷达',
+            '04101': '1路情景 + 雷达',
+            '0480': '3路开关 + 红外面板',
+            '0481': '1路开关 + 3路情景 + 红外面板',
+            '0483': '3路开关 + 3路场景 + 红外面板',
+            '0486': '6路情景 + 红外对管',
+            '0490': 'WiFi插座',
+            '0491': '2键窗帘面板',
+            '0492': '4键窗帘面板',
+            '04111': '2键开窗器',
+            '04121': '4路情景 + 2调光调色',
             '04122': '可设置6键情景面板',
-            '0441': '1路开关 + 3路情景开关',
-            '0442': '2路开关 + 3路情景开关',
-            '0443': '3路开关 + 3路情景开关',
-            '0451': '一键单线开关',
-            '0452': '二键单线开关',
-            '0462': '2路开关+2路情景开关',
-            '0480': '红外面板',
-            '0481': '红外面板',
-            '0483': '红外面板',
-            '0486': '六键情景+红外对管',
-            '0490': 'WiFi插座',
-            '0491': '单一窗帘面板',
-            '0492': '两个窗帘面板'
         },
@@ -150,5 +156,5 @@ status: {
             // touch: ['02', '21', '22', '23', '24', '25', '26', '28', '51', '52'],
-            touch: ['02', '21', '22', '24', '25', '26', '28', '51', '52'],
+            // touch: ['25', '26', '27', '28'],
             // 情景面板
-            scene: ['31', '32', '33', '35'],
+            // scene: ['31', '32', '33', '35'],
             // 可设置情景面板
@@ -160,17 +166,17 @@ settableScene: ['122'],
             // 普通开关
-            normal: ['03'],
+            // normal: ['03'],
             // 插座 byte[0]
-            simple: ['01', '12', '13', '14'],
+            // simple: ['01', '12', '13', '14'],
+            // 智能插座
             plug: ['01', '12', '13', '14'],
-            // x 路开关
-            xkey: ['21', '22', '23', '24', '31', '32', '33', '34', '36', '41', '42', '43', '62']
+            // x 路开关 | TODO 插座开关隔离
+            xkey: ['21', '22', '23', '24', '31', '32', '33', '34', '36', '41', '42', '43', '62', '51', '52']
         },
         // 设备类型索引类型 一键开关 -> 1， 二建开关 -> 2 , 1路开关 + 3路情景面板 -> 1|3
-        // 约定格式： 普通开关|情景|待约定
         typeIndex: {
             // 普通开关
-            '0421': '1',
-            '0422': '2',
-            '0423': '3',
-            '0424': '4',
+            '0421': '1|',
+            '0422': '2|',
+            '0423': '3|',
+            '0424': '4|',
             // 情景面板
@@ -183,3 +189,3 @@ '0431': '|1',
             '04122': '|6',
-            // 开关情景面板
+            // 开关情景面板 约定格式： 普通开关|情景
             '0441': '1|3',
@@ -189,4 +195,5 @@ '0442': '2|3',
             '0462': '2|2',
-            '0451': '1',
-            '0452': '2'
+            // 单线开关
+            '0451': '1|',
+            '0452': '2|'
         },
@@ -216,11 +223,34 @@ statusLength: {
      * 开关类设备
+     * @deprecated
      * @namespace Suiter.switchgear
      */
-    switchgear: {
+    // switchgear: {
+    //   // 开关类设备
+    //   type: {
+    //     '05': '智能开关',
+    //     '0501': '窗帘',
+    //     '0502': '投影仪幕布'
+    //   },
+    //   status: {
+    //     '0500': '关',
+    //     '0501': '停',
+    //     '0510': '开',
+    //     '0502': '开'
+    //   }
+    // },
+    /**
+     * 智能开关
+     * @namespace Suiter.smartSwitch
+     */
+    smartSwitch: {
         // 开关类设备
         type: {
-            '05': '智能开关类设备',
+            '05': '智能开关',
             '0501': '窗帘',
             '0502': '投影仪幕布'
         },
+        group: {
+            root: ['05'],
+            curtain: ['01']
+        },
         status: {
@@ -384,3 +414,3 @@ '0500': '关',
     },
-    wireControlPanel: {
+    wireControl: {
         type: {
@@ -540,2 +570,2 @@ '13': '线控面板',
 exports.default = exports.Suiter;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"suiter.js","sourceRoot":"","sources":["../../../src/utils/suiter.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"suiter.js","sourceRoot":"","sources":["../../../src/utils/suiter.ts"],"names":[],"mappings":"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"}

CHANGELOG.md

@@ -5,2 +5,6 @@ # Changelog
 
+### [1.1.31](https://github.com/ob-cloud/hardware-suit/compare/v1.1.28...v1.1.31) (2020-12-18)
+
+
+
 ### [1.1.29](https://github.com/ob-cloud/hardware-suit/compare/v1.1.26...v1.1.29) (2020-12-17)
@@ -7,0 +11,0 @@

package.json

 {
   "name": "hardware-suit",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "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

789930

increased by38.31%

Number of package files

83

increased by23.88%

Lines of code

7882

increased by37.6%

No dependency changes