From e942696e1453f157540137b10c9a90d8f19292f5 Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Fri, 7 Jun 2024 11:05:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChatRoomMessageViewHolderBase.java          | 17 +++++++++++------
 .../viewholder/ChatRoomMsgViewHolderBase.java   |  8 ++++++--
 .../session/viewholder/MsgViewHolderBase.java   |  4 +++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/core/viewholder/ChatRoomMessageViewHolderBase.java b/app/src/module_public_chat/java/com/chwl/app/public_chat/core/viewholder/ChatRoomMessageViewHolderBase.java
index 17361a0bf..b9c18e4bb 100644
--- a/app/src/module_public_chat/java/com/chwl/app/public_chat/core/viewholder/ChatRoomMessageViewHolderBase.java
+++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/core/viewholder/ChatRoomMessageViewHolderBase.java
@@ -342,13 +342,16 @@ public abstract class ChatRoomMessageViewHolderBase extends RecyclerViewHolder<B
                     if (!TextUtils.isEmpty(sessionId)) {
                         AvatarClickListener avatarClickListener = NimUIKitImpl.getAvatarClickListener(sessionId);
 
-                        if (avatarClickListener != null)
+                        if (avatarClickListener != null) {
                             avatarClickListener.avatarClick(message.getFromAccount());
-                        else
+                        } else if (NimUIKitImpl.getSessionListener() != null) {
                             NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
-
-                    } else
-                        NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                        }
+                    } else {
+                        if (NimUIKitImpl.getSessionListener() != null) {
+                            NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                        }
+                    }
                 }
             };
             avatarLeft.setOnClickListener(portraitListener);
@@ -381,7 +384,9 @@ public abstract class ChatRoomMessageViewHolderBase extends RecyclerViewHolder<B
             View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    if (NimUIKitImpl.getSessionListener() != null) {
+                        NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    }
                     return true;
                 }
             };
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/viewholder/ChatRoomMsgViewHolderBase.java b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/viewholder/ChatRoomMsgViewHolderBase.java
index c1842eecf..6287567ff 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/viewholder/ChatRoomMsgViewHolderBase.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/viewholder/ChatRoomMsgViewHolderBase.java
@@ -285,7 +285,9 @@ public abstract class ChatRoomMsgViewHolderBase extends RecyclerViewHolder<BaseM
             View.OnClickListener portraitListener = new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                    if (NimUIKitImpl.getSessionListener() != null) {
+                        NimUIKitImpl.getSessionListener().onAvatarClicked(context, message);
+                    }
                 }
             };
             avatarLeft.setOnClickListener(portraitListener);
@@ -318,7 +320,9 @@ public abstract class ChatRoomMsgViewHolderBase extends RecyclerViewHolder<BaseM
             View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    if (NimUIKitImpl.getSessionListener() != null) {
+                        NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    }
                     return true;
                 }
             };
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
index e4f0d93f0..7e098a397 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderBase.java
@@ -343,7 +343,9 @@ public abstract class MsgViewHolderBase extends RecyclerViewHolder<BaseMultiItem
             View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    if (NimUIKitImpl.getSessionListener() != null) {
+                        NimUIKitImpl.getSessionListener().onAvatarLongClicked(context, message);
+                    }
                     return true;
                 }
             };