From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java |  193 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 156 insertions(+), 37 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 d7768a3..bcca91e 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
@@ -4,9 +4,9 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.springframework.stereotype.Service;
 
-import com.yeshi.fanli.controller.admin.PushController;
 import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;
 import com.yeshi.fanli.dao.mybatis.push.PushRecordMapper;
 import com.yeshi.fanli.dto.push.PushTypeEnum;
@@ -20,8 +20,10 @@
 import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
 import com.yeshi.fanli.service.inter.push.HWPushService;
 import com.yeshi.fanli.service.inter.push.IOSPushService;
+import com.yeshi.fanli.service.inter.push.OPPOPushService;
 import com.yeshi.fanli.service.inter.push.PushRecordService;
 import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.push.VIVOPushService;
 import com.yeshi.fanli.service.inter.push.XMPushService;
 import com.yeshi.fanli.service.inter.user.SystemZnxService;
 import com.yeshi.fanli.util.Constant;
@@ -57,6 +59,12 @@
 	private XMPushService xmPushService;
 
 	@Resource
+	private OPPOPushService oPPOPushService;
+
+	@Resource
+	private VIVOPushService vIVOPushService;
+
+	@Resource
 	private PushRecordMapper pushRecordMapper;
 
 	@Resource
@@ -67,7 +75,7 @@
 
 	@Override
 	public void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid, SystemEnum system) throws PushException {
 		String gids = url.split("id=")[1];
 		String gid = gids.split("&")[0];
 		if (StringUtil.isNullOrEmpty(gid))
@@ -80,7 +88,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushGoods(uid, Long.parseLong(gid), title, content, codes);
 			}
@@ -89,7 +97,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushGoods(uid, Long.parseLong(gid), title, content, versions);
 			}
@@ -97,9 +105,25 @@
 			if (listAndroid == null || listAndroid.size() > 0) {
 				List<Integer> versionCodeList = null;
 				if (listAndroid != null)
-					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 				hwPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
 			}
+
+			// OPPO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				oPPOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
+			}
+			// VIVO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				vIVOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
+			}
+
 		}
 
 		PushRecord pushRecord = new PushRecord();
@@ -116,7 +140,7 @@
 
 	@Override
 	public void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid, SystemEnum system) throws PushException {
 
 		if (StringUtil.isNullOrEmpty(url))
 			throw new PushException(1, "鏃犳帹閫侀摼鎺�");
@@ -128,7 +152,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushUrl(uid, url, title, content, codes);
 			}
@@ -137,7 +161,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushUrl(uid, url, title, content, versions);
 			}
@@ -146,9 +170,26 @@
 			if (listAndroid == null || listAndroid.size() > 0) {
 				List<Integer> versionCodeList = null;
 				if (listAndroid != null)
-					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 				hwPushService.pushUrl(uid, url, title, content, versionCodeList);
 			}
+
+			// OPPO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				oPPOPushService.pushUrl(uid, url, title, content, versionCodeList);
+			}
+
+			// VIVO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				vIVOPushService.pushUrl(uid, url, title, content, versionCodeList);
+			}
+
 		}
 
 		PushRecord pushRecord = new PushRecord();
@@ -163,7 +204,7 @@
 	}
 
 	@Override
-	public void pushZNX(Long uId, String title, String content, List<String> listIOS, List<String> listAndroid)
+	public void pushZNX(Long uId, String title, String content, List<String> listIOS, List<String> listAndroid, SystemEnum system)
 			throws PushException {
 		if (StringUtil.isNullOrEmpty(title))
 			throw new PushException(1, "鏃犳帹閫佹爣棰�");
@@ -194,7 +235,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushZNX(uId, accountMessage, systemZnx, codes);
 			}
@@ -203,7 +244,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushZNX(uId, accountMessage, systemZnx, versions);
 			}
