From 94a6e4e4bc39153e64f8599e626475c4ce5bdb88 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 16 Jul 2024 13:49:01 +0800
Subject: [PATCH] 修改喊话功能的重新喊话和音频展示接口，新增缩略图展示接口
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 e9d86c9..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,21 +69,35 @@
actionGroup.setActionTrigger(at);
// 开始增加事件
List<ActionMode> list = new ArrayList<>();
+
+ //拍照事件
ActionMode actionMode = new ActionMode();
- actionMode.setActionId(0);
+ actionMode.setActionId(2);
actionMode.setActionActuatorFunc(CameraActionEnum.TAKE_PHOTO.getDescription());//拍照事件
// actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(quotient-1).getDkbh()));
// 设置媒体文件名称后缀
- actionMode.setActionActuatorFuncParam(ActionUtils.setTakePhoto(lotInfos.get(pointPO.getIndex()).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();
actionMode2.setActionId(1);
- actionMode2.setActionActuatorFunc(CameraActionEnum.GIMBAL_ROTATE.getDescription());//拍照事件
- actionMode2.setActionActuatorFuncParam(ActionUtils.setGimbalRotate());
- list.add(actionMode2);
+ actionMode2.setActionActuatorFunc(CameraActionEnum.GIMBAL_ROTATE.getDescription());//旋转云台
+ //设置转动角度
+ 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);
placemark.setActionGroup(actionGroup);
--
Gitblit v1.9.3