From 0d02d968ba0626009dfddfccda2ded84a118a88c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 17 Jul 2024 10:49:45 +0800
Subject: [PATCH] 新增临时文件自动删除定时器，增加巡河喊话，修改水印文件上传方式
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 18 ++++++++++++++----
1 files changed, 14 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 d9a075a..56c6b0f 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
@@ -69,8 +69,10 @@
actionGroup.setActionTrigger(at);
// 开始增加事件
List<ActionMode> list = new ArrayList<>();
+
+ //拍照事件
ActionMode actionMode = new ActionMode();
- actionMode.setActionId(1);
+ actionMode.setActionId(2);
actionMode.setActionActuatorFunc(CameraActionEnum.TAKE_PHOTO.getDescription());//拍照事件
// actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(quotient-1).getDkbh()));
@@ -78,14 +80,22 @@
actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(pointPO.getIndex()).getDkbh() + "~" + lotInfos.get(pointPO.getIndex()).getTaskId()));
// actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto("测试"));
+ //云台旋转事件
ActionMode actionMode2 = new ActionMode();
- actionMode2.setActionId(0);
+ actionMode2.setActionId(1);
actionMode2.setActionActuatorFunc(CameraActionEnum.GIMBAL_ROTATE.getDescription());//旋转云台
-
//设置转动角度
- double bearing = GeoToolsUtil.bearing(pointPO.getCoordinate().x,pointPO.getCoordinate().y,pointPO.getCentro().x,pointPO.getCentro().y);
+ double bearing = GeoToolsUtil.bearing(pointPO.getCoordinate().y,pointPO.getCoordinate().x,pointPO.getCentro().y,pointPO.getCentro().x);
+// System.out.println("角度：" + bearing);
actionMode2.setActionActuatorFuncParam(ActionUtils.setGimbalRotate(bearing));
+ // 飞行器偏航事件
+ ActionMode actionModeFxqph = new ActionMode();
+ actionModeFxqph.setActionId(0);
+ actionModeFxqph.setActionActuatorFunc(CameraActionEnum.ROTATE_YAW.getDescription());//飞行器偏航
+ actionModeFxqph.setActionActuatorFuncParam(ActionUtils.setRotateYaw(bearing));
+
+ list.add(actionModeFxqph);//添加飞行器偏航
list.add(actionMode2);//添加云台旋转
list.add(actionMode);//添加拍照
actionGroup.setActions(list);
--
Gitblit v1.9.3