From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..7270ca1 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);
@@ -328,6 +328,7 @@
payloadInfo.setPayloadPositionIndex("0");
payloadInfo.setPayloadSubEnumValue("0");
param.setPayloadInfo(payloadInfo);
+ param.setExecuteHeightMode("relativeToStartPoint");
// 初始化模板对象
XMLTemplateModel xmlModel = XMLTemplateModel.initPolygon(param);
--
Gitblit v1.9.3