From 82e121657c68ed3cfb9c88cd829c3bbe67915113 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Thu, 5 Jan 2023 14:14:09 +0800
Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=8C=96=E6=88=BF=E9=97=B4=E5=BC=B9=E7=AA=97=E5=9C=A8=E6=88=BF?=
 =?UTF-8?q?=E9=97=B4=E5=85=B3=E9=97=AD=E5=90=8E=E4=BE=9D=E7=84=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yizhuan/erban/MainActivity.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java
index d22631b9e..08330d937 100644
--- a/app/src/main/java/com/yizhuan/erban/MainActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java
@@ -640,12 +640,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
 
     @SuppressLint("SetTextI18n")
     private void displayAvatarLayout(String avatar, String nickName, long uid) {
-        avatarLayout.clearAnimation();
-        avatarLayout.setVisibility(View.VISIBLE);
-        userLivingView.start();
-        stopRoomMinAnim();
-        startRoomMinAnim();
-        ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage);
+        RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
+        if(roomInfo != null) {
+            avatarLayout.clearAnimation();
+            avatarLayout.setVisibility(View.VISIBLE);
+            userLivingView.start();
+            stopRoomMinAnim();
+            startRoomMinAnim();
+            ImageLoadUtils.loadAvatar(MainActivity.this, avatar, avatarImage);
+        }
     }
 
     public void onEnter(RoomInfo roomInfo) {