From 879378a9a2e73278dc822c97f8d1dda589919b6d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 21 五月 2021 17:36:44 +0800
Subject: [PATCH] 1. 根据新的协议，扩展了设备编号的位数从1位至6位； 2. 新增监测因子无人机高度；
---
src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataPackageDecoderImpl.kt | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataPackageDecoderImpl.kt b/src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataPackageDecoderImpl.kt
index deadf89..e79b6c0 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataPackageDecoderImpl.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/decoder/impl/DataPackageDecoderImpl.kt
@@ -14,10 +14,15 @@
class DataPackageDecoderImpl : DataPackageDecoder {
companion object {
+// 鏁版嵁澶�
const val HEAD_BYTES = 1
+// 鐩戞祴鍙傛暟纭鎸囦护浣�
const val COMMAND_UNIT_BYTES = 1
- const val DEVICE_CODE_BYTES = 1
+// 璁惧绫诲瀷
+ const val DEVICE_CODE_BYTES = 6
+// 鏈鐩戞祴鐨勭┖姘斿洜瀛愭暟閲�
const val DATA_LENGTH = 1
+// 鏍￠獙
const val BCC_BYTES = 2
}
@@ -47,7 +52,7 @@
}
override fun getDeviceCode(b: List<String>): String? = if (b.size >= (HEAD_BYTES + COMMAND_UNIT_BYTES + DEVICE_CODE_BYTES)) {
- //2021/1/7 '0A'浠ｈ〃杞﹁浇璁惧锛�'0B'浠ｈ〃鏃犱汉鏈鸿澶�
+ //2021/1/7 '0A'浠ｈ〃杞﹁浇璁惧锛�'0B'浠ｈ〃鏃犱汉鏈鸿澶囷紝'0C'涓虹綉鏍煎寲鐩戞祴
val s = StringBuilder()
repeat(DEVICE_CODE_BYTES) {
s.append(b[HEAD_BYTES + COMMAND_UNIT_BYTES + it])
@@ -91,7 +96,7 @@
}
override fun getCheckCode(b: List<String>): Int? {
- return if (b.size >= 5) {
+ return if (b.size >= HEAD_BYTES + COMMAND_UNIT_BYTES + DEVICE_CODE_BYTES + BCC_BYTES) {
val hexNum = "${b[b.size - 2]}${b[b.size - 1]}"
hexNum.toIntOrNull(16)
--
Gitblit v1.9.3