From 09a4080ab364d9697b5a0a7e3181bd99da8c70a6 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Sun, 7 Feb 2021 17:33:07 +0800
Subject: [PATCH 1/2] fix bug of logic in destory

---
 .idea/gradle.xml                                         | 1 +
 .../com/mogo/cloud/live/manager/MoGoLiveManager.java     | 9 +++------
 .../mogo/cloud/trafficlive/core/TrafficLiveManager.java  | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

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 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
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;

From 3a6bfb57ed7501475bc77b5a82581916486a32ec Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Sun, 7 Feb 2021 17:41:43 +0800
Subject: [PATCH 2/2] add trafficLive release compile

---
 app/build.gradle | 1 +
 1 file changed, 1 insertion(+)

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")