From deb35bf5fec2693d8eb6dee19fea8077319da2a2 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 6 Sep 2022 17:46:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=82=B9=E5=87=BB=E7=A7=81=E4=BF=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BD=86=E6=9C=AA=E8=AF=BB=E5=90=8E=E4=BC=9A?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=BB=98=E8=AE=A4=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/live/activity/PDLIiveChatActivity.java |  1 +
 .../com/yunbao/live/views/LiveRoomViewHolder.java     | 11 +++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
index 348f1033d..a57ef0f4d 100644
--- a/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
@@ -195,6 +195,7 @@ public class PDLIiveChatActivity extends FragmentActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        EventBus.getDefault().post(new io.rong.imlib.model.Message());
         Bus.getOff(this);
     }
 
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index b1f954f88..2bcbc5c57 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -1009,7 +1009,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
     @Override
     public void onResume() {
         super.onResume();
-        changeMsgView(msg2, msg);
         reloadIM();
     }
 
@@ -1704,11 +1703,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         } else if (i == R.id.user_guard) {
             // ((LiveActivity) mContext).openUserMoreListWindow(2, true);
             ((LiveActivity) mContext).openNewGuardListWindow();
-        } else if (i == R.id.room_msg) {
-            changeMsgView(msg, msg2);
-        } else if (i == R.id.room_msg_user) {
-            changeMsgView(msg2, msg);
-        } else if (i == R.id.lt_trickery) {
+        } if (i == R.id.lt_trickery) {
             showTrickeryDialog();
         }
 
@@ -1805,11 +1800,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                             if (userInfo != null) {
                                 ImgLoader.display(mContext, userInfo.getPortraitUri().toString(), msgUserIcon);
                             }
-                            break;
+                            return;
                         }
-
                     }
                 }
+                changeMsgView(msg2,msg);
             }
 
             @Override