Merge remote-tracking branch 'obdserver2/master'

riku

2021-03-01 09f411e381f885619b32e05fc89cad26bb20824d

 src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt

@@ -1,5 +1,6 @@
package com.flightfeather.uav.socket

import com.flightfeather.uav.socket.decoder.impl.DataPackageDecoderImpl
import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.ByteToMessageDecoder
@@ -13,11 +14,11 @@
class UAVByteDataDecoder : ByteToMessageDecoder() {

    companion object {
        private const val HEAD_BYTES = 2//数据头所占长度
        private const val LENGTH_BYTES = 1//数据位数所占长度
        private const val BCC_BYTES = 2//校验码长度
        const val BASE_LENGTH = HEAD_BYTES + LENGTH_BYTES + BCC_BYTES
        const val BASE_LENGTH = DataPackageDecoderImpl.HEAD_BYTES + DataPackageDecoderImpl.COMMAND_UNIT_BYTES +
                DataPackageDecoderImpl.DEVICE_CODE_BYTES + DataPackageDecoderImpl.DATA_LENGTH + DataPackageDecoderImpl.BCC_BYTES
        const val HEAD1 = 0x01.toByte()
        const val HEAD_LENGTH = DataPackageDecoderImpl.HEAD_BYTES + DataPackageDecoderImpl.COMMAND_UNIT_BYTES +
                DataPackageDecoderImpl.DEVICE_CODE_BYTES
    }

    override fun decode(p0: ChannelHandlerContext?, p1: ByteBuf?, p2: MutableList<Any>?) {
@@ -41,11 +42,12 @@
                    // 标记包头开始的index
                    it.markReaderIndex()
                    // 读到了协议的开始标志，结束while循环
                    val b = ByteArray(2)
                    val b = ByteArray(HEAD_LENGTH)
                    it.readBytes(b)
                    if (b[0] == HEAD1) {
                        dataList.add(b[0])
                        dataList.add(b[1])
                        b.forEach {b ->
                            dataList.add(b)
                        }
                        break
                    }

@@ -69,14 +71,14 @@
                //数据单元的长度
                val length = getDataUnitLength(it, dataList)
                // 判断请求数据单元数据及[LENGTH_BYTES]个字节的校验码是否到齐
                if (it.readableBytes() < length + BCC_BYTES) {
                if (it.readableBytes() < length + DataPackageDecoderImpl.BCC_BYTES) {
                    // 还原读指针
                    it.readerIndex(beginReader)
                    return
                }

                //读取数据单元和校验码数据
                ByteArray(length + BCC_BYTES).apply {
                ByteArray(length + DataPackageDecoderImpl.BCC_BYTES).apply {
                    it.readBytes(this)
                }.forEach {b ->
                    dataList.add(b)