From c7fa563f9a951c647725c3d0e02b7bce366d23ea Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 23 Dec 2025 11:02:51 +0800
Subject: [PATCH] 增加设置相机模式接口 取消拍照录像业务中设置
---
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
index 3d134e3..e7f0880 100644
--- a/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java
@@ -336,9 +336,10 @@
throw new ControlException("未找到对应的飞行器信息,boxSn:{}" + boxSn);
}
//设置相机模式为拍照模式
- updateCameraMode(CameraModeDTO.builder().boxSn(capturePicDto.getBoxSn()).actionParam((byte) 0x01).build());
+ //updateCameraMode(CameraModeDTO.builder().boxSn(capturePicDto.getBoxSn()).actionParam((byte) 0x01).build());
//设置拍照回传
- photoReturnToggle(PhotoReturnToggleDTO.builder().boxSn(capturePicDto.getBoxSn()).actionParam((byte) 0x01).build());
+ //photoReturnToggle(PhotoReturnToggleDTO.builder().boxSn(capturePicDto.getBoxSn()).actionParam((byte) 0x01)
+ // .build());
CapturePicCmd capturePicCommand = new CapturePicCmd(capturePicDto);
this.sendMessage(ardDroneInfo.getServerId(), capturePicCommand);
@@ -358,7 +359,7 @@
}
BaseCmd baseCmd;
if (recordDto.getIsRecord()) {
- updateCameraMode(CameraModeDTO.builder().boxSn(recordDto.getBoxSn()).actionParam((byte) 0x02).build());
+ //updateCameraMode(CameraModeDTO.builder().boxSn(recordDto.getBoxSn()).actionParam((byte) 0x02).build());
baseCmd = new RecordStartCmd(recordDto);
} else {
baseCmd = new RecordStopCmd(recordDto);
@@ -957,6 +958,7 @@
// 处理无人机遥测消息
UavTelemetryDataCmd uavTelemetryDataCmd = (UavTelemetryDataCmd) tyCommand;
TelemetryData telemetryData = uavTelemetryDataCmd.getTelemetryData();
+ telemetryData.setTimestamp(System.currentTimeMillis());//由于六合提供的状态时间戳不准，先以接收状态作为时间戳
UavTelemetryDataCache.put(telemetryData);
//logPrint("无人机遥测", uavTelemetryDataCmd.getTelemetryData().getBoxSn());
//WebSocketUtil.sendMessageAll(uavTelemetryDataCmd.getTelemetryData());
--
Gitblit v1.9.3