From 44b8d8b3407cacce19e3702c2167ecdf3db5d24c Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Wed, 23 Oct 2024 16:10:05 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 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 5c27bd5..0f8f432 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,7 +1,7 @@
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.*;
+import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
@@ -20,7 +20,7 @@
in.markReaderIndex(); // 标记当前读取位置
short dataHead = in.readShort();
- if(dataHead != 0x6A77){
+ if (dataHead != 0x6A77) {
return;
}
short dataLength = in.readShort();
@@ -30,22 +30,44 @@
return;
}
byte cmdCode = in.readByte();
- BaseCommand command = null;
-
- // 根据 cmdCode 创建相应消息对象
- if (cmdCode == 0x01) { // 注册回复消息
- byte success = in.readByte(); // 读取是否成功
- log.info("注册回复: {}", success == 0x01 ? "成功" : "失败");
+ BaseCommand baseCommand = null;
+ switch (cmdCode) {
+ 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.debug("心跳回复: 时间戳 {}", timestamp);
+ break;
+ case 0x03:
+ case 0x04:
+ byte[] boxSn = new byte[dataLength - 1];
+ in.readBytes(boxSn);
+ SubscribeReplyCommand subscribeReply = new SubscribeReplyCommand(new String(boxSn));
+ log.debug("订阅回复: {}", subscribeReply.getBoxSn());
+ 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());
+ 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());
+ break;
+ default:
+ log.warn("无法识别的命令码: {}", String.format("0x%02X", cmdCode & 0xFF));//String.format("0x%02X", cmdCode & 0xFF)
}
- if (cmdCode == 0x02) { // 注册回复消息
- long timestamp = in.readLong(); // 读取时间戳
- command = new HeartbeatReplyCommand(timestamp); // 创建心跳回复对象
- log.info("心跳回复: 时间戳 {}", timestamp);
- }
- if (command != null) {
- out.add(command); // 添加解码的命令对象到输出列表
- } else {
- // log.warn("无法识别的命令码: {}", cmdCode);
+ if (baseCommand != null) {
+ out.add(baseCommand);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3