diff --git a/common.js b/common.js index 593c6df..fd3fc14 100644 --- a/common.js +++ b/common.js @@ -787,15 +787,7 @@ 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: @@ -907,7 +899,7 @@ export async function parsingCharacteristicValue(binaryData) { new Result(updateResult.code, updateResult.data, updateResult.message) ) } - } else if (this.requestParams.operate === 3) { + } else if (this.requestParams.operate === 2 || this.requestParams.operate === 3) { const deleteResult = await deletePasswordRequest(this.requestParams) if (deleteResult.code === Result.Success.code) { this.characteristicValueCallback(new Result(deleteResult.code)) diff --git a/star-cloud/generalExtend.js b/star-cloud/generalExtend.js index 38c4887..539354b 100644 --- a/star-cloud/generalExtend.js +++ b/star-cloud/generalExtend.js @@ -14,6 +14,7 @@ import { getIcCardListRequest, getPalmVeinListRequest, getRemoteListRequest, updateIcCardRequest } from "../api.js"; +import {_convertToMilliseconds} from "../common.js"; /** @@ -305,6 +306,23 @@ export async function registerExtendedProducts(params) { this.requestParams = params + // 处理时间戳 + if (this.requestParams.startDate !== undefined && this.requestParams.startDate !== null) { + // 确保转换为数字类型 + const startDate = Number(this.requestParams.startDate); + if (!isNaN(startDate)) { + this.requestParams.startDate = _convertToMilliseconds(startDate); + } + } + + if (this.requestParams.endDate !== undefined && this.requestParams.endDate !== null) { + // 确保转换为数字类型 + const endDate = Number(this.requestParams.endDate); + if (!isNaN(endDate)) { + this.requestParams.endDate = _convertToMilliseconds(endDate); + } + } + startDate = Math.floor(startDate / 1000) endDate = Math.floor(endDate / 1000)