From 16fd4235f692777cfd9cceff5090e5450e2173b3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 04 Mar 2025 13:59:05 +0800
Subject: [PATCH] 优化包结构、增加载荷飞控权限
---
ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java | 212 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 164 insertions(+), 48 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 d08699c..dc3490c 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,12 +1,35 @@
package com.ard.tianyu.netty.handler;// MessageProtocolDecoder.java
-import com.ard.tianyu.netty.command.*;
+import com.ard.common.utils.ByteUtils;
+import com.ard.tianyu.domain.dto.converter.realdata.UavSignalInfoConverter;
+import com.ard.tianyu.domain.dto.converter.realdata.UavStateConverter;
+import com.ard.tianyu.domain.dto.converter.realdata.UavTelemetryDataConverter;
+import com.ard.tianyu.domain.dto.signal.SignalInfo;
+import com.ard.tianyu.domain.dto.state.UavState;
+import com.ard.tianyu.domain.dto.telemetry.TelemetryData;
+import com.ard.tianyu.netty.command.BaseCmd;
+import com.ard.tianyu.netty.command.camera.CameraModeReplyCmd;
+import com.ard.tianyu.netty.command.camera.CapturePicReplyCmd;
+import com.ard.tianyu.netty.command.camera.RecordStartReplyCmd;
+import com.ard.tianyu.netty.command.camera.RecordStopReplyCmd;
+import com.ard.tianyu.netty.command.manual.*;
+import com.ard.tianyu.netty.command.notice.BoxPowerStatusReplyCmd;
+import com.ard.tianyu.netty.command.notice.FlyWayEndReplyCmd;
+import com.ard.tianyu.netty.command.notice.UavReadyReplyCmd;
+import com.ard.tianyu.netty.command.real.SignalInfoCmd;
+import com.ard.tianyu.netty.command.real.UavStateCmd;
+import com.ard.tianyu.netty.command.real.UavTelemetryDataCmd;
+import com.ard.tianyu.netty.command.register.HeartbeatReplyCmd;
+import com.ard.tianyu.netty.command.register.RegisterReplyCmd;
+import com.ard.tianyu.netty.command.settings.ReturnHeightSettingReplyCmd;
+import com.ard.tianyu.netty.command.settings.ReturnPointSettingReplyCmd;
+import com.ard.tianyu.netty.command.settings.VideoStreamSettingReplyCmd;
+import com.ard.tianyu.netty.command.wayline.*;
import com.ard.tianyu.netty.protobuf.TelemetryDataPB;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.ByteToMessageDecoder;
import lombok.extern.slf4j.Slf4j;
-
import java.util.List;
@Slf4j
@@ -30,79 +53,172 @@
return;
}
byte cmdCode = in.readByte();
- BaseCommand baseCommand = null;
+ BaseCmd baseCmd = null;
+ byte actionCode;
switch (cmdCode) {
case 0x01:
byte success = in.readByte(); // 读取是否成功
log.warn("注册回复: {}", success == 0x01 ? "成功" : "失败");
- baseCommand = new RegisterReplyCommand(success);
+ baseCmd = new RegisterReplyCmd(success);
break;
case 0x02:
long timestamp = in.readLong(); // 读取时间戳
- baseCommand = new HeartbeatReplyCommand(timestamp);
+ baseCmd = new HeartbeatReplyCmd(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());
+ case 0x0A:
+ byte status = in.readByte();
+ baseCmd = new BoxPowerStatusReplyCmd(status);
+ log.debug("云盒开机/关机通知回复: 状态 {}", ByteUtils.byteToHex(status));
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);
+ TelemetryDataPB.UavState uavStatePB = TelemetryDataPB.UavState.parseFrom(uavStatus);
+ UavState uavState = UavStateConverter.convertProtoToEntity(uavStatePB);
+ baseCmd = new UavStateCmd(uavState);
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 UavTelemetryDataCommand(telemetryData);
+ byte[] telemetryDataBytes = new byte[dataLength - 1];
+ in.readBytes(telemetryDataBytes);
+ TelemetryDataPB.TelemetryData telemetryDataPB = TelemetryDataPB.TelemetryData.parseFrom(telemetryDataBytes);
+ TelemetryData telemetryData = UavTelemetryDataConverter.convertProtoToEntity(telemetryDataPB);
+ baseCmd = new UavTelemetryDataCmd(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);
+ byte[] signalInfoBytes = new byte[15];
+ in.readBytes(signalInfoBytes);
+ signalInfoBytes = new byte[dataLength - 20];
+ in.readBytes(signalInfoBytes);
+ TelemetryDataPB.SignalInfo signalInfoPB = TelemetryDataPB.SignalInfo.parseFrom(signalInfoBytes);
+ SignalInfo signalInfo =UavSignalInfoConverter.convertProtoToEntity(signalInfoPB);
+ baseCmd = new SignalInfoCmd(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);
- TelemetryDataPB.UavInitInfo uavInitInfo = TelemetryDataPB.UavInitInfo.parseFrom(uavData1);
- baseCommand = new DroneReadyNotificationCommand(uavInitInfo, actionCode);
- log.info("无人机初始化数据： {}", uavInitInfo.getUavModel());
- break;
- default:
- log.warn("无法识别的命令码动作编号：{}", String.format("0x%02X", actionCode & 0xFF));
- break;
- }
+ in.readByte();//加密标志
+ actionCode = in.readByte();//动作编号
+ baseCmd = processD1ReplyCmd(in, actionCode);
+ break;
+ case (byte) 0xD2:
+ in.readByte();//加密标志
+ actionCode = in.readByte();//动作编号
+ baseCmd = processD2ReplyCmd(in, actionCode);
break;
default:
- encryptionFlag = in.readByte();
+ 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)
-
+ log.warn("无法识别的命令码: {},动作编号：{}",
+ ByteUtils.byteToHex(cmdCode),
+ ByteUtils.byteToHex(actionCode)
+ );
}
- if (baseCommand != null) {
- out.add(baseCommand);
+ if (baseCmd != null) {
+ out.add(baseCmd);
}
}
+
+ //处理D1指令回复
+ private BaseCmd processD1ReplyCmd(ByteBuf in, byte actionCode) {
+ byte result = in.readByte();
+ int errorCode = in.readInt();
+ byte[] uavData = new byte[15];
+ in.readBytes(uavData);
+ String boxSn = new String(uavData);
+ switch (actionCode) {
+ case 0x10:
+ return new WayLineUploadReplyCmd(boxSn, result, errorCode);
+ case 0x11:
+ return new TakeOffReplyCmd(boxSn, result, errorCode);
+ case 0x12:
+ return new ReturnHomeReplyCmd(boxSn, result, errorCode);
+ case 0x13:
+ return new ReturnHomeCancelReplyCmd(boxSn, result, errorCode);
+ case 0x14:
+ return new LandReplyCmd(boxSn, result, errorCode);
+ case 0x15:
+ return new LandCancelReplyCmd(boxSn, result, errorCode);
+ case 0x17:
+ return new WayLineBeginReplyCmd(boxSn, result, errorCode);
+ case 0x18:
+ return new WayLinePauseReplyCmd(boxSn, result, errorCode);
+ case 0x19:
+ return new WayLineResumeReplyCmd(boxSn, result, errorCode);
+ case 0x20:
+ return new WayLineEndReplyCmd(boxSn, result, errorCode);
+ case 0x21:
+ return new ReturnHeightSettingReplyCmd(boxSn, result, errorCode);
+ case 0x29:
+ return new LandForcedReplyCmd(boxSn, result, errorCode);
+ case 0x31:
+ return new ReturnPointSettingReplyCmd(boxSn, result, errorCode);
+ case 0x32:
+ return new EmergencyBrakeReplyCmd(boxSn, result, errorCode);
+ case 0x39:
+ return new PointControlReachedReplyCmd(boxSn, result, errorCode);
+ case 0x22:
+ return new CameraModeReplyCmd(boxSn, result, errorCode);
+ case 0x23:
+ return new CapturePicReplyCmd(boxSn, result, errorCode);
+ case 0x24:
+ return new RecordStartReplyCmd(boxSn, result, errorCode);
+ case 0x25:
+ return new RecordStopReplyCmd(boxSn, result, errorCode);
+ case 0x2E:
+ return new FlyWayEndReplyCmd(boxSn, result, errorCode);
+ // Special cases
+ case 0x3D:
+ case 0x42:
+ return processSpecialD1ReplyCmd(in, actionCode, boxSn);
+ // Add other cases...
+ default:
+ log.warn("无法识别D1的动作编号：{}", ByteUtils.byteToHex(actionCode));
+ }
+ return null;
+ }
+ //处理D2指令回复
+ private BaseCmd processD2ReplyCmd(ByteBuf in, byte actionCode) {
+ byte result = in.readByte();
+ int errorCode = in.readInt();
+ byte[] uavData = new byte[15];
+ in.readBytes(uavData);
+ String boxSn = new String(uavData);
+ switch (actionCode) {
+ case 0x05:
+ return new VideoStreamSettingReplyCmd(boxSn, result, errorCode);
+ // Add other cases...
+ default:
+ log.warn("无法识别D2的动作编号：{}", ByteUtils.byteToHex(actionCode));
+ }
+ return null;
+ }
+ //处理特殊D1指令回复
+ private BaseCmd processSpecialD1ReplyCmd(ByteBuf in, byte actionCode, String boxSn) {
+ switch (actionCode) {
+ //无人机准备完成通知回复
+ case 0x3D:
+ byte batteryPower = in.readByte();
+ double longitude = in.readDouble();
+ double latitude = in.readDouble();
+ int altitude = in.readInt();
+ return new UavReadyReplyCmd(boxSn, batteryPower, longitude, latitude, altitude);
+ //无人机初始化信息回复
+ case 0x42:
+// byte[] uavData1 = new byte[in.readableBytes() - 15];
+// in.readBytes(uavData1);
+// TelemetryDataPB.UavInitInfo uavInitInfo;
+// try {
+// uavInitInfo = TelemetryDataPB.UavInitInfo.parseFrom(uavData1);
+// } catch (InvalidProtocolBufferException e) {
+// throw new RuntimeException(e);
+// }
+// return new UavInitReplyCmd(boxSn, uavInitInfo);
+ default:
+ return null;
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3