@onbright/hardware-suit - npm Package Compare versions

Comparing version 1.10.4 to 1.11.0

build/main/entity/SensorHumanBeing.d.ts

@@ -11,2 +11,4 @@ import { Status } from './Status';
     constructor(status: string);
+    setGear(num: string): void;
+    setEvent(num: string): void;
 }

build/main/entity/SensorHumanBeing.js

@@ -22,4 +22,10 @@ "use strict";
     }
+    setGear(num) {
+        this.gear = num;
+    }
+    setEvent(num) {
+        this.type = num;
+    }
 }
 exports.SensorHumanBeingStatus = SensorHumanBeingStatus;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbnRpdHkvU2Vuc29ySHVtYW5CZWluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxQ0FBa0M7QUFFbEMsTUFBYSxzQkFBdUIsU0FBUSxlQUFNO0lBUWhELFlBQVksTUFBYztRQUN4QixLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFSVCxTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLFNBQUksR0FBVyxFQUFFLENBQUM7UUFDbEIsYUFBUSxHQUFXLEVBQUUsQ0FBQztRQUN0QixTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLFdBQU0sR0FBVyxFQUFFLENBQUM7UUFDcEIsV0FBTSxHQUFXLEVBQUUsQ0FBQztRQUNwQixZQUFPLEdBQVcsRUFBRSxDQUFDO1FBRzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5QixJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDaEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsQyxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQ3JDLENBQUM7Q0FDRjtBQWpCRCx3REFpQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lbnRpdHkvU2Vuc29ySHVtYW5CZWluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxQ0FBa0M7QUFFbEMsTUFBYSxzQkFBdUIsU0FBUSxlQUFNO0lBUWhELFlBQVksTUFBYztRQUN4QixLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFSVCxTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLFNBQUksR0FBVyxFQUFFLENBQUM7UUFDbEIsYUFBUSxHQUFXLEVBQUUsQ0FBQztRQUN0QixTQUFJLEdBQVcsRUFBRSxDQUFDO1FBQ2xCLFdBQU0sR0FBVyxFQUFFLENBQUM7UUFDcEIsV0FBTSxHQUFXLEVBQUUsQ0FBQztRQUNwQixZQUFPLEdBQVcsRUFBRSxDQUFDO1FBRzFCLElBQUksQ0FBQyxJQUFJLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDOUIsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5QixJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzlCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDaEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUNsQyxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFBO0lBQ3JDLENBQUM7SUFDRCxPQUFPLENBQUMsR0FBVTtRQUNoQixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQTtJQUNqQixDQUFDO0lBQ0QsUUFBUSxDQUFDLEdBQVc7UUFDbEIsSUFBSSxDQUFDLElBQUksR0FBRyxHQUFHLENBQUE7SUFDakIsQ0FBQztDQUNGO0FBdkJELHdEQXVCQyJ9

build/main/modules/MeterReaderEquip.d.ts

@@ -24,3 +24,3 @@ import { BaseEquip } from './BaseEquip';
     */
-    getStatusDescriptor(): string;
+    getStatusDescriptor(type?: string): string;
     getReportTime(): Number;
@@ -27,0 +27,0 @@ getPowerInt(): Number[];

build/main/modules/MeterReaderEquip.js

@@ -37,3 +37,3 @@ "use strict";
     */
-    getStatusDescriptor() {
+    getStatusDescriptor(type = '') {
         const allCode = this.meterReadertatus.getStatus();
@@ -48,2 +48,6 @@ const status = converter_1.fillLength((new this.Converter(allCode.slice(0, 2), 16).toBinary()), 8);
         console.log('电表状态', this.meterReadertatus.getStatus(), status, time, threshold, power, energy, voltage, electricCurrent);
+        //  兼容情景状态
+        if (type === 'scene') {
+            return `${status[7] === '1' ? '通电' : '断电'}`;
+        }
         let desCript = [];
@@ -111,2 +115,2 @@ if (+status.slice(1, 2) === 1) {
 exports.MeterReaderEquip = MeterReaderEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJFcXVpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tb2R1bGVzL01ldGVyUmVhZGVyRXF1aXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXdDO0FBQ3hDLG1FQUErRDtBQUMvRCxrREFBb0Y7QUFFbkYsTUFBYSxnQkFBaUIsU0FBUSxxQkFBUztJQUczQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3RFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBSDdCLFVBQUssR0FBRyxrQkFBa0IsQ0FBQztRQUl6QyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxvQ0FBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBQ0Q7O01BRUU7SUFDSyxRQUFRO1FBQ2IsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7SUFDMUMsQ0FBQztJQUVEOztNQUVFO0lBQ0ssU0FBUyxDQUFDLEdBQVc7UUFDM0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNwQyxPQUFPLElBQUksQ0FBQztJQUNiLENBQUM7SUFDRjs7OztPQUlHO0lBQ0gsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFFQTs7TUFFRTtJQUNKLG1CQUFtQjtRQUNqQixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDakQsTUFBTSxNQUFNLEdBQUcsc0JBQVUsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBQyxDQUFDLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJFcXVpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tb2R1bGVzL01ldGVyUmVhZGVyRXF1aXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXdDO0FBQ3hDLG1FQUErRDtBQUMvRCxrREFBb0Y7QUFFbkYsTUFBYSxnQkFBaUIsU0FBUSxxQkFBUztJQUczQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3RFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBSDdCLFVBQUssR0FBRyxrQkFBa0IsQ0FBQztRQUl6QyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxvQ0FBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBQ0Q7O01BRUU7SUFDSyxRQUFRO1FBQ2IsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7SUFDMUMsQ0FBQztJQUVEOztNQUVFO0lBQ0ssU0FBUyxDQUFDLEdBQVc7UUFDM0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNwQyxPQUFPLElBQUksQ0FBQztJQUNiLENBQUM7SUFDRjs7OztPQUlHO0lBQ0gsV0FBVztRQUNULE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFFQTs7TUFFRTtJQUNKLG1CQUFtQixDQUFDLE9BQWMsRUFBRTtRQUNsQyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDakQsTUFBTSxNQUFNLEdBQUcsc0JBQVUsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMs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

build/main/modules/SensorHumanBeingEquip.d.ts

 import { BaseEquip } from './BaseEquip';
 import { SensorHumanBeingStatus } from "../entity/SensorHumanBeing";
 export declare class SensorHumanBeingEquip extends BaseEquip {
+    private readonly bytes;
     readonly SensorHumanBeingStatus: SensorHumanBeingStatus;
@@ -16,5 +17,10 @@ /**
      */
-    getCdtBytes(): void;
+    getCdtBytes(mode?: String): string;
+    getBytes(): string;
+    getSensitivity(): Number;
+    setSensitivity(gear: number): void;
+    getEventType(): Number;
+    setEventType(code: number): void;
     getTime(): string;
-    getStatusDescriptor(): string;
+    getStatusDescriptor(mode?: string): string;
 }

build/main/modules/SensorHumanBeingEquip.js

@@ -18,7 +18,7 @@ "use strict";
 const motionMap = {
-    '0': '静止',
+    '0': '平静',
     '1': '运动'
 };
 const nearMap = {
-    '0': '不接近也不远离',
+    '0': '无',
     '1': '接近',
@@ -40,2 +40,3 @@ '2': '远离'
         super(status, deviceType, deviceChildType);
+        this.bytes = `{0}00000000000000`;
         this.SensorHumanBeingStatus = new SensorHumanBeing_1.SensorHumanBeingStatus(status);
@@ -47,4 +48,30 @@ }
      */
-    getCdtBytes() {
+    getCdtBytes(mode = "control") {
+        if (mode === 'scene') {
+            return this.bytes.format(this.SensorHumanBeingStatus.type);
+        }
+        return '';
     }
+    getBytes() {
+        return this.bytes.format(this.SensorHumanBeingStatus.gear);
+    }
+    // 获取当前的灵敏度
+    getSensitivity() {
+        return Number(converter_1.toDecimal(this.SensorHumanBeingStatus.gear, 16));
+    }
+    // 获取当前的灵敏度
+    setSensitivity(gear) {
+        this.SensorHumanBeingStatus.setGear(converter_1.toHex(gear + '', 10));
+    }
+    // 获取环境状态
+    getEventType() {
+        return Number(converter_1.fillLength(converter_1.toBinary(this.SensorHumanBeingStatus.type, 16), 8)[7]);
+    }
+    // 设置环境状态
+    setEventType(code) {
+        const eventCode = converter_1.fillLength(converter_1.toBinary(this.SensorHumanBeingStatus.type, 16), 8).split('');
+        eventCode[7] = code + '';
+        this.SensorHumanBeingStatus.setEvent(converter_1.toHex(eventCode.join(''), 2));
+    }
+    // 获取当前时间
     getTime() {
@@ -65,12 +92,14 @@ const time = Number(converter_1.toDecimal(this.SensorHumanBeingStatus.time, 16));
     }
-    getStatusDescriptor() {
+    getStatusDescriptor(mode = '') {
         const eventCode = converter_1.fillLength(converter_1.toBinary(this.SensorHumanBeingStatus.type, 16), 8);
-        const gearNumber = converter_1.toDecimal(this.SensorHumanBeingStatus.gear, 16);
+        // const gearNumber = toDecimal(this.SensorHumanBeingStatus.gear, 16)
         const isMotion = Number(converter_1.toDecimal(this.SensorHumanBeingStatus.motion, 16));
         const near = Number(converter_1.toDecimal(this.SensorHumanBeingStatus.isNear, 16));
-        const checkNum = Number(converter_1.toDecimal(this.SensorHumanBeingStatus.isCheck, 16));
-        return `档位：${Number(gearNumber)}档 | 事件类型：${evnetMap[eventCode[7]] || ''}${eventCode[6] === '1' ? ',定时上报' : ''}${eventCode[5] === '1' ? ',按键上报' : ''} |  上报时间：${this.getTime() || '-'} | 运动/静止：${motionMap[isMotion] || '-'} | 接近/远离：${nearMap[near] || '-'} | 状态检查开关：${checkMap[checkNum] || '-'}`;
+        // const checkNum = Number(toDecimal(this.SensorHumanBeingStatus.isCheck, 16))
+        if (mode === 'scene')
+            return evnetMap[eventCode[7]];
+        return `环境状态：${evnetMap[eventCode[7]] || ''} | 动作状态：${motionMap[isMotion] || '-'} | 人体动向：${nearMap[near] || '-'} `;
     }
 }
 exports.SensorHumanBeingEquip = SensorHumanBeingEquip;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZ0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU2Vuc29ySHVtYW5CZWluZ0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsMkNBQXdDO0FBQ3hDLGlFQUFvRTtBQUNwRSxrREFBb0U7QUFFcEUsTUFBTSxRQUFRLEdBQVE7SUFDcEIsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFNBQVMsR0FBUTtJQUNyQixHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQTtBQUNELE1BQU0sT0FBTyxHQUFRO0lBQ25CLEdBQUcsRUFBRSxTQUFTO0lBQ2QsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFFBQVEsR0FBUTtJQUNwQixHQUFHLEVBQUUsU0FBUztJQUNkLEdBQUcsRUFBRSxRQUFRO0NBQ2QsQ0FBQTtBQUNELE1BQWEscUJBQXNCLFNBQVEscUJBQVM7SUFFbEQ7Ozs7O09BS0c7SUFDSCxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLHlDQUFzQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXO0lBQ1gsQ0FBQztJQUNELE9BQU87UUFDTCxNQUFNLElBQUksR0FBWSxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDN0UsUUFBTyxJQUFJLEVBQUU7WUFDWCxLQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNMLE9BQU8sUUFBUSxDQUFBO1lBQ2pCLEtBQUksQ0FBQyxHQUFHLENBQUM7Z0JBQ1AsT0FBTyxRQUFRLENBQUE7WUFDakI7Z0JBQ0UsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtnQkFDbkMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLENBQUE7Z0JBQ3hDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7Z0JBQ2hELE1BQU0sR0FBRyxHQUFHLENBQUMsU0FBUyxHQUFHLEVBQUUsQ0FBQyxDQUFBO2dCQUM1QixPQUFPLEdBQUcsR0FBRyxJQUFJLElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQTtTQUNsQztJQUNILENBQUM7SUFDRCxtQkFBbUI7UUFDakIsTUFBTSxTQUFTLEdBQUcsc0JBQVUsQ0FBQyxvQkFBUSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDL0UsTUFBTSxVQUFVLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2xFLE1BQU0sUUFBUSxHQUFJLE1BQU0sQ0FBQyxxQkFBUyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUMzRSxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDdEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLHFCQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzNFLE9BQU8sTUFBTSxNQUFNLENBQUMsVUFBVSxDQUFDLFlBQVksUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUEsQ0FBQyxDQUFBLEVBQUUsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUEsQ0FBQyxDQUFBLEVBQUUsWUFBWSxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksR0FBRyxZQUFZLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLFlBQVksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLEdBQUcsYUFBYSxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxFQUFFLENBQUE7SUFDaFMsQ0FBQztDQUNGO0FBMUNELHNEQTBDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZ0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU2Vuc29ySHVtYW5CZWluZ0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsMkNBQXdDO0FBQ3hDLGlFQUFvRTtBQUNwRSxrREFBMkU7QUFFM0UsTUFBTSxRQUFRLEdBQVE7SUFDcEIsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFNBQVMsR0FBUTtJQUNyQixHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQTtBQUNELE1BQU0sT0FBTyxHQUFRO0lBQ25CLEdBQUcsRUFBRSxHQUFHO0lBQ1IsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFFBQVEsR0FBUTtJQUNwQixHQUFHLEVBQUUsU0FBUztJQUNkLEdBQUcsRUFBRSxRQUFRO0NBQ2QsQ0FBQTtBQUNELE1BQWEscUJBQXNCLFNBQVEscUJBQVM7SUFHbEQ7Ozs7O09BS0c7SUFDSCxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBVDVCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQVUzQyxJQUFJLENBQUMsc0JBQXNCLEdBQUcsSUFBSSx5Q0FBc0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsV0FBVyxDQUFFLE9BQVksU0FBUztRQUNoQyxJQUFHLElBQUksS0FBSyxPQUFPLEVBQUU7WUFDbkIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLENBQUE7U0FDM0Q7UUFDRCxPQUFPLEVB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

build/main/utils/Descriptor.d.ts

@@ -112,3 +112,3 @@ import { Converter } from './converter';
      */
-    getMeterReaderDescriptor(status: string, deviceType: string, deviceChildType: string): string;
+    getMeterReaderDescriptor(status: string, deviceType: string, deviceChildType: string, selectType?: string): string;
     /**
@@ -115,0 +115,0 @@ * 获取设备状态描述

build/main/utils/Descriptor.js

@@ -254,5 +254,5 @@ "use strict";
      */
-    getMeterReaderDescriptor(status, deviceType, deviceChildType) {
+    getMeterReaderDescriptor(status, deviceType, deviceChildType, selectType = '') {
         const condition = new MeterReaderEquip_1.MeterReaderEquip(status, deviceType, deviceChildType);
-        return condition.getStatusDescriptor();
+        return condition.getStatusDescriptor(selectType);
     }
@@ -284,2 +284,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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"}

CHANGELOG.md

@@ -0,1 +1,13 @@
+## [1.11.0](http://git.on-bright.com:8081/iweb/hardware-suit/compare/v1.10.4...v1.11.0) (2022-03-10)
+
+
+### Features
+
+* 人体存在优化，电表场景条件 ([85c3779](http://git.on-bright.com:8081/iweb/hardware-suit/commit/85c3779b453dc0bacea336fd7ee109764e6d9048))
+
+
+### Bug Fixes
+
+* 人体存在状态修改 ([8672521](http://git.on-bright.com:8081/iweb/hardware-suit/commit/8672521f5a0f806ee287de3f934271e02417784e))
+
 ### [1.10.4](http://git.on-bright.com:8081/iweb/hardware-suit/compare/v1.10.3...v1.10.4) (2022-03-03)
@@ -2,0 +14,0 @@

package.json

 {
   "name": "@onbright/hardware-suit",
-  "version": "1.10.4",
+  "version": "1.11.0",
   "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

2418820

increased by0.57%

Lines of code

25765

increased by0.52%

No dependency changes