diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 1f8e3ef..5674e0c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -26,6 +26,7 @@ diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java index 559106d..4579372 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java @@ -166,7 +166,7 @@ public class MoGoLiveManager { /** * 事件回调用 */ - private IZegoEventHandler mEventHandler = new IZegoEventHandler() { + private final IZegoEventHandler mEventHandler = new IZegoEventHandler() { // 调试错误信息回调 @Override @@ -280,9 +280,7 @@ public class MoGoLiveManager { * 销毁即构引擎 */ private void destroyEngine() { - ZegoExpressEngine.destroyEngine(() -> { - - }); + ZegoExpressEngine.destroyEngine(null); } /** @@ -414,7 +412,7 @@ public class MoGoLiveManager { * 停止直播 */ public void stopLive() { - if (!TextUtils.isEmpty(currentStreamId)) { + if (!TextUtils.isEmpty(currentStreamId) && mExpressEngine != null) { mExpressEngine.stopPlayingStream(currentStreamId); } stopPreview(); @@ -493,7 +491,6 @@ public class MoGoLiveManager { * 停止观看直播 */ public void onDestroyLive() { - logOutRoom(); destroyEngine(); } } diff --git a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java index 2bc42c3..533dd3f 100644 --- a/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java +++ b/modules/mogo-trafficlive/src/main/java/com/mogo/cloud/trafficlive/core/TrafficLiveManager.java @@ -87,15 +87,14 @@ public class TrafficLiveManager implements ILiveProgressListener { requestLiveManager.requestVehicleHeadLive(LIVE_TYPE_CLOSE, liveSn, new IRequestLiveListener() { @Override public void onSuccess() { - MoGoLiveManager.getInstance().stopLive(); } @Override public void onError(Throwable e) { - MoGoLiveManager.getInstance().stopLive(); callBack.onError(e.getMessage()); } }); + MoGoLiveManager.getInstance().stopLive(); surfaceView = null; callBack = null; isLoginSuccess = false;