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 | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 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 720e677..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,33 +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.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;
@@ -97,6 +97,9 @@
@Resource
private BilibiliUtil bilibiliUtil;
+
+ @Resource
+ private APPManager appManager;
@SuppressWarnings("unchecked")
// @Cacheable(value = "homeCache", key = "'getVideoInfo'+'-'+#videoid+'-'+#resourceId+'-'+#cacheMD5")
@@ -304,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, "鎸囧畾鎾斁婧愭棤娉曟挱鏀�");
}
@@ -320,32 +324,73 @@
return solrShortVideoDataManager.getPlayUrl(id, vr);
}
+ String oldId = id;
+ if (id.startsWith("native_")) {
+ id = id.replace("native_", "");
+ }
+
+
+ PlayUrl playUrl = null;
+
switch (resourceid) {
case IqiyiUtil2.RESOURCE_ID:
- return iqiyi2Service.getPlayUrl(detailSystemId, resourceid, id, videoid);
+ playUrl = iqiyi2Service.getPlayUrl(detailSystemId, resourceid, id, videoid);
+ break;
case IqiyiUtil.RESOURCE_ID:
- return iqiyiUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
+ playUrl = iqiyiUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
+ break;
case FunTVUtil2.RESOURCE_ID:
- return funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid);
+ playUrl = funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid);
+ break;
case FunTVUtil.RESOURCE_ID:
- return funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid, acceptData.getChannel(), acceptData.getVersion());
+ break;
case SoHuUtil.RESOURCE_ID:
- return soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
+ playUrl = soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);
+ break;
case AcFunUtil.RESOURCE_ID:
- return videoInfoService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = videoInfoService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ break;
case YouKuUtil.RESOURCE_ID:
- return youKuUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = youKuUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ break;
case MogoTVUtil.RESOURCE_ID:
- return mogoTVUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = mogoTVUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ break;
case TencentVideoUtil.RESOURCE_ID:
- return tencentVideoUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = tencentVideoUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ break;
case BilibiliUtil.RESOURCE_ID:
- return bilibiliUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ playUrl = bilibiliUtil.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+ break;
case HanmiUtil.RESOURCE_ID:
- return hanmiService.getPlayUrl(detailSystemId, resourceid, id, videoid);
+ playUrl = hanmiService.getPlayUrl(detailSystemId, resourceid, id, videoid);
+ break;
default:
throw new VideoPlayException(2, "鏈煡鎾斁婧�");
}
+
+ if (playUrl != null) {
+ //闊╁墽
+ if ("48".equalsIgnoreCase(acceptData.getDetailSystem().getId())) {
+ //姝ｅ湪涓婄嚎
+ //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());
+// }
+// }
+// }
+ }
+ }
+
+ return playUrl;
+
+
}
}
--
Gitblit v1.8.0