@@ -212,8 +253,24 @@
 			if (listAndroid == null || listAndroid.size() > 0) {
 				List<Integer> versionCodeList = null;
 				if (listAndroid != null)
-					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 				hwPushService.pushZNX(uId, title, content, versionCodeList);
+			}
+
+			// OPPO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				oPPOPushService.pushZNX(uId, title, content, versionCodeList);
+			}
+
+			// VIVO鎺ㄩ��
+			if (listAndroid == null || listAndroid.size() > 0) {
+				List<Integer> versionCodeList = null;
+				if (listAndroid != null)
+					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+				vIVOPushService.pushZNX(uId, title, content, versionCodeList);
 			}
 		}
 
@@ -230,7 +287,7 @@
 
 	@Override
 	public void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid, SystemEnum system) throws PushException {
 		if (StringUtil.isNullOrEmpty(title))
 			throw new PushException(1, "鏃犳帹閫佹爣棰�");
 		if (StringUtil.isNullOrEmpty(content))
@@ -241,7 +298,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushWEEX(uid, title, content, weexUrl, codes);
 			}
@@ -250,7 +307,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�31
-			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushWEEX(uid, title, content, weexUrl, versions);
 			}
@@ -260,8 +317,24 @@
 		if (listAndroid == null || listAndroid.size() > 0) {
 			List<Integer> versionCodeList = null;
 			if (listAndroid != null)
-				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 			hwPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
+		}
+
+		// OPPO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			oPPOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
+		}
+
+		// VIVO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			vIVOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -277,7 +350,7 @@
 
 	@Override
 	public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid, SystemEnum system) throws PushException {
 
 		if (StringUtil.isNullOrEmpty(title))
 			throw new PushException(1, "鏃犳帹閫佹爣棰�");
@@ -289,7 +362,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushBaiChuanUrl(uid, title, content, url, codes);
 			}
@@ -298,7 +371,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�31
-			String versions = getEffectiveVersions(31, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(31, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushBaiChuanUrl(uid, title, content, url, versions);
 			}
@@ -308,8 +381,24 @@
 		if (listAndroid == null || listAndroid.size() > 0) {
 			List<Integer> versionCodeList = null;
 			if (listAndroid != null)
-				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 			hwPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
+		}
+
+		// OPPO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			oPPOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
+		}
+
+		// VIVO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			vIVOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -326,7 +415,7 @@
 
 	@Override
 	public void pushWelfareCenter(Long uid, String title, String content, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid, SystemEnum system) throws PushException {
 
 		if (StringUtil.isNullOrEmpty(title))
 			throw new PushException(1, "鏃犳帹閫佹爣棰�");
@@ -336,7 +425,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�0
-			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushWelfareCenter(uid, title, content, codes);
 			}
@@ -345,7 +434,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�36
-			String versions = getEffectiveVersions(36, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(36, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushWelfareCenter(uid, title, content, versions);
 			}
@@ -355,8 +444,24 @@
 		if (listAndroid == null || listAndroid.size() > 0) {
 			List<Integer> versionCodeList = null;
 			if (listAndroid != null)
-				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 			hwPushService.pushWelfareCenter(uid, title, content, versionCodeList);
+		}
+
+		// OPPO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			oPPOPushService.pushWelfareCenter(uid, title, content, versionCodeList);
+		}
+
+		// VIVO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			vIVOPushService.pushWelfareCenter(uid, title, content, versionCodeList);
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -373,11 +478,10 @@
 	/**
 	 * 鏌ヨ鑳芥帹閫佺増鏈彿
 	 * 
-	 * @param versionCode
 	 * @param listVersion
 	 * @return
 	 */
