From 75902fb9d5b27a440d14308ccca3c3cff32167bb Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Fri, 25 Oct 2024 09:51:19 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java b/ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java
index 795bffb..eafc7b5 100644
--- a/ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java
+++ b/ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java
@@ -1,9 +1,6 @@
package com.ard.tianyu.netty.handler;// MessageProtocolDecoder.java
-import com.ard.tianyu.netty.command.BaseCommand;
-import com.ard.tianyu.netty.command.HeartbeatReplyCommand;
-import com.ard.tianyu.netty.command.UavDataCommand;
-import com.ard.tianyu.netty.command.UavStateCommand;
+import com.ard.tianyu.netty.command.*;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
@@ -38,28 +35,68 @@
case 0x01:
byte success = in.readByte(); // 读取是否成功
log.warn("注册回复: {}", success == 0x01 ? "成功" : "失败");
+ baseCommand = new RegisterReplyCommand(success);
break;
case 0x02:
long timestamp = in.readLong(); // 读取时间戳
baseCommand = new HeartbeatReplyCommand(timestamp);
- log.warn("心跳回复: 时间戳 {}", timestamp);
+ log.debug("心跳回复: 时间戳 {}", timestamp);
+ break;
+ case 0x03:
+ case 0x04:
break;
case (byte) 0xA8:
byte[] uavStatus = new byte[dataLength - 1];
in.readBytes(uavStatus); // 读取 ProtoBuf 数据
TelemetryDataPB.UavState uavState = TelemetryDataPB.UavState.parseFrom(uavStatus);
baseCommand = new UavStateCommand(uavState);
- log.warn("无人机状态数据： {}", uavState.getBoxSn());
+ log.debug("无人机状态数据： {}", uavState.getBoxSn());
break;
case (byte) 0xA9:
byte[] uavData = new byte[dataLength - 1];
in.readBytes(uavData);
TelemetryDataPB.TelemetryData telemetryData = TelemetryDataPB.TelemetryData.parseFrom(uavData);
- baseCommand = new UavDataCommand(telemetryData);
- log.warn("无人机遥测数据： {}", telemetryData.getBoxSn());
+ baseCommand = new UavTelemetryDataCommand(telemetryData);
+ log.debug("遥测数据： {}", telemetryData.getBoxSn());
+ break;
+ case (byte) 0x0C:
+ int delayTime = in.readInt();
+ uavData = new byte[15];
+ in.readBytes(uavData);
+ // String boxSn12 = new String(uavData);
+ uavData = new byte[dataLength - 20];
+ in.readBytes(uavData);
+ TelemetryDataPB.SignalInfo signalInfo = TelemetryDataPB.SignalInfo.parseFrom(uavData);
+ baseCommand = new SignalInfoCommand(signalInfo);
+ log.debug("信道质量数据： {}", delayTime);
+ break;
+ case (byte) 0xD1:
+ byte encryptionFlag = in.readByte();
+ byte actionCode = in.readByte();
+ switch (actionCode) {
+ case 0x42:
+ byte[] uavData1 = new byte[dataLength - 18];
+ in.readBytes(uavData1);
+ byte[] uavData2 = new byte[15];
+ in.readBytes(uavData2);
+ String boxSn = new String(uavData2);
+ TelemetryDataPB.UavInitInfo uavInitInfo = TelemetryDataPB.UavInitInfo.parseFrom(uavData1);
+ baseCommand = new DroneReadyNotificationCommand(boxSn, uavInitInfo, actionCode);
+ log.info("无人机初始化数据： {}", uavInitInfo.getUavModel());
+ break;
+ default:
+ log.warn("无法识别的命令码动作编号：{}", String.format("0x%02X", actionCode & 0xFF));
+ break;
+ }
break;
default:
- log.warn("无法识别的命令码: {}", String.format("0x%02X", cmdCode & 0xFF));//String.format("0x%02X", cmdCode & 0xFF)
+ encryptionFlag = in.readByte();
+ actionCode = in.readByte();
+ log.warn("无法识别的命令码: {},加密标志：{},动作编号：{}",
+ String.format("0x%02X", cmdCode & 0xFF),
+ String.format("0x%02X", encryptionFlag & 0xFF),
+ String.format("0x%02X", actionCode & 0xFF));//String.format("0x%02X", cmdCode & 0xFF)
+
}
if (baseCommand != null) {
out.add(baseCommand);
--
Gitblit v1.9.3