diff --git a/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java b/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java index e627158d9..9388e69d1 100644 --- a/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/mango/moshen/ui/im/ImInitHelper.java @@ -2,47 +2,6 @@ package com.mango.moshen.ui.im; import android.content.Context; -import com.mango.core.im.custom.bean.UserCardAttachment; -import com.mango.moshen.ui.im.chat.MsgViewHolderUserCard; -import com.netease.nim.uikit.api.NimUIKit; -import com.netease.nim.uikit.api.model.contact.ContactEventListener; -import com.netease.nim.uikit.api.model.main.OnlineStateContentProvider; -import com.netease.nim.uikit.api.model.session.SessionCustomization; -import com.netease.nim.uikit.api.model.session.SessionEventListener; -import com.netease.nim.uikit.api.wrapper.NimMessageRevokeObserver; -import com.netease.nim.uikit.business.session.actions.BaseAction; -import com.netease.nim.uikit.business.session.actions.CameraAction; -import com.netease.nim.uikit.business.session.actions.ImageAction; -import com.netease.nim.uikit.business.session.actions.PhotoAction; -import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.msg.MsgService; -import com.netease.nimlib.sdk.msg.MsgServiceObserve; -import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.mango.moshen.community.holder.DynamicSysHolder; -import com.mango.moshen.community.im.WorldDynamicShareViewHolder; -import com.mango.moshen.luckymoney.viewholder.LuckyMoneyMsgViewHolder; -import com.mango.moshen.luckymoney.viewholder.LuckyMoneyTipsViewHolder; -import com.mango.moshen.module_hall.HallDataManager; -import com.mango.moshen.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; -import com.mango.moshen.share.viewholder.InAppSharingMsgViewHolder; -import com.mango.moshen.ui.im.actions.GiftAction; -import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; -import com.mango.moshen.ui.im.chat.MsgViewHolderAudioParty; -import com.mango.moshen.ui.im.chat.MsgViewHolderChatHint; -import com.mango.moshen.ui.im.chat.MsgViewHolderContent; -import com.mango.moshen.ui.im.chat.MsgViewHolderGift; -import com.mango.moshen.ui.im.chat.MsgViewHolderHello; -import com.mango.moshen.ui.im.chat.MsgViewHolderLevel; -import com.mango.moshen.ui.im.chat.MsgViewHolderLottery; -import com.mango.moshen.ui.im.chat.MsgViewHolderOnline; -import com.mango.moshen.ui.im.chat.MsgViewHolderRedPackage; -import com.mango.moshen.ui.im.chat.MsgViewHolderRedPacket; -import com.mango.moshen.ui.im.chat.MsgViewHolderSkill; -import com.mango.moshen.ui.im.chat.MsgViewHolderText; -import com.mango.moshen.ui.im.chat.SignInNoticeMsgViewHolder; -import com.mango.moshen.ui.im.chat.SysMsgV2ViewHolder; -import com.mango.moshen.ui.im.chat.SysMsgViewHolder; -import com.mango.moshen.ui.user.UserInfoActivity; import com.mango.core.community.attachment.DynamicSysAttachment; import com.mango.core.community.im.WorldDynamicAttachment; import com.mango.core.im.custom.bean.AssistantAttachment; @@ -69,9 +28,48 @@ import com.mango.core.im.custom.bean.RedPacketAttachment; import com.mango.core.im.custom.bean.SkillMsgAttachment; import com.mango.core.im.custom.bean.SysMsgAttachment; import com.mango.core.im.custom.bean.SysMsgV2Attachment; +import com.mango.core.im.custom.bean.UserCardAttachment; import com.mango.core.miniworld.bean.OpenAudioPartyAttachment; import com.mango.core.public_chat_hall.attachment.AitMeAttachment; -import com.netease.nimlib.service.NimService; +import com.mango.core.utils.SystemUidUtil; +import com.mango.moshen.community.holder.DynamicSysHolder; +import com.mango.moshen.community.im.WorldDynamicShareViewHolder; +import com.mango.moshen.luckymoney.viewholder.LuckyMoneyMsgViewHolder; +import com.mango.moshen.luckymoney.viewholder.LuckyMoneyTipsViewHolder; +import com.mango.moshen.module_hall.HallDataManager; +import com.mango.moshen.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; +import com.mango.moshen.share.viewholder.InAppSharingMsgViewHolder; +import com.mango.moshen.ui.im.actions.GiftAction; +import com.mango.moshen.ui.im.avtivity.NimP2PMessageActivity; +import com.mango.moshen.ui.im.chat.MsgViewHolderAudioParty; +import com.mango.moshen.ui.im.chat.MsgViewHolderChatHint; +import com.mango.moshen.ui.im.chat.MsgViewHolderContent; +import com.mango.moshen.ui.im.chat.MsgViewHolderGift; +import com.mango.moshen.ui.im.chat.MsgViewHolderHello; +import com.mango.moshen.ui.im.chat.MsgViewHolderLevel; +import com.mango.moshen.ui.im.chat.MsgViewHolderLottery; +import com.mango.moshen.ui.im.chat.MsgViewHolderOnline; +import com.mango.moshen.ui.im.chat.MsgViewHolderRedPackage; +import com.mango.moshen.ui.im.chat.MsgViewHolderRedPacket; +import com.mango.moshen.ui.im.chat.MsgViewHolderSkill; +import com.mango.moshen.ui.im.chat.MsgViewHolderText; +import com.mango.moshen.ui.im.chat.MsgViewHolderUserCard; +import com.mango.moshen.ui.im.chat.SignInNoticeMsgViewHolder; +import com.mango.moshen.ui.im.chat.SysMsgV2ViewHolder; +import com.mango.moshen.ui.im.chat.SysMsgViewHolder; +import com.mango.moshen.ui.user.UserInfoActivity; +import com.netease.nim.uikit.api.NimUIKit; +import com.netease.nim.uikit.api.model.contact.ContactEventListener; +import com.netease.nim.uikit.api.model.session.SessionCustomization; +import com.netease.nim.uikit.api.model.session.SessionEventListener; +import com.netease.nim.uikit.api.wrapper.NimMessageRevokeObserver; +import com.netease.nim.uikit.business.session.actions.BaseAction; +import com.netease.nim.uikit.business.session.actions.CameraAction; +import com.netease.nim.uikit.business.session.actions.ImageAction; +import com.netease.nim.uikit.business.session.actions.PhotoAction; +import com.netease.nimlib.sdk.NIMClient; +import com.netease.nimlib.sdk.msg.MsgServiceObserve; +import com.netease.nimlib.sdk.msg.model.IMMessage; import java.util.ArrayList; @@ -95,7 +93,7 @@ public class ImInitHelper { private final SessionEventListener listener = new SessionEventListener() { @Override public void onAvatarClicked(Context context, IMMessage message) { - if (message == null) return; + if (message == null || SystemUidUtil.isSystemUid(message.getFromAccount())) return; UserInfoActivity.Companion.start(context, Long.parseLong(message.getFromAccount())); } diff --git a/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java b/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java index 6c891a003..209ce0417 100644 --- a/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java +++ b/app/src/main/java/com/mango/moshen/ui/im/MessageListPanelEx.java @@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONObject; import com.mango.core.im.custom.bean.UserCardAttachment; import com.mango.core.room.event.MessageSizeEvent; import com.mango.core.utils.CurrentTimeUtils; +import com.mango.core.utils.SystemUidUtil; import com.mango.xchat_android_library.utils.SingleToastUtil; import com.netease.nim.uikit.R; import com.netease.nim.uikit.api.NimUIKit; @@ -870,9 +871,11 @@ public class MessageListPanelEx { } else { // 顶部加载 if (noMoreMessage) { - IMMessage imMessage = MessageBuilder.createCustomMessage(container.account, container.sessionType, new UserCardAttachment()); - imMessage.setStatus(MsgStatusEnum.draft); - messages.add(0, imMessage); + if (!SystemUidUtil.isSystemUid(container.account)){ + IMMessage imMessage = MessageBuilder.createCustomMessage(container.account, container.sessionType, new UserCardAttachment()); + imMessage.setStatus(MsgStatusEnum.draft); + messages.add(0, imMessage); + } adapter.fetchMoreEnd(messages, true); } else { adapter.fetchMoreComplete(messages); diff --git a/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java index 5a0859855..8b37c9d52 100644 --- a/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/mango/moshen/ui/im/avtivity/NimP2PMessageActivity.java @@ -168,6 +168,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity { private void addBlackList() { if (SystemUidUtil.isSystemUid(sessionId)) { ivAddBlackList.setVisibility(View.GONE); + ivAttention.setVisibility(View.GONE); return; } ivAddBlackList.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/layout/layout_p2p_user_card.xml b/app/src/main/res/layout/layout_p2p_user_card.xml index 4aab2aa33..051a31dd1 100644 --- a/app/src/main/res/layout/layout_p2p_user_card.xml +++ b/app/src/main/res/layout/layout_p2p_user_card.xml @@ -144,10 +144,10 @@ android:layout_width="wrap_content" android:layout_height="20dp" android:layout_marginStart="10dp" - app:layout_constraintBottom_toTopOf="@id/tv_desc" + android:visibility="visible" + app:layout_constraintBottom_toBottomOf="@id/tv_nick" app:layout_constraintStart_toEndOf="@id/iv_head_wear" - app:layout_constraintTop_toTopOf="@id/iv_avatar" - app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/tv_nick" tools:src="@drawable/ic_gender_female" /> @@ -170,8 +171,8 @@ android:layout_marginStart="5dp" android:background="@drawable/shape_ff90ae_to_ff497d" android:drawableStart="@drawable/ic_gender_female_empty_bg" - android:gravity="center_vertical" android:drawablePadding="2dp" + android:gravity="center_vertical" android:includeFontPadding="false" android:paddingStart="4dp" android:textColor="@color/white" @@ -202,15 +203,19 @@ + app:layout_constraintTop_toBottomOf="@id/tv_nick" + app:layout_goneMarginStart="10dp" + tools:text="正在“可惜不是你…”热聊中正在“可惜不是你…”热聊中正在“可惜不是你…”热聊中" />