diff --git a/common.js b/common.js index 3de41d0..593c6df 100644 --- a/common.js +++ b/common.js @@ -787,6 +787,16 @@ export async function parsingCharacteristicValue(binaryData) { const cmdId = decrypted[0] * 256 + decrypted[1] + // 处理时间戳 + if (this.requestParams.startDate) { + // 判断是否为秒级时间戳(10位) + this.requestParams.startDate = _convertToMilliseconds(this.requestParams.startDate) + } + if (this.requestParams.endDate) { + // 判断是否为秒级时间戳(10位) + this.requestParams.startDate = _convertToMilliseconds(this.requestParams.startDate) + } + switch (cmdId) { case cmdIds.getLockStatus: if (decrypted[2] === Result.Success.code) { @@ -1082,7 +1092,7 @@ export async function parsingCharacteristicValue(binaryData) { }) if (addResult.code === Result.Success.code) { // 增加返回一个指纹序号 - addResult.data.fingerprintNumber = decrypted[6] * 256 + decrypted[7]; + addResult.data.fingerprintNumber = decrypted[6] * 256 + decrypted[7]; } console.log('registerFingerprintConfirm', decrypted) // 触发指纹确认事件 @@ -1416,3 +1426,14 @@ export function createPackageHeader(encryptionType, originalLength) { export async function disconnectDevice() { return await closeBLEConnection(this.lockInfo.deviceId) } + +/** + * 用于判断时间戳是否是秒级别的,如果是的话则补充到毫秒级别 + * @param timestamp 时间戳 + * @returns {number|*} + * @private + */ +export function _convertToMilliseconds(timestamp) { + if (!timestamp) return timestamp; + return timestamp.toString().length === 10 ? timestamp * 1000 : timestamp; +} \ No newline at end of file