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/api/VideoPlayController.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java b/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
index d396ed9..ca59293 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
@@ -7,16 +7,14 @@
 import com.yeshi.buwan.domain.video.VideoWatchHistory;
 import com.yeshi.buwan.domain.vip.VideoBuyRecord;
 import com.yeshi.buwan.exception.ParamsException;
-import com.yeshi.buwan.pptv.PPTVApiUtil;
-import com.yeshi.buwan.pptv.PPTVUtil;
-import com.yeshi.buwan.pptv.entity.PPTVProgram;
-import com.yeshi.buwan.pptv.entity.PPTVSeries;
-import com.yeshi.buwan.pptv.entity.PPTVSeriesProgramMap;
-import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
-import com.yeshi.buwan.service.inter.LoginUserService;
+import com.yeshi.buwan.videos.pptv.PPTVApiUtil;
+import com.yeshi.buwan.videos.pptv.PPTVUtil;
+import com.yeshi.buwan.videos.pptv.entity.PPTVProgram;
+import com.yeshi.buwan.videos.pptv.entity.PPTVSeries;
+import com.yeshi.buwan.videos.pptv.entity.PPTVSeriesProgramMap;
+import com.yeshi.buwan.videos.pptv.entity.VideoPPTVMap;
 import com.yeshi.buwan.service.inter.juhe.PPTVPlayProcessRecordService;
 import com.yeshi.buwan.service.inter.juhe.PPTVService;
-import com.yeshi.buwan.service.inter.push.PushDeviceTokenService;
 import com.yeshi.buwan.service.inter.system.SystemConfigService;
 import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
 import com.yeshi.buwan.service.inter.vip.VIPService;
@@ -142,6 +140,7 @@
         //鏌ヨcid涓巚id鐨勫悕瀛�
         PPTVSeries pptvSeries = pptvService.selectSeriesBySeriesCode(cid);
         if (pptvSeries == null) {
+//            PPTVProgram program = pptvService.selectProgramById(cid);
             try {
                 pptvSeries = PPTVApiUtil.getDetail(cid);
                 ThreadUtil.run(new Runnable() {
@@ -277,6 +276,8 @@
         data.put("vipVideo", isVIPVideo);
         data.put("bought", isBought);
         data.put("canBuy", canBuy);
+        data.put("showInterstitialAd", true);
+        data.put("showPreVideoAd", false);
         if (pptvSeries != null)
             data.put("title", pptvSeries.getName());
         if (record != null) {

--
Gitblit v1.8.0