Browse Source

关播停止流程

linjianpeng 1 month ago
parent
commit
0cf780725a

+ 7 - 6
module_live/src/main/java/com/yc/module_live/view/RoomActivity.kt

@@ -2468,12 +2468,7 @@ class RoomActivity : BaseActivity<RoomVm>(), LiveDialogFragmentListener, VoicePr
     private fun showEndFragment(leaveInfo: LeaveInfo?) {
         DialogUtils.dismissAllDialogFragment(fragmentManager = supportFragmentManager)
         if (userLiveEndFragment != null || anchorLiveEndFragment != null) return
-        liveFragment?.let {
-            it.leaveChannel()
-        }
-        videoFragment?.let {
-            it.leaveChannel()
-        }
+
         updateRoomUI(BaseRoomVm.END_LIVE, true)
         if (viewModel.room?.isLive == true) {
             anchorLiveEndFragment = AnchorLiveEndFragment.newInstance(leaveInfo)
@@ -2495,6 +2490,12 @@ class RoomActivity : BaseActivity<RoomVm>(), LiveDialogFragmentListener, VoicePr
                 .commitNowAllowingStateLoss()
         }
 //        liveRoom?.isLive = false
+        liveFragment?.let {
+            it.leaveChannel()
+        }
+        videoFragment?.let {
+            it.leaveChannel()
+        }
     }
 
     fun exit() {

+ 2 - 2
module_live/src/main/java/com/yc/module_live/view/live/LiveFragment.kt

@@ -174,12 +174,12 @@ class LiveFragment : BaseFragment<LiveVm>() {
             LiveFragment::class.java.simpleName,
             "leaveChannel roomId: $roomId"
         )
-        // 退出房间
-        engine?.logoutRoom()
         // 停止本地预览
         engine?.stopPreview()
         // 停止推流
         engine?.stopPublishingStream()
+        // 退出房间
+        engine?.logoutRoom()
         // 销毁引擎
         ZegoExpressEngine.destroyEngine(null);
     }