From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 4 ++--
src/main/java/com/dji/sample/wayline/plane/param/CreateWaylineParam.java | 2 ++
src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
index e7993b1..85dab35 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java
@@ -130,7 +130,7 @@
*/
public static XMLTemplateModel initPolygon(CreateWaylineParam param) {
- Folder folder = FolderUtils.setFloder(param.getTemplateType(), param.getAutoFlightSpeed());
+ Folder folder = FolderUtils.setFloder(param.getTemplateType(), param.getAutoFlightSpeed(),param.getExecuteHeightMode());
//坐标系参数
WaylineCoordinateSysParam wcs = new WaylineCoordinateSysParam("EGM96", String.valueOf(param.getHeight()), String.valueOf(param.getHeight()));
@@ -189,7 +189,7 @@
placemark.setCoordinates(c.x + "," + c.y);
placemark.setEllipsoidHeight(param.getHeight());
placemark.setHeight(param.getHeight());
- placemark.setExecuteHeight(param.getHeight() + param.getDroneHeight()); //执行高度 = 机场高度 + 飞行高度
+ placemark.setExecuteHeight(param.getHeight()); //执行高度 = 机场高度 + 飞行高度 *修改为前端直接传
placemark.setWaypointSpeed(param.getAutoFlightSpeed() + "");
placemark.setUseStraightLine(1);
diff --git a/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java b/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java
index 4b46535..7e2cd28 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java
@@ -44,12 +44,12 @@
return folder;
}
- public static Folder setFloder(String templateType, double autoFlightSpeed) {
+ public static Folder setFloder(String templateType, double autoFlightSpeed,String executeHeightMode) {
Folder folder = new Folder();
folder.setPayloadParam(PayloadParamUtils.setPayloadParam("visable"));
folder.setTemplateType(templateType);//航点模式
folder.setTemplateId("0");
- folder.setExecuteHeightMode("WGS84");
+ folder.setExecuteHeightMode(executeHeightMode);
folder.setAutoFlightSpeed(autoFlightSpeed);//全局航线飞行速度
folder.setGlobalHeight(100D); //全局航线高度（相对起飞点高度）
diff --git a/src/main/java/com/dji/sample/wayline/plane/param/CreateWaylineParam.java b/src/main/java/com/dji/sample/wayline/plane/param/CreateWaylineParam.java
index 46c1623..120a3c2 100644
--- a/src/main/java/com/dji/sample/wayline/plane/param/CreateWaylineParam.java
+++ b/src/main/java/com/dji/sample/wayline/plane/param/CreateWaylineParam.java
@@ -32,6 +32,8 @@
private double sideRatio;//旁向重叠率
@NotNull(message = "航线角度不能为空")
private int bearing;//航线角度
+ @NotNull(message = "执行高度模式不能为空")
+ private String executeHeightMode;//执行高度模式 * 注：该元素仅在waylines.wpml中使用。
/**
* 全局航线飞行速度 1-15
--
Gitblit v1.9.3