From af4d73a0d51cb8c81608835171f511689676f654 Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Sat, 25 May 2019 07:55:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=8F=90=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/moquette/spi/impl/MessagesPublisher.java | 4 ++++ .../java/cn/wildfirechat/proto/ProtoConstants.java | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) 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 1d5cf7eb..c8c445ba 100755 --- a/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java +++ b/broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java @@ -480,6 +480,10 @@ public class MessagesPublisher { pushContent = "[视频]"; } else if(type == ProtoConstants.ContentType.RichMedia) { pushContent = "[图文]"; + } else if(type == ProtoConstants.ContentType.File) { + pushContent = "[文件]"; + } else if(type == ProtoConstants.ContentType.Sticker) { + pushContent = "[表情]"; } } diff --git a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java index 7bc8b86d..10eed8d5 100644 --- a/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java +++ b/common/src/main/java/cn/wildfirechat/proto/ProtoConstants.java @@ -73,12 +73,13 @@ public class ProtoConstants { public interface ContentType { int Unknown = 0; int Text = 1; - int Image = 2; - int Voice = 3; + int Voice = 2; + int Image = 3; int Location = 4; - int Video = 5; - int RichMedia = 6; - int Custom = 7; + int File = 5; + int Video = 6; + int Sticker = 7; + int RichMedia = 8; } //ModifyGroupInfoRequest -> type