From d175a7fe7d6e96c0e6abfe3954eefed539bb6e3c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 18 Sep 2023 19:23:41 +0800
Subject: [PATCH] 初始提交

---
 src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 5d2c8cd..94ece0d 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
@@ -90,6 +90,11 @@
 
     @Override
     public ResponseResult liveStart(LiveTypeDTO liveParam) {
+
+//        String streamId_2 = liveParam.getVideoId().replace("/","_");
+//        String streamId_1 = liveParam.getVideoId().replace("_","/");
+//        liveParam.setVideoId(streamId_2);
+
         // Check if this lens is available live.
         ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
         if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
@@ -100,7 +105,14 @@
         // target topic
         String respTopic = THING_MODEL_PRE + PRODUCT +
                 data.getDeviceSn() + SERVICES_SUF;
+
         ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
+
+        if(receiveReply.getResult() == 513003) {
+            LiveDTO live = new LiveDTO();
+            live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
+            return ResponseResult.success(live);
+        }
 
         if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
             return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
@@ -111,7 +123,8 @@
 
         switch (urlType) {
             case RTMP:
-                live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
+//                live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
+                live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
                 break;
             case GB28181:
                 LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
@@ -144,6 +157,8 @@
 
         String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;
 
+        videoId = videoId.replace("_","/");
+
         ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
         if (receiveReply.getResult() != 0) {
             return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));

--
Gitblit v1.9.3