From 9d4ca2e7bdfc0d634b0cc27c7fbe23740f4bb398 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 十二月 2024 15:43:30 +0800
Subject: [PATCH] 1. 新增aod数据索引，aod详细数据实体类，mapper，service 2. 新增卫星遥测数据网格数据pm2.5、aod数据导入，模板下载 3. FileExchange.kt 新增转换pm2.5和aod数据方法
---
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