From 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:19:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
index 3b723a1..5afb74e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/PushUtils.java
@@ -87,13 +87,34 @@
* @param json
* @return
*/
- public static int singlePushXiaoMi(MessageInfo info, JSONObject json, PushRecord pushRecord) {
+ public static int singlePushXiaoMi(MessageInfo info, JSONObject json,List<String> regIds, PushRecord pushRecord) {
+// if (Constant.IS_TEST)
+// return 1;
+
+ JSONObject mapXm = JSONObject.fromObject(json);
+
+ String android = XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm,regIds, null);
+
+ LogHelper.userInfo("瀹夊崜鎺ㄩ�佹祴璇曪細" + android);
+ pushRecord.setAndroidPushId(android);
+
+ if (android != null) {
+ return 1;
+ } else {
+ return 4;
+ }
+ }
+
+ public static int singlePushXiaoMiByRegisterId(MessageInfo info, JSONObject json, PushRecord pushRecord,
+ String regId) {
if (Constant.IS_TEST)
return 1;
JSONObject mapXm = JSONObject.fromObject(json);
- String android = XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm, null);
+ List<String> regIdList = new ArrayList<>();
+ regIdList.add(regId);
+ String android = XiaoMiPushUtil.pushBatchAndroidForXM(info, mapXm, regIdList);
LogHelper.userInfo("瀹夊崜鎺ㄩ�佹祴璇曪細" + android);
pushRecord.setAndroidPushId(android);
--
Gitblit v1.8.0