From a62d474f024332dde7616054c549b7794f120151 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 02 七月 2020 10:20:19 +0800
Subject: [PATCH] 增加华为广告控制

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java |   42 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index 706f1da..e6d1e4a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -51,8 +51,10 @@
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.VersionUtil;
 import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.util.suning.SuningUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.vipshop.VipShopUtil;
 import com.yeshi.fanli.vo.elme.ElemeConvertInfoResultVO;
 import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO;
 
@@ -344,6 +346,18 @@
 
 			data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
 
+		} else if (url != null && (url.contains(".vip.com"))) {// 鍞搧浼�
+			String goodsId = VipShopUtil.parseGoodsIdByUrl(url);
+			if (StringUtil.isNullOrEmpty(goodsId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆
+				data.put("goodsDetail", true);
+			else
+				data.put("goodsDetail", false);
+		} else if (url != null && (url.contains(".suning.com"))) {// 鑻忓畞
+			String goodsId = SuningUtil.parseGoodsIdByUrl(url);
+			if (StringUtil.isNullOrEmpty(goodsId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆
+				data.put("goodsDetail", true);
+			else
+				data.put("goodsDetail", false);
 		} else if (url != null && ((url.contains("yangkeduo.com") && !url.contains("yangkeduo.com/goods.html?")
 				&& !url.contains("yangkeduo.com/duo_coupon_landing.html?"))
 				|| (url.startsWith("https://p.pinduoduo.com/")))) {
@@ -673,13 +687,39 @@
 	@RequestMapping(value = "getShowAd")
 	public void showAd(AcceptData acceptData, Long uid, PrintWriter out) {
 		String value = configService.get(ConfigKeyEnum.showSplashAd.getKey());
+		boolean huaweiShowAd = true;
+		if ("huawei".equalsIgnoreCase(acceptData.getChannel())) {
+			String version = configService.get(ConfigKeyEnum.huaweiOnLineVersionCode.getKey());
+			if (!StringUtil.isNullOrEmpty(version)) {
+				if (Integer.parseInt(version) == Integer.parseInt(acceptData.getVersion())) {
+					huaweiShowAd = false;
+				}
+			}
+		}
+
 		JSONObject data = new JSONObject();
 		if ("0".equalsIgnoreCase(value.trim())) {
 			data.put("show", false);
 		} else {
-			data.put("show", true);
+			if (huaweiShowAd)
+				data.put("show", true);
+			else
+				data.put("show", false);
 		}
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
+	/**
+	 * 鑾峰彇娉ㄩ攢鍗忚
+	 * @param acceptData
+	 * @param uid
+	 * @param type
+	 * @param out
+	 */
+	@RequestMapping(value = "getLogoutProtocol")
+	public void getLogoutProtocol(String callback, AcceptData acceptData, PrintWriter out) {
+		JSONObject data = new JSONObject();
+		data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));
+		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+	}
 }

--
Gitblit v1.8.0