From d8999754954411442b63943b5c32c73041de09d4 Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Mon, 7 Aug 2023 18:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=9E=8D=E4=BA=91=E5=90=88?=
 =?UTF-8?q?=E6=B5=81=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/presenter/LiveRyLinkMicPkPresenter.java  | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
index b79c02a83..c7502c29e 100644
--- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
+++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
@@ -594,7 +594,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                             public void onSuccess() {
                                 Log.i("ry", "订阅资源成功");
 
-                                if (rtcRoom != null) {
                                     RCRTCMixConfig config = new RCRTCMixConfig();
                                     RCRTCMixConfig.MediaConfig mediaConfig = new RCRTCMixConfig.MediaConfig();
                                     config.setMediaConfig(mediaConfig);
@@ -635,7 +634,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                                     } else {
                                         Log.w("PkDebug", "PK合流失败,rcrtcLiveInfo为空");
                                     }
-                                }
                             }
 
                             @Override
@@ -716,7 +714,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                                 inputStreamList.add(stream);
 
 
-                                if (rtcRoom != null) {
 
                                     RCRTCMixConfig config = new RCRTCMixConfig();
                                     RCRTCMixConfig.MediaConfig mediaConfig = new RCRTCMixConfig.MediaConfig();
@@ -757,7 +754,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
                                         }
                                     });
-                                }
                             }
                         }
                         //开始订阅资源
@@ -885,7 +881,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                                         Log.i("ry", "订阅资源成功");
                                         List<RCRTCStream> streams = new ArrayList<>();
                                         streams.add(RCRTCEngine.getInstance().getDefaultVideoStream());
-                                        if (rtcRoom != null) {
                                             RCRTCMixConfig config = new RCRTCMixConfig();
                                             RCRTCMixConfig.MediaConfig mediaConfig = new RCRTCMixConfig.MediaConfig();
                                             config.setMediaConfig(mediaConfig);
@@ -922,7 +917,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
                                                 }
                                             });
-                                        }
                                     }
 
                                     @Override
@@ -1155,7 +1149,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
             });
         }
 
-        if (rtcRoom != null) {
+
             RCRTCMixConfig config = new RCRTCMixConfig();
             RCRTCMixConfig.MediaConfig mediaConfig = new RCRTCMixConfig.MediaConfig();
             config.setMediaConfig(mediaConfig);
@@ -1204,7 +1198,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
                     }
                 });
-            }
+
         }
 
         leaveHandler.post(leaveRunnable);
@@ -1948,7 +1942,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
 
                             }
-                            if (rtcRoom != null) {
 
                                 //开始订阅资源
                                 rtcRoom.getLocalUser().subscribeStreams(inputStreamList1, new IRCRTCResultCallback() {
@@ -1976,7 +1969,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
 
                                     }
                                 });
-                            }
                         }
 
                     }
@@ -2328,7 +2320,6 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
             if (btn_close != null) {
                 btn_close.setVisibility(View.GONE);
             }
-            if (rtcRoom != null) {
 //            inputStreamList.clear();
                 RCRTCMixConfig config = new RCRTCMixConfig();
                 RCRTCMixConfig.MediaConfig mediaConfig = new RCRTCMixConfig.MediaConfig();
@@ -2368,7 +2359,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
                         }
                     });
                 }
-            }
+
             runOnUiThread(new Runnable() {
                 public void run() {
 //                    try {