From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java b/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
index df8b199..a4cfb00 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/web/WebVideosParser.java
@@ -7,6 +7,7 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeshi.buwan.exception.video.VideoPlayException;
 import org.springframework.stereotype.Controller;
 
 import com.yeshi.buwan.domain.CategoryContry;
@@ -127,7 +128,7 @@
         JSONObject object = new JSONObject();
 
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
-        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, 1);
+        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, 1,null);
         // 鑾峰彇瑙嗛鍒楄〃
         List<VideoInfo> list1;
         if (type.equalsIgnoreCase("area")) {
@@ -197,7 +198,7 @@
             return;
         }
 
-        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1);
+        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1,null);
 
         VideoInfo info = (videoDeailUtil.getVideoInfo(null, videoId, resourceId, resourceList,
                 CacheUtil.getMD5Long(resourceList)));
@@ -284,7 +285,7 @@
             return;
         }
 
-        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1);
+        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1,null);
 
         DetailSystem ds = systemService.getDetailSystemByPackage(packageName);
         // 鐚滀綘鍠滄
@@ -378,7 +379,12 @@
 
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
 
-        PlayUrl pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+        PlayUrl pu = null;
+        try {
+            pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+        } catch (VideoPlayException e) {
+            e.printStackTrace();
+        }
 
         if (pu != null) {
             if (!StringUtil.isNullOrEmpty(pu.getUrl()))

--
Gitblit v1.8.0