Merge branch 'dev_tcp2byte' of http://47.122.70.237:3000/harmony_car/subject-two into dev_tcp2byte
This commit is contained in:
commit
284532f979
@ -1,6 +1,7 @@
|
|||||||
import { string2Bytes, str2UTF8, timeTOBCD } from './tools'
|
import { string2Bytes, str2UTF8, timeTOBCD } from './tools'
|
||||||
import Buffer from '@ohos.buffer'
|
import Buffer from '@ohos.buffer'
|
||||||
import photo from './base64'
|
import photo from './base64'
|
||||||
|
const TAG = '[TCP2BYTE]'
|
||||||
|
|
||||||
export default class TcpToByte {
|
export default class TcpToByte {
|
||||||
//WORD 流水号
|
//WORD 流水号
|
||||||
@ -112,11 +113,11 @@ export default class TcpToByte {
|
|||||||
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
||||||
//拼接消息
|
//拼接消息
|
||||||
const message = msgHead.concat(msg).concat(file)
|
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 emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1);
|
||||||
const packages = []
|
const packages = []
|
||||||
emptyArr.forEach((item, index) => {
|
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 =
|
const currentPackage =
|
||||||
[prefix, 0x01]
|
[prefix, 0x01]
|
||||||
.concat(string2Bytes(lsh, 16))
|
.concat(string2Bytes(lsh, 16))
|
||||||
@ -127,6 +128,7 @@ export default class TcpToByte {
|
|||||||
|
|
||||||
.concat(currentMessage)
|
.concat(currentMessage)
|
||||||
.concat(prefix);
|
.concat(prefix);
|
||||||
|
|
||||||
packages.push(currentPackage)
|
packages.push(currentPackage)
|
||||||
|
|
||||||
})
|
})
|
||||||
@ -284,11 +286,11 @@ export default class TcpToByte {
|
|||||||
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
||||||
//拼接消息
|
//拼接消息
|
||||||
const message = msgHead.concat(msg).concat(file)
|
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 emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1);
|
||||||
const packages = []
|
const packages = []
|
||||||
emptyArr.forEach((item, index) => {
|
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 =
|
const currentPackage =
|
||||||
[prefix, 0x04]
|
[prefix, 0x04]
|
||||||
.concat(string2Bytes(lsh, 16))
|
.concat(string2Bytes(lsh, 16))
|
||||||
@ -409,11 +411,11 @@ export default class TcpToByte {
|
|||||||
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
const file = this.getBytePhoto(drvexam.file.param[0].data);
|
||||||
//拼接消息
|
//拼接消息
|
||||||
const message = msgHead.concat(msg).concat(file)
|
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 emptyArr = new Array(Math.ceil(translateMessage.length / packageSize)).fill(1);
|
||||||
const packages = []
|
const packages = []
|
||||||
emptyArr.forEach((item, index) => {
|
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 =
|
const currentPackage =
|
||||||
[prefix, 0x06]
|
[prefix, 0x06]
|
||||||
.concat(string2Bytes(lsh, 16))
|
.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)
|
return (string2Bytes(arr.length + 5, 4 * 8)).concat([0]).concat(string2Bytes(arr.length, 4 * 8)).concat(arr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//随机获取流水号
|
//随机获取流水号
|
||||||
getRandomLsh() {
|
getRandomLsh() {
|
||||||
return Math.floor(Math.random() * 65535);
|
return Math.floor(Math.random() * 65535);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user