From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 1 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 fa34d15..0881d0d 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
@@ -15,11 +15,12 @@
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.system.SystemZnx;
 import com.yeshi.fanli.entity.xinge.PushRecord;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.service.inter.config.AppVersionService;
 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.XMPushService;
@@ -55,6 +56,9 @@
 
 	@Resource
 	private XMPushService xmPushService;
+
+	@Resource
+	private OPPOPushService oPPOPushService;
 
 	@Resource
 	private PushRecordMapper pushRecordMapper;
@@ -100,6 +104,15 @@
 					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
 				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);
+				oPPOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
+			}
+
 		}
 
 		PushRecord pushRecord = new PushRecord();
@@ -149,6 +162,15 @@
 					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
 				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);
+				oPPOPushService.pushUrl(uid, url, title, content, versionCodeList);
+			}
+
 		}
 
 		PushRecord pushRecord = new PushRecord();
@@ -215,6 +237,14 @@
 					versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
 				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);
+				oPPOPushService.pushZNX(uId, title, content, versionCodeList);
+			}
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -262,6 +292,14 @@
 			if (listAndroid != null)
 				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
 			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);
+			oPPOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -312,6 +350,14 @@
 			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);
+			oPPOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
+		}
+
 		// 鎻掑叆鎺ㄩ�佽褰�
 		PushRecord pushRecord = new PushRecord();
 		pushRecord.setUrl(url);
@@ -357,6 +403,14 @@
 			if (listAndroid != null)
 				versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
 			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);
+			oPPOPushService.pushWelfareCenter(uid, title, content, versionCodeList);
 		}
 
 		// 鎻掑叆鎺ㄩ�佽褰�
@@ -484,6 +538,14 @@
 			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);
+			oPPOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
+		}
+
 		// 鎻掑叆鎺ㄩ�佽褰�
 		PushRecord pushRecord = new PushRecord();
 		pushRecord.setTitle(title);

--
Gitblit v1.8.0