@onbright/hardware-suit
Advanced tools
Comparing version 1.10.0 to 1.10.1
@@ -11,2 +11,4 @@ import { Status } from './Status'; | ||
setStatus(state: string): MeterReadertatus; | ||
getPowerStatus(): string; | ||
setPowerStatus(state: string): MeterReadertatus; | ||
} |
@@ -5,4 +5,4 @@ "use strict"; | ||
* @Date: 2021-07-09 14:45:34 | ||
* @Last Modified by: mikey.zhaopeng | ||
* @Last Modified time: 2022-01-18 18:37:51 | ||
* @Last Modified by: sanda | ||
* @Last Modified time: 2022-03-01 11:22:11 | ||
*/ | ||
@@ -23,10 +23,20 @@ Object.defineProperty(exports, "__esModule", { value: true }); | ||
getStatus() { | ||
return this.state.toEvenHex(); | ||
return this.state; | ||
} | ||
setStatus(state) { | ||
this.state = state.toEvenHex(); | ||
this.state = state; | ||
return this; | ||
} | ||
getPowerStatus() { | ||
return this.state.slice(2, 4); | ||
} | ||
setPowerStatus(state) { | ||
const hexState = state.toEvenHex(); | ||
const stateList = this.state.split(''); | ||
stateList.splice(2, 2, hexState[0], hexState[1]); | ||
this.state = stateList.join(''); | ||
return this; | ||
} | ||
} | ||
exports.MeterReadertatus = MeterReadertatus; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJTdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW50aXR5L01ldGVyUmVhZGVyU3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgscUNBQWtDO0FBRWxDLE1BQWEsZ0JBQWlCLFNBQVEsZUFBTTtJQUcxQzs7O09BR0c7SUFDSCxZQUFhLE1BQWM7UUFDekIsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBUFIsVUFBSyxHQUFXLEVBQUUsQ0FBQztRQVF4QixJQUFJLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQTtJQUNyQixDQUFDO0lBQ0QsU0FBUztRQUNQLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUMvQixDQUFDO0lBQ0QsU0FBUyxDQUFFLEtBQWE7UUFDdEIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDOUIsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0NBQ0Y7QUFsQkQsNENBa0JDIn0= | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJTdGF0dXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZW50aXR5L01ldGVyUmVhZGVyU3RhdHVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7Ozs7R0FLRzs7O0FBRUgscUNBQWtDO0FBRWxDLE1BQWEsZ0JBQWlCLFNBQVEsZUFBTTtJQUcxQzs7O09BR0c7SUFDSCxZQUFhLE1BQWM7UUFDekIsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBUFIsVUFBSyxHQUFXLEVBQUUsQ0FBQztRQVF4QixJQUFJLENBQUMsS0FBSyxHQUFHLE1BQU0sQ0FBQTtJQUNyQixDQUFDO0lBQ0QsU0FBUztRQUNQLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQTtJQUNuQixDQUFDO0lBQ0QsU0FBUyxDQUFFLEtBQWE7UUFDdEIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUE7UUFDbEIsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0lBQ0QsY0FBYztRQUNaLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQy9CLENBQUM7SUFDRCxjQUFjLENBQUUsS0FBYTtRQUMzQixNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDbEMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDdEMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUMsQ0FBQyxFQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM5QyxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDL0IsT0FBTyxJQUFJLENBQUE7SUFDYixDQUFDO0NBQ0Y7QUE1QkQsNENBNEJDIn0= |
@@ -26,2 +26,4 @@ import { BaseEquip } from './BaseEquip'; | ||
getReportTime(): Number; | ||
getPowerInt(): Number[]; | ||
setPowerInt(state: string): MeterReaderEquip; | ||
} |
@@ -17,3 +17,3 @@ "use strict"; | ||
getbytes() { | ||
return this.bytes.format(this.meterReadertatus.getStatus()); | ||
return this.meterReadertatus.getStatus(); | ||
} | ||
@@ -98,4 +98,15 @@ /** | ||
} | ||
// 获取开关列表 | ||
getPowerInt() { | ||
const state = converter_1.fillLength(converter_1.toBinary(this.meterReadertatus.getPowerStatus(), 16), 8)[7]; | ||
return [parseInt(state)]; | ||
} | ||
setPowerInt(state) { | ||
const stateList = converter_1.fillLength(converter_1.toBinary(this.meterReadertatus.getPowerStatus(), 16), 8).split(''); | ||
stateList[7] = state; | ||
this.meterReadertatus.setPowerStatus(converter_1.toHex(stateList.join(''), 2)); | ||
return this; | ||
} | ||
} | ||
exports.MeterReaderEquip = MeterReaderEquip; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJFcXVpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tb2R1bGVzL01ldGVyUmVhZGVyRXF1aXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXdDO0FBQ3hDLG1FQUErRDtBQUMvRCxrREFBbUU7QUFFbEUsTUFBYSxnQkFBaUIsU0FBUSxxQkFBUztJQUczQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3RFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBSDdCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQUkxQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxvQ0FBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBQ0Q7O01BRUU7SUFDSyxRQUFRO1FBQ2IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxDQUFDO0lBRUQ7O01BRUU7SUFDSyxTQUFTLENBQUMsR0FBVztRQUMzQixJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3BDLE9BQU8sSUFBSSxDQUFDO0lBQ2IsQ0FBQztJQUNGOzs7O09BSUc7SUFDRixXQUFXO1FBQ1YsbUJBQW1CO1FBQ25CLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUE7SUFDN0QsQ0FBQztJQUVBOztNQUVFO0lBQ0osbUJBQW1CO1FBQ2pCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQTtRQUNqRCxNQUFNLE1BQU0sR0FBRyxzQkFBVSxDQUFDLENBQUMsSUFBSSxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8s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 | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWV0ZXJSZWFkZXJFcXVpcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9tb2R1bGVzL01ldGVyUmVhZGVyRXF1aXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsMkNBQXdDO0FBQ3hDLG1FQUErRDtBQUMvRCxrREFBb0Y7QUFFbkYsTUFBYSxnQkFBaUIsU0FBUSxxQkFBUztJQUczQyxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3RFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBSDdCLFVBQUssR0FBRyxtQkFBbUIsQ0FBQztRQUkxQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsSUFBSSxvQ0FBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBQ0Q7O01BRUU7SUFDSyxRQUFRO1FBQ2IsT0FBTyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7SUFDMUMsQ0FBQztJQUVEOztNQUVFO0lBQ0ssU0FBUyxDQUFDLEdBQVc7UUFDM0IsSUFBSSxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNwQyxPQUFPLElBQUksQ0FBQztJQUNiLENBQUM7SUFDRjs7OztPQUlHO0lBQ0gsV0FBVztRQUNULG1CQUFtQjtRQUNuQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQzdELENBQUM7SUFFQTs7TUFFRTtJQUNKLG1CQUFtQjtRQUNqQixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDakQsTUFBTSxNQUFNLEdBQUcsc0JBQVUsQ0FBQyxDQUFDLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBQyxDQUFDLENBQUMs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 |
@@ -0,3 +1,5 @@ | ||
import { BaseEquip } from './BaseEquip'; | ||
import { SensorHumanBeingStatus } from "../entity/SensorHumanBeing"; | ||
export declare class SensorHumanBeingEquip extends SensorHumanBeingStatus { | ||
export declare class SensorHumanBeingEquip extends BaseEquip { | ||
readonly SensorHumanBeingStatus: SensorHumanBeingStatus; | ||
/** | ||
@@ -9,3 +11,3 @@ * 光线传感器 | ||
*/ | ||
constructor(status: string); | ||
constructor(status: string, deviceType?: string, deviceChildType?: string); | ||
/** | ||
@@ -12,0 +14,0 @@ * 根据状态获取联动条件字节串 |
@@ -8,4 +8,5 @@ "use strict"; | ||
* @Last Modified by: sanda | ||
* @Last Modified time: 2022-02-28 17:22:35 | ||
* @Last Modified time: 2022-03-01 09:57:42 | ||
*/ | ||
const BaseEquip_1 = require("./BaseEquip"); | ||
const SensorHumanBeing_1 = require("../entity/SensorHumanBeing"); | ||
@@ -30,3 +31,3 @@ const converter_1 = require("../utils/converter"); | ||
}; | ||
class SensorHumanBeingEquip extends SensorHumanBeing_1.SensorHumanBeingStatus { | ||
class SensorHumanBeingEquip extends BaseEquip_1.BaseEquip { | ||
/** | ||
@@ -38,4 +39,5 @@ * 光线传感器 | ||
*/ | ||
constructor(status) { | ||
super(status); | ||
constructor(status, deviceType, deviceChildType) { | ||
super(status, deviceType, deviceChildType); | ||
this.SensorHumanBeingStatus = new SensorHumanBeing_1.SensorHumanBeingStatus(status); | ||
} | ||
@@ -49,3 +51,3 @@ /** | ||
getTime() { | ||
const time = Number(converter_1.toDecimal(this.time, 16)); | ||
const time = Number(converter_1.toDecimal(this.SensorHumanBeingStatus.time, 16)); | ||
switch (time) { | ||
@@ -65,7 +67,7 @@ case (0): | ||
getStatusDescriptor() { | ||
const eventCode = converter_1.fillLength(converter_1.toBinary(this.evenType, 16), 8); | ||
const gearNumber = converter_1.toDecimal(this.gear, 16); | ||
const isMotion = Number(converter_1.toDecimal(this.motion, 16)); | ||
const near = Number(converter_1.toDecimal(this.isNear, 16)); | ||
const checkNum = Number(converter_1.toDecimal(this.isCheck, 16)); | ||
const eventCode = converter_1.fillLength(converter_1.toBinary(this.SensorHumanBeingStatus.evenType, 16), 8); | ||
const gearNumber = converter_1.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 `${evnetMap[eventCode[7]]}${eventCode[6] === '1' ? ' | 定时上报' : ''}${eventCode[5] === '1' ? ' | 按键上报' : ''}| ${Number(gearNumber)}档 | 上报时间:${this.getTime()} | ${motionMap[isMotion]} | ${nearMap[near]} | 检查开关:${checkMap[checkNum]}`; | ||
@@ -75,2 +77,2 @@ } | ||
exports.SensorHumanBeingEquip = SensorHumanBeingEquip; | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZ0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU2Vuc29ySHVtYW5CZWluZ0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsaUVBQW9FO0FBQ3BFLGtEQUFvRTtBQUVwRSxNQUFNLFFBQVEsR0FBUTtJQUNwQixHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQTtBQUNELE1BQU0sU0FBUyxHQUFRO0lBQ3JCLEdBQUcsRUFBRSxJQUFJO0lBQ1QsR0FBRyxFQUFFLElBQUk7Q0FDVixDQUFBO0FBQ0QsTUFBTSxPQUFPLEdBQVE7SUFDbkIsR0FBRyxFQUFFLFNBQVM7SUFDZCxHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQTtBQUNELE1BQU0sUUFBUSxHQUFRO0lBQ3BCLEdBQUcsRUFBRSxTQUFTO0lBQ2QsR0FBRyxFQUFFLFFBQVE7Q0FDZCxDQUFBO0FBQ0QsTUFBYSxxQkFBc0IsU0FBUSx5Q0FBc0I7SUFDL0Q7Ozs7O09BS0c7SUFDSCxZQUFZLE1BQWM7UUFDeEIsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hCLENBQUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXO0lBQ1gsQ0FBQztJQUNELE9BQU87UUFDTCxNQUFNLElBQUksR0FBWSxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDdEQsUUFBTyxJQUFJLEVBQUU7WUFDWCxLQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNMLE9BQU8sUUFBUSxDQUFBO1lBQ2pCLEtBQUksQ0FBQyxHQUFHLENBQUM7Z0JBQ1AsT0FBTyxRQUFRLENBQUE7WUFDakI7Z0JBQ0UsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtnQkFDbkMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLENBQUE7Z0JBQ3hDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7Z0JBQ2hELE1BQU0sR0FBRyxHQUFHLENBQUMsU0FBUyxHQUFHLEVBQUUsQ0FBQyxDQUFBO2dCQUM1QixPQUFPLEdBQUcsR0FBRyxJQUFJLElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQTtTQUNsQztJQUNILENBQUM7SUFDRCxtQkFBbUI7UUFDakIsTUFBTSxTQUFTLEdBQUcsc0JBQVUsQ0FBQyxvQkFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDNUQsTUFBTSxVQUFVLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQzNDLE1BQU0sUUFBUSxHQUFJLE1BQU0sQ0FBQyxxQkFBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUNwRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLHFCQUFTLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3BELE9BQU8sR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBLENBQUMsQ0FBQSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBLENBQUMsQ0FBQSxFQUFFLEtBQUssTUFBTSxDQUFDLFVBQVUsQ0FBQyxZQUFZLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxTQUFTLENBQUMsUUFBUSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFBO0lBQzFPLENBQUM7Q0FDRjtBQXhDRCxzREF3Q0MifQ== | ||
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2Vuc29ySHVtYW5CZWluZ0VxdWlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21vZHVsZXMvU2Vuc29ySHVtYW5CZWluZ0VxdWlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBOzs7OztHQUtHO0FBQ0gsMkNBQXdDO0FBQ3hDLGlFQUFvRTtBQUNwRSxrREFBb0U7QUFFcEUsTUFBTSxRQUFRLEdBQVE7SUFDcEIsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFNBQVMsR0FBUTtJQUNyQixHQUFHLEVBQUUsSUFBSTtJQUNULEdBQUcsRUFBRSxJQUFJO0NBQ1YsQ0FBQTtBQUNELE1BQU0sT0FBTyxHQUFRO0lBQ25CLEdBQUcsRUFBRSxTQUFTO0lBQ2QsR0FBRyxFQUFFLElBQUk7SUFDVCxHQUFHLEVBQUUsSUFBSTtDQUNWLENBQUE7QUFDRCxNQUFNLFFBQVEsR0FBUTtJQUNwQixHQUFHLEVBQUUsU0FBUztJQUNkLEdBQUcsRUFBRSxRQUFRO0NBQ2QsQ0FBQTtBQUNELE1BQWEscUJBQXNCLFNBQVEscUJBQVM7SUFFbEQ7Ozs7O09BS0c7SUFDSCxZQUFZLE1BQWMsRUFBRSxVQUFtQixFQUFFLGVBQXdCO1FBQ3ZFLEtBQUssQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLGVBQWUsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLHlDQUFzQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25FLENBQUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXO0lBQ1gsQ0FBQztJQUNELE9BQU87UUFDTCxNQUFNLElBQUksR0FBWSxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDN0UsUUFBTyxJQUFJLEVBQUU7WUFDWCxLQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNMLE9BQU8sUUFBUSxDQUFBO1lBQ2pCLEtBQUksQ0FBQyxHQUFHLENBQUM7Z0JBQ1AsT0FBTyxRQUFRLENBQUE7WUFDakI7Z0JBQ0UsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtnQkFDbkMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLENBQUE7Z0JBQ3hDLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUE7Z0JBQ2hELE1BQU0sR0FBRyxHQUFHLENBQUMsU0FBUyxHQUFHLEVBQUUsQ0FBQyxDQUFBO2dCQUM1QixPQUFPLEdBQUcsR0FBRyxJQUFJLElBQUksSUFBSSxHQUFHLEdBQUcsQ0FBQTtTQUNsQztJQUNILENBQUM7SUFDRCxtQkFBbUI7UUFDakIsTUFBTSxTQUFTLEdBQUcsc0JBQVUsQ0FBQyxvQkFBUSxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbkYsTUFBTSxVQUFVLEdBQUcscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2xFLE1BQU0sUUFBUSxHQUFJLE1BQU0sQ0FBQyxxQkFBUyxDQUFDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUMzRSxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMscUJBQVMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDdEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLHFCQUFTLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzNFLE9BQU8sR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBLENBQUMsQ0FBQSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBLENBQUMsQ0FBQSxFQUFFLEtBQUssTUFBTSxDQUFDLFVBQVUsQ0FBQyxZQUFZLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxTQUFTLENBQUMsUUFBUSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxXQUFXLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFBO0lBQzFPLENBQUM7Q0FDRjtBQTFDRCxzREEwQ0MifQ== |
@@ -0,1 +1,8 @@ | ||
### [1.10.1](http://git.on-bright.com:8081/iweb/hardware-suit/compare/v1.10.0...v1.10.1) (2022-03-01) | ||
### Bug Fixes | ||
* 添加电表控制 ([91da01b](http://git.on-bright.com:8081/iweb/hardware-suit/commit/91da01b573b7d98b51be02c4645f459d23727a4b)) | ||
## [1.10.0](http://git.on-bright.com:8081/iweb/hardware-suit/compare/v1.9.2...v1.10.0) (2022-02-28) | ||
@@ -2,0 +9,0 @@ |
{ | ||
"name": "@onbright/hardware-suit", | ||
"version": "1.10.0", | ||
"version": "1.10.1", | ||
"description": "hardware-suit javascript library", | ||
@@ -5,0 +5,0 @@ "main": "dist/hardware-suit.js", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2396919
25574