From 25d0f31f22f77a914a50bbc088902e00e28c4889 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 15 七月 2020 11:10:42 +0800
Subject: [PATCH] 根据新的多参数传输协议，修改解析规则
---
src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
index bb88cb1..937060f 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
@@ -18,7 +18,6 @@
private const val BCC_BYTES = 2//鏍￠獙鐮侀暱搴�
const val BASE_LENGTH = HEAD_BYTES + LENGTH_BYTES + BCC_BYTES
const val HEAD1 = 0x01.toByte()
- const val HEAD2 = 0x05.toByte()
}
override fun decode(p0: ChannelHandlerContext?, p1: ByteBuf?, p2: MutableList<Any>?) {
@@ -44,7 +43,7 @@
// 璇诲埌浜嗗崗璁殑寮�濮嬫爣蹇楋紝缁撴潫while寰幆
val b = ByteArray(2)
it.readBytes(b)
- if (b[0] == HEAD1 && b[1] == HEAD2) {
+ if (b[0] == HEAD1) {
dataList.add(b[0])
dataList.add(b[1])
break
@@ -61,11 +60,11 @@
}
}
- ByteArray(1).apply {
- it.readBytes(this)
- }.forEach {b ->
- dataList.add(b)
- }
+// ByteArray(1).apply {
+// it.readBytes(this)
+// }.forEach {b ->
+// dataList.add(b)
+// }
//鏁版嵁鍗曞厓鐨勯暱搴�
val length = getDataUnitLength(it, dataList)
--
Gitblit v1.9.3