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/controller/api/VideoPlayController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 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 ca8e0d5..9f6ad90 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,15 @@
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.service.imp.DetailSystemConfigService;
+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;
@@ -52,6 +51,9 @@
@Resource
private SystemConfigService systemConfigService;
+
+ @Resource
+ private DetailSystemConfigService detailSystemConfigService;
@Resource
private VIPService vipService;
@@ -278,6 +280,18 @@
data.put("vipVideo", isVIPVideo);
data.put("bought", isBought);
data.put("canBuy", canBuy);
+
+
+ //鍗庝负鏄惁鍦ㄤ笂绾匡紝鍦ㄤ笂绾垮氨涓嶅睍绀�
+ String onLiningVersionInfo = detailSystemConfigService.getConfigValueByKey("ad_hw_online_version_info", acceptData.getDetailSystem().getId(), acceptData.getVersion());
+ net.sf.json.JSONObject onLiningVersionInfoJson = net.sf.json.JSONObject.fromObject(onLiningVersionInfo);
+ int onLiningVersionCode = onLiningVersionInfoJson.optInt("versionCode");
+
+ if ("huawei".equalsIgnoreCase(acceptData.getChannel()) && onLiningVersionCode <= acceptData.getVersion()) {
+ data.put("showInterstitialAd", false);
+ } else
+ data.put("showInterstitialAd", true);
+ data.put("showPreVideoAd", false);
if (pptvSeries != null)
data.put("title", pptvSeries.getName());
if (record != null) {
--
Gitblit v1.8.0