From afb85211ae10481f73a4809964ebb7b11e923ff0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:18 +0800
Subject: [PATCH] 站内信修改

---
 fanli/src/main/java/com/yeshi/fanli/util/push/XiaoMiPushUtil.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 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..8c12c48 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
@@ -161,7 +161,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)) {
@@ -187,7 +188,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 +207,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 +223,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 +241,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 +255,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 +278,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 +299,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