From 2c35775368637b44af44d0793fc4790ba11038d2 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Wed, 7 Feb 2024 15:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=AF=AD=E9=9F=B3=E9=80=9A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wildfirechat/message/CallStartMessageContent.java | 2 ++ .../cn/wildfire/chat/kit/conversation/ext/VoipExt.java | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/main/java/cn/wildfirechat/message/CallStartMessageContent.java b/client/src/main/java/cn/wildfirechat/message/CallStartMessageContent.java index 1d3545ff4..9c1ad6f51 100644 --- a/client/src/main/java/cn/wildfirechat/message/CallStartMessageContent.java +++ b/client/src/main/java/cn/wildfirechat/message/CallStartMessageContent.java @@ -222,6 +222,7 @@ public void writeToParcel(Parcel dest, int flags) { dest.writeByte(this.audioOnly ? (byte) 1 : (byte) 0); dest.writeInt(this.status); dest.writeString(this.pin); + dest.writeInt(this.type); } protected CallStartMessageContent(Parcel in) { @@ -234,6 +235,7 @@ protected CallStartMessageContent(Parcel in) { this.audioOnly = in.readByte() != 0; this.status = in.readInt(); this.pin = in.readString(); + this.type = in.readInt(); } public static final Creator CREATOR = new Creator() { diff --git a/uikit/src/main/java/cn/wildfire/chat/kit/conversation/ext/VoipExt.java b/uikit/src/main/java/cn/wildfire/chat/kit/conversation/ext/VoipExt.java index 40a399ea9..d09f3a93e 100644 --- a/uikit/src/main/java/cn/wildfire/chat/kit/conversation/ext/VoipExt.java +++ b/uikit/src/main/java/cn/wildfire/chat/kit/conversation/ext/VoipExt.java @@ -112,11 +112,11 @@ public boolean filter(Conversation conversation) { } if (conversation.type == Conversation.ConversationType.Single) { - UserInfo userInfo = ChatManager.Instance().getUserInfo(conversation.target, false); - // robot - if (userInfo.type == 1) { - return true; - } +// UserInfo userInfo = ChatManager.Instance().getUserInfo(conversation.target, false); +// // robot +// if (userInfo.type == 1) { +// return true; +// } return false; } return true;