From cf8a1261b5a27b0e3270da2bd57fbe936b4e809b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 19 一月 2024 17:44:31 +0800
Subject: [PATCH] 支持合并录像使用https
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
index 39f6388..ef7c6bb 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
@@ -92,7 +92,7 @@
result.put("error","device[ " + serial + " ]鏈壘鍒�");
resultDeferredResult.setResult(result);
return resultDeferredResult;
- }else if (device.isOnLine()) {
+ }else if (!device.isOnLine()) {
JSONObject result = new JSONObject();
result.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result);
@@ -133,17 +133,29 @@
result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", "");
result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl());
- result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getHttps_flv() != null) {
+ result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl());
+ }
result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl());
- result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ if(inviteInfo.getStreamInfo().getWss_flv() != null) {
+ result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl());
+ }
result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl());
- result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtmps() != null) {
+ result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl());
+ }
result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl());
- result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ if (inviteInfo.getStreamInfo().getHttps_hls() != null) {
+ result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl());
+ }
result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl());
- result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ if (inviteInfo.getStreamInfo().getRtsps() != null) {
+ result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl());
+ }
result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl());
- result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ if (inviteInfo.getStreamInfo().getRtcs() != null) {
+ result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl());
+ }
result.put("CDN", "");
result.put("SnapURL", "");
result.put("Transport", device.getTransport());
--
Gitblit v1.8.0