admin/push_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加对好友请求的推送请求

Browse Source
This commit is contained in:
heavyrain2012
2020-03-26 13:33:57 +08:00
parent d6968b1259
commit db719a36f3
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cn/wildfirechat/push/PushMessageType.java
View File

@@ -4,4 +4,5 @@ public interface PushMessageType {
int PUSH_MESSAGE_TYPE_NORMAL = 0;
int PUSH_MESSAGE_TYPE_VOIP_INVITE = 1;
int PUSH_MESSAGE_TYPE_VOIP_BYE = 2;
int PUSH_MESSAGE_TYPE_FRIEND_REQUEST = 3;
}

19
src/main/java/cn/wildfirechat/push/android/meizu/MeiZuPush.java
View File

@@ -1,6 +1,7 @@
package cn.wildfirechat.push.android.meizu;
import cn.wildfirechat.push.PushMessage;
import cn.wildfirechat.push.PushMessageType;
import com.meizu.push.sdk.server.IFlymePush;
import com.meizu.push.sdk.server.constant.ResultPack;
import com.meizu.push.sdk.server.model.push.PushResult;
@@ -9,6 +10,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import javax.annotation.PostConstruct;
import java.io.IOException;
@@ -31,9 +33,24 @@ public class MeiZuPush {
public void push(PushMessage pushMessage) {
//组装透传消息
String title;
if (pushMessage.pushMessageType == PushMessageType.PUSH_MESSAGE_TYPE_FRIEND_REQUEST) {
if (StringUtils.isEmpty(pushMessage.senderName)) {
title = "好友请求";
} else {
title = pushMessage.senderName + " 请求加您为好友";
}
} else {
if (StringUtils.isEmpty(pushMessage.senderName)) {
title = "消息";
} else {
title = pushMessage.senderName;
}
}
VarnishedMessage message = new VarnishedMessage.Builder()
.appId(mConfig.getAppId())
.title("WildfireChat")
.title(title)
.content(pushMessage.pushContent)
.validTime(1)
.build();

2
src/main/java/cn/wildfirechat/push/android/xiaomi/XiaomiPush.java
View File

@@ -33,7 +33,7 @@ public class XiaomiPush {
Message message;
String token = pushMessage.getDeviceToken();
pushMessage.deviceToken = null;
if(pushMessage.pushMessageType != PushMessageType.PUSH_MESSAGE_TYPE_NORMAL) {
if(pushMessage.pushMessageType != PushMessageType.PUSH_MESSAGE_TYPE_NORMAL && pushMessage.pushMessageType != PushMessageType.PUSH_MESSAGE_TYPE_FRIEND_REQUEST) {
//voip
long timeToLive = 60 * 1000; // 1 min
message = new Message.Builder()

15
src/main/java/cn/wildfirechat/push/ios/ApnsServer.java
View File

@@ -174,11 +174,20 @@ public class ApnsServer {
}
}
} else {
if (StringUtils.isEmpty(pushMessage.senderName)) {
title = "消息";
if (pushMessage.pushMessageType == PushMessageType.PUSH_MESSAGE_TYPE_FRIEND_REQUEST) {
if (StringUtils.isEmpty(pushMessage.senderName)) {
title = "好友请求";
} else {
title = pushMessage.senderName + " 请求加您为好友";
}
} else {
title = pushMessage.senderName;
if (StringUtils.isEmpty(pushMessage.senderName)) {
title = "消息";
} else {
title = pushMessage.senderName;
}
}
if (hiddenDetail) {
body = "你收到一条新消息"; //Todo 需要判断当前语言
} else {