diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml index 7fc2a176c..f4fee666b 100644 --- a/live/src/main/res/layout/rc_conversationlist_item.xml +++ b/live/src/main/res/layout/rc_conversationlist_item.xml @@ -28,32 +28,47 @@ - + android:gravity="center_vertical" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + app:layout_constraintTop_toBottomOf="@+id/rc_conversation_linear"> - diff --git a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java index faa70c118..78480bbfb 100644 --- a/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java +++ b/main/src/main/java/com/yunbao/main/utils/PDLiveCustomConversationProvider.java @@ -1,12 +1,14 @@ package com.yunbao.main.utils; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import com.bumptech.glide.Glide; -import com.yunbao.common.glide.ImgLoader; +import com.google.gson.Gson; +import com.yunbao.common.bean.IMLoginModel; import com.yunbao.main.R; import java.util.List; @@ -14,11 +16,13 @@ import java.util.List; import io.rong.imkit.config.RongConfigCenter; import io.rong.imkit.conversationlist.model.BaseUiConversation; import io.rong.imkit.conversationlist.provider.BaseConversationProvider; +import io.rong.imkit.userinfo.RongUserInfoManager; import io.rong.imkit.widget.adapter.IViewProviderListener; import io.rong.imkit.widget.adapter.ViewHolder; import io.rong.imlib.RongIMClient; import io.rong.imlib.model.Conversation; import io.rong.imlib.model.Message; +import io.rong.imlib.model.UserInfo; import io.rong.message.RecallNotificationMessage; /** @@ -46,10 +50,20 @@ public class PDLiveCustomConversationProvider extends BaseConversationProvider { super.bindViewHolder(holder, uiConversation, position, list, listener); ImageView readReceipt = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_read_receipt); ImageView conversationUnread = holder.itemView.findViewById(com.yunbao.live.R.id.rc_conversation_unread_bg); - if (conversationUnread!=null){ + ImageView imgNew = holder.itemView.findViewById(com.yunbao.live.R.id.img_new); + if (conversationUnread != null) { Glide.with(holder.getContext()).asDrawable().load(R.mipmap.rc_unread_count_bg_normal).into(conversationUnread); } + if (imgNew != null) { + String targetId = uiConversation.mCore.getTargetId(); + UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(targetId); + if (userInfo != null && !TextUtils.isEmpty(userInfo.getExtra())) { + IMLoginModel model = new Gson().fromJson(userInfo.getExtra(), IMLoginModel.class); + if (model != null && TextUtils.equals(model.getIsAdmin(), "1")) + Glide.with(holder.getContext()).asDrawable().load("https://qny.shayucm.com/Instructors.png").into(imgNew); + } + } readReceipt.setVisibility(View.VISIBLE); if (RongConfigCenter.featureConfig().isReadReceiptConversationType(Conversation.ConversationType.PRIVATE) && uiConversation.mCore.getSenderUserId().equals(RongIMClient.getInstance().getCurrentUserId()) &&