From 6d766eed50f34b102e607ea471f2ee565a8b9d30 Mon Sep 17 00:00:00 2001 From: feiyu02 <risaku@163.com> Date: 星期五, 17 一月 2025 16:15:43 +0800 Subject: [PATCH] 1. 修改融合数据逻辑中,融合数据id数组为先排序后转换为字符串,修复同一批原始数据因为id排序不一样被判定为不同的融合数据的问题; --- src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt index 47017e0..9b22dbf 100644 --- a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt +++ b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt @@ -16,8 +16,8 @@ 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 COMMAND_1 = 0x04.toByte() + const val COMMAND_2 = 0x05.toByte() const val HEAD_LENGTH = DataPackageDecoder.HEAD_BYTES + DataPackageDecoder.COMMAND_UNIT_BYTES + DataPackageDecoder.DEVICE_CODE_BYTES } @@ -46,7 +46,7 @@ val b = ByteArray(HEAD_LENGTH) it.readBytes(b) if (b[0] == HEAD1 && - (b[1] == COMMAND_1 || b[2] == COMMAND_2)) { + (b[1] == COMMAND_1 || b[1] == COMMAND_2)) { b.forEach {b -> dataList.add(b) } -- Gitblit v1.9.3