From a1a81473ab7c7c73016b1b3b79fae0beac571704 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 02 Nov 2024 14:33:21 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/tianyu/netty/handler/MessageProtocolDecoder.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 d14dbd5..3417645 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,6 +1,12 @@
package com.ard.tianyu.netty.handler;// MessageProtocolDecoder.java
import com.ard.common.utils.ByteUtils;
+import com.ard.tianyu.model.dto.converter.realdata.UavSignalInfoConverter;
+import com.ard.tianyu.model.dto.converter.realdata.UavStateConverter;
+import com.ard.tianyu.model.dto.converter.realdata.UavTelemetryDataConverter;
+import com.ard.tianyu.model.dto.signal.SignalInfo;
+import com.ard.tianyu.model.dto.state.UavState;
+import com.ard.tianyu.model.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;
@@ -70,15 +76,16 @@
case (byte) 0xA8:
byte[] uavStatus = new byte[dataLength - 1];
in.readBytes(uavStatus); // 读取 ProtoBuf 数据
-
- TelemetryDataPB.UavState uavState = TelemetryDataPB.UavState.parseFrom(uavStatus);
+ 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[] telemetryDataBytes = new byte[dataLength - 1];
in.readBytes(telemetryDataBytes);
- TelemetryDataPB.TelemetryData telemetryData = TelemetryDataPB.TelemetryData.parseFrom(telemetryDataBytes);
+ TelemetryDataPB.TelemetryData telemetryDataPB = TelemetryDataPB.TelemetryData.parseFrom(telemetryDataBytes);
+ TelemetryData telemetryData = UavTelemetryDataConverter.convertProtoToEntity(telemetryDataPB);
baseCmd = new UavTelemetryDataCmd(telemetryData);
log.debug("遥测数据： {}", telemetryData.getBoxSn());
break;
@@ -88,7 +95,8 @@
in.readBytes(signalInfoBytes);
signalInfoBytes = new byte[dataLength - 20];
in.readBytes(signalInfoBytes);
- TelemetryDataPB.SignalInfo signalInfo = TelemetryDataPB.SignalInfo.parseFrom(signalInfoBytes);
+ TelemetryDataPB.SignalInfo signalInfoPB = TelemetryDataPB.SignalInfo.parseFrom(signalInfoBytes);
+ SignalInfo signalInfo =UavSignalInfoConverter.convertProtoToEntity(signalInfoPB);
baseCmd = new SignalInfoCmd(signalInfo);
log.debug("信道质量数据： {}", delayTime);
break;
--
Gitblit v1.9.3