From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 3f10a2a..4476327 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
@@ -2,6 +2,7 @@
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.utils.GeoToolsUtil;
+import com.dji.sample.patches.utils.PointPO;
import com.dji.sample.patches.xml.mode.share.ActionGroup;
import com.dji.sample.patches.xml.mode.share.ActionMode;
import com.dji.sample.patches.xml.mode.share.ActionTrigger;
@@ -46,21 +47,22 @@
* @param lotInfos
* @return
*/
- public static XMLTemplateModel init(Coordinate[] coordinates,List<LotInfo> lotInfos) {
+ public static XMLTemplateModel init(List<PointPO> coordinates, List<LotInfo> lotInfos) {
Folder folder = FolderUtils.setFloder();
List<Placemark> placemarkList = new ArrayList<>();
int i = 0;
- for (Coordinate c:coordinates) {
+ for (PointPO pointPO:coordinates) {
if (i != 0) {//去除第一个航点
+ Coordinate c = pointPO.getCoordinate();
Placemark placemark = PlacemarkUtils.setPlacemark(c.x + "," + c.y);
// 增加事件组
ActionGroup actionGroup = new ActionGroup();
- actionGroup.setActionGroupId(i);//动作组id从0开始单调连续递增。
- actionGroup.setActionGroupStartIndex(i);//动作组开始生效的航点
- actionGroup.setActionGroupEndIndex(i);//动作组结束生效的航点
+ actionGroup.setActionGroupId(i-1);//动作组id从0开始单调连续递增。
+ actionGroup.setActionGroupStartIndex(i-1);//动作组开始生效的航点
+ actionGroup.setActionGroupEndIndex(i-1);//动作组结束生效的航点
actionGroup.setActionGroupMode("sequence");
ActionTrigger at = new ActionTrigger();
at.setActionTriggerType("reachPoint");
@@ -70,15 +72,11 @@
ActionMode actionMode = new ActionMode();
actionMode.setActionId(0);
actionMode.setActionActuatorFunc(CameraActionEnum.TAKE_PHOTO.getDescription());//拍照事件
- // 计算获取图斑编号
- int quotient = i / 4;
- if (i % 4 != 0) { // 检查是否有余数
- quotient++; // 如果有余数，商加1
- }
- if (quotient == 0) quotient = 1;
-
- actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(quotient-1).getDkbh()));
+// actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(quotient-1).getDkbh()));
+ // 设置媒体文件名称后缀
+ actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(pointPO.getIndex()).getDkbh() + "~" + lotInfos.get(pointPO.getIndex()).getTaskId()));
+// actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto("测试"));
list.add(actionMode);
ActionMode actionMode2 = new ActionMode();
@@ -102,7 +100,7 @@
.author("Aix")
.createTime(String.valueOf(System.currentTimeMillis()))
.updateTime(String.valueOf(System.currentTimeMillis()))
- .missionConfig(MissionConfigUtils.setMissionConfig(coordinates[0].y + "," + coordinates[0].x + ",0"))
+ .missionConfig(MissionConfigUtils.setMissionConfig(coordinates.get(0).getCoordinate().y + "," + coordinates.get(0).getCoordinate().x + ",0"))
.folder(folder)
.build();
@@ -128,7 +126,7 @@
double airportLat = 28.624514734; // 机场纬度
double airportLon = 115.856725497; // 机场经度
// 解析图斑生成航点，按顺序返回
- Coordinate[] coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
+ List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, airportLat, airportLon);
// 初始化模板对象
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
--
Gitblit v1.9.3