anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push void answer

Browse Source
This commit is contained in:
imhao183
2021-01-21 20:51:08 +08:00
parent 4e9e87f113
commit 3b783fb72e
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/cn/wildfirechat/push/PushMessage.java
+10 -1
View File
@@ -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;
broker/src/main/java/cn/wildfirechat/push/PushServer.java
+1
View File
@@ -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();
broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java
+1 -1
View File
@@ -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;
}