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 |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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 c1db418..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
@@ -687,16 +687,28 @@
 	@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
@@ -705,7 +717,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "getLogoutProtocol")
-	public void getLogoutProtocol(String callback, AcceptData acceptData,PrintWriter out) {
+	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