From 3b783fb72e2a42d477fd983d57b5d397b13cc6b4 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Thu, 22 Oct 2020 10:32:51 +0800 Subject: [PATCH] push void answer --- .../main/java/cn/wildfirechat/push/PushMessage.java | 11 ++++++++++- .../main/java/cn/wildfirechat/push/PushServer.java | 1 + .../java/io/moquette/spi/impl/MessagesPublisher.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/broker/src/main/java/cn/wildfirechat/push/PushMessage.java b/broker/src/main/java/cn/wildfirechat/push/PushMessage.java index 75d21d64..497c8b73 100644 --- a/broker/src/main/java/cn/wildfirechat/push/PushMessage.java +++ b/broker/src/main/java/cn/wildfirechat/push/PushMessage.java @@ -43,7 +43,16 @@ public class PushMessage { this.cntType = messageContentType; this.serverTime = serverTime; this.unReceivedMsg = unReceivedMsg; - this.pushMessageType = (cntType == 400 ? PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE : (cntType == 402 ? PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE : PushServer.PushMessageType.PUSH_MESSAGE_TYPE_NORMAL)); + if (cntType == 400) { + this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_INVITE; + } else if(cntType == 402) { + this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_BYE; + } else if(cntType == 401) { + this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_VOIP_ANSWER; + } else { + this.pushMessageType = PushServer.PushMessageType.PUSH_MESSAGE_TYPE_NORMAL; + } + this.mentionedType = mentionedType; this.isHiddenDetail = isHiddenDetail; this.language = language; diff --git a/broker/src/main/java/cn/wildfirechat/push/PushServer.java b/broker/src/main/java/cn/wildfirechat/push/PushServer.java index 5beaf361..deb1f1ad 100644 --- a/broker/src/main/java/cn/wildfirechat/push/PushServer.java +++ b/broker/src/main/java/cn/wildfirechat/push/PushServer.java @@ -34,6 +34,7 @@ public class PushServer { int PUSH_MESSAGE_TYPE_VOIP_INVITE = 1; int PUSH_MESSAGE_TYPE_VOIP_BYE = 2; int PUSH_MESSAGE_TYPE_FRIEND_REQUEST = 3; + int PUSH_MESSAGE_TYPE_VOIP_ANSWER = 4; } private static PushServer INSTANCE = new PushServer(); diff --git a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java index a7efca08..9f72319c 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -332,7 +332,7 @@ public class MessagesPublisher { } } - if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400)) { + if ((StringUtil.isNullOrEmpty(pushContent) && messageContentType != 402 && messageContentType != 400 && messageContentType != 401)) { LOG.info("push content is empty and contenttype is {}", messageContentType); continue; }