From 56cf48282b9fa39637fdcad9b445d2a2f81a61d9 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 15:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/xml/mode/Folder.java | 1 +
src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/PayloadParamUtils.java | 14 ++++++++++++++
src/main/resources/template/waylines-polygon.xml | 2 +-
src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/FolderUtils.java | 6 +++---
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/xml/mode/Folder.java b/src/main/java/com/dji/sample/patches/xml/mode/Folder.java
index 69b52ec..2fc9335 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/Folder.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/Folder.java
@@ -23,6 +23,7 @@
private Double autoFlightSpeed;
private Double globalHeight;
+ private String executeHeightMode;
private Integer caliFlightEnable;
private String gimbalPitchMode;
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 a56b09f..4b46535 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
@@ -46,10 +46,10 @@
public static Folder setFloder(String templateType, double autoFlightSpeed) {
Folder folder = new Folder();
- folder.setPayloadParam(PayloadParamUtils.setPayloadParam());
- folder.setWaylineCoordinateSysParam(new WaylineCoordinateSysParam());
+ folder.setPayloadParam(PayloadParamUtils.setPayloadParam("visable"));
folder.setTemplateType(templateType);//航点模式
folder.setTemplateId("0");
+ folder.setExecuteHeightMode("WGS84");
folder.setAutoFlightSpeed(autoFlightSpeed);//全局航线飞行速度
folder.setGlobalHeight(100D); //全局航线高度（相对起飞点高度）
@@ -66,7 +66,7 @@
folder.setGlobalWaypointHeadingParam(gwhp);
folder.setGlobalWaypointTurnMode("coordinateTurn");
- folder.setGlobalUseStraightLine(10);
+ folder.setGlobalUseStraightLine(1);
return folder;
}
diff --git a/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/PayloadParamUtils.java b/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/PayloadParamUtils.java
index e292a9d..d9fa7dc 100644
--- a/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/PayloadParamUtils.java
+++ b/src/main/java/com/dji/sample/patches/xml/mode/share/action/utils/PayloadParamUtils.java
@@ -24,4 +24,18 @@
return pp;
}
+ public static PayloadParam setPayloadParam(String imageFormat) {
+ PayloadParam pp = PayloadParam.builder()
+ .focusMode("firstPoint")
+ .meteringMode("average")
+ .returnMode("singleReturnFirst")
+ .samplingRate("240000")
+ .scanningMode("repetitive")
+ .payloadPositionIndex(0)
+// .imageFormat("wide,ir")
+ .imageFormat(imageFormat)
+ .build();
+ return pp;
+ }
+
}
diff --git a/src/main/resources/template/waylines-polygon.xml b/src/main/resources/template/waylines-polygon.xml
index e08367d..6003c64 100644
--- a/src/main/resources/template/waylines-polygon.xml
+++ b/src/main/resources/template/waylines-polygon.xml
@@ -21,7 +21,7 @@
</wpml:missionConfig>
<Folder>
<wpml:templateId>${folder.templateId!''}</wpml:templateId>
- <wpml:executeHeightMode>${folder.waylineCoordinateSysParam.heightMode!''}</wpml:executeHeightMode>
+ <wpml:executeHeightMode>${folder.executeHeightMode!''}</wpml:executeHeightMode>
<wpml:waylineId>0</wpml:waylineId>
<wpml:autoFlightSpeed>${folder.autoFlightSpeed!''}</wpml:autoFlightSpeed>
<wpml:startActionGroup>
--
Gitblit v1.9.3