From f2c909e42b81bb7b589c956bfcf90dba3e16d0a8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 10:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/component/netty/command/manual/FlyRoundControlCmd.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/component/netty/command/manual/FlyRoundControlCmd.java b/ard-work/src/main/java/com/ard/work/component/netty/command/manual/FlyRoundControlCmd.java
index 3684c57..dc9c434 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/command/manual/FlyRoundControlCmd.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/command/manual/FlyRoundControlCmd.java
@@ -15,18 +15,20 @@
     private final double longitude;                  // 兴趣点经度
     private final double latitude;                   // 兴趣点纬度
     private final float altitude;                    // 兴趣点高度
+    private final float height;                      // 飞行高度
     private final float speed;                       // 环绕速度
     private final float radius;                      // 环绕半径
     private final byte flyMode;                      // 飞行模式
 
     public FlyRoundControlCmd(FlyRoundControlDTO flyRoundControlDTO) {
         setDataHeader((short) 0x7479);
-        setDataLength((short) 47);
+        setDataLength((short) 51);
         setBoxSn(flyRoundControlDTO.getBoxSn().getBytes());
         setCmdCode((byte) 0xD1);
         this.longitude = flyRoundControlDTO.getLongitude();
         this.latitude = flyRoundControlDTO.getLatitude();
         this.altitude = flyRoundControlDTO.getAltitude();
+        this.height=flyRoundControlDTO.getHeight();
         this.speed = flyRoundControlDTO.getSpeed();
         this.radius= flyRoundControlDTO.getRadius();
         this.flyMode = flyRoundControlDTO.getFlyMode();
@@ -43,6 +45,7 @@
         out.writeDouble(longitude);         // 写入兴趣点经度
         out.writeDouble(latitude);          // 写入兴趣点纬度
         out.writeFloat(altitude);           // 写入兴趣点高度
+        out.writeFloat(height);             // 写入飞行高度
         out.writeFloat(speed);              // 写入环绕速度
         out.writeFloat(radius);             // 写入环绕半径
         out.writeByte(flyMode);             // 写入飞行模式

--
Gitblit v1.9.3