From 638408723ebbf884f59ecaafcaab1c29f69bc689 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 15 Jul 2024 16:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/xml/mode/XMLTemplateModel.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 6f2b986..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
@@ -72,7 +72,7 @@
//拍照事件
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()));
@@ -82,7 +82,7 @@
//云台旋转事件
ActionMode actionMode2 = new ActionMode();
- actionMode2.setActionId(0);
+ actionMode2.setActionId(1);
actionMode2.setActionActuatorFunc(CameraActionEnum.GIMBAL_ROTATE.getDescription());//旋转云台
//设置转动角度
double bearing = GeoToolsUtil.bearing(pointPO.getCoordinate().y,pointPO.getCoordinate().x,pointPO.getCentro().y,pointPO.getCentro().x);
@@ -95,8 +95,8 @@
actionModeFxqph.setActionActuatorFunc(CameraActionEnum.ROTATE_YAW.getDescription());//飞行器偏航
actionModeFxqph.setActionActuatorFuncParam(ActionUtils.setRotateYaw(bearing));
-// list.add(actionMode2);//添加云台旋转
list.add(actionModeFxqph);//添加飞行器偏航
+ list.add(actionMode2);//添加云台旋转
list.add(actionMode);//添加拍照
actionGroup.setActions(list);
--
Gitblit v1.9.3