From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
index 7d8e623..01aa519 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -128,18 +128,20 @@
//获取返回结果
ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
+ LiveDTO live = new LiveDTO();
+ live.setVideoId(liveParam.getVideoId());
//相机已经在直播中，请勿重复开启直播
if (receiveReply.getResult() == 513003) {
- LiveDTO live = new LiveDTO();
-// live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735", "700") + ".flv");
- LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
- live.setUrl(new StringBuilder()
- .append("https://wrj.shuixiongit.com/zb/rtp/")
- .append(gb28181.getAgentID())
- .append("_")
- .append(gb28181.getChannel())
- .append(".live.flv")
- .toString());
+
+ live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735", "700") + ".flv");
+// LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
+// live.setUrl(new StringBuilder()
+// .append("https://wrj.shuixiongit.com/zb/rtp/")
+// .append(gb28181.getAgentID())
+// .append("_")
+// .append(gb28181.getChannel())
+// .append(".live.flv")
+// .toString());
return ResponseResult.success(live);
}
@@ -148,7 +150,6 @@
}
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
- LiveDTO live = new LiveDTO();
//对不同的协议类型做处理
switch (urlType) {
@@ -202,7 +203,6 @@
liveParam.setUrlType(3);
liveParam.setVideoId(getVedioId(getLiveCapacity(workspaceId, deviceSn), deviceSn,deviceName));
liveParam.setVideoQuality(0);
- System.out.println(liveStart(liveParam));
return liveStart(liveParam);
}
--
Gitblit v1.9.3