From b44f60ae27bbe0b7aec29414c629747b7755e964 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 09 十月 2019 09:52:38 +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 | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 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..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
@@ -20,6 +20,7 @@
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