From ed2879e26396179b06d4a4cf79ced0e388e3d31d Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 1 Dec 2022 18:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=92=AD=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/views/PortraitLiveManager.java       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

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 7622dd73e..e95c3557f 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -27,8 +27,6 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.lzf.easyfloat.EasyFloat;
 import com.lzf.easyfloat.permission.PermissionUtils;
 import com.lzf.easyfloat.utils.LifecycleUtils;
-import com.tencent.imsdk.v2.V2TIMCallback;
-import com.tencent.imsdk.v2.V2TIMManager;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.CommonAppContext;
 import com.yunbao.common.Constants;
@@ -139,6 +137,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
     //观众与主播连麦逻辑
     private LiveLinkMicPresenter mLiveLinkMicPresenter;
     private LiveBean mLiveBean;
+
     //sdk类型  0金山  1腾讯
     private int mLiveSDK;
     //主播与主播连麦逻辑
@@ -186,6 +185,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
     private View loading;
 
     private int landscape;
+    private String leaveStream = "", leaveGroupId = "";
 
     public PortraitLiveManager setQuitF(boolean quitF) {
         isQuitF = quitF;
@@ -343,12 +343,17 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 .enterRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), mLiveBean.getCity(), new com.yunbao.common.http.base.HttpCallback<EnterRoomNewModel>() {
                     @Override
                     public void onSuccess(EnterRoomNewModel data) {
+
+                        isEnterRoom = true;
+                        if (TextUtils.isEmpty(leaveStream)) {
+                            leaveStream = mLiveBean.getStream();
+                            leaveGroupId = mLiveBean.getUid();
+                        }
                         landscape = data.getLiveInfo().getLandscape();
                         mLivePlayViewHolder.setLiveBeanLandscape(landscape);
                         //是否热度卡加成
                         liveHandler.postDelayed(() -> mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()), 700);
 
-                        isEnterRoom = true;
                         //延时1秒发送
                         liveHandler.postDelayed(sendFIm, 700);
 
@@ -1231,7 +1236,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             }, 4000);//3秒后执行Runnable中的run方法
 
         }
-        if (mLivePlayViewHolder!=null){
+        if (mLivePlayViewHolder != null) {
             mLivePlayViewHolder.setLiveBeanLandscape(1);
         }
     }
@@ -1501,13 +1506,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
         }
         if (mLiveBean != null) {
             isEnterRoom = false;
+
             RongChatRoomClient.getInstance().quitChatRoom("g" + mLiveBean.getUid(), new IRongCoreCallback.OperationCallback() {
                 @Override
                 public void onSuccess() {
                     try {
                         Log.i("tx", "退出成功" + mLiveBean.getUid());
                         LiveNetManager.get(mContext)
-                                .leaveRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), new com.yunbao.common.http.base.HttpCallback<String>() {
+                                .leaveRoomNew(leaveStream, leaveGroupId, new com.yunbao.common.http.base.HttpCallback<String>() {
                                     @Override
                                     public void onSuccess(String data) {
 
@@ -1515,9 +1521,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
                                     @Override
                                     public void onError(String error) {
-
                                     }
                                 });
+                        leaveStream = "";
+                        leaveGroupId = "";
 
                     } catch (Exception e) {
                         e.printStackTrace();
@@ -1528,20 +1535,20 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 @Override
                 public void onError(IRongCoreEnum.CoreErrorCode coreErrorCode) {
                     try {
+
                         Log.i("tx", "退出成功" + mLiveBean.getUid());
                         LiveNetManager.get(mContext)
-                                .leaveRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), new com.yunbao.common.http.base.HttpCallback<String>() {
+                                .leaveRoomNew(leaveStream, leaveGroupId, new com.yunbao.common.http.base.HttpCallback<String>() {
                                     @Override
                                     public void onSuccess(String data) {
-
                                     }
 
                                     @Override
                                     public void onError(String error) {
-
                                     }
                                 });
-
+                        leaveStream = "";
+                        leaveGroupId = "";
                     } catch (Exception e) {
                         e.printStackTrace();
                     }