From b80d575b9676aad2d79640c46925cadf770d3ed0 Mon Sep 17 00:00:00 2001 From: surenjun Date: Wed, 5 Mar 2025 18:11:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/tcp2byte/utils/tcp2byte.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/entry/src/main/ets/tcp2byte/utils/tcp2byte.ts b/entry/src/main/ets/tcp2byte/utils/tcp2byte.ts index 160bde8d..b77ded2a 100644 --- a/entry/src/main/ets/tcp2byte/utils/tcp2byte.ts +++ b/entry/src/main/ets/tcp2byte/utils/tcp2byte.ts @@ -1,6 +1,7 @@ import { string2Bytes, str2UTF8, timeTOBCD } from './tools' import Buffer from '@ohos.buffer' import photo from './base64' +const TAG = '[TCP2BYTE]' export default class TcpToByte { //WORD 流水号 @@ -112,11 +113,11 @@ export default class TcpToByte { const file = this.getBytePhoto(drvexam.file.param[0].data); //拼接消息 const message = msgHead.concat(msg).concat(file) - const translateMessage = this.checkHasPrefix(message) + const translateMessage = message; const emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1); const packages = [] emptyArr.forEach((item, index) => { - const currentMessage = translateMessage.slice(index * packageSize, (index + 1) * packageSize); + const currentMessage = this.checkHasPrefix(translateMessage.slice(index * packageSize, (index + 1) * packageSize)); const currentPackage = [prefix, 0x01] .concat(string2Bytes(lsh, 16)) @@ -127,6 +128,7 @@ export default class TcpToByte { .concat(currentMessage) .concat(prefix); + packages.push(currentPackage) }) @@ -284,11 +286,11 @@ export default class TcpToByte { const file = this.getBytePhoto(drvexam.file.param[0].data); //拼接消息 const message = msgHead.concat(msg).concat(file) - const translateMessage = this.checkHasPrefix(message) + const translateMessage = message; const emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1); const packages = [] emptyArr.forEach((item, index) => { - const currentMessage = translateMessage.slice(index * packageSize, (index + 1) * packageSize); + const currentMessage = this.checkHasPrefix(translateMessage.slice(index * packageSize, (index + 1) * packageSize)); const currentPackage = [prefix, 0x04] .concat(string2Bytes(lsh, 16)) @@ -409,11 +411,11 @@ export default class TcpToByte { const file = this.getBytePhoto(drvexam.file.param[0].data); //拼接消息 const message = msgHead.concat(msg).concat(file) - const translateMessage = this.checkHasPrefix(message) + const translateMessage = message; const emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1); const packages = [] emptyArr.forEach((item, index) => { - const currentMessage = translateMessage.slice(index * packageSize, (index + 1) * packageSize); + const currentMessage = this.checkHasPrefix(translateMessage.slice(index * packageSize, (index + 1) * packageSize)); const currentPackage = [prefix, 0x06] .concat(string2Bytes(lsh, 16)) @@ -455,7 +457,6 @@ export default class TcpToByte { return (string2Bytes(arr.length + 5, 4 * 8)).concat([0]).concat(string2Bytes(arr.length, 4 * 8)).concat(arr) } - //随机获取流水号 getRandomLsh() { return Math.floor(Math.random() * 65535);