From b215f86274d790e3d4eb956d06b040bf4572a139 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Thu, 23 Dec 2021 12:13:41 +0800
Subject: [PATCH 1/2] fix bug

---
 .../com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
index 1099384b47..076856fa6e 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -43,7 +43,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     private var vip: Boolean = false
 
     @Volatile
-    private var enter: Boolean = false
+    private var exit: Boolean = true
 
     private var result: TrafficLightResult? = null
     private var lastResult: TrafficLightStatus? = null
@@ -99,7 +99,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (!vip) {
             return
         }
-        if (!enter) {
+        if (!exit) {
             Logger.d(TAG, "驶入路口，返回 , then  resetConditions")
             resetConditions()
             return
@@ -226,7 +226,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     override fun onEnterCrossRoad(enter: Boolean) {
         super.onEnterCrossRoad(enter)
         UiThreadHandler.post {
-            this.enter = enter
+            this.exit = enter
         }
     }
 

From 76c811ba1c5efc7e194339765af2c36c729ffbea Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Thu, 23 Dec 2021 17:08:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8D=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=97=B6tanlu=E6=A8=A1=E5=9D=97=E6=9C=AA=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../common/error/ARoutDegradeService.java     | 25 +++++++++++++++++++
 .../module/main/service/MogoMainService.java  |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/error/ARoutDegradeService.java

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/error/ARoutDegradeService.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/error/ARoutDegradeService.java
new file mode 100644
index 0000000000..f35f14bad3
--- /dev/null
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/error/ARoutDegradeService.java
@@ -0,0 +1,25 @@
+package com.mogo.module.common.error;
+
+import android.content.Context;
+
+import com.alibaba.android.arouter.facade.Postcard;
+import com.alibaba.android.arouter.facade.service.DegradeService;
+import com.mogo.utils.logger.Logger;
+
+/**
+ * 自定义当个 ARouter 加载失败的服务
+ * @author donghongyu
+ */
+public class ARoutDegradeService implements DegradeService {
+    private String TAG = this.getClass().getSimpleName();
+
+    @Override
+    public void onLost(Context context, Postcard postcard) {
+        Logger.w(TAG, "postcard:" + postcard);
+
+    }
+
+    @Override
+    public void init(Context context) {
+    }
+}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
index 56bec93b55..0483e43e71 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java
@@ -92,7 +92,7 @@ class MogoMainService extends Service implements IMogoLocationListener {
     private void startTanluService() {
         UiThreadHandler.postDelayed(() -> {
                     Logger.d(TAG, "startTanluService ---------- ");
-                    if (mServiceApis != null) {
+                    if (mServiceApis != null && mServiceApis.getTanluApi() != null) {
                         mServiceApis.getTanluApi().startTanluService();
                     }
                 }, 2_000L