From 2cbdac4bd0c75c4b8e5c72c11f440313fb96ce45 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Wed, 7 Sep 2022 18:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B6=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=A9=9F=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yunbao/common/http/PDLiveApi.java     |  2 +-
 .../live/activity/LiveAudienceActivity.java   | 25 +++++++++++--------
 .../live/views/PortraitLiveManager.java       |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
index 65307f2ff..8145c8ee4 100644
--- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
+++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java
@@ -146,7 +146,7 @@ public interface PDLiveApi {
      * @param liveuid
      * @return
      */
-    @GET("/api/public/?service=User.slketAttents")
+    @GET("/api/public/?service=User.setAttents")
     Observable<ResponseModel<List<SetAttentsModel>>> setAttents(
             @Query("touid") String liveuid
     );
diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
index f5c7cf9d4..b7741ed97 100644
--- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
+++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
@@ -441,17 +441,20 @@ public class LiveAudienceActivity extends LiveActivity {
 
     @Override
     public void onBackPressed() {
-        manager.onBackPressed();
-        if (Micing == 1) {
-            manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal);
-        } else if (Micing == 2) {
-            manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal);
-        } else {
-            manager.onRemove();
-            verticalViewPager.removeAllViews();
-            finish();
-            overridePendingTransition(0, 0);
+        try {
+            manager.onBackPressed();
+            if (Micing == 1) {
+                manager.micIngTypeOne(mLiveBean, mLiveType, mLiveTypeVal);
+            } else if (Micing == 2) {
+                manager.micIngTypeTwo(mLiveBean, mLiveType, mLiveTypeVal);
+            } else {
+                manager.onRemove();
+                super.onBackPressed();
 
+
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
     }
@@ -471,7 +474,7 @@ public class LiveAudienceActivity extends LiveActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
+        overridePendingTransition(0, 0);
         Bus.getOff(this);
         L.e("LiveAudienceActivity-------onDestroy------->");
     }
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 3c9146717..de6a6fde4 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -290,7 +290,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
         IMLoginManager.get(mContext).setisNewUserOne(false);
         //子线程执行退出操作
-        endPlay();
+
         exitLiveRoom();
 
         if (mLiveAudienceViewHolder != null) {