Merge branch 'dev_MogoAP_eagle-220_211207_8.0.15' into dev_move_old_model

# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java

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
         }
     }
 

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) {
+    }
+}

modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java

@@ -91,7 +91,8 @@ class MogoMainService extends Service implements IMogoLocationListener {
 
     private void startTanluService() {
         UiThreadHandler.postDelayed(() -> {
-                    if (mServiceApis != null) {
+                    Logger.d(TAG, "startTanluService ---------- ");
+                    if (mServiceApis != null && mServiceApis.getTanluApi() != null) {
                         mServiceApis.getTanluApi().startTanluService();
                     }
                 }, 2_000L