From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
index ef79ca4..c44ede6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java
@@ -76,6 +76,7 @@
Message message = null; // 鍋氬惊鐜紶鏉ョ殑key
Builder builder = new Message.Builder().restrictedPackageName(PackageName).title(title).payload(payload)
+ .notifyId((int) (Math.random() * Integer.MAX_VALUE))
.description(description).passThrough(0) // 璁剧疆娑堟伅鏄惁閫氳繃閫忎紶鏂瑰紡鑷矨pp,
// 1琛ㄧず閫忎紶锛�0琛ㄧず閫氱煡鏍忔秷鎭紙榛樿锛�
.notifyType(1); // 璁剧疆閫氱煡绫诲瀷, type绫诲瀷(1-榛樿鎻愮ず闊�, 2-浣跨敤榛樿闇囧姩鎻愮ず,
@@ -129,6 +130,7 @@
Message message = null; // 鍋氬惊鐜紶鏉ョ殑key
Builder builder = new Message.Builder().restrictedPackageName(PackageName).title(title).payload(payload)
+ .notifyId((int) (Math.random() * Integer.MAX_VALUE))
.description(description).passThrough(0) // 璁剧疆娑堟伅鏄惁閫氳繃閫忎紶鏂瑰紡鑷矨pp,
// 1琛ㄧず閫忎紶锛�0琛ㄧず閫氱煡鏍忔秷鎭紙榛樿锛�
.notifyType(1); // 璁剧疆閫氱煡绫诲瀷, type绫诲瀷(1-榛樿鎻愮ず闊�, 2-浣跨敤榛樿闇囧姩鎻愮ず,
@@ -161,7 +163,8 @@
* @param system
* @return
*/
- public static String singlePushAndroidForXM(MessageInfo info, Map<String, Object> map, System system) {
+ public static String singlePushAndroidForXM(MessageInfo info, Map<String, Object> map, List<String> regIds,
+ System system) {
String name = info.getPackageName();
if (!Constant.systemCommonConfig.getAndroidPackageName().equalsIgnoreCase(name)
&& !Constant.systemCommonConfig.getIosBundleId().equalsIgnoreCase(name)) {
@@ -177,8 +180,10 @@
Message message = null; // 鍋氬惊鐜紶鏉ョ殑key
Builder builder = new Message.Builder().restrictedPackageName(PackageName).title(title).description(content)
.passThrough(0) // 璁剧疆娑堟伅鏄惁閫氳繃閫忎紶鏂瑰紡鑷矨pp, 1琛ㄧず閫忎紶锛�0琛ㄧず閫氱煡鏍忔秷鎭紙榛樿锛�
- .notifyType(1); // 璁剧疆閫氱煡绫诲瀷, type绫诲瀷(1-榛樿鎻愮ず闊�, 2-浣跨敤榛樿闇囧姩鎻愮ず,
- // 3-浣跨敤榛樿led鐏厜鎻愮ず)
+ .notifyId((int) (Math.random() * Integer.MAX_VALUE)).notifyType(1); // 璁剧疆閫氱煡绫诲瀷,
+ // type绫诲瀷(1-榛樿鎻愮ず闊�,
+ // 2-浣跨敤榛樿闇囧姩鎻愮ず,
+ // 3-浣跨敤榛樿led鐏厜鎻愮ず)
// 灏唀xtra鏀惧叆MessageInfo瀵硅薄涓紝 寰幆閬嶅巻extra涓殑key 鍜� value
if (map != null) {
for (String key : map.keySet()) {
@@ -187,7 +192,8 @@
}
message = builder.build();
try {
- Result result = sender.sendToAlias(message, uId, 3);
+ Result result = sender.send(message, regIds, 3); // sender.sendToAlias(message,
+ // uId, 3);
PushLogHelper.xmInfo("鎺ㄩ�佺粨鏋�:" + result.getReason());
return result.getMessageId();
} catch (IOException e) {
@@ -205,14 +211,13 @@
* @author mawurui createTime 2018骞�3鏈�8鏃� 涓婂崍9:55:14
* @param info
*/
- public static void pushByHongBao(String alias, System system) {
+ public static void pushByHongBao(List<String> regIds, System system) {
MessageInfo info = new MessageInfo();
- info.setAlias(alias);
info.setTitle("鏂板埌绾㈠寘");
info.setDescription("绾㈠寘鍒版潵浜�...");
JSONObject jsonObject = new JSONObject();
jsonObject.put("type", "hongbao");
- XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);
+ XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), regIds, system);
}
/**
@@ -222,14 +227,13 @@
* @author mawurui createTime 2018骞�3鏈�8鏃� 涓婂崍10:00:16
* @param info
*/
- public static void pushByApply(String alias, System system) {
+ public static void pushByApply(List<String> regIds, System system) {
MessageInfo info = new MessageInfo();
- info.setAlias(alias);
info.setTitle("鎻愮幇鐢宠");
info.setDescription("鎻愮幇瀹℃牳涓�...");
JSONObject jsonObject = new JSONObject();
jsonObject.put("type", "cash");
- XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);
+ XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), regIds, system);
}
/**
@@ -241,9 +245,8 @@
* @param state
* @param system
*/
- public static void pushByExtract(String alias, int state, System system) {
+ public static void pushByExtract(List<String> regIds, int state, System system) {
MessageInfo info = new MessageInfo();
- info.setAlias(alias);
if (state == 0) {
info.setTitle("鎻愮幇鎴愬姛");
info.setDescription("鎮ㄦ湁涓�绗斾氦鏄擄紝宸叉彁鐜版垚鍔燂紒");
@@ -256,7 +259,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("type", "cash");
- XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), system);
+ XiaoMiPushUtil.singlePushAndroidForXM(info, JsonUtil.parseData(jsonObject), regIds, system);
}
/**
@@ -279,12 +282,11 @@
}
}
- public static void pushZNX(Long uid, String title, String content, String msgId) {
+ public static void pushZNX(List<String> regIds, String title, String content, String msgId) {
// 灏忕背寮�濮嬫帹閫�
MessageInfo info = new MessageInfo();
info.setActivty(
String.format("%s.ui.BrowserActivity", Constant.systemCommonConfig.getAndroidBaseactivityName()));
- info.setAlias(uid + "");
info.setTitle(title);
info.setContent(content);
info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
@@ -301,7 +303,7 @@
contentJson.put("createTime", java.lang.System.currentTimeMillis());
json.put("content", contentJson);
JSONObject mapXm = JSONObject.fromObject(json);
- XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm, null);
+ XiaoMiPushUtil.singlePushAndroidForXM(info, mapXm, regIds, null);
}
}
--
Gitblit v1.8.0