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/app/build.gradle b/app/build.gradle index c33760b..3fc486f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,6 +48,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}" implementation "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}" + implementation "com.mogo.cloud:realtime:${MOGO_TRAFFICLIVE_VERSION}" } else { implementation project(":modules:mogo-tanlu") implementation project(":modules:mogo-realtime") 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 87b78ad..35420b9 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 @@ -397,7 +397,7 @@ public class MoGoLiveManager { * 停止直播 */ public void stopLive() { - if (!TextUtils.isEmpty(currentStreamId)) { + if (!TextUtils.isEmpty(currentStreamId) && mExpressEngine != null) { mExpressEngine.stopPlayingStream(currentStreamId); } stopPreview(); @@ -476,7 +476,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 c9b5df2..3b9b25f 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;