diff --git a/common/build.gradle b/common/build.gradle index 7c307d71f..520452acc 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -151,10 +151,10 @@ dependencies { //腾讯im api 'com.tencent.imsdk:imsdk-plus:5.4.666' api 'com.google.code.gson:gson:2.8.8' - api 'cn.rongcloud.sdk:rtc_lib:5.2.3.2' // 音视频通话基础能力库 + api 'cn.rongcloud.sdk:rtc_lib:5.2.0' // 音视频通话基础能力库 //此处以集成 5.1.2 版本为例 - api 'cn.rongcloud.sdk:im_lib:5.2.3.2' // 即时通讯基础能力库 - api 'cn.rongcloud.sdk:im_kit:5.2.3.2' // 即时通讯 UI 基础组件 + api 'cn.rongcloud.sdk:im_lib:5.1.3.10' // 即时通讯基础能力库 + api 'cn.rongcloud.sdk:im_kit:5.1.3.10' // 即时通讯 UI 基础组件 api 'com.facebook.android:facebook-login:8.2.0' api 'com.facebook.android:facebook-android-sdk:[5,6)' diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml index 599a5ba56..7f3354c54 100644 --- a/live/src/main/res/layout/rc_conversationlist_item.xml +++ b/live/src/main/res/layout/rc_conversationlist_item.xml @@ -47,6 +47,7 @@ + android:layout_marginEnd="4dp" + android:visibility="gone" /> - + list, IViewProviderListener listener) { //根据业务需要,自定义处理 super.bindViewHolder(holder, uiConversation, position, list, listener); - ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_read_receipt_new); - if (uiConversation.mCore.getLatestMessageDirection()==Message.MessageDirection.SEND) { - Message.SentStatus sentStatus = uiConversation.mCore.getSentStatus(); - if (sentStatus == Message.SentStatus.READ) { - readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_read); - } else { - readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_unread); - } - }else { - readReceipt.setVisibility(View.GONE); + ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_read_receipt); +// IMLoginModel userInfo = IMLoginManager.get(holder.getContext()).getUserInfo(); +// if (String.valueOf(userInfo.getId()).equals(uiConversation.mCore.getSenderUserId())) { +// Message.SentStatus sentStatus = uiConversation.mCore.getSentStatus(); +// if (sentStatus == Message.SentStatus.READ) { +// +// } else { +// +// } +// } else { +// readReceipt.setVisibility(View.GONE); +// } + readReceipt.setVisibility(View.VISIBLE); + if (RongConfigCenter.featureConfig().isReadReceiptConversationType(Conversation.ConversationType.PRIVATE) && + uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) && + uiConversation.mCore.getSentStatus().getValue() == Message.SentStatus.READ.getValue() && + !(uiConversation.mCore.getLatestMessage() instanceof RecallNotificationMessage)) { + readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_read); + } else if (uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) && + !(uiConversation.mCore.getLatestMessage() instanceof RecallNotificationMessage)) { + readReceipt.setBackgroundResource(com.yunbao.live.R.mipmap.icon_messagelist_unread); + } else { + holder.setVisible(R.id.rc_conversation_read_receipt, false); } } } diff --git a/main/src/main/res/layout/rc_conversation_fragment.xml b/main/src/main/res/layout/rc_conversation_fragment.xml index 23a8fa31b..159e2f6ee 100644 --- a/main/src/main/res/layout/rc_conversation_fragment.xml +++ b/main/src/main/res/layout/rc_conversation_fragment.xml @@ -86,7 +86,7 @@ android:layout_width="0dp" app:RCStyle="CE" android:layout_height="wrap_content" - android:visibility="visible" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"