From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
index 0797827..e04d4f7 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -1,34 +1,33 @@
package com.yeshi.buwan.util.video;
-import com.yeshi.buwan.domain.system.DetailSystem;
-import com.yeshi.buwan.exception.video.VideoPlayException;
-import com.yeshi.buwan.service.inter.video.VideoResourcePlayVersionMapService;
-import com.yeshi.buwan.service.manager.APPManager;
-import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
-import com.yeshi.buwan.videos.acFun.AcFunUtil;
import com.yeshi.buwan.dao.VideoInfoDao;
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.videos.funtv.FunTVUtil;
-import com.yeshi.buwan.videos.funtv.FunTVUtil2;
-import com.yeshi.buwan.videos.hanmi.HanmiUtil;
-import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
-import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
-import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.exception.video.VideoPlayException;
import com.yeshi.buwan.service.imp.VideoInfoService;
import com.yeshi.buwan.service.imp.VideoResourceService;
import com.yeshi.buwan.service.imp.juhe.FunTVService;
import com.yeshi.buwan.service.imp.juhe.IqiyiService;
import com.yeshi.buwan.service.imp.juhe.SoHuService;
import com.yeshi.buwan.service.inter.juhe.*;
+import com.yeshi.buwan.service.manager.APPManager;
import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
-import com.yeshi.buwan.videos.sohu.SoHuUtil;
-import com.yeshi.buwan.videos.tencent.TencentVideoUtil;
+import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.log.VideoLogFactory;
+import com.yeshi.buwan.videos.acFun.AcFunUtil;
import com.yeshi.buwan.videos.bilibili.BilibiliUtil;
-import com.yeshi.buwan.vo.AcceptData;
+import com.yeshi.buwan.videos.funtv.FunTVUtil;
+import com.yeshi.buwan.videos.funtv.FunTVUtil2;
+import com.yeshi.buwan.videos.hanmi.HanmiUtil;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
+import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
+import com.yeshi.buwan.videos.sohu.SoHuUtil;
+import com.yeshi.buwan.videos.tencent.TencentVideoUtil;
import com.yeshi.buwan.videos.youku.YouKuUtil;
+import com.yeshi.buwan.vo.AcceptData;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.slf4j.Logger;
@@ -308,12 +307,13 @@
private VideoResourceUtil videoResourceUtil;
- @Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
+ @Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#acceptData.version+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
public PlayUrl getPlayUrl(AcceptData acceptData, String detailSystemId, String id, String type, int resourceid, String videoid) throws VideoPlayException {
playLogger.info(VideoLogFactory.createPlayUrlLog(detailSystemId, id, type, resourceid, videoid));
//鍒ゆ柇resourceId鏄惁鍦ㄥ厑璁告挱鏀剧殑鏉ユ簮鍒楄〃涓�
List<Long> resourceIds = videoResourceUtil.getAvailablePlayResourceIds(new DetailSystem(detailSystemId), acceptData.getVersion(), acceptData.getChannel());
+
if (resourceIds == null || !resourceIds.contains(Long.parseLong(resourceid + ""))) {
throw new VideoPlayException(1, "鎸囧畾鎾斁婧愭棤娉曟挱鏀�");
}
@@ -343,7 +343,7 @@
playUrl = funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid);
break;
case FunTVUtil.RESOURCE_ID:
- playUrl = funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid, acceptData.getChannel(), acceptData.getVersion());
break;
case SoHuUtil.RESOURCE_ID:
playUrl = soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
@@ -374,16 +374,17 @@
//闊╁墽
if ("48".equalsIgnoreCase(acceptData.getDetailSystem().getId())) {
//姝ｅ湪涓婄嚎
- if (appManager.isOnline(acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel())) {
- //闇�瑕佸師鐢熸挱鏀惧櫒
- if (oldId != null && oldId.startsWith("native_")) {
- if (playUrl.getPlayType() == 1) {
- //鍘熺敓鎾斁鍣ㄦ挱鏀�
- playUrl.setPlayType(2);
- playUrl.setUrl("https://jx.parwix.com:4433/player/?url=" + playUrl.getUrl());
- }
- }
- }
+ //TODO 涓婄嚎鐨勬椂鍊欏紑鍚紝闃叉璇搷浣�
+// if (appManager.isOnline(acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel())) {
+// //闇�瑕佸師鐢熸挱鏀惧櫒
+// if (oldId != null && oldId.startsWith("native_")) {
+// if (playUrl.getPlayType() == 1) {
+// //鍘熺敓鎾斁鍣ㄦ挱鏀�
+// playUrl.setPlayType(2);
+// playUrl.setUrl("https://jx.parwix.com:4433/player/?url=" + playUrl.getUrl());
+// }
+// }
+// }
}
}
--
Gitblit v1.8.0