From dff60bc721754a09fc2cd530bb75aa7bf9c01810 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 四月 2021 19:49:44 +0800
Subject: [PATCH] Bilibili集成完善

---
 src/main/java/com/yeshi/buwan/videos/bilibili/BilibiliUtil.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/videos/bilibili/BilibiliUtil.java b/src/main/java/com/yeshi/buwan/videos/bilibili/BilibiliUtil.java
index 8b76d26..43b3744 100644
--- a/src/main/java/com/yeshi/buwan/videos/bilibili/BilibiliUtil.java
+++ b/src/main/java/com/yeshi/buwan/videos/bilibili/BilibiliUtil.java
@@ -9,6 +9,7 @@
 import com.yeshi.buwan.service.imp.VideoTypeService;
 import com.yeshi.buwan.service.inter.juhe.BilibiliVideoService;
 import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
+import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.factory.VideoInfoFactory;
 import com.yeshi.buwan.util.video.VideoConstant;
 import com.yeshi.buwan.videos.bilibili.entity.BilibiliEpInfo;
@@ -27,6 +28,15 @@
 public class BilibiliUtil {
 
 
+    //3-璁板綍鐗� 5-鐢佃鍓�  4-鍥芥极 1-鐣墽  2-鐢靛奖
+
+    public final static int TYPE_DIANYING = 2;
+    public final static int TYPE_DIANSHIJU = 5;
+    public final static int TYPE_JILUPIAN = 3;
+    public final static int TYPE_GUOMAN = 4;
+    public final static int TYPE_FANJU = 1;
+
+
     @Resource
     private InternetSearchVideoService internetSearchVideoService;
 
@@ -39,7 +49,7 @@
     @Resource
     private VideoTypeService videoTypeService;
 
-    public final static int RESOURCE_ID = 17;
+    public final static int RESOURCE_ID = 27;
 
     public static VideoDetailInfo convertToDetail(BilibiliEpInfo epInfo) {
         VideoDetailInfo detail = new VideoDetailInfo();
@@ -76,7 +86,7 @@
         VideoInfo info = VideoInfoFactory.create(internetSearchVideo);
         info.setResourceList(resourceList);
         info.setShowType(YouKuUtil.getShowType(internetSearchVideo));
-        info.setPlayPicture(info.getHpicture());
+        info.setPlayPicture(StringUtil.isNullOrEmpty(info.getHpicture())?info.getVpicture():info.getHpicture());
         //鑾峰彇鍒嗙被璇︽儏
         info.setVideoType(videoTypeService.getVideoType(info.getVideoType().getId()));
         info.setCommentCount(0);
@@ -142,11 +152,11 @@
         if ("ep".equalsIgnoreCase(type)) {
             BilibiliEpInfo epInfo = bilibiliVideoService.selectEPInfoByPrimaryKey(Long.parseLong(id));
             if (epInfo != null) {
-                playUrl.setUrl(epInfo.getLink());
+                playUrl.setUrl(epInfo.getLink()+"?bsource=baidu_aladdin");
             }
         } else {
             BilibiliVideo bilibiliVideo = bilibiliVideoService.selectVideoByPrimaryKey(Long.parseLong(id));
-            playUrl.setUrl("https://www.bilibili.com/video/" + bilibiliVideo.getBvid());
+            playUrl.setUrl("https://www.bilibili.com/video/" + bilibiliVideo.getBvid()+"?bsource=baidu_aladdin");
         }
 
         return playUrl;

--
Gitblit v1.8.0