From b2e7e9ed88acb0e0ea50571ae028199926b7d262 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 15:34:29 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
index 0756848..fa34d15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
@@ -460,8 +460,8 @@
 
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
-			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			// 闄愬埗鎺ㄩ�佺増鏈彿锛�1.6.5浠ュ悗
+			String codes = getEffectiveVersionCodes(60, AppVersionInfo.PLATFORM_IOS, listIOS);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushUserSignInNotification(uid, title, content, codes);
 			}
@@ -469,8 +469,8 @@
 
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
-			// 闄愬埗鎺ㄩ�佺増鏈彿锛�36
-			String versions = getEffectiveVersions(36, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			// 闄愬埗鎺ㄩ�佺増鏈彿锛�1.6.5浠ュ悗
+			String versions = getEffectiveVersions(47, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushUserSignInNotification(uid, title, content, versions);
 			}

--
Gitblit v1.8.0