From 40a8d604b041cecefd317c5ab45f872d9be4fb87 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Tue, 30 Aug 2022 17:55:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=20=E6=96=B0?=
 =?UTF-8?q?=E4=BA=BA=E5=BC=95=E5=AF=BC=E9=80=81=E7=A4=BC=E4=B8=8E=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E6=B6=88=E6=81=AF=E5=B8=83=E5=B1=80=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunbao/live/views/LiveRoomViewHolder.java  |  1 -
 .../yunbao/live/views/PortraitLiveManager.java | 18 +++---------------
 live/src/main/res/layout/view_live_room.xml    |  7 ++++---
 3 files changed, 7 insertions(+), 19 deletions(-)

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 1da87e78b..80ab25921 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -857,7 +857,6 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10);
             }
         });
-        loadWishlistData();
         //打招呼消息
         fastMsgRecyclerView = (RecyclerView) findViewById(R.id.room_fast_msg);
         fastMsgRecyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index b150e08d6..a29beed22 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -273,6 +273,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     @Override
     public void onRemove() {
+        end();
         if (mLiveAudienceViewHolder != null) {
             mLiveAudienceViewHolder.removeFromParent();
             mLiveAudienceViewHolder.countDownTimerTrickery = null;
@@ -1286,20 +1287,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             mLivePlayViewHolder.release();
         }
         mLivePlayViewHolder = null;
-        onRemove();
     }
 
     public void end() {
         if (mLiveRoomViewHolder != null)
             mLiveRoomViewHolder.clearList();
-        boolean canBackPressed = true;
-        if (mContext instanceof LiveAudienceActivity) {
-            canBackPressed = ((LiveAudienceActivity) mContext).canBackPressed();
-        }
+
         IMLoginManager.get(mContext).setisNewUserOne(false);
-        if (!mEnd && !canBackPressed) {
-            return;
-        }
+
         if (countDownTimer != null) {
             countDownTimer.cancel();
             countDownTimer = null;
@@ -1309,13 +1304,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             if (LiveRoomViewHolder.isAttention == 0) {
                 if (isStayRoomfive) {
                     LiveRoomViewHolder.showFollowDialog(LiveRoomViewHolder.mNameText, LiveRoomViewHolder.mAvatarUrl, mContext);
-                } else {
-                    backIndex = 1;
-                    ((LiveAudienceActivity) mContext).onBackPressed();
                 }
-            } else {
-                backIndex = 1;
-                ((LiveAudienceActivity) mContext).onBackPressed();
             }
         } else {
             exitLiveRoom();
@@ -1367,7 +1356,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 }
             });
             endPlay();
-            mContext.finish();
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml
index 014378c7b..bd3b5f29f 100644
--- a/live/src/main/res/layout/view_live_room.xml
+++ b/live/src/main/res/layout/view_live_room.xml
@@ -227,11 +227,12 @@
                     android:layout_height="30dp"
                     android:layout_marginTop="4dp"
                     android:src="@mipmap/live_users_more" />
+
                 <ImageView
                     android:id="@+id/btn_close"
-                    android:layout_marginStart="6dp"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
+                    android:layout_marginStart="6dp"
                     android:layout_marginTop="4dp"
                     android:src="@mipmap/icon_live_close_3" />
             </LinearLayout>
@@ -239,7 +240,6 @@
     </LinearLayout>
 
 
-
     <LinearLayout
         android:id="@+id/hour_rank_layout"
         android:layout_width="wrap_content"
@@ -713,7 +713,7 @@
             android:id="@+id/chat_recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="430dp"
+            android:layout_marginTop="370dp"
             android:overScrollMode="never"
             android:scrollbars="none" />
 
@@ -846,6 +846,7 @@
     </LinearLayout>
 
     <FrameLayout
+
         android:layout_width="match_parent"
         android:layout_height="300dp"
         android:layout_below="@id/lin">