From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/push/VIVOPushUtil.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/push/VIVOPushUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/push/VIVOPushUtil.java
index 21b4662..df5debd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/push/VIVOPushUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/push/VIVOPushUtil.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import com.vivo.push.sdk.notofication.Message;
import com.vivo.push.sdk.notofication.Result;
@@ -64,7 +65,9 @@
private static Message.Builder getBaseMessageBuidler(String title, String content,
Map<String, String> customParams) {
Message.Builder buidler = new Message.Builder();
- buidler = buidler.title(title).content(content).skipType(4).skipContent("").notifyType(3);
+
+ buidler = buidler.title(title).content(content).skipType(4).skipContent("todo").notifyType(3)
+ .requestId(UUID.randomUUID().toString());
buidler = buidler.clientCustomMap(customParams);
return buidler;
}
@@ -114,20 +117,27 @@
Sender sender = new Sender(APP_SECRET);
sender.initPool(20, 10);// 璁剧疆杩炴帴姹犲弬鏁帮紝鍙�夐」
sender.setAuthToken(authToken);// 璁剧疆鎺ㄩ�佺殑蹇呰鍙傛暟authToken(璋冪敤閴存潈鏂规硶鑾峰緱)
- Message saveList = builder.build();// 鏋勫缓瑕佷繚瀛樼殑鎵归噺鎺ㄩ�佹秷鎭綋
- Result result = sender.saveListPayLoad(saveList);// 鍙戦�佷繚瀛樼兢鎺ㄦ秷鎭姹�
- String taskId = result.getTaskId();
-
- Set<String> regIds = new HashSet<>();// 鏋勫缓鎵归噺鎺ㄩ�佺敤鎴风兢
- for (String regId : regIdList)
- regIds.add(regId);
- TargetMessage targetMessage = new TargetMessage.Builder().regIds(regIds).taskId(taskId).build();// 鏋勫缓鎵归噺鎺ㄩ�佺殑娑堟伅浣�
- result = sender.sendToList(targetMessage);// 鎵归噺鎺ㄩ�佺粰鐢ㄦ埛
+ Message saveList = builder.timeToLive(3600).build();// 鏋勫缓瑕佷繚瀛樼殑鎵归噺鎺ㄩ�佹秷鎭綋
+ Result result = null;
+ if (regIdList.size() > 1) {
+ result = sender.saveListPayLoad(saveList);// 鍙戦�佷繚瀛樼兢鎺ㄦ秷鎭姹�
+ String taskId = result.getTaskId();
+ Set<String> regIds = new HashSet<>();// 鏋勫缓鎵归噺鎺ㄩ�佺敤鎴风兢
+ for (String regId : regIdList)
+ regIds.add(regId);
+ TargetMessage targetMessage = new TargetMessage.Builder().requestId(UUID.randomUUID().toString())
+ .regIds(regIds).taskId(taskId).build();// 鏋勫缓鎵归噺鎺ㄩ�佺殑娑堟伅浣�
+ result = sender.sendToList(targetMessage);// 鎵归噺鎺ㄩ�佺粰鐢ㄦ埛
+ } else
+ {
+ result = sender.sendSingle(builder.regId(regIdList.get(0)).timeToLive(3600).build());
+ }
if (result.getResult() == 0)// 鎴愬姛
{
return true;
}
} catch (Exception e) {
+ e.printStackTrace();
}
return false;
}
--
Gitblit v1.8.0