Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v10.3.2版本 #126

Merged
merged 2 commits into from
Sep 2, 2024
Merged

v10.3.2版本 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8532c15
feat(imkit): 10.3.3版本发布
shuine Aug 30, 2024
bafcd92
feat(imkit): 权限调整
shuine Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
applicationId = "com.netease.yunxin.app.im"
minSdk = 24
versionCode = 1
versionName = "10.3.1"
versionName = "10.3.2"
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -53,12 +53,12 @@ dependencies {
// implementation(project(":locationkit"))
// implementation(project(":aisearchkit"))

implementation("com.netease.yunxin.kit.contact:contactkit-ui:10.3.1")
implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:10.3.1")
implementation("com.netease.yunxin.kit.team:teamkit-ui:10.3.1")
implementation("com.netease.yunxin.kit.chat:chatkit-ui:10.3.1")
implementation("com.netease.yunxin.kit.locationkit:locationkit:10.3.1")
implementation("com.netease.yunxin.kit.aisearchkit:aisearchkit:10.3.1")
implementation("com.netease.yunxin.kit.contact:contactkit-ui:10.3.2")
implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:10.3.2")
implementation("com.netease.yunxin.kit.team:teamkit-ui:10.3.2")
implementation("com.netease.yunxin.kit.chat:chatkit-ui:10.3.2")
implementation("com.netease.yunxin.kit.locationkit:locationkit:10.3.2")
implementation("com.netease.yunxin.kit.aisearchkit:aisearchkit:10.3.2")
implementation("com.netease.yunxin.kit.call:call-ui:2.2.0") //呼叫组件 UI 包
implementation("com.netease.nimlib:avsignalling:10.3.0-beta") //信令组件
implementation("com.airbnb.android:lottie:5.0.3")
Expand Down
4 changes: 2 additions & 2 deletions chatkit-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {
defaultConfig {
minSdk = 24
consumerProguardFiles("consumer-rules.pro")
buildConfigField("String", "versionName", "\"10.3.1\"")
buildConfigField("String", "versionName", "\"10.3.2\"")
}

buildTypes {
Expand All @@ -40,7 +40,7 @@ android {

dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
api("com.netease.yunxin.kit.chat:chatkit:10.3.1")
api("com.netease.yunxin.kit.chat:chatkit:10.3.2")
api("com.netease.yunxin.kit.common:common-ui:1.3.7")
api("com.netease.yunxin.kit.core:corekit-plugin:1.1.2-rc01")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
Expand Down
3 changes: 1 addition & 2 deletions chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatViewHolderDefaultFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.netease.yunxin.kit.chatkit.ui.model.ChatMessageBean;
import com.netease.yunxin.kit.chatkit.ui.normal.factory.ChatViewHolderFactory;
import com.netease.yunxin.kit.chatkit.ui.view.message.viewholder.ChatBaseMessageViewHolder;
import com.netease.yunxin.kit.chatkit.ui.view.message.viewholder.CommonBaseMessageViewHolder;
import java.util.HashMap;
Expand All @@ -23,7 +22,7 @@ public final class ChatViewHolderDefaultFactory implements IChatDefaultFactory {
private final Map<Integer, Pair<Class<? extends CommonBaseMessageViewHolder>, Integer>>
commonBaseViewHolderMap = new HashMap<>();

private IChatDefaultFactory factory = ChatViewHolderFactory.getInstance();
private IChatDefaultFactory factory;

private ChatViewHolderDefaultFactory() {}

Expand Down
6 changes: 5 additions & 1 deletion chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/MessageHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,11 @@ public static String getReplyContent(IMMessageInfo messageInfo) {
if (messageInfo == null) {
result = IMKitClient.getApplicationContext().getString(R.string.chat_message_removed_tip);
} else {
String nickName = messageInfo.getFromUserName();
String nickName =
getChatMessageUserNameByAccount(
messageInfo.getMessage().getSenderId(),
messageInfo.getMessage().getConversationType());
//messageInfo.getFromUserName();
String content = getMsgBrief(messageInfo, false);
result = nickName + ": " + content;
}
Expand Down
16 changes: 12 additions & 4 deletions chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/FunChatView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,15 +358,21 @@ public void setTitleBarVisible(int visible) {

@Override
public void setReeditMessage(String content) {
aitTextManager.setIgnoreTextChange(true);
if (aitTextManager != null) {
aitTextManager.setIgnoreTextChange(true);
}
hideRichInputPanel();
binding.chatBottomInputLayout.setInputEditTextContent(content);
aitTextManager.setIgnoreTextChange(false);
if (aitTextManager != null) {
aitTextManager.setIgnoreTextChange(false);
}
}

@Override
public void setReeditRichMessage(String title, String body) {
aitTextManager.setIgnoreTextChange(true);
if (aitTextManager != null) {
aitTextManager.setIgnoreTextChange(true);
}
showRichInputPanel();
binding.chatRichTitleEt.setText(title);
if (aitTextManager != null
Expand All @@ -376,7 +382,9 @@ public void setReeditRichMessage(String title, String body) {
} else {
binding.chatRichContentEt.setText(body);
}
aitTextManager.setIgnoreTextChange(false);
if (aitTextManager != null) {
aitTextManager.setIgnoreTextChange(false);
}
}

@Override
Expand Down
48 changes: 29 additions & 19 deletions ...tease/yunxin/kit/chatkit/ui/fun/view/message/viewholder/FunChatBaseMessageViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,27 +318,37 @@ protected void setReplyInfo(ChatMessageBean messageBean) {
} else if (messageBean.hasReply()) {
// 自定义回复实现
addReplayViewToBottomGroup();
V2NIMMessageRefer replyMsg = messageBean.getReplyMessage();
V2NIMMessageRefer replyMsg = messageBean.getReplyMessageRefer();
if (replyMsg != null) {
MessageHelper.getReplyMessageInfo(
replyMsg,
new FetchCallback<IMMessageInfo>() {
@Override
public void onError(int errorCode, @Nullable String errorMsg) {
baseViewBinding.messageTopGroup.removeAllViews();
}
if (messageBean.getReplyMessage() == null) {
MessageHelper.getReplyMessageInfo(
replyMsg,
new FetchCallback<IMMessageInfo>() {
@Override
public void onError(int errorCode, @Nullable String errorMsg) {
baseViewBinding.messageTopGroup.removeAllViews();
}

@Override
public void onSuccess(@Nullable IMMessageInfo param) {
replyMessage = param;
String content = MessageHelper.getReplyContent(replyMessage);
MessageHelper.identifyFaceExpression(
replayBinding.tvReply.getContext(),
replayBinding.tvReply,
content,
ImageSpan.ALIGN_BOTTOM);
}
});
@Override
public void onSuccess(@Nullable IMMessageInfo param) {
replyMessage = param;
String content = MessageHelper.getReplyContent(replyMessage);
MessageHelper.identifyFaceExpression(
replayBinding.tvReply.getContext(),
replayBinding.tvReply,
content,
ImageSpan.ALIGN_BOTTOM);
}
});
} else {
replyMessage = messageBean.getReplyMessage();
String content = MessageHelper.getReplyContent(replyMessage);
MessageHelper.identifyFaceExpression(
replayBinding.tvReply.getContext(),
replayBinding.tvReply,
content,
ImageSpan.ALIGN_BOTTOM);
}
}

if (itemClickListener != null) {
Expand Down
155 changes: 98 additions & 57 deletions chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/ChatMessageBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ public ChatMessageBean() {}

public ChatMessageBean(IMMessageInfo messageData) {
this.messageData = messageData;
if (messageData == null) {
return;
}
Map<String, Object> localExtensionMap =
MessageExtensionHelper.parseJsonStringToMap(messageData.getMessage().getLocalExtension());

Expand All @@ -48,6 +51,8 @@ public ChatMessageBean(IMMessageInfo messageData) {
revokeMsgEdit = (Boolean) revokeEdit;
}
}

initReplyMessage();
}

IMMessageInfo messageData;
Expand All @@ -66,6 +71,11 @@ public ChatMessageBean(IMMessageInfo messageData) {
// 上传进度 % 0-100
public int progress;

boolean hasReply = false;
V2NIMMessageRefer replyMessageRefer;

IMMessageInfo replyMessage;

public IMMessageInfo getMessageData() {
return messageData;
}
Expand All @@ -88,72 +98,103 @@ public String getMsgClientId() {

public void setMessageData(IMMessageInfo messageData) {
this.messageData = messageData;
if (messageData == null) {
return;
}
Map<String, Object> localExtensionMap =
MessageExtensionHelper.parseJsonStringToMap(messageData.getMessage().getLocalExtension());

if (localExtensionMap != null && localExtensionMap.containsKey(KEY_REVOKE_TAG)) {
Object revokeLocal = localExtensionMap.get(KEY_REVOKE_TAG);
Object revokeEdit = localExtensionMap.get(KEY_REVOKE_EDIT_TAG);
if (revokeLocal instanceof Boolean) {
isRevoked = (Boolean) revokeLocal;
}

if (revokeEdit instanceof Boolean) {
revokeMsgEdit = (Boolean) revokeEdit;
}
}

initReplyMessage();
}

public boolean hasReply() {
if (messageData == null) {
return false;
}
Map<String, Object> serverExtensionMap =
MessageExtensionHelper.parseJsonStringToMap(messageData.getMessage().getServerExtension());
return serverExtensionMap != null
&& serverExtensionMap.containsKey(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY);
return hasReply;
}

public V2NIMMessageRefer getReplyMessage() {
if (messageData == null) {
return null;
}
// 优先取threadReply
if (messageData.getMessage().getThreadReply() != null) {
return messageData.getMessage().getThreadReply();
}
Map<String, Object> serverExtensionMap =
MessageExtensionHelper.parseJsonStringToMap(messageData.getMessage().getServerExtension());

if (serverExtensionMap != null
&& serverExtensionMap.containsKey(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY)) {
Object replyInfo = serverExtensionMap.get(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY);
if (replyInfo instanceof Map) {
String clientId = "";
String senderId = "";
String serverId = "";
long time = 0;
String conversationId = "";
String receiveId = "";
V2NIMConversationType conversationType = V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P;
try {
Map<String, Object> replyMap = (Map<String, Object>) replyInfo;
if (replyMap.containsKey(ChatKitUIConstant.REPLY_UUID_KEY)) {
clientId = (String) replyMap.get(ChatKitUIConstant.REPLY_UUID_KEY);
senderId = (String) replyMap.get(ChatKitUIConstant.REPLY_FROM_KEY);
serverId = (String) replyMap.get(ChatKitUIConstant.REPLY_SERVER_ID_KEY);
time = (long) replyMap.get(ChatKitUIConstant.REPLY_TIME_KEY);
conversationId = (String) replyMap.get(ChatKitUIConstant.REPLY_TO_KEY);
receiveId =
replyMap.get(ChatKitUIConstant.REPLY_RECEIVE_ID_KEY) == null
? V2NIMConversationIdUtil.conversationTargetId(conversationId)
: (String) replyMap.get(ChatKitUIConstant.REPLY_RECEIVE_ID_KEY);
conversationType = V2NIMConversationIdUtil.conversationType(conversationId);
public V2NIMMessageRefer getReplyMessageRefer() {
return replyMessageRefer;
}

public IMMessageInfo getReplyMessage() {
return replyMessage;
}

public void setReplyMessage(IMMessageInfo msg) {
replyMessage = msg;
}

private void initReplyMessage() {
if (messageData != null) {
// 优先取threadReply
if (messageData.getMessage().getThreadReply() != null) {
replyMessageRefer = messageData.getMessage().getThreadReply();
hasReply = true;
}
Map<String, Object> serverExtensionMap =
MessageExtensionHelper.parseJsonStringToMap(
messageData.getMessage().getServerExtension());
hasReply =
serverExtensionMap != null
&& serverExtensionMap.containsKey(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY);
if (serverExtensionMap != null
&& serverExtensionMap.containsKey(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY)) {
Object replyInfo = serverExtensionMap.get(ChatKitUIConstant.REPLY_REMOTE_EXTENSION_KEY);
if (replyInfo instanceof Map) {
String clientId = "";
String senderId = "";
String serverId = "";
long time = 0;
String conversationId = "";
String receiveId = "";
V2NIMConversationType conversationType =
V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P;
try {
Map<String, Object> replyMap = (Map<String, Object>) replyInfo;
if (replyMap.containsKey(ChatKitUIConstant.REPLY_UUID_KEY)) {
clientId = (String) replyMap.get(ChatKitUIConstant.REPLY_UUID_KEY);
senderId = (String) replyMap.get(ChatKitUIConstant.REPLY_FROM_KEY);
serverId = (String) replyMap.get(ChatKitUIConstant.REPLY_SERVER_ID_KEY);
time = (long) replyMap.get(ChatKitUIConstant.REPLY_TIME_KEY);
conversationId = (String) replyMap.get(ChatKitUIConstant.REPLY_TO_KEY);
receiveId =
replyMap.get(ChatKitUIConstant.REPLY_RECEIVE_ID_KEY) == null
? V2NIMConversationIdUtil.conversationTargetId(conversationId)
: (String) replyMap.get(ChatKitUIConstant.REPLY_RECEIVE_ID_KEY);
conversationType = V2NIMConversationIdUtil.conversationType(conversationId);
}
} catch (Exception e) {
ALog.e(
LIB_TAG,
"V2ChatMessageBean",
"getReplyUUid,error message"
+ (messageData == null
? "null"
: messageData.getMessage().getMessageClientId()));
}
} catch (Exception e) {
ALog.e(
LIB_TAG,
"V2ChatMessageBean",
"getReplyUUid,error message"
+ (messageData == null ? "null" : messageData.getMessage().getMessageClientId()));
replyMessageRefer =
V2NIMMessageReferBuilder.builder()
.withMessageClientId(clientId)
.withSenderId(senderId)
.withReceiverId(receiveId)
.withConversationType(conversationType)
.withMessageServerId(serverId)
.withCreateTime(time)
.build();
}
return V2NIMMessageReferBuilder.builder()
.withMessageClientId(clientId)
.withSenderId(senderId)
.withReceiverId(receiveId)
.withConversationType(conversationType)
.withMessageServerId(serverId)
.withCreateTime(time)
.build();
}
}
return null;
}

public boolean isRevoked() {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/netease/yunxin/kit/chatkit/ui/normal/page/fragment/ChatTeamFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ protected void initDataObserver() {
}
ALog.d(LIB_TAG, TAG, "TeamMessageReceiptLiveData,observer,msgList:" + messageList.size());
for (ChatMessageBean message : updateMessage) {
chatView.getMessageListView().updateMessageStatus(message);
chatView.updateMessageStatus(message);
}
};
// 监听群聊消息已读回执
Expand Down
Loading