hardware-suit - npm Package Compare versions

Comparing version 1.1.31 to 1.1.33

build/main/entity/Status.d.ts

 export declare class Status {
     readonly status: string;
     constructor(status: string);
+    /**
+     * 根据给定数量值，将16进制状态解析成二进制状态码，
+     * 并反正顺序返回 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
+     * @param state 16进制状态码('01')
+     * @param count 码数量
+     * @param splitSize 分割位数
+     */
+    __parseBitState(state: string, count: number, splitSize?: number): string[];
     adaptHex(hex: string): string;
 }

build/main/entity/Status.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Status = void 0;
+const converter_1 = require("../utils/converter");
 class Status {
@@ -10,2 +11,22 @@ constructor(status) {
     }
+    /**
+     * 根据给定数量值，将16进制状态解析成二进制状态码，
+     * 并反正顺序返回 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
+     * @param state 16进制状态码('01')
+     * @param count 码数量
+     * @param splitSize 分割位数
+     */
+    __parseBitState(state, count, splitSize = 2) {
+        let keyList = [];
+        const converter = new converter_1.Converter(state || '00', 16);
+        const bits = converter.fill(8, converter.toBinary());
+        let i = 0;
+        for (let index = count; index > 0; index--) {
+            keyList.push(bits.slice(bits.length - splitSize * (i + 1), bits.length - splitSize * i));
+            i += 1;
+        }
+        if (splitSize === 1)
+            keyList = keyList.map(k => this.adaptHex(k));
+        return keyList;
+    }
     adaptHex(hex) {
@@ -18,2 +39,2 @@ if (!hex)
 exports.Status = Status;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9TdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBYSxNQUFNO0lBRWpCLFlBQVksTUFBYztRQURWLFdBQU0sR0FBVyxFQUFFLENBQUM7UUFFbEMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUE7UUFDMUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUNNLFFBQVEsQ0FBQyxHQUFXO1FBQ3pCLElBQUksQ0FBQyxHQUFHO1lBQUUsT0FBTyxFQUFFLENBQUE7UUFDbkIsT0FBTyxHQUFHLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQVZELHdCQVVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9TdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsa0RBQStDO0FBRS9DLE1BQWEsTUFBTTtJQUVqQixZQUFZLE1BQWM7UUFEVixXQUFNLEdBQVcsRUFBRSxDQUFDO1FBRWxDLE1BQU0sR0FBRyxNQUFNLENBQUMsTUFBTSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFBO1FBQzFELElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFDRDs7Ozs7O09BTUc7SUFDSCxlQUFlLENBQUUsS0FBYSxFQUFFLEtBQWEsRUFBRSxZQUFvQixDQUFDO1FBQ2xFLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNoQixNQUFNLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtRQUNwRCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDVCxLQUFLLElBQUksS0FBSyxHQUFHLEtBQUssRUFBRSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQzFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQ3hGLENBQUMsSUFBSSxDQUFDLENBQUE7U0FDUDtRQUNELElBQUksU0FBUyxLQUFLLENBQUM7WUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNqRSxPQUFPLE9BQU8sQ0FBQTtJQUNoQixDQUFDO0lBQ00sUUFBUSxDQUFDLEdBQVc7UUFDekIsSUFBSSxDQUFDLEdBQUc7WUFBRSxPQUFPLEVBQUUsQ0FBQTtRQUNuQixPQUFPLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7SUFDMUMsQ0FBQztDQUNGO0FBN0JELHdCQTZCQyJ9

build/main/entity/SwitchMixStatus.d.ts

 import { SwitchStatus } from './SwitchStatus';
 export declare class SwitchMixStatus extends SwitchStatus {
     extraState: string;
-    extraCount: number;
     extraKeyDots: string[];
@@ -10,5 +9,6 @@ /**
      * @param count 按键数量列表
-     * @param typeIndex 类型索引
+     * @param pattern 类型范式
      */
-    constructor(status: string, count?: Array<number>, typeIndex?: string);
+    constructor(status: string, count?: Array<number>, pattern?: string);
+    get extraCount(): number;
     /**
@@ -15,0 +15,0 @@ * 设置按键值

build/main/entity/SwitchMixStatus.js

@@ -6,3 +6,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-17 16:57:01
+ * @Last Modified time: 2020-12-21 16:10:33
  */
@@ -17,10 +17,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
      * @param count 按键数量列表
-     * @param typeIndex 类型索引
+     * @param pattern 类型范式
      */
-    constructor(status, count, typeIndex) {
-        super(status, count, typeIndex);
-        this.extraCount = this.count[1] || 0;
+    constructor(status, count, pattern) {
+        super(status, count, pattern);
         this.extraState = status.slice(2, 4);
-        this.extraKeyDots = this.__parseKeyDots(this.extraState, this.extraCount);
+        this.extraKeyDots = this.__parseBitState(this.extraState, this.extraCount);
     }
+    // 非主程面板按键数
+    get extraCount() {
+        return this.count[SwitchStatus_1.OrderEnum.Secondary] || 0;
+    }
     /**
@@ -51,2 +54,2 @@ * 设置按键值
 exports.SwitchMixStatus = SwitchMixStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoTWl4U3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hNaXhTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCxpREFBOEM7QUFFOUMsTUFBYSxlQUFnQixTQUFRLDJCQUFZO0lBSS9DOzs7OztPQUtHO0lBQ0gsWUFBYSxNQUFjLEVBQUUsS0FBcUIsRUFBRSxTQUFrQjtRQUNwRSxLQUFLLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxTQUFTLENBQUMsQ0FBQTtRQUMvQixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3BDLElBQUksQ0FBQyxVQUFVLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDcEMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0lBQzNFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsZUFBZSxDQUFFLENBQVMsRUFBRSxLQUFhO1FBQ3ZDLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU8sSUFBSSxDQUFBO1FBQzVDLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFBO1FBQ3JDLE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUNEOzs7T0FHRztJQUNILHFCQUFxQixDQUFFLEtBQWE7UUFDbEMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxVQUFVO1lBQUUsT0FBTTtRQUN2QyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDakMsQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUE7SUFDeEIsQ0FBQztDQUNGO0FBdkNELDBDQXVDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoTWl4U3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hNaXhTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCxpREFBeUQ7QUFFekQsTUFBYSxlQUFnQixTQUFRLDJCQUFZO0lBRy9DOzs7OztPQUtHO0lBQ0gsWUFBYSxNQUFjLEVBQUUsS0FBcUIsRUFBRSxPQUFnQjtRQUNsRSxLQUFLLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUM3QixJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3BDLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUM1RSxDQUFDO0lBRUQsV0FBVztJQUNYLElBQUksVUFBVTtRQUNaLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyx3QkFBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUM3QyxDQUFDO0lBQ0Q7Ozs7T0FJRztJQUNILGVBQWUsQ0FBRSxDQUFTLEVBQUUsS0FBYTtRQUN2QyxJQUFJLEtBQUssR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVU7WUFBRSxPQUFPLElBQUksQ0FBQTtRQUM1QyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUNyQyxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDRDs7O09BR0c7SUFDSCxxQkFBcUIsQ0FBRSxLQUFhO1FBQ2xDLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsVUFBVTtZQUFFLE9BQU07UUFDdkMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ2pDLENBQUM7SUFFRCxhQUFhO1FBQ1gsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFBO0lBQ3hCLENBQUM7Q0FDRjtBQXpDRCwwQ0F5Q0MifQ==

build/main/entity/SwitchPlugStatus.js

@@ -39,2 +39,2 @@ "use strict";
 exports.SwitchPlugStatus = SwitchPlugStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z1N0YXR1cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbnRpdHkvU3dpdGNoUGx1Z1N0YXR1cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFPQSxpREFBOEM7QUFDOUM7O0dBRUc7QUFDSCxNQUFhLGdCQUFpQixTQUFRLDJCQUFZO0lBVWhELFlBQWEsTUFBYyxFQUFFLEtBQXFCO1FBQ2hELEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUE7UUFWZixVQUFLLEdBQVcsRUFBRSxDQUFDLENBQUUsT0FBTztRQVdqQyxJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ25DLElBQUksQ0FBQyxTQUFTLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbkMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzVDLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDeEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUVwQyxJQUFJLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBRS9CLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFBO1FBQ25CLElBQUksQ0FBQyxVQUFVLEdBQUcsRUFBRSxDQUFBO1FBQ3BCLElBQUksQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFBO0lBQ3hCLENBQUM7SUFFRCxlQUFlLENBQUUsQ0FBUyxFQUFFLEtBQWE7UUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUE7UUFDckIsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0gscUJBQXFCLENBQUUsS0FBYTtRQUNsQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ2xCLE9BQU8sRUFBRSxDQUFBO0lBQ1gsQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLEVBQUUsQ0FBQTtJQUNYLENBQUM7Q0FDRjtBQXpDRCw0Q0F5Q0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z1N0YXR1cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbnRpdHkvU3dpdGNoUGx1Z1N0YXR1cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFPQSxpREFBOEM7QUFDOUM7O0dBRUc7QUFDSCxNQUFhLGdCQUFpQixTQUFRLDJCQUFZO0lBVWhELFlBQWEsTUFBYyxFQUFFLEtBQXFCO1FBQ2hELEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxDQUFDLENBQUE7UUFWZixVQUFLLEdBQVcsRUFBRSxDQUFDLENBQUUsT0FBTztRQVdqQyxJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ25DLElBQUksQ0FBQyxTQUFTLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbkMsSUFBSSxDQUFDLGtCQUFrQixHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzVDLElBQUksQ0FBQyxhQUFhLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDeEMsSUFBSSxDQUFDLFFBQVEsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUVwQyxJQUFJLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQy9CLElBQUksQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFBO1FBQ25CLElBQUksQ0FBQyxVQUFVLEdBQUcsRUFBRSxDQUFBO1FBQ3BCLElBQUksQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFBO0lBQ3hCLENBQUM7SUFFRCxlQUFlLENBQUUsQ0FBUyxFQUFFLEtBQWE7UUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLENBQUE7UUFDckIsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0gscUJBQXFCLENBQUUsS0FBYTtRQUNsQyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ2xCLE9BQU8sRUFBRSxDQUFBO0lBQ1gsQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLEVBQUUsQ0FBQTtJQUNYLENBQUM7Q0FDRjtBQXhDRCw0Q0F3Q0MifQ==

build/main/entity/SwitchStatus.d.ts

 import { Status } from './Status';
+export declare enum OrderEnum {
+    Primary = 0,
+    Secondary = 1
+}
 /**
@@ -7,16 +11,12 @@ * 开关 或 情景状态
     state: string;
-    typeIndex: string;
+    pattern: string;
     count: number[];
-    private _count;
-    constructor(status: string, count?: Array<number>, typeIndex?: string);
-    get keyDots(): string[];
+    keyDots: string[];
+    constructor(status: string, count?: Array<number>, pattern?: string);
+    get _count(): number;
+    get _pattern(): string;
     /**
-     * 解析按键坑位状态码
-     * @param state 16进制状态码
-     * @param count 按键数
-     */
-    __parseKeyDots(state: string, count: number): string[];
-    /**
      * 获取主程按键坑位，二进制码
-     * 反转数组 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
+     * 并获取按键正序
+     * 情景 一个 bit 表示一个按键
      */
@@ -23,0 +23,0 @@ private getKeyDots;

build/main/entity/SwitchStatus.js

@@ -6,8 +6,13 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-18 14:51:22
+ * @Last Modified time: 2020-12-21 17:19:55
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwitchStatus = void 0;
-const converter_1 = require("../utils/converter");
+exports.SwitchStatus = exports.OrderEnum = void 0;
+const SwitchMixEquip_1 = require("../modules/SwitchMixEquip");
 const Status_1 = require("./Status");
+var OrderEnum;
+(function (OrderEnum) {
+    OrderEnum[OrderEnum["Primary"] = 0] = "Primary";
+    OrderEnum[OrderEnum["Secondary"] = 1] = "Secondary";
+})(OrderEnum = exports.OrderEnum || (exports.OrderEnum = {}));
 /**
@@ -17,38 +22,27 @@ * 开关 或 情景状态
 class SwitchStatus extends Status_1.Status {
-    constructor(status, count, typeIndex) {
+    constructor(status, count, pattern) {
         super(status);
         this.state = '';
+        this.pattern = ''; // 类型范式
         this.count = [1]; // 按键数列表 [3, 3] ---> 开关 3， 情景 3
         this.state = status.slice(0, 2) || '00';
         this.count = count || [1];
-        this._count = this.count[0];
-        this.typeIndex = typeIndex || '';
-        // this.keyDots = this.getKeyDots()
+        this.pattern = pattern || '';
+        this.keyDots = this.getKeyDots();
     }
-    // 按键字节位
-    get keyDots() {
-        return this.getKeyDots();
+    // 主程按键数，普通开关面板 -> 开关，情景 -> 情景， 混合 -> 情景
+    get _count() {
+        return this.count[OrderEnum.Primary];
     }
-    /**
-     * 解析按键坑位状态码
-     * @param state 16进制状态码
-     * @param count 按键数
-     */
-    __parseKeyDots(state, count) {
-        let keyList = [];
-        const converter = new converter_1.Converter(state || '00', 16);
-        const bits = converter.fillBinary(converter.toBinary());
-        let i = 0;
-        for (let index = 0; index < count; index++) {
-            keyList[index] = bits.slice(i, i + 2);
-            i += 2;
-        }
-        return keyList.reverse();
+    get _pattern() {
+        return this.pattern;
     }
     /**
      * 获取主程按键坑位，二进制码
-     * 反转数组 ['01', '11', '10', '00'] => ["00", "10", "11", "01"]
+     * 并获取按键正序
+     * 情景 一个 bit 表示一个按键
      */
     getKeyDots() {
-        return this.__parseKeyDots(this.state, this._count);
+        const bit = [`${SwitchMixEquip_1.KeyTypePatternEnum.SCENE}`, `${SwitchMixEquip_1.KeyTypePatternEnum.SWITCHSCENE}`].includes(this.pattern) ? 1 : 2;
+        return this.__parseBitState(this.state, this._count, bit);
     }
@@ -80,2 +74,2 @@ /**
 exports.SwitchStatus = SwitchStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCxrREFBK0M7QUFDL0MscUNBQWtDO0FBQ2xDOztHQUVHO0FBQ0gsTUFBYSxZQUFhLFNBQVEsZUFBTTtJQU10QyxZQUFhLE1BQWMsRUFBRSxLQUFxQixFQUFFLFNBQWtCO1FBQ3BFLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQU5SLFVBQUssR0FBVyxFQUFFLENBQUM7UUFHMUIsVUFBSyxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQywrQkFBK0I7UUFJcEQsSUFBSSxDQUFDLEtBQUssR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUE7UUFDdkMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN6QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDM0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLElBQUksRUFBRSxDQUFBO1FBQ2hDLG1DQUFtQztJQUNyQyxDQUFDO0lBQ0QsUUFBUTtJQUNSLElBQUksT0FBTztRQUNULE9BQU8sSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFBO0lBQzFCLENBQUM7SUFDRDs7OztPQUlHO0lBQ0gsY0FBYyxDQUFFLEtBQWEsRUFBRSxLQUFhO1FBQzFDLElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNoQixNQUFNLFNBQVMsR0FBRyxJQUFJLHFCQUFTLENBQUMsS0FBSyxJQUFJLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsRCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFBO1FBQ3ZELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNULEtBQUssSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssR0FBRyxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDMUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtZQUNyQyxDQUFDLElBQUksQ0FBQyxDQUFBO1NBQ1A7UUFDRCxPQUFPLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUMxQixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0ssVUFBVTtRQUNoQixPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDckQsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxTQUFTLENBQUUsQ0FBUyxFQUFFLEtBQWE7UUFDakMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTyxJQUFJLENBQUE7UUFDeEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUE7UUFDaEMsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0Q7OztPQUdHO0lBQ0gsZ0JBQWdCLENBQUUsS0FBYTtRQUM3QixJQUFJLEtBQUssR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU07WUFBRSxPQUFNO1FBQ25DLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM1QixDQUFDO0lBQ0QsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQTtJQUNuQixDQUFDO0NBQ0Y7QUE5REQsb0NBOERDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoU3RhdHVzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2VudGl0eS9Td2l0Y2hTdGF0dXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7OztHQUtHOzs7QUFFSCw4REFBK0Q7QUFDL0QscUNBQWtDO0FBRWxDLElBQVksU0FHWDtBQUhELFdBQVksU0FBUztJQUNuQiwrQ0FBVyxDQUFBO0lBQ1gsbURBQWEsQ0FBQTtBQUNmLENBQUMsRUFIVyxTQUFTLEdBQVQsaUJBQVMsS0FBVCxpQkFBUyxRQUdwQjtBQUNEOztHQUVHO0FBQ0gsTUFBYSxZQUFhLFNBQVEsZUFBTTtJQUt0QyxZQUFhLE1BQWMsRUFBRSxLQUFxQixFQUFFLE9BQWdCO1FBQ2xFLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUxSLFVBQUssR0FBVyxFQUFFLENBQUM7UUFDMUIsWUFBTyxHQUFXLEVBQUUsQ0FBQyxDQUFDLE9BQU87UUFDN0IsVUFBSyxHQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQywrQkFBK0I7UUFJcEQsSUFBSSxDQUFDLEtBQUssR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUE7UUFDdkMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN6QixJQUFJLENBQUMsT0FBTyxHQUFHLE9BQU8sSUFBSSxFQUFFLENBQUE7UUFDNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUE7SUFDbEMsQ0FBQztJQUNELHdDQUF3QztJQUN4QyxJQUFJLE1BQU07UUFDUixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3RDLENBQUM7SUFDRCxJQUFJLFFBQVE7UUFDVixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUNEOzs7O09BSUc7SUFDSyxVQUFVO1FBQ2hCLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxtQ0FBa0IsQ0FBQyxLQUFLLEVBQUUsRUFBRSxHQUFHLG1DQUFrQixDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDL0csT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUMzRCxDQUFDO0lBQ0Q7Ozs7T0FJRztJQUNILFNBQVMsQ0FBRSxDQUFTLEVBQUUsS0FBYTtRQUNqQyxJQUFJLEtBQUssR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU07WUFBRSxPQUFPLElBQUksQ0FBQTtRQUN4QyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUNoQyxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUM7SUFDRDs7O09BR0c7SUFDSCxnQkFBZ0IsQ0FBRSxLQUFhO1FBQzdCLElBQUksS0FBSyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTTtZQUFFLE9BQU07UUFDbkMsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFDRCxRQUFRO1FBQ04sT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFBO0lBQ25CLENBQUM7Q0FDRjtBQWpERCxvQ0FpREMifQ==

build/main/modules/AirConditionEquip.d.ts

 import { BaseEquip } from './BaseEquip';
 import { AirConditionModel } from '../entity/AirConditionModel';
+declare enum ConditionTempEnum {
+    default = 26,
+    min = 16,
+    max = 30
+}
 export declare class AirConditionEquip extends BaseEquip {
@@ -16,3 +21,3 @@ airModel: AirConditionModel;
     constructor(status?: string, deviceType?: string, deviceChildType?: string, ac?: any);
-    static get defaultTemp(): number;
+    static get defaultTemp(): ConditionTempEnum;
     init(): void;
@@ -133,1 +138,2 @@ /**
 }
+export {};

build/main/modules/AirConditionEquip.js

@@ -6,3 +6,3 @@ "use strict";
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-17 15:50:45
+ * @Last Modified time: 2020-12-21 10:37:30
  */
@@ -13,49 +13,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AirConditionModel_1 = require("../entity/AirConditionModel");
-// 模式
-const ModeMap = {
-    1: 'a',
-    2: 'r',
-    3: 'd',
-    4: 'w',
-    5: 'h'
-};
-/**
- * 模式描述表
- */
-const ModeDescriptorMap = {
-    1: '自动',
-    2: '制冷',
-    3: '抽湿',
-    4: '送风',
-    5: '制热'
-};
-// 风速
-const SpeedMap = {
-    0: 's0',
-    1: 's1',
-    2: 's2',
-    3: 's3'
-};
-const SpeedDescriptorMap = {
-    0: '自动',
-    1: '弱',
-    2: '中',
-    3: '强'
-};
-// 左右摆风
-const HorizontalWingMap = {
-    0: 'l0',
-    1: 'l1'
-};
-// 上下摆风
-const VerticalWingMap = {
-    0: 'u0',
-    1: 'u1'
-};
-const WingDescriptorMap = {
-    'l0': '',
-    'l1': '左右',
-    'u0': '',
-    'u1': '上下'
-};
+const constant_1 = require("../shared/constant");
+var ConditionTempEnum;
+(function (ConditionTempEnum) {
+    ConditionTempEnum[ConditionTempEnum["default"] = 26] = "default";
+    ConditionTempEnum[ConditionTempEnum["min"] = 16] = "min";
+    ConditionTempEnum[ConditionTempEnum["max"] = 30] = "max";
+})(ConditionTempEnum || (ConditionTempEnum = {}));
 class AirConditionEquip extends BaseEquip_1.BaseEquip {
@@ -86,3 +46,3 @@ /**
     static get defaultTemp() {
-        return 26;
+        return ConditionTempEnum.default;
     }
@@ -93,7 +53,4 @@ init() {
             return;
-        if (['on', 'off'].includes(keyValue)) {
-            // this.airModel.setPower(keyValue)
-            this.setPower(keyValue === 'on');
-            // keyValue === 'on' ? this.setPowerOn() : this.setPowerOff()
-            // this.setTemperature(+this.getTemperature(new this.Converter(`${AirConditionEquip.defaultTemp}`, 10).toHex()))
+        if ([`${constant_1.PowerEnum.ON}`, `${constant_1.PowerEnum.OFF}`].includes(keyValue)) {
+            this.setPower(keyValue === constant_1.PowerEnum.ON);
         }
@@ -103,3 +60,3 @@ else {
             if (keys.filter(i => i).length)
-                this.airModel.setPower('on');
+                this.airModel.setPower(constant_1.PowerEnum.ON);
             keys[0] && this.setMode(+this.getMode(keys[0]));
@@ -131,7 +88,3 @@ keys[1] && this.setSpeed(+this.getSpeed(keys[1]));
     setTemperature(temp) {
-        // if (temp === 0) {
-        //   this.airModel.setTemperature(`${temp}`);
-        //   return this
-        // }
-        const temperature = temp < 18 ? temp + 1 : temp > 30 ? temp - 1 : temp;
+        const temperature = temp < ConditionTempEnum.min ? temp + 1 : temp > ConditionTempEnum.max ? temp - 1 : temp;
         const tempHex = new this.Converter(`${temperature}`, 10).toHex();
@@ -151,3 +104,2 @@ this.airModel.setTemperature(tempHex);
         const temp = this.getTemperature();
-        // const tempTxt = temp === '00' ? '--' : temp
         return this.isPowerOn() ? `${temp}` : '--';
@@ -160,10 +112,8 @@ }
     setMode(mode) {
-        mode = mode > 5 ? 1 : mode;
-        this.airModel.setMode(ModeMap[mode]);
-        // if ([2, 3].includes(mode)) this.setSpeed(0) // 自动
+        mode = mode > 5 ? constant_1.ModeEnum.AUTO : mode;
+        this.airModel.setMode(constant_1.ModeMap[mode]);
         // 制冷、抽湿， 自动风， 否则 弱风
-        this.setSpeed([1, 2, 3].includes(mode) ? 0 : 1);
+        this.setSpeed([constant_1.ModeEnum.AUTO, constant_1.ModeEnum.COLD, constant_1.ModeEnum.WEDY].includes(mode) ? constant_1.SpeedEnum.AUTO : constant_1.SpeedEnum.WEAK);
         // 自动、抽湿 无温度，否则默认温度
-        // this.setTemperature([1, 3].includes(mode) ? 0 : AirConditionEquip.defaultTemp)
-        if (![1, 3].includes(mode)) {
+        if (![constant_1.ModeEnum.AUTO, constant_1.ModeEnum.WEDY].includes(mode)) {
             this.setTemperature(AirConditionEquip.defaultTemp);
@@ -178,3 +128,3 @@ }
         const mode = v || this.airModel.getMode();
-        const modeKey = Object.keys(ModeMap).find(key => ModeMap[key] === mode);
+        const modeKey = Object.keys(constant_1.ModeMap).find(key => constant_1.ModeMap[key] === mode);
         return modeKey || '';
@@ -192,3 +142,3 @@ }
     getModeText() {
-        const mode = ModeDescriptorMap[this.getMode()] || ModeDescriptorMap[2];
+        const mode = constant_1.ModeDescriptorMap[this.getMode()] || constant_1.ModeDescriptorMap[constant_1.ModeEnum.COLD];
         return this.isPowerOn() ? `${mode}` : '--';
@@ -201,3 +151,3 @@ }
     setSpeed(speed) {
-        this.airModel.setSpeed(SpeedMap[speed > 3 ? 0 : speed]);
+        this.airModel.setSpeed(constant_1.SpeedMap[speed > 3 ? constant_1.SpeedEnum.AUTO : speed]);
         return this;
@@ -210,3 +160,3 @@ }
         const speed = v || this.airModel.getSpeed();
-        const speedKey = Object.keys(SpeedMap).find(key => SpeedMap[key] === speed);
+        const speedKey = Object.keys(constant_1.SpeedMap).find(key => constant_1.SpeedMap[key] === speed);
         return speedKey || '';
@@ -221,3 +171,3 @@ }
     getSpeedText() {
-        const speed = SpeedDescriptorMap[this.getSpeed()] || SpeedDescriptorMap[0];
+        const speed = constant_1.SpeedDescriptorMap[this.getSpeed()] || constant_1.SpeedDescriptorMap[constant_1.SpeedEnum.AUTO];
         return this.isPowerOn() ? `${speed}` : '--';
@@ -230,5 +180,5 @@ }
     setHorizontalWing(wing = 0) {
-        this.airModel.setHorizontalWing(HorizontalWingMap[wing > 1 ? 0 : wing]);
-        if (wing === 1)
-            this.setVerticalWing(0);
+        this.airModel.setHorizontalWing(constant_1.HorizontalWingMap[wing > 1 ? constant_1.HWingEnum.OFF : wing]);
+        if (wing === constant_1.HWingEnum.ON)
+            this.setVerticalWing(constant_1.VWingEnum.OFF);
         return this;
@@ -241,3 +191,3 @@ }
         const wing = v || this.airModel.getHorizontalWing();
-        const wingKey = Object.keys(HorizontalWingMap).find(key => HorizontalWingMap[key] === wing);
+        const wingKey = Object.keys(constant_1.HorizontalWingMap).find(key => constant_1.HorizontalWingMap[key] === wing);
         return wingKey || '';
@@ -253,5 +203,5 @@ }
     setVerticalWing(wing = 0) {
-        this.airModel.setVerticalWing(VerticalWingMap[wing > 1 ? 0 : wing]);
-        if (wing === 1)
-            this.setHorizontalWing(0);
+        this.airModel.setVerticalWing(constant_1.VerticalWingMap[wing > 1 ? constant_1.VWingEnum.OFF : wing]);
+        if (wing === constant_1.VWingEnum.ON)
+            this.setHorizontalWing(constant_1.HWingEnum.OFF);
         return this;
@@ -261,3 +211,3 @@ }
         const wing = v || this.airModel.getVerticalWing();
-        const wingKey = Object.keys(VerticalWingMap).find(key => VerticalWingMap[key] === wing);
+        const wingKey = Object.keys(constant_1.VerticalWingMap).find(key => constant_1.VerticalWingMap[key] === wing);
         return wingKey || '';
@@ -269,3 +219,3 @@ }
     getWingText() {
-        const w = WingDescriptorMap[this.getHorizontalWingValue()] || WingDescriptorMap[this.getVerticalWingVlaue()] || '--';
+        const w = constant_1.WingDescriptorMap[this.getHorizontalWingValue()] || constant_1.WingDescriptorMap[this.getVerticalWingVlaue()] || '--';
         return this.isPowerOn() ? `${w}` : '--';
@@ -280,3 +230,3 @@ }
     setPowerOn(temp = 26, speed = 0, mode = 1) {
-        this.airModel.setPower('on');
+        this.airModel.setPower(constant_1.PowerEnum.ON);
         this.setTemperature(temp).setSpeed(speed).setMode(mode);
@@ -289,3 +239,3 @@ return this;
     setPowerOff() {
-        this.airModel.setPower('off');
+        this.airModel.setPower(constant_1.PowerEnum.OFF);
         return this;
@@ -309,3 +259,3 @@ }
     isPowerOn() {
-        return this.getPower() === 'on';
+        return this.getPower() === constant_1.PowerEnum.ON;
     }
@@ -316,3 +266,3 @@ /**
     isTemperatureValid() {
-        return this.isPowerOn() && ['2', '5'].includes(this.getMode());
+        return this.isPowerOn() && [`${constant_1.ModeEnum.COLD}`, `${constant_1.ModeEnum.HOT}`].includes(this.getMode());
     }
@@ -323,6 +273,6 @@ /**
     isFanSpeedValid() {
-        return this.isPowerOn() && ['1', '2', '5'].includes(this.getMode());
+        return this.isPowerOn() && [`${constant_1.ModeEnum.AUTO}`, `${constant_1.ModeEnum.COLD}`, `${constant_1.ModeEnum.HOT}`].includes(this.getMode());
     }
     isWingValid() {
-        return this.isPowerOn() && ['1', '2', '5'].includes(this.getMode());
+        return this.isPowerOn() && [`${constant_1.ModeEnum.AUTO}`, `${constant_1.ModeEnum.COLD}`, `${constant_1.ModeEnum.HOT}`].includes(this.getMode());
     }
@@ -334,3 +284,2 @@ /**
     hasHorizontalSwing(keys = []) {
-        // if (!this.airEntity && (!keys || !keys.length)) return false
         const wingKeys = this.airEntity ? this.airEntity.getKeys() : keys;
@@ -350,3 +299,2 @@ if (!wingKeys || !wingKeys.length)
     hasVerticalSwing(keys = []) {
-        // if (!this.airEntity && (!keys || !keys.length)) return false
         const wingKeys = this.airEntity ? this.airEntity.getKeys() : keys;
@@ -370,3 +318,2 @@ if (!wingKeys || !wingKeys.length)
         const speed = this.getSpeedValue();
-        // const temperature = this.getTemperature() === '00' ? '' : this.getTemperature()
         const temperature = this.getTemperature();
@@ -379,2 +326,2 @@ const vwing = this.getVerticalWingVlaue();
 exports.AirConditionEquip = AirConditionEquip;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AirConditionEquip.js","sourceRoot":"","sources":["../../../src/modules/AirConditionEquip.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AirConditionEquip.js","sourceRoot":"","sources":["../../../src/modules/AirConditionEquip.ts"],"names":[],"mappings":"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"}

build/main/modules/CurtainEquip.js

@@ -48,3 +48,3 @@ "use strict";
     get curStatusInt() {
-        return +new this.Converter(this.curStatus, 2).toDecimal();
+        return +new this.Converter(this.curStatus, 16).toDecimal();
     }
@@ -103,2 +103,2 @@ /**
 exports.CurtainEquip = CurtainEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VydGFpbkVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvQ3VydGFpbkVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF3QztBQUN4QywyREFBd0Q7QUFFdkQ7O0dBRUc7QUFDSCxJQUFLLGlCQUlMO0FBSkEsV0FBSyxpQkFBaUI7SUFDckIseURBQVEsQ0FBQTtJQUNSLDJEQUFTLENBQUE7SUFDVCx5REFBUSxDQUFBO0FBQ1YsQ0FBQyxFQUpLLGlCQUFpQixLQUFqQixpQkFBaUIsUUFJdEI7QUFFRCxNQUFNLGdCQUFnQixHQUFPO0lBQzNCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRztJQUM3QixDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUk7SUFDL0IsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO0NBQzlCLENBQUE7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUVILE1BQWEsWUFBYSxTQUFRLHFCQUFTO0lBSXpDOzs7OztPQUtHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztRQVQ1QixVQUFLLEdBQUcsbUJBQW1CLENBQUM7UUFVM0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUN2QyxDQUFDO0lBRUQsSUFBSSxZQUFZO1FBQ2QsT0FBTyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBQzNELENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVE7UUFDTixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFBO1FBQzNCLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDO1lBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN4QixPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7SUFFRDs7O09BR0c7SUFDSSxTQUFTLENBQUUsTUFBYztRQUM5QixJQUFJLE1BQU0sR0FBRyxDQUFDLElBQUksTUFBTSxHQUFHLENBQUM7WUFBRSxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUNwRixJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDL0UsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFBO0lBQy9DLENBQUM7SUFDRDs7T0FFRztJQUNJLEtBQUs7UUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUVEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUMvQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxtQkFBbUI7UUFDakIsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2xELENBQUM7SUFDRDs7T0FFRztJQUNJLFFBQVE7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUMxRCxDQUFDO0NBQ0Y7QUEzRUQsb0NBMkVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3VydGFpbkVxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvQ3VydGFpbkVxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDJDQUF3QztBQUN4QywyREFBd0Q7QUFFdkQ7O0dBRUc7QUFDSCxJQUFLLGlCQUlMO0FBSkEsV0FBSyxpQkFBaUI7SUFDckIseURBQVEsQ0FBQTtJQUNSLDJEQUFTLENBQUE7SUFDVCx5REFBUSxDQUFBO0FBQ1YsQ0FBQyxFQUpLLGlCQUFpQixLQUFqQixpQkFBaUIsUUFJdEI7QUFFRCxNQUFNLGdCQUFnQixHQUFPO0lBQzNCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRztJQUM3QixDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUk7SUFDL0IsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO0NBQzlCLENBQUE7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUVILE1BQWEsWUFBYSxTQUFRLHFCQUFTO0lBSXpDOzs7OztPQUtHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQztRQVQ1QixVQUFLLEdBQUcsbUJBQW1CLENBQUM7UUFVM0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELElBQUksU0FBUztRQUNYLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUN2QyxDQUFDO0lBRUQsSUFBSSxZQUFZO1FBQ2QsT0FBTyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFBO0lBQzVELENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVE7UUFDTixNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFBO1FBQzNCLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDO1lBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN4QixPQUFPLEtBQUssQ0FBQTtJQUNkLENBQUM7SUFFRDs7O09BR0c7SUFDSSxTQUFTLENBQUUsTUFBYztRQUM5QixJQUFJLE1BQU0sR0FBRyxDQUFDLElBQUksTUFBTSxHQUFHLENBQUM7WUFBRSxPQUFPLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUNwRixJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDL0UsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBRUQ7O09BRUc7SUFDSSxJQUFJO1FBQ1QsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFBO0lBQy9DLENBQUM7SUFDRDs7T0FFRztJQUNJLEtBQUs7UUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDaEQsQ0FBQztJQUVEOztPQUVHO0lBQ0ksSUFBSTtRQUNULE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUMvQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxtQkFBbUI7UUFDakIsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2xELENBQUM7SUFDRDs7T0FFRztJQUNJLFFBQVE7UUFDYixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUMxRCxDQUFDO0NBQ0Y7QUEzRUQsb0NBMkVDIn0=

build/main/modules/SwitchEquip.d.ts

@@ -1,34 +0,23 @@
-import { SwitchStatus } from '../entity/SwitchStatus';
 import { BaseEquip } from './BaseEquip';
+import { SwitchMixEquip } from './SwitchMixEquip';
 export declare class SwitchEquip extends BaseEquip {
-    switchStatus: SwitchStatus;
-    typeStr: any;
-    private readonly bytes;
-    constructor(status: string, deviceType?: string, deviceChildType?: string);
+    switchStatus: any;
+    equip: any;
     /**
-     * 类型索引 1|3
+     * 开关工厂函数
+     * @param status 状态字符串
+     * @param deviceType 设备主类型
+     * @param deviceChildType 设备子类型
+     *
+     * @example
+     *
+     * const factory = new SwitchEquip(status, device, deviceChildType)
+     * const equip = factory.create()
+     * const power = euip.getPowerInt()
+     * equip.setPower(1, 0)
+     * const status = equip.getBytes()
+     * const statusDescriptor = equip.getStatusDescriptor()
      */
-    get typeIndex(): any;
-    /**
-     * 开关类型标志
-     * {
-     *   normal: 1,
-     *   scene: 0
-     * }
-     */
-    get keyTypes(): any;
-    /**
-     * 按键
-     * ['00', '01', '10', '11']
-     */
-    get keyDots(): string[];
-    /**
-     * 按键数
-     */
-    get keyCount(): number;
-    private getKeyCount;
-    setPower(v: number, index: number): void;
-    getPower(index?: number): Array<string>;
-    getPowerInt(index?: number): Array<number>;
-    getBytes(): string;
+    constructor(status: string, deviceType?: string, deviceChildType?: string);
+    create(): SwitchMixEquip;
 }

build/main/modules/SwitchEquip.js

@@ -10,102 +10,34 @@ "use strict";
  */
-const SwitchStatus_1 = require("../entity/SwitchStatus");
 const BaseEquip_1 = require("./BaseEquip");
-var SwitchKeyStatus;
-(function (SwitchKeyStatus) {
-    SwitchKeyStatus[SwitchKeyStatus["ON"] = 1] = "ON";
-    SwitchKeyStatus[SwitchKeyStatus["OFF"] = 0] = "OFF";
-})(SwitchKeyStatus || (SwitchKeyStatus = {}));
-// 按键类型索引 3|3
-var SwitchKeyTypeIndex;
-(function (SwitchKeyTypeIndex) {
-    SwitchKeyTypeIndex[SwitchKeyTypeIndex["NORMAL"] = 0] = "NORMAL";
-    SwitchKeyTypeIndex[SwitchKeyTypeIndex["SCENE"] = 1] = "SCENE"; // 情景
-})(SwitchKeyTypeIndex || (SwitchKeyTypeIndex = {}));
-const SwitchKeyTypeIndexMap = {
-    [SwitchKeyTypeIndex.NORMAL]: 'normal',
-    [SwitchKeyTypeIndex.SCENE]: 'scene'
-};
-const SwitchKeyStatusMap = {
-    [SwitchKeyStatus.ON]: '开',
-    [SwitchKeyStatus.OFF]: '关'
-};
+const SwitchMixEquip_1 = require("./SwitchMixEquip");
+const SwitchPlugEquip_1 = require("./SwitchPlugEquip");
 class SwitchEquip extends BaseEquip_1.BaseEquip {
+    /**
+     * 开关工厂函数
+     * @param status 状态字符串
+     * @param deviceType 设备主类型
+     * @param deviceChildType 设备子类型
+     *
+     * @example
+     *
+     * const factory = new SwitchEquip(status, device, deviceChildType)
+     * const equip = factory.create()
+     * const power = euip.getPowerInt()
+     * equip.setPower(1, 0)
+     * const status = equip.getBytes()
+     * const statusDescriptor = equip.getStatusDescriptor()
+     */
     constructor(status, deviceType, deviceChildType) {
         super(status, deviceType, deviceChildType);
-        this.bytes = `{0}00000000000000`;
-        this.typeStr = this.TypeHints.getSocketSwitchTypeIndex(deviceType, deviceChildType);
-        this.switchStatus = new SwitchStatus_1.SwitchStatus(status, [+this.getKeyCount()]);
+        this.equip = {};
     }
-    /**
-     * 类型索引 1|3
-     */
-    get typeIndex() {
-        return this.typeStr;
-    }
-    /**
-     * 开关类型标志
-     * {
-     *   normal: 1,
-     *   scene: 0
-     * }
-     */
-    get keyTypes() {
-        if (!this.typeStr)
-            return '';
-        const types = this.typeStr.split('|');
-        const typeObj = {
-            normal: 0,
-            scene: 0
-        };
-        for (let index = 0; index < types.length; index++) {
-            const t = types[index];
-            typeObj[SwitchKeyTypeIndexMap[index]] = +!!t;
+    create() {
+        let equip = new SwitchMixEquip_1.SwitchMixEquip(this.status, this.deviceType, this.deviceChildType);
+        if (equip.isSocket) {
+            equip = new SwitchPlugEquip_1.SwitchPlugEquip(this.status, this.deviceType, this.deviceChildType);
         }
-        return typeObj;
+        return this.equip = equip;
     }
-    /**
-     * 按键
-     * ['00', '01', '10', '11']
-     */
-    get keyDots() {
-        return this.switchStatus.keyDots;
-    }
-    /**
-     * 按键数
-     */
-    get keyCount() {
-        return +this.getKeyCount();
-    }
-    getKeyCount() {
-        if (!this.typeStr || !this.typeStr.length)
-            return 1;
-        let keys = this.typeStr.split('|');
-        keys = keys.filter((it) => it);
-        return keys.reduce((a, b) => +a + (+b)) || 1;
-    }
-    setPower(v, index) {
-        const vb = new this.Converter(`${v}`, 10).toBinary();
-        this.switchStatus.setKeyDot(vb, index);
-    }
-    getPower(index) {
-        if (index !== undefined) {
-            const v = this.switchStatus.getKeyDotByIndex(index);
-            const vd = new this.Converter(`${v}`, 2).toDecimal();
-            return [vd];
-        }
-        else {
-            return this.keyDots.map(item => new this.Converter(`${item}`, 2).toDecimal());
-        }
-    }
-    getPowerInt(index) {
-        const powers = this.getPower(index);
-        return powers.map(item => +item > 1 ? 0 : +item);
-    }
-    getBytes() {
-        const keyDots = this.switchStatus.keyDots.reverse();
-        const status = new this.Converter(keyDots.join('') || '00', 2).toHex();
-        return this.bytes.format(status);
-    }
 }
 exports.SwitchEquip = SwitchEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9Td2l0Y2hFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNILHlEQUFzRDtBQUN0RCwyQ0FBd0M7QUFFeEMsSUFBSyxlQUdKO0FBSEQsV0FBSyxlQUFlO0lBQ2xCLGlEQUFNLENBQUE7SUFDTixtREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUhJLGVBQWUsS0FBZixlQUFlLFFBR25CO0FBRUQsYUFBYTtBQUNiLElBQUssa0JBR0o7QUFIRCxXQUFLLGtCQUFrQjtJQUNyQiwrREFBVSxDQUFBO0lBQ1YsNkRBQVMsQ0FBQSxDQUFDLEtBQUs7QUFDakIsQ0FBQyxFQUhJLGtCQUFrQixLQUFsQixrQkFBa0IsUUFHdEI7QUFFRCxNQUFNLHFCQUFxQixHQUFPO0lBQ2hDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUTtJQUNyQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU87Q0FDcEMsQ0FBQTtBQUVELE1BQU0sa0JBQWtCLEdBQVE7SUFDOUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRztJQUN6QixDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHO0NBQzNCLENBQUE7QUFFRCxNQUFhLFdBQVksU0FBUSxxQkFBUztJQUl4QyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBRjNCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQUczQyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsd0JBQXdCLENBQUMsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBQ25GLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSwyQkFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUNyRSxDQUFDO0lBQ0Q7O09BRUc7SUFDSCxJQUFJLFNBQVM7UUFDWCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUNEOzs7Ozs7T0FNRztJQUNILElBQUksUUFBUTtRQUNWLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTztZQUFFLE9BQU8sRUFBRSxDQUFBO1FBQzVCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3JDLE1BQU0sT0FBTyxHQUFPO1lBQ2xCLE1BQU0sRUFBRSxDQUFDO1lBQ1QsS0FBSyxFQUFFLENBQUM7U0FDVCxDQUFBO1FBQ0QsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDakQsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ3RCLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtTQUM3QztRQUNELE9BQU8sT0FBTyxDQUFBO0lBQ2hCLENBQUM7SUFDRDs7O09BR0c7SUFDSCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFBO0lBQ2xDLENBQUM7SUFDRDs7T0FFRztJQUNILElBQUksUUFBUTtRQUNWLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDNUIsQ0FBQztJQUNPLFdBQVc7UUFDakIsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU07WUFBRSxPQUFPLENBQUMsQ0FBQTtRQUNuRCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNsQyxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQU8sRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDbkMsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBSyxFQUFFLENBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFDRCxRQUFRLENBQUUsQ0FBUyxFQUFFLEtBQWE7UUFDaEMsTUFBTSxFQUFFLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUE7UUFDcEQsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ3hDLENBQUM7SUFDRCxRQUFRLENBQUUsS0FBYztRQUN0QixJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUU7WUFDdkIsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNuRCxNQUFNLEVBQUUsR0FBRyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQTtZQUNwRCxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUE7U0FDWjthQUFNO1lBQ0wsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFFLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUE7U0FDL0U7SUFDSCxDQUFDO0lBQ0QsV0FBVyxDQUFFLEtBQWM7UUFDekIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUNuQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNsRCxDQUFDO0lBQ0QsUUFBUTtRQUNOLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUN0RSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUM7Q0FDRjtBQTVFRCxrQ0E0RUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoRXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9Td2l0Y2hFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNILDJDQUF3QztBQUN4QyxxREFBa0Q7QUFDbEQsdURBQW9EO0FBRXBELE1BQWEsV0FBWSxTQUFRLHFCQUFTO0lBR3hDOzs7Ozs7Ozs7Ozs7OztPQWNHO0lBQ0gsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQTtRQWpCNUMsVUFBSyxHQUFRLEVBQUUsQ0FBQztJQWtCaEIsQ0FBQztJQUNELE1BQU07UUFDSixJQUFJLEtBQUssR0FBRyxJQUFJLCtCQUFjLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUNsRixJQUFJLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDbEIsS0FBSyxHQUFHLElBQUksaUNBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFBO1NBQ2hGO1FBQ0QsT0FBTyxJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQTtJQUMzQixDQUFDO0NBZ0JGO0FBM0NELGtDQTJDQyJ9

build/main/modules/SwitchMixEquip.d.ts

 import { SwitchMixStatus } from '../entity/SwitchMixStatus';
 import { BaseEquip } from './BaseEquip';
+export declare enum KeyTypePatternEnum {
+    SWITCH = "10",
+    SCENE = "01",
+    SWITCHSCENE = "11",
+    LINE = "001",
+    SOCKET = "0001",
+    SWITCHRADAR = "10001",
+    SCENERADAR = "01001"
+}
 export declare class SwitchMixEquip extends BaseEquip {
@@ -8,3 +17,3 @@ switchStatus: SwitchMixStatus;
     /**
-     * 面板开关(普通开关、情景开关、单线开挂、混合开关[普通+情景])
+     * 面板开关(普通开关、情景开关、单线开关、混合开关[普通+情景])
      * @param status 状态
@@ -22,3 +31,3 @@ * @param deviceType 主类型
      * {
-     *   normal: 1,
+     *   switch: 1,
      *   scene: 0
@@ -28,2 +37,3 @@ * }
     get keyTypes(): any;
+    get keyTypePattern(): string;
     /**
@@ -48,9 +58,13 @@ * 按键列表
      * 混合类型 - 情景为主入口
+     * 单线开关 - 开关
+     * 插座开关 - 插座
      */
     get orderCount(): number[];
+    get isSwitch(): boolean;
+    get isScene(): boolean;
+    get isSwitchScene(): boolean;
+    get isLine(): boolean;
+    get isSocket(): boolean;
+    get isRadar(): boolean;
     /**
-     * 获取按键总数
-     */
-    private _getKeyCount;
-    /**
      * 设置按键位
@@ -57,0 +71,0 @@ * @param v 值

build/main/modules/SwitchMixEquip.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwitchMixEquip = void 0;
+exports.SwitchMixEquip = exports.KeyTypePatternEnum = void 0;
 /*
@@ -8,21 +8,38 @@ * @Author: eamiear
  * @Last Modified by: eamiear
- * @Last Modified time: 2020-12-18 15:38:27
+ * @Last Modified time: 2020-12-21 17:55:33
  */
 const SwitchMixStatus_1 = require("../entity/SwitchMixStatus");
+const SwitchStatus_1 = require("../entity/SwitchStatus");
 const BaseEquip_1 = require("./BaseEquip");
-var SwitchKeyStatus;
-(function (SwitchKeyStatus) {
-    SwitchKeyStatus[SwitchKeyStatus["ON"] = 1] = "ON";
-    SwitchKeyStatus[SwitchKeyStatus["OFF"] = 0] = "OFF";
-})(SwitchKeyStatus || (SwitchKeyStatus = {}));
 // 按键类型索引 3|3
+// 开关|情景|单线|插座|雷达
 var SwitchKeyTypeIndex;
 (function (SwitchKeyTypeIndex) {
-    SwitchKeyTypeIndex[SwitchKeyTypeIndex["NORMAL"] = 0] = "NORMAL";
-    SwitchKeyTypeIndex[SwitchKeyTypeIndex["SCENE"] = 1] = "SCENE"; // 情景
+    SwitchKeyTypeIndex[SwitchKeyTypeIndex["SWITCH"] = 0] = "SWITCH";
+    SwitchKeyTypeIndex[SwitchKeyTypeIndex["SCENE"] = 1] = "SCENE";
+    SwitchKeyTypeIndex[SwitchKeyTypeIndex["LINE"] = 2] = "LINE";
+    SwitchKeyTypeIndex[SwitchKeyTypeIndex["SOCKET"] = 3] = "SOCKET";
+    SwitchKeyTypeIndex[SwitchKeyTypeIndex["RADAR"] = 4] = "RADAR";
 })(SwitchKeyTypeIndex || (SwitchKeyTypeIndex = {}));
+// 开关类型
 const SwitchKeyTypeIndexMap = {
-    [SwitchKeyTypeIndex.NORMAL]: 'normal',
-    [SwitchKeyTypeIndex.SCENE]: 'scene'
+    [SwitchKeyTypeIndex.SWITCH]: 'switch',
+    [SwitchKeyTypeIndex.SCENE]: 'scene',
+    [SwitchKeyTypeIndex.LINE]: 'line',
+    [SwitchKeyTypeIndex.SOCKET]: 'socket',
+    [SwitchKeyTypeIndex.RADAR]: 'radar',
 };
+const SwitchTypeIndexObj = {
+    switch: 0,
+    scene: 0,
+    line: 0,
+    socket: 0,
+    radar: 0
+};
+// 按键状态
+var SwitchKeyStatus;
+(function (SwitchKeyStatus) {
+    SwitchKeyStatus[SwitchKeyStatus["ON"] = 1] = "ON";
+    SwitchKeyStatus[SwitchKeyStatus["OFF"] = 0] = "OFF";
+})(SwitchKeyStatus || (SwitchKeyStatus = {}));
 const SwitchKeyStatusMap = {
@@ -32,5 +49,17 @@ [SwitchKeyStatus.ON]: '开',
 };
+const DEFAULT_KEY_COUNT = 0; // 默认按键数
+// 按键类型范式
+var KeyTypePatternEnum;
+(function (KeyTypePatternEnum) {
+    KeyTypePatternEnum["SWITCH"] = "10";
+    KeyTypePatternEnum["SCENE"] = "01";
+    KeyTypePatternEnum["SWITCHSCENE"] = "11";
+    KeyTypePatternEnum["LINE"] = "001";
+    KeyTypePatternEnum["SOCKET"] = "0001";
+    KeyTypePatternEnum["SWITCHRADAR"] = "10001";
+    KeyTypePatternEnum["SCENERADAR"] = "01001";
+})(KeyTypePatternEnum = exports.KeyTypePatternEnum || (exports.KeyTypePatternEnum = {}));
 class SwitchMixEquip extends BaseEquip_1.BaseEquip {
     /**
-     * 面板开关(普通开关、情景开关、单线开挂、混合开关[普通+情景])
+     * 面板开关(普通开关、情景开关、单线开关、混合开关[普通+情景])
      * @param status 状态
@@ -44,3 +73,3 @@ * @param deviceType 主类型
         this.typeStr = this.TypeHints.getSocketSwitchTypeIndex(deviceType, deviceChildType);
-        this.switchStatus = new SwitchMixStatus_1.SwitchMixStatus(status, this.orderCount);
+        this.switchStatus = new SwitchMixStatus_1.SwitchMixStatus(status, this.orderCount, this.keyTypePattern);
     }
@@ -56,3 +85,3 @@ /**
      * {
-     *   normal: 1,
+     *   switch: 1,
      *   scene: 0
@@ -65,12 +94,18 @@ * }
         const types = this.typeStr.split('|');
-        const typeObj = {
-            normal: 0,
-            scene: 0
-        };
+        const typeObj = Object.assign({}, SwitchTypeIndexObj);
         for (let index = 0; index < types.length; index++) {
-            const t = types[index];
-            typeObj[SwitchKeyTypeIndexMap[index]] = +!!t;
+            typeObj[SwitchKeyTypeIndexMap[index]] = +!!types[index];
         }
         return typeObj;
     }
+    // 类型范式 [3, 3] => '11', [3, 0] => '10', [0, 3] => '01'...
+    get keyTypePattern() {
+        let keys = this.typeStr.split('|');
+        const keyList = []; // [3, 0, 2] => [1, 0, 1]
+        for (let index = 0; index < keys.length; index++) {
+            const key = keys[index];
+            keyList[index] = +key ? 1 : 0;
+        }
+        return keyList.join('');
+    }
     /**
@@ -87,3 +122,7 @@ * 按键列表
     get keyCount() {
-        return +this._getKeyCount();
+        if (!this.typeStr || !this.typeStr.length)
+            return DEFAULT_KEY_COUNT;
+        let keys = this.typeStr.split('|');
+        keys = keys.filter((it) => it);
+        return +keys.reduce((a, b) => +a + (+b)) || DEFAULT_KEY_COUNT;
     }
@@ -95,3 +134,3 @@ /**
         if (!this.typeStr || !this.typeStr.length)
-            return [1];
+            return [DEFAULT_KEY_COUNT];
         let keys = this.typeStr.split('|');
@@ -101,3 +140,3 @@ const keyList = [];
             const key = keys[index];
-            keyList[index] = +key ? +key : 0;
+            keyList[index] = +key ? +key : DEFAULT_KEY_COUNT;
         }
@@ -112,17 +151,38 @@ return keyList;
      * 混合类型 - 情景为主入口
+     * 单线开关 - 开关
+     * 插座开关 - 插座
      */
     get orderCount() {
-        const countList = this._keyCountList;
-        return countList.length && countList.length === 2 ? countList.reverse() : countList;
+        const countList = [...this._keyCountList];
+        if (!countList.length)
+            return [];
+        // 开关
+        if (countList.length === 1 || this.isSwitch)
+            return countList;
+        // 主要主程
+        if (this.isScene || this.isSwitchScene || this.isLine || this.isSocket)
+            return countList.reverse().slice(0, 2);
+        // 雷达主程
+        if (this.isRadar)
+            return [countList.find(i => !!i) || DEFAULT_KEY_COUNT];
+        return [];
     }
-    /**
-     * 获取按键总数
-     */
-    _getKeyCount() {
-        if (!this.typeStr || !this.typeStr.length)
-            return 1;
-        let keys = this.typeStr.split('|');
-        keys = keys.filter((it) => it);
-        return keys.reduce((a, b) => +a + (+b)) || 1;
+    get isSwitch() {
+        return this.keyTypePattern === KeyTypePatternEnum.SWITCH;
     }
+    get isScene() {
+        return this.keyTypePattern === KeyTypePatternEnum.SCENE;
+    }
+    get isSwitchScene() {
+        return this.keyTypePattern === KeyTypePatternEnum.SWITCHSCENE;
+    }
+    get isLine() {
+        return this.keyTypePattern === KeyTypePatternEnum.LINE;
+    }
+    get isSocket() {
+        return this.keyTypePattern === KeyTypePatternEnum.SOCKET;
+    }
+    get isRadar() {
+        return [`${KeyTypePatternEnum.SWITCHRADAR}`, `${KeyTypePatternEnum.SCENERADAR}`].includes(this.keyTypePattern);
+    }
     /**
@@ -137,3 +197,3 @@ * 设置按键位
         const setMethod = t ? 'setExtraKeyDots' : 'setKeyDot';
-        const idx = t ? index - this.orderCount[0] : index;
+        const idx = t ? index - this.orderCount[SwitchStatus_1.OrderEnum.Primary] : index;
         this.switchStatus[setMethod](vb, idx);
@@ -176,4 +236,9 @@ return this;
     getBytes() {
-        const keyDots = this.switchStatus.keyDots.reverse();
-        const extraDots = this.switchStatus.extraKeyDots.reverse();
+        // 按键从右至左取值，构建字节码需先取反
+        let keyDots = [...this.switchStatus.keyDots];
+        keyDots = keyDots.reverse();
+        if (this.isScene || this.isSwitchScene) { // 情景开关按字节 8位获取按键
+            keyDots = keyDots.map(k => `${+k}`);
+        }
+        const extraDots = [...this.switchStatus.extraKeyDots].reverse();
         const status = new this.Converter(keyDots.join('') || '00', 2).toHex();
@@ -185,2 +250,2 @@ const extraStatus = new this.Converter(extraDots.join('') || '00', 2).toHex();
 exports.SwitchMixEquip = SwitchMixEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoTWl4RXF1aXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvbW9kdWxlcy9Td2l0Y2hNaXhFcXVpcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQTs7Ozs7R0FLRztBQUNILCtEQUE0RDtBQUM1RCwyQ0FBd0M7QUFFeEMsSUFBSyxlQUdKO0FBSEQsV0FBSyxlQUFlO0lBQ2xCLGlEQUFNLENBQUE7SUFDTixtREFBTyxDQUFBO0FBQ1QsQ0FBQyxFQUhJLGVBQWUsS0FBZixlQUFlLFFBR25CO0FBRUQsYUFBYTtBQUNiLElBQUssa0JBR0o7QUFIRCxXQUFLLGtCQUFrQjtJQUNyQiwrREFBVSxDQUFBO0lBQ1YsNkRBQVMsQ0FBQSxDQUFDLEtBQUs7QUFDakIsQ0FBQyxFQUhJLGtCQUFrQixLQUFsQixrQkFBa0IsUUFHdEI7QUFFRCxNQUFNLHFCQUFxQixHQUFPO0lBQ2hDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLEVBQUUsUUFBUTtJQUNyQyxDQUFDLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU87Q0FDcEMsQ0FBQTtBQUVELE1BQU0sa0JBQWtCLEdBQVE7SUFDOUIsQ0FBQyxlQUFlLENBQUMsRUFBRSxDQUFDLEVBQUUsR0FBRztJQUN6QixDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHO0NBQzNCLENBQUE7QUFFRCxNQUFhLGNBQWUsU0FBUSxxQkFBUztJQUkzQzs7Ozs7T0FLRztJQUNILFlBQVksTUFBYyxFQUFFLFVBQW1CLEVBQUUsZUFBd0I7UUFDdkUsS0FBSyxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsZUFBZSxDQUFDLENBQUE7UUFSNUMsVUFBSyxHQUFHLG9CQUFvQixDQUFDO1FBUzNCLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsZUFBZSxDQUFDLENBQUE7UUFDbkYsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLGlDQUFlLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUNsRSxDQUFDO0lBQ0Q7O09BRUc7SUFDSCxJQUFJLFNBQVM7UUFDWCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUNEOzs7Ozs7T0FNRztJQUNILElBQUksUUFBUTtRQUNWLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTztZQUFFLE9BQU8sRUFBRSxDQUFBO1FBQzVCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3JDLE1BQU0sT0FBTyxHQUFPO1lBQ2xCLE1BQU0sRUFBRSxDQUFDO1lBQ1QsS0FBSyxFQUFFLENBQUM7U0FDVCxDQUFBO1FBQ0QsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEtBQUssQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7WUFDakQsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ3RCLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtTQUM3QztRQUNELE9BQU8sT0FBTyxDQUFBO0lBQ2hCLENBQUM7SUFDRDs7O09BR0c7SUFDSCxJQUFJLE9BQU87UUFDVCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksSUFBSSxFQUFFLENBQUMsQ0FBQTtJQUMvRSxDQUFDO0lBQ0Q7O09BRUc7SUFDSCxJQUFJLFFBQVE7UUFDVixPQUFPLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFBO0lBQzdCLENBQUM7SUFDRDs7T0FFRztJQUNILElBQUksYUFBYTtRQUNmLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNO1lBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3JELElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2xDLE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQTtRQUNsQixLQUFLLElBQUksS0FBSyxHQUFHLENBQUMsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRTtZQUNoRCxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDdkIsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO1NBQ2pDO1FBQ0QsT0FBTyxPQUFPLENBQUE7SUFDaEIsQ0FBQztJQUNEOzs7Ozs7T0FNRztJQUNILElBQUksVUFBVTtRQUNaLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUE7UUFDcEMsT0FBTyxTQUFTLENBQUMsTUFBTSxJQUFJLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtJQUNyRixDQUFDO0lBQ0Q7O09BRUc7SUFDSyxZQUFZO1FBQ2xCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNO1lBQUUsT0FBTyxDQUFDLENBQUE7UUFDbkQsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDbEMsSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFPLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ25DLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUssRUFBRSxDQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN0RCxDQUFDO0lBQ0Q7Ozs7O09BS0c7SUFDSCxRQUFRLENBQUUsQ0FBUyxFQUFFLEtBQWEsRUFBRSxDQUFVO1FBQzVDLE1BQU0sRUFBRSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFBO1FBQ3BELE1BQU0sU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQTtRQUNyRCxNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7UUFDbEQsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDckMsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0Q7Ozs7T0FJRztJQUNILFFBQVEsQ0FBRSxLQUFjLEVBQUUsQ0FBVTtRQUNsQyxJQUFJLEtBQUssS0FBSyxTQUFTLEVBQUU7WUFDdkIsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUE7WUFDbEUsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO1lBQ2xELE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDM0MsTUFBTSxFQUFFLEdBQUcsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUE7WUFDcEQsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1NBQ1o7YUFBTTtZQUNMLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBRSxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFBO1NBQy9FO0lBQ0gsQ0FBQztJQUNEOzs7O09BSUc7SUFDSCxXQUFXLENBQUUsS0FBYyxFQUFFLENBQVU7UUFDckMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDdEMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsbUJBQW1CO1FBQ2pCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUNoQyxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN4RCxDQUFDO0lBRUQsUUFBUTtRQUNOLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ25ELE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQzFELE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUN0RSxNQUFNLFdBQVcsR0FBRyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDN0UsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDL0MsQ0FBQztDQUNGO0FBN0lELHdDQTZJQyJ9
+//# 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

 import { SwitchMixEquip } from './SwitchMixEquip';
 export declare class SwitchPlugEquip extends SwitchMixEquip {
-    typeStr: any;
     constructor(status: string, deviceType?: string, deviceChildType?: string);
@@ -5,0 +4,0 @@ /**

build/main/modules/SwitchPlugEquip.js

@@ -22,95 +22,7 @@ "use strict";
 class SwitchPlugEquip extends SwitchMixEquip_1.SwitchMixEquip {
-    // private bytes = `{0}00000000000000`;
     constructor(status, deviceType, deviceChildType) {
         super(status, deviceType, deviceChildType);
-        // this.typeStr = this.TypeHints.getSocketSwitchTypeIndex(deviceType, deviceChildType)
         this.switchStatus = new SwitchPlugStatus_1.SwitchPlugStatus(status, this.orderCount);
         this.bytes = `0000{0}0000000000`;
     }
-    // /**
-    //  * 类型索引 1|3
-    //  */
-    // get typeIndex () {
-    //   return this.typeStr
-    // }
-    // /**
-    //  * 按键列表
-    //  * ['00', '01', '10', '11']
-    //  */
-    // get keyDots () {
-    //   return this.switchStatus.keyDots
-    // }
-    // /**
-    //  * 按键总数
-    //  */
-    // get keyCount () {
-    //   return +this._getKeyCount()
-    // }
-    // /**
-    //  * 获取各类型按键数量列表 [2,3] -> [开关, 情景]
-    //  */
-    // get _keyCountList () {
-    //   if (!this.typeStr || !this.typeStr.length) return [1]
-    //   let keys = this.typeStr.split('|')
-    //   const keyList = []
-    //   for (let index = 0; index < keys.length; index++) {
-    //     const key = keys[index]
-    //     keyList[index] = +key ? +key : 0
-    //   }
-    //   return keyList
-    // }
-    // /**
-    //  * 按键数列表，按主程类型排序
-    //  *
-    //  * 开关类型 - 开关为主入口
-    //  * 情景类型 - 情景为主入口
-    //  * 混合类型 - 情景为主入口
-    //  */
-    // get orderCount () {
-    //   const countList = this._keyCountList
-    //   return countList.length && countList.length === 2 ? countList.reverse() : countList
-    // }
-    // /**
-    //  * 获取按键总数
-    //  */
-    // private _getKeyCount () {
-    //   if (!this.typeStr || !this.typeStr.length) return 1
-    //   let keys = this.typeStr.split('|')
-    //   keys = keys.filter((it: any) => it)
-    //   return keys.reduce((a:any, b:any) => +a + (+b)) || 1
-    // }
-    // /**
-    //  * 设置按键位
-    //  * @param v 值
-    //  * @param index 索引
-    //  * @param t 非主程类型 > 0 的任意值
-    //  */
-    // setPower (v: number, index: number, t?: number) {
-    //   const vb = new this.Converter(`${v}`, 10).toBinary()
-    //   this.switchStatus.setKeyDot(vb, index)
-    //   return this
-    // }
-    // /**
-    //  * 获取按键值 ['1', '0', '1']
-    //  * @param index 索引
-    //  * @param t  非主程类型 > 0 的任意值
-    //  */
-    // getPower (index?: number, t?: number): Array<string> {
-    //   if (index !== undefined) {
-    //     const v = this.switchStatus.getKeyDotByIndex(index)
-    //     const vd = new this.Converter(`${v}`, 2).toDecimal()
-    //     return [vd]
-    //   } else {
-    //     return this.keyDots.map(item =>  new this.Converter(`${item}`, 2).toDecimal())
-    //   }
-    // }
-    // /**
-    //  * 获取按键位整型值  [1, 0, 1]
-    //  * @param index 索引
-    //  * @param t  非主程类型 > 0 的任意值
-    //  */
-    // getPowerInt (index?: number, t?: number): Array<number> {
-    //   const powers = this.getPower(index, t)
-    //   return powers.map(item => +item > 1 ? 0 : +item)
-    // }
     /**
@@ -130,2 +42,2 @@ * 获取状态描述
 exports.SwitchPlugEquip = SwitchPlugEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU3dpdGNoUGx1Z0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsaUVBQThEO0FBQzlELHFEQUFrRDtBQUVsRCxJQUFLLFVBR0o7QUFIRCxXQUFLLFVBQVU7SUFDYix1Q0FBTSxDQUFBO0lBQ04seUNBQU8sQ0FBQTtBQUNULENBQUMsRUFISSxVQUFVLEtBQVYsVUFBVSxRQUdkO0FBRUQsTUFBTSxtQkFBbUIsR0FBUTtJQUMvQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUc7Q0FDdEIsQ0FBQTtBQUVELE1BQWEsZUFBZ0IsU0FBUSwrQkFBYztJQUVqRCx1Q0FBdUM7SUFDdkMsWUFBWSxNQUFjLEVBQUUsVUFBbUIsRUFBRSxlQUF3QjtRQUN2RSxLQUFLLENBQUMsTUFBTSxFQUFFLFVBQVUsRUFBRSxlQUFlLENBQUMsQ0FBQTtRQUMxQyxzRkFBc0Y7UUFDdEYsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLG1DQUFnQixDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLEtBQUssR0FBRyxtQkFBbUIsQ0FBQTtJQUNsQyxDQUFDO0lBQ0QsTUFBTTtJQUNOLGNBQWM7SUFDZCxNQUFNO0lBQ04scUJBQXFCO0lBQ3JCLHdCQUF3QjtJQUN4QixJQUFJO0lBQ0osTUFBTTtJQUNOLFVBQVU7SUFDViw4QkFBOEI7SUFDOUIsTUFBTTtJQUNOLG1CQUFtQjtJQUNuQixxQ0FBcUM7SUFDckMsSUFBSTtJQUNKLE1BQU07SUFDTixVQUFVO0lBQ1YsTUFBTTtJQUNOLG9CQUFvQjtJQUNwQixnQ0FBZ0M7SUFDaEMsSUFBSTtJQUNKLE1BQU07SUFDTixtQ0FBbUM7SUFDbkMsTUFBTTtJQUNOLHlCQUF5QjtJQUN6QiwwREFBMEQ7SUFDMUQsdUNBQXVDO0lBQ3ZDLHVCQUF1QjtJQUN2Qix3REFBd0Q7SUFDeEQsOEJBQThCO0lBQzlCLHVDQUF1QztJQUN2QyxNQUFNO0lBQ04sbUJBQW1CO0lBQ25CLElBQUk7SUFDSixNQUFNO0lBQ04sbUJBQW1CO0lBQ25CLEtBQUs7SUFDTCxtQkFBbUI7SUFDbkIsbUJBQW1CO0lBQ25CLG1CQUFtQjtJQUNuQixNQUFNO0lBQ04sc0JBQXNCO0lBQ3RCLHlDQUF5QztJQUN6Qyx3RkFBd0Y7SUFDeEYsSUFBSTtJQUNKLE1BQU07SUFDTixZQUFZO0lBQ1osTUFBTTtJQUNOLDRCQUE0QjtJQUM1Qix3REFBd0Q7SUFDeEQsdUNBQXVDO0lBQ3ZDLHdDQUF3QztJQUN4Qyx5REFBeUQ7SUFDekQsSUFBSTtJQUNKLE1BQU07SUFDTixXQUFXO0lBQ1gsZ0JBQWdCO0lBQ2hCLHFCQUFxQjtJQUNyQiw2QkFBNkI7SUFDN0IsTUFBTTtJQUNOLG9EQUFvRDtJQUNwRCx5REFBeUQ7SUFDekQsMkNBQTJDO0lBQzNDLGdCQUFnQjtJQUNoQixJQUFJO0lBQ0osTUFBTTtJQUNOLDJCQUEyQjtJQUMzQixxQkFBcUI7SUFDckIsOEJBQThCO0lBQzlCLE1BQU07SUFDTix5REFBeUQ7SUFDekQsK0JBQStCO0lBQy9CLDBEQUEwRDtJQUMxRCwyREFBMkQ7SUFDM0Qsa0JBQWtCO0lBQ2xCLGFBQWE7SUFDYixxRkFBcUY7SUFDckYsTUFBTTtJQUNOLElBQUk7SUFDSixNQUFNO0lBQ04seUJBQXlCO0lBQ3pCLHFCQUFxQjtJQUNyQiw4QkFBOEI7SUFDOUIsTUFBTTtJQUNOLDREQUE0RDtJQUM1RCwyQ0FBMkM7SUFDM0MscURBQXFEO0lBQ3JELElBQUk7SUFFSjs7T0FFRztJQUNILG1CQUFtQjtRQUNqQixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUE7UUFDaEMsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDekQsQ0FBQztJQUVELFFBQVE7UUFDTixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtRQUNuRCxNQUFNLE1BQU0sR0FBRyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDdEUsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNsQyxDQUFDO0NBQ0Y7QUE3R0QsMENBNkdDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3dpdGNoUGx1Z0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU3dpdGNoUGx1Z0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsaUVBQThEO0FBQzlELHFEQUFrRDtBQUVsRCxJQUFLLFVBR0o7QUFIRCxXQUFLLFVBQVU7SUFDYix1Q0FBTSxDQUFBO0lBQ04seUNBQU8sQ0FBQTtBQUNULENBQUMsRUFISSxVQUFVLEtBQVYsVUFBVSxRQUdkO0FBRUQsTUFBTSxtQkFBbUIsR0FBUTtJQUMvQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUc7Q0FDdEIsQ0FBQTtBQUVELE1BQWEsZUFBZ0IsU0FBUSwrQkFBYztJQUNqRCxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFBO1FBQzFDLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxtQ0FBZ0IsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFBO1FBQ2pFLElBQUksQ0FBQyxLQUFLLEdBQUcsbUJBQW1CLENBQUE7SUFDbEMsQ0FBQztJQUNEOztPQUVHO0lBQ0gsbUJBQW1CO1FBQ2pCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQTtRQUNoQyxPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN6RCxDQUFDO0lBRUQsUUFBUTtRQUNOLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUN0RSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUM7Q0FDRjtBQW5CRCwwQ0FtQkMifQ==

build/main/modules/WireConditionEquip.d.ts

@@ -8,11 +8,9 @@ import { BaseEquip } from './BaseEquip';
     /**
-     * 空调套件操作
+     * 线控空调
      * @param status          16进制状态字符串
      * @param deviceType      设备类型
      * @param deviceChildType 设备子类型
-     * @param ac              空调对象信息
      */
     constructor(status?: string, deviceType?: string, deviceChildType?: string);
     static get defaultTemp(): number;
-    init(): void;
     /**
@@ -28,2 +26,6 @@ * 设置空调温度值
     /**
+     * 获取温度存储值（hex）
+     */
+    getTemperatureRawValue(): string;
+    /**
      * 获取温度文本
@@ -43,5 +45,5 @@ */
     /**
-     * 获取空调模式值: 0x00， 01，21， 51
+     * 获取空调模式值: 21， 51
      */
-    getModeValue(): string;
+    getModeRawValue(): string;
     /**
@@ -63,3 +65,3 @@ * 获取模式描述: 自动、制冷...
      */
-    getSpeedValue(): string;
+    getSpeedRawValue(): string;
     get speedText(): string;
@@ -78,3 +80,3 @@ /**
      */
-    getHorizontalWingValue(): string;
+    getHorizontalWingRawValue(): string;
     /**
@@ -96,3 +98,3 @@ * 获取左右摆风文本: '左右', '--'
      */
-    getVerticalWingVlaue(): string;
+    getVerticalWingRawValue(): string;
     /**
@@ -99,0 +101,0 @@ * 获取摆风文本: '左右', '--'

build/main/modules/WireConditionEquip.js

@@ -7,10 +7,8 @@ "use strict";
 const WireConditionStatus_1 = require("../entity/WireConditionStatus");
-// 线控空调
 class WireConditionEquip extends BaseEquip_1.BaseEquip {
     /**
-     * 空调套件操作
+     * 线控空调
      * @param status          16进制状态字符串
      * @param deviceType      设备类型
      * @param deviceChildType 设备子类型
-     * @param ac              空调对象信息
      */
@@ -22,3 +20,2 @@ constructor(status = '', deviceType, deviceChildType) {
         this.airModel = new WireConditionStatus_1.WireAirConditionModel(status);
-        this.init();
     }
@@ -28,17 +25,2 @@ static get defaultTemp() {
     }
-    init() {
-        // const keyValue = this.airModel.getKeyValue()
-        // if (!keyValue) return
-        // if (['on', 'off'].includes(keyValue)) {
-        //   this.setPower(keyValue === 'on')
-        // } else {
-        //   const keys = keyValue.split('_')
-        //   if (keys.filter(i => i).length) this.airModel.setPower('on')
-        //   keys[0] && this.setMode(+this.getMode(keys[0]))
-        //   keys[1] && this.setSpeed(+this.getSpeed(keys[1]))
-        //   this.setTemperature(+this.getTemperature(new this.Converter(keys[2] ? keys[2] : `${WireConditionEquip.defaultTemp}`, 10).toHex()))
-        //   keys[3] && this.setVerticalWing(+this.getVerticalWing(keys[3]))
-        //   keys[4] && this.setHorizontalWing(+this.getHorizontalWing(keys[4]))
-        // }
-    }
     /**
@@ -63,2 +45,8 @@ * 设置空调温度值
     /**
+     * 获取温度存储值（hex）
+     */
+    getTemperatureRawValue() {
+        return this.airModel.getTemperature();
+    }
+    /**
      * 获取温度文本
@@ -91,5 +79,5 @@ */
     /**
-     * 获取空调模式值: 0x00， 01，21， 51
+     * 获取空调模式值: 21， 51
      */
-    getModeValue() {
+    getModeRawValue() {
         return this.airModel.getMode();
@@ -123,3 +111,3 @@ }
      */
-    getSpeedValue() {
+    getSpeedRawValue() {
         return this.airModel.getSpeed();
@@ -152,3 +140,3 @@ }
      */
-    getHorizontalWingValue() {
+    getHorizontalWingRawValue() {
         return this.airModel.getHorizontalWing();
@@ -184,3 +172,3 @@ }
      */
-    getVerticalWingVlaue() {
+    getVerticalWingRawValue() {
         return this.airModel.getVerticalWing();
@@ -233,3 +221,3 @@ }
     get isPowerOn() {
-        return this.getPower() === constant_1.WireModeMap[constant_1.WireMode.ON];
+        return this.getPower() === constant_1.WireModeMap[constant_1.WireMode.ON] || !!+this.getModeRawValue();
     }
@@ -259,22 +247,31 @@ /**
         const mode = this.getPower();
-        const speed = this.getSpeedValue();
-        const temperature = this.getTemperature();
-        const vwing = this.getVerticalWingVlaue();
-        const hwing = this.getHorizontalWingValue();
+        const speed = this.getSpeedRawValue();
+        const temperature = this.getTemperatureRawValue();
+        const vwing = this.getVerticalWingRawValue();
+        const hwing = this.getHorizontalWingRawValue();
         return this.bytes.format(mode, speed, temperature, vwing, hwing, this.airModel.roomTemp);
     }
     getBytes() {
-        const mode = this.getModeValue();
-        const speed = this.getSpeedValue();
-        const temperature = this.getTemperature();
-        const vwing = this.getVerticalWingVlaue();
-        const hwing = this.getHorizontalWingValue();
+        const mode = this.getModeRawValue();
+        const speed = this.getSpeedRawValue();
+        const temperature = this.getTemperatureRawValue();
+        const vwing = this.getVerticalWingRawValue();
+        const hwing = this.getHorizontalWingRawValue();
         return this.bytes.format(mode, speed, temperature, vwing, hwing, this.airModel.roomTemp);
     }
     getStatusDescriptor() {
-        const isPowerOn = this.isPowerOn ? this.isPowerOn : !!this.getModeValue();
-        return isPowerOn ? constant_1.WireModeDescriptorMap[constant_1.WireMode.ON] : constant_1.WireModeDescriptorMap[constant_1.WireMode.OFF];
+        // return this.isPowerOn ? WireModeDescriptorMap[WireMode.ON] : WireModeDescriptorMap[WireMode.OFF]
+        if (this.isPowerOn) {
+            const modeValue = this.getModeRawValue();
+            if (!modeValue)
+                return constant_1.WireModeDescriptorMap[constant_1.WireMode.ON];
+            if (constant_1.WireModeMap[constant_1.WireMode.COLD] === modeValue)
+                return constant_1.WireModeDescriptorMap[constant_1.WireMode.COLD];
+            if (constant_1.WireModeMap[constant_1.WireMode.HOT] === modeValue)
+                return constant_1.WireModeDescriptorMap[constant_1.WireMode.HOT];
+        }
+        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/shared/constant.d.ts

@@ -0,1 +1,12 @@
+export declare enum PowerEnum {
+    ON = "on",
+    OFF = "off"
+}
+export declare enum ModeEnum {
+    AUTO = 1,
+    COLD = 2,
+    WEDY = 3,
+    WING = 4,
+    HOT = 5
+}
 export declare const ModeMap: any;
@@ -6,5 +17,19 @@ /**
 export declare const ModeDescriptorMap: any;
+export declare enum SpeedEnum {
+    AUTO = 0,
+    WEAK = 1,
+    MEDIUM = 2,
+    STRONG = 3
+}
 export declare const SpeedMap: any;
 export declare const SpeedDescriptorMap: any;
+export declare enum HWingEnum {
+    ON = 1,
+    OFF = 0
+}
 export declare const HorizontalWingMap: any;
+export declare enum VWingEnum {
+    ON = 1,
+    OFF = 0
+}
 export declare const VerticalWingMap: any;
@@ -11,0 +36,0 @@ export declare const WingDescriptorMap: any;

build/main/shared/constant.js

 "use strict";
+///// 红外空调 ///////
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WireVWingDescriptorMap = exports.WWireVWingMap = exports.WireVWing = exports.WireHWingDescriptorMap = exports.WireHWingMap = exports.WireHWing = exports.WireSpeedDescriptorMap = exports.WireSpeedMap = exports.WireSpeed = exports.WireModeDescriptorMap = exports.WireModeMap = exports.WireMode = exports.WingDescriptorMap = exports.VerticalWingMap = exports.HorizontalWingMap = exports.SpeedDescriptorMap = exports.SpeedMap = exports.ModeDescriptorMap = exports.ModeMap = void 0;
+exports.WireVWingDescriptorMap = exports.WWireVWingMap = exports.WireVWing = exports.WireHWingDescriptorMap = exports.WireHWingMap = exports.WireHWing = exports.WireSpeedDescriptorMap = exports.WireSpeedMap = exports.WireSpeed = exports.WireModeDescriptorMap = exports.WireModeMap = exports.WireMode = exports.WingDescriptorMap = exports.VerticalWingMap = exports.VWingEnum = exports.HorizontalWingMap = exports.HWingEnum = exports.SpeedDescriptorMap = exports.SpeedMap = exports.SpeedEnum = exports.ModeDescriptorMap = exports.ModeMap = exports.ModeEnum = exports.PowerEnum = void 0;
+// 电源
+var PowerEnum;
+(function (PowerEnum) {
+    PowerEnum["ON"] = "on";
+    PowerEnum["OFF"] = "off";
+})(PowerEnum = exports.PowerEnum || (exports.PowerEnum = {}));
 // 模式
+var ModeEnum;
+(function (ModeEnum) {
+    ModeEnum[ModeEnum["AUTO"] = 1] = "AUTO";
+    ModeEnum[ModeEnum["COLD"] = 2] = "COLD";
+    ModeEnum[ModeEnum["WEDY"] = 3] = "WEDY";
+    ModeEnum[ModeEnum["WING"] = 4] = "WING";
+    ModeEnum[ModeEnum["HOT"] = 5] = "HOT"; // 制热
+})(ModeEnum = exports.ModeEnum || (exports.ModeEnum = {}));
 exports.ModeMap = {
-    1: 'a',
-    2: 'r',
-    3: 'd',
-    4: 'w',
-    5: 'h'
+    [ModeEnum.AUTO]: 'a',
+    [ModeEnum.COLD]: 'r',
+    [ModeEnum.WEDY]: 'd',
+    [ModeEnum.WING]: 'w',
+    [ModeEnum.HOT]: 'h'
 };
@@ -16,30 +31,47 @@ /**
 exports.ModeDescriptorMap = {
-    1: '自动',
-    2: '制冷',
-    3: '抽湿',
-    4: '送风',
-    5: '制热'
+    [ModeEnum.AUTO]: '自动',
+    [ModeEnum.COLD]: '制冷',
+    [ModeEnum.WEDY]: '抽湿',
+    [ModeEnum.WING]: '送风',
+    [ModeEnum.HOT]: '制热'
 };
 // 风速
+var SpeedEnum;
+(function (SpeedEnum) {
+    SpeedEnum[SpeedEnum["AUTO"] = 0] = "AUTO";
+    SpeedEnum[SpeedEnum["WEAK"] = 1] = "WEAK";
+    SpeedEnum[SpeedEnum["MEDIUM"] = 2] = "MEDIUM";
+    SpeedEnum[SpeedEnum["STRONG"] = 3] = "STRONG";
+})(SpeedEnum = exports.SpeedEnum || (exports.SpeedEnum = {}));
 exports.SpeedMap = {
-    0: 's0',
-    1: 's1',
-    2: 's2',
-    3: 's3'
+    [SpeedEnum.AUTO]: 's0',
+    [SpeedEnum.WEAK]: 's1',
+    [SpeedEnum.MEDIUM]: 's2',
+    [SpeedEnum.STRONG]: 's3'
 };
 exports.SpeedDescriptorMap = {
-    0: '自动',
-    1: '弱',
-    2: '中',
-    3: '强'
+    [SpeedEnum.AUTO]: '自动',
+    [SpeedEnum.WEAK]: '弱',
+    [SpeedEnum.MEDIUM]: '中',
+    [SpeedEnum.STRONG]: '强'
 };
 // 左右摆风
+var HWingEnum;
+(function (HWingEnum) {
+    HWingEnum[HWingEnum["ON"] = 1] = "ON";
+    HWingEnum[HWingEnum["OFF"] = 0] = "OFF";
+})(HWingEnum = exports.HWingEnum || (exports.HWingEnum = {}));
 exports.HorizontalWingMap = {
-    0: 'l0',
-    1: 'l1'
+    [HWingEnum.OFF]: 'l0',
+    [HWingEnum.ON]: 'l1'
 };
 // 上下摆风
+var VWingEnum;
+(function (VWingEnum) {
+    VWingEnum[VWingEnum["ON"] = 1] = "ON";
+    VWingEnum[VWingEnum["OFF"] = 0] = "OFF";
+})(VWingEnum = exports.VWingEnum || (exports.VWingEnum = {}));
 exports.VerticalWingMap = {
-    0: 'u0',
-    1: 'u1'
+    [VWingEnum.OFF]: 'u0',
+    [VWingEnum.ON]: 'u1'
 };
@@ -52,2 +84,4 @@ exports.WingDescriptorMap = {
 };
+////// 线控空调 ///////
+// 模式
 var WireMode;
@@ -68,7 +102,8 @@ (function (WireMode) {
 exports.WireModeDescriptorMap = {
-    [WireMode.OFF]: '关机',
-    [WireMode.ON]: '开机',
+    [WireMode.OFF]: '关',
+    [WireMode.ON]: '开',
     [WireMode.COLD]: '制冷',
     [WireMode.HOT]: '制热',
 };
+// 风速
 var WireSpeed;
@@ -93,2 +128,3 @@ (function (WireSpeed) {
 };
+// 左右摆风
 var WireHWing;
@@ -107,2 +143,3 @@ (function (WireHWing) {
 };
+// 上下摆风
 var WireVWing;
@@ -121,2 +158,2 @@ (function (WireVWing) {
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2hhcmVkL2NvbnN0YW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLEtBQUs7QUFDUSxRQUFBLE9BQU8sR0FBUTtJQUMxQixDQUFDLEVBQUUsR0FBRztJQUNOLENBQUMsRUFBRSxHQUFHO0lBQ04sQ0FBQyxFQUFFLEdBQUc7SUFDTixDQUFDLEVBQUUsR0FBRztJQUNOLENBQUMsRUFBRSxHQUFHO0NBQ1AsQ0FBQTtBQUNEOztHQUVHO0FBQ1UsUUFBQSxpQkFBaUIsR0FBUTtJQUNwQyxDQUFDLEVBQUUsSUFBSTtJQUNQLENBQUMsRUFBRSxJQUFJO0lBQ1AsQ0FBQyxFQUFFLElBQUk7SUFDUCxDQUFDLEVBQUUsSUFBSTtJQUNQLENBQUMsRUFBRSxJQUFJO0NBQ1IsQ0FBQTtBQUNELEtBQUs7QUFDUSxRQUFBLFFBQVEsR0FBUTtJQUMzQixDQUFDLEVBQUUsSUFBSTtJQUNQLENBQUMsRUFBRSxJQUFJO0lBQ1AsQ0FBQyxFQUFFLElBQUk7SUFDUCxDQUFDLEVBQUUsSUFBSTtDQUNSLENBQUE7QUFDWSxRQUFBLGtCQUFrQixHQUFRO0lBQ3JDLENBQUMsRUFBRSxJQUFJO0lBQ1AsQ0FBQyxFQUFFLEdBQUc7SUFDTixDQUFDLEVBQUUsR0FBRztJQUNOLENBQUMsRUFBRSxHQUFHO0NBQ1AsQ0FBQTtBQUNELE9BQU87QUFDTSxRQUFBLGlCQUFpQixHQUFRO0lBQ3BDLENBQUMsRUFBRSxJQUFJO0lBQ1AsQ0FBQyxFQUFFLElBQUk7Q0FDUixDQUFBO0FBQ0QsT0FBTztBQUNNLFFBQUEsZUFBZSxHQUFRO0lBQ2xDLENBQUMsRUFBRSxJQUFJO0lBQ1AsQ0FBQyxFQUFFLElBQUk7Q0FDUixDQUFBO0FBQ1ksUUFBQSxpQkFBaUIsR0FBUTtJQUNwQyxJQUFJLEVBQUUsRUFBRTtJQUNSLElBQUksRUFBRSxJQUFJO0lBQ1YsSUFBSSxFQUFFLEVBQUU7SUFDUixJQUFJLEVB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2hhcmVkL2NvbnN0YW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxrQkFBa0I7OztBQUVsQixLQUFLO0FBQ0wsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLHNCQUFTLENBQUE7SUFDVCx3QkFBVyxDQUFBO0FBQ2IsQ0FBQyxFQUhXLFNBQVMsR0FBVCxpQkFBUyxLQUFULGlCQUFTLFFBR3BCO0FBQ0QsS0FBSztBQUNMLElBQVksUUFNWDtBQU5ELFdBQVksUUFBUTtJQUNsQix1Q0FBUSxDQUFBO0lBQ1IsdUNBQVEsQ0FBQTtJQUNSLHVDQUFRLENBQUE7SUFDUix1Q0FBUSxDQUFBO0lBQ1IscUNBQU8sQ0FBQSxDQUFDLEtBQUs7QUFDZixDQUFDLEVBTlcsUUFBUSxHQUFSLGdCQUFRLEtBQVIsZ0JBQVEsUUFNbkI7QUFDWSxRQUFBLE9BQU8sR0FBUTtJQUMxQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLEdBQUc7SUFDcEIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRztJQUNwQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO0lBQ3BCLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEdBQUc7Q0FDcEIsQ0FBQTtBQUNEOztHQUVHO0FBQ1UsUUFBQSxpQkFBaUIsR0FBUTtJQUNwQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJO0lBQ3JCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUk7SUFDckIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSTtJQUNyQixDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxJQUFJO0lBQ3JCLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxF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

build/main/utils/Descriptor.d.ts

@@ -59,3 +59,3 @@ import { Converter } from './converter';
     /**
-     * TODO 获取开关状态描述
+     * 获取开关状态描述
      * @param status 状态码 16位字符串
@@ -62,0 +62,0 @@ * @param deviceType 设备主类型

build/main/utils/Descriptor.js

@@ -30,5 +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");
+const SwitchEquip_1 = require("../modules/SwitchEquip");
 /**
@@ -134,3 +134,3 @@ * 状态描述器
     /**
-     * TODO 获取开关状态描述
+     * 获取开关状态描述
      * @param status 状态码 16位字符串
@@ -146,30 +146,6 @@ * @param deviceType 设备主类型
         const TypeHints = this.TypeHints;
-        const bitlen = TypeHints.getSocketSwitchBitLen(deviceChildType);
-        if (TypeHints.isPlugSocketSwitch(deviceChildType)) {
-            const statusBitStr = converter_1.fillLength(socketStatus.getPlugStatus(), 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);
+            // const equip = new SwitchMixEquip(status, deviceType, deviceChildType)
+            const factory = new SwitchEquip_1.SwitchEquip(status, deviceType, deviceChildType);
+            const equip = factory.create();
             return equip.getStatusDescriptor();
@@ -275,2 +251,2 @@ }
 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/string.js

@@ -62,2 +62,2 @@ "use strict";
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RyaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL3N0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEdBQUc7SUFDM0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3hELENBQUMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHO0lBQ3pCLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN4RCxDQUFDLENBQUM7QUFDRjs7R0FFRztBQUNILE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHLFVBQVMsWUFBb0IsRUFBRTtJQUN4RCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0FBQ3RDLENBQUMsQ0FBQTtBQUNEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEdBQUcsVUFBUyxZQUFvQixFQUFFO0lBQ3pELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUE7QUFDcEMsQ0FBQyxDQUFBO0FBQ0Q7O0dBRUc7QUFDSCxNQUFNLENBQUMsU0FBUyxDQUFDLFdBQVcsR0FBRztJQUM3QixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtRQUFFLE9BQU8sRUFBRSxDQUFBO0lBQy9CLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUNqRCxDQUFDLENBQUE7QUFDRCxXQUFXO0FBQ1gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUc7SUFDeEIsT0FBTyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3hFLENBQUMsQ0FBQTtBQUNELE1BQU0sQ0FBQyxTQUFTLENBQUMsU0FBUyxHQUFHO0lBQzNCLE9BQU8sSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUNEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsR0FBRyxVQUFTLEdBQWtCO0lBQy9ELElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTTtRQUFFLE9BQU8sRUFBRSxDQUFBO0lBQ2xDLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUM3QyxDQUFDLENBQUE7QUFDRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sR0FBRyxVQUFTLEdBQUcsS0FBd0I7SUFDNUQsSUFBSSxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtRQUMxQixPQUFPLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztLQUN4QjtJQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMxQixJQUFJLENBQUMsR0FBRyxJQUFJLENBQUM7SUFDYixJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRTtRQUM3QixLQUFLLElBQUksR0FBRyxJQUFJLEtBQUssRUFBRTtZQUNyQixDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtTQUNoRTtRQUNELE9BQU8sQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFBO0tBQ3BCO1NBQU07UUFDTCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUN6QyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxLQUFLLEdBQUcsQ0FBQyxHQUFHLEtBQUssRUFBRSxHQUFHLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNqRTtRQUNELE9BQU8sQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO0tBQ3JCO0FBQ0gsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RyaW5nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL3N0cmluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBTSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEdBQUc7SUFDM0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3hELENBQUMsQ0FBQztBQUVGLE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHO0lBQ3pCLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUN4RCxDQUFDLENBQUM7QUFDRjs7R0FFRztBQUNILE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHLFVBQVMsWUFBb0IsRUFBRTtJQUN4RCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0FBQ3RDLENBQUMsQ0FBQTtBQUNEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEdBQUcsVUFBUyxZQUFvQixFQUFFO0lBQ3pELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUE7QUFDcEMsQ0FBQyxDQUFBO0FBQ0Q7O0dBRUc7QUFDSCxNQUFNLENBQUMsU0FBUyxDQUFDLFdBQVcsR0FBRztJQUM3QixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtRQUFFLE9BQU8sRUFBRSxDQUFBO0lBQy9CLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUNqRCxDQUFDLENBQUE7QUFDRCxXQUFXO0FBQ1gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUc7SUFDeEIsT0FBTyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ3hFLENBQUMsQ0FBQTtBQUNELE1BQU0sQ0FBQyxTQUFTLENBQUMsU0FBUyxHQUFHO0lBQzNCLE9BQU8sSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUNEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsR0FBRyxVQUFTLEdBQWtCO0lBQy9ELElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTTtRQUFFLE9BQU8sRUFBRSxDQUFBO0lBQ2xDLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUM3QyxDQUFDLENBQUE7QUFDRCxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sR0FBRyxVQUFTLEdBQUcsS0FBZTtJQUNuRCxJQUFJLFNBQVMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1FBQzFCLE9BQU8sSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0tBQ3hCO0lBQ0QsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzFCLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQztJQUNiLElBQUksT0FBTyxLQUFLLEtBQUssUUFBUSxFQUFFO1FBQzdCLEtBQUssSUFBSSxHQUFHLElBQUksS0FBSyxFQUFFO1lBQ3JCLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO1NBQ2hFO1FBQ0QsT0FBTyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUE7S0FDcEI7U0FBTTtRQUNMLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ3pDLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDLEtBQUssR0FBRyxDQUFDLEdBQUcsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1NBQ2pFO1FBQ0QsT0FBTyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7S0FDckI7QUFDSCxDQUFDLENBQUMifQ==

build/main/utils/suiter.d.ts

@@ -152,2 +152,8 @@ /**
             '0452': string;
+            '0401': string;
+            '0412': string;
+            '0413': string;
+            '0414': string;
+            '0471': string;
+            '04101': string;
         };
@@ -154,0 +160,0 @@ statusLength: {

build/main/utils/suiter.js

@@ -98,8 +98,9 @@ "use strict";
             '04': '插座开关',
-            '0401': '1路智能插座',
+            // 智能插座
+            '0401': '1路插座',
             // '0402': '单线开关'（停用）,
             // '0403': '触摸开关'（停用）,
-            '0412': '2路智能插座',
-            '0413': '3路智能插座',
-            '0414': '4路智能插座',
+            '0412': '2路插座',
+            '0413': '3路插座',
+            '0414': '4路插座',
             // 触摸开关
@@ -114,2 +115,3 @@ '0421': '1路开关',
             '0428': '8路开关',
+            // 情景开关
             '0431': '1路情景开关',
@@ -120,2 +122,3 @@ '0432': '2路情景开关',
             '0436': '6键情景开关',
+            // 混合开关
             '0441': '1路开关 + 3路情景',
@@ -126,4 +129,6 @@ '0442': '2路开关 + 3路情景',
             '0462': '2路开关 + 2路情景',
+            // 单线开关
             '0451': '1键单线开关',
             '0452': '2键单线开关',
+            // 雷达开关
             '0471': '1路开关 + 雷达',
@@ -154,7 +159,2 @@ '04101': '1路情景 + 雷达',
             root: ['04'],
-            // 触摸开关，子类型组 byte[0]
-            // touch: ['02', '21', '22', '23', '24', '25', '26', '28', '51', '52'],
-            // touch: ['25', '26', '27', '28'],
-            // 情景面板
-            // scene: ['31', '32', '33', '35'],
             // 可设置情景面板
@@ -165,12 +165,9 @@ settableScene: ['122'],
             mixup: ['41', '42', '43', '62', '83'],
-            // 普通开关
-            // normal: ['03'],
-            // 插座 byte[0]
-            // simple: ['01', '12', '13', '14'],
             // 智能插座
             plug: ['01', '12', '13', '14'],
             // x 路开关 | TODO 插座开关隔离
-            xkey: ['21', '22', '23', '24', '31', '32', '33', '34', '36', '41', '42', '43', '62', '51', '52']
+            xkey: ['21', '22', '23', '24', '31', '32', '33', '34', '36', '41', '42', '43', '62', '51', '52', '01', '12', '13', '14']
         },
         // 设备类型索引类型 一键开关 -> 1， 二建开关 -> 2 , 1路开关 + 3路情景面板 -> 1|3
+        // 开关|情景|单线|插座|雷达
         typeIndex: {
@@ -195,4 +192,11 @@ // 普通开关
             // 单线开关
-            '0451': '1|',
-            '0452': '2|'
+            '0451': '||1',
+            '0452': '||2',
+            '0401': '|||1',
+            '0412': '|||2',
+            '0413': '|||3',
+            '0414': '|||4',
+            // 雷达
+            '0471': '1||||1',
+            '04101': '|1|||1',
         },
@@ -567,2 +571,2 @@ statusLength: {
 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.33](https://github.com/ob-cloud/hardware-suit/compare/v1.1.30...v1.1.33) (2020-12-21)
+
+
+
 ### [1.1.31](https://github.com/ob-cloud/hardware-suit/compare/v1.1.28...v1.1.31) (2020-12-18)
@@ -7,0 +11,0 @@

package.json

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

795557

increased by0.71%

Number of package files

85

increased by2.41%

Lines of code

7963

increased by1.03%

No dependency changes