1. 新增用电量数据的接收协议 2. 调整socket接收模块的代码结构

riku

2021-06-17 81bd0388494d45463de42cd91bd8c33f10f0030a

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

@@ -1,10 +1,9 @@
package com.flightfeather.uav.socket

import com.flightfeather.uav.socket.decoder.impl.DataPackageDecoderImpl
import com.flightfeather.uav.socket.decoder.DataPackageDecoder
import io.netty.buffer.ByteBuf
import io.netty.channel.ChannelHandlerContext
import io.netty.handler.codec.ByteToMessageDecoder
import java.lang.StringBuilder

/**
 * @author riku
@@ -14,13 +13,13 @@
class UAVByteDataDecoder : ByteToMessageDecoder() {

    companion object {
        const val BASE_LENGTH = DataPackageDecoderImpl.HEAD_BYTES + DataPackageDecoderImpl.COMMAND_UNIT_BYTES +
                DataPackageDecoderImpl.DEVICE_CODE_BYTES + DataPackageDecoderImpl.DATA_LENGTH + DataPackageDecoderImpl.BCC_BYTES
        const val BASE_LENGTH = DataPackageDecoder.HEAD_BYTES + DataPackageDecoder.COMMAND_UNIT_BYTES +
                DataPackageDecoder.DEVICE_CODE_BYTES + DataPackageDecoder.DATA_LENGTH + DataPackageDecoder.BCC_BYTES
        const val HEAD1 = 0x01.toByte()
        const val COMMAND_1 = 0x01.toByte()
        const val COMMAND_2 = 0x01.toByte()
        const val HEAD_LENGTH = DataPackageDecoderImpl.HEAD_BYTES + DataPackageDecoderImpl.COMMAND_UNIT_BYTES +
                DataPackageDecoderImpl.DEVICE_CODE_BYTES
        const val HEAD_LENGTH = DataPackageDecoder.HEAD_BYTES + DataPackageDecoder.COMMAND_UNIT_BYTES +
                DataPackageDecoder.DEVICE_CODE_BYTES
    }

    override fun decode(p0: ChannelHandlerContext?, p1: ByteBuf?, p2: MutableList<Any>?) {
@@ -74,14 +73,14 @@
                //数据单元的长度
                val length = getDataUnitLength(it, dataList)
                // 判断请求数据单元数据及[LENGTH_BYTES]个字节的校验码是否到齐
                if (it.readableBytes() < length + DataPackageDecoderImpl.BCC_BYTES) {
                if (it.readableBytes() < length + DataPackageDecoder.BCC_BYTES) {
                    // 还原读指针
                    it.readerIndex(beginReader)
                    return
                }

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