-	private String getEffectiveVersions(int minCode, String type, List<String> listVersion) throws PushException {
+	private String getEffectiveVersions(int minCode, String type, List<String> listVersion, SystemEnum system) throws PushException {
 
 		if (minCode == 0 && listVersion == null) {
 			return null;
@@ -385,14 +489,14 @@
 
 		String versions = "";
 		if (listVersion == null) {
-			List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode);
+			List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode,system);
 			if (list != null) {
 				for (AppVersionInfo appVersion : list) {
 					versions += appVersion.getVersion() + ",";
 				}
 			}
 		} else {
-			List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion);
+			List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion,system);
 			if (list != null) {
 				for (AppVersionInfo appVersion : list) {
 					Integer code = appVersion.getVersionCode();
@@ -413,11 +517,10 @@
 	/**
 	 * 鏌ヨ鑳芥帹閫佺増鏈彿code
 	 * 
-	 * @param versionCode
 	 * @param listVersion
 	 * @return
 	 */
-	private String getEffectiveVersionCodes(int minCode, String type, List<String> listVersion) throws PushException {
+	private String getEffectiveVersionCodes(int minCode, String type, List<String> listVersion,SystemEnum system) throws PushException {
 
 		if (minCode == 0 && listVersion == null) {
 			return null;
@@ -425,14 +528,14 @@
 
 		String versionCodes = "";
 		if (listVersion == null) {
-			List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode);
+			List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode,system);
 			if (list != null) {
 				for (AppVersionInfo appVersion : list) {
 					versionCodes += appVersion.getVersionCode() + ",";
 				}
 			}
 		} else {
-			List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion);
+			List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion,system);
 			if (list != null) {
 				for (AppVersionInfo appVersion : list) {
 					Integer code = appVersion.getVersionCode();
@@ -452,7 +555,7 @@
 
 	@Override
 	public void pushUserSignInNotification(Long uid, String title, String content, List<String> listIOS,
-			List<String> listAndroid) throws PushException {
+			List<String> listAndroid,SystemEnum system) throws PushException {
 		if (StringUtil.isNullOrEmpty(title))
 			throw new PushException(1, "鏃犳帹閫佹爣棰�");
 		if (StringUtil.isNullOrEmpty(content))
@@ -461,7 +564,7 @@
 		/* IOS绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listIOS == null || listIOS.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�1.6.5浠ュ悗
-			String codes = getEffectiveVersionCodes(60, AppVersionInfo.PLATFORM_IOS, listIOS);
+			String codes = getEffectiveVersionCodes(60, AppVersionInfo.PLATFORM_IOS, listIOS,system);
 			if (listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {
 				iosPushService.pushUserSignInNotification(uid, title, content, codes);
 			}
@@ -470,7 +573,7 @@
 		/* Android绔帹閫� (娉ㄦ槑锛歭ist绛変簬 'null' 鏃跺叏鎺紝 size绛変簬0 涓嶅仛鎺ㄩ��) */
 		if (listAndroid == null || listAndroid.size() > 0) {
 			// 闄愬埗鎺ㄩ�佺増鏈彿锛�1.6.5浠ュ悗
-			String versions = getEffectiveVersions(47, AppVersionInfo.PLATFORM_ANDROID, listAndroid);
+			String versions = getEffectiveVersions(47, AppVersionInfo.PLATFORM_ANDROID, listAndroid,system);
 			if (listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {
 				xmPushService.pushUserSignInNotification(uid, title, content, versions);
 			}
@@ -480,10 +583,26 @@
 		if (listAndroid == null || listAndroid.size() > 0) {
 			List<Integer> versionCodeList = null;
 			if (listAndroid != null)
-				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
 			hwPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
 		}
 
+		// OPPO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			oPPOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
+		}
+
+		// VIVO鎺ㄩ��
+		if (listAndroid == null || listAndroid.size() > 0) {
+			List<Integer> versionCodeList = null;
+			if (listAndroid != null)
+				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid,system);
+			vIVOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
+		}
+
 		// 鎻掑叆鎺ㄩ�佽褰�
 		PushRecord pushRecord = new PushRecord();
 		pushRecord.setTitle(title);

--
Gitblit v1.8.0