From 38dac8f822d1ede5e9fd3fbe3e8a5de719fd6883 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 10 Dec 2025 09:17:25 +0800
Subject: [PATCH] 2025-12-10 zwy 在切换无人机摄像头时，因为无人机不支持红外，切换失败，修改提示内容为“325003000，指令响应失败，请确认无人机是否支持此功能。”
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
index 4a7438c..28d5dff 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -118,7 +118,7 @@
ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
+ return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
}
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
@@ -182,6 +182,11 @@
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
+ // 开始直播时发送机场相机摄像头默认信息（舱外）到所有在线用户,只取机场sn，发机场的摄像头信息
+ if(data.getChildDeviceSn()!=null) {
+ String sn = data.getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, 1);
+ }
return ResponseResult.success(live);
}
@@ -241,6 +246,11 @@
ServiceReply receiveReply = this.publishLiveLensChange(respTopic, liveParam);
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ Integer code = receiveReply.getResult();
+ if(code == 325003) {
+ // 指令响应失败，请重试. 经查询官网，机场3为低配，飞行器不支持红外
+ return ResponseResult.error(325003000,LiveErrorEnum.COMMAND_FAILED.getErrorMsg()+"请确认无人机是否支持此功能！");
+ }
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
@@ -268,6 +278,10 @@
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
+ // 将切换相机摄像头信息到redis
+ Integer camera_position = liveParam.getCameraPosition();
+ String sn = responseResult.getData().getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, camera_position);
return ResponseResult.success();
}
--
Gitblit v1.9.3