From 6a486f505881408d991cebfae2c20cb5108a7746 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 26 一月 2019 18:14:47 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
index b839928..6097f38 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -19,6 +19,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -51,11 +52,15 @@
@RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
public void getHomeConfig(AcceptData acceptData, PrintWriter out) {
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
- if ("ios".equalsIgnoreCase(acceptData.getPlatform()))
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
appHomeFloatImg = null;
JSONObject data = new JSONObject();
if (appHomeFloatImg != null)
data.put("floatImg", appHomeFloatImg);
+ String notifyImg = configService.getAppHomeFloatNotifyImg();
+ if (!StringUtil.isNullOrEmpty(notifyImg)) {
+ data.put("floatNotifyImg", notifyImg);
+ }
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0