Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts:
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/service/MogoMainService.java

core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -325,7 +325,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider"));
         // 超视距，路测、行车记录仪监控
         MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_MONITORING, "IMoGoMonitoringProvider"));
-
+        // 云公告发布
+        MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AI_NOTICE, "IMoGoNoticeProvider"));
 
         // V2X 模块
         MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider"));
@@ -337,11 +338,12 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
         MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider"));
         // 全局语音唤醒
         MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_GLOBAL_UNWAKE, "GlobalUnwake"));
-        // 云公告发布
-        MogoModulePaths.addModuleFunction(new MogoModule(MogoServicePaths.PATH_AI_NOTICE, "IMoGoNoticeProvider"));
+        // ADAS模块（旧，慢慢被 域控制器模块 替换掉）
+        MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_ADAS, "AdasProvider"));
 
         if (!DebugConfig.isLauncher()) {
-            PersistentManager.getInstance().initManager(this);
+            PersistentManager
+                    .getInstance().initManager(this);
         }
 
         Log.i(TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");

core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java

@@ -37,7 +37,6 @@ import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils;
 import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.widget.RoundLayout;
-import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.utils.DrivingDirectionUtils;
 
 import java.util.ArrayList;
@@ -100,20 +99,6 @@ public class SmallMapDirectionView
 
         // 注册定位监听
         CallerMapLocationListenerManager.INSTANCE.addListener(TAG, this);
-
-        setOnLongClickListener(view -> {
-            MogoApisHandler.getInstance().getApis()
-                    .getMapServiceApi()
-                    .getMapUIController()
-                    .changeMapMode(
-                            MogoApisHandler.getInstance()
-                                    .getApis()
-                                    .getAdasControllerApi()
-                                    .getCurrentSkinMode()
-                    );
-            return false;
-        });
-
     }
 
     @Override

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt

@@ -41,7 +41,7 @@ class TrafficLightNetWorkModel {
             }
             onSuccess {
                 if (it?.result != null) {
-                    if (it.result.rsCrossId.isNotEmpty() && !it.result.rectLatLngs.isNullOrEmpty()) {
+                    if (!it.result.rsCrossId.isNullOrEmpty() && !it.result.rectLatLngs.isNullOrEmpty()) {
                         onSuccess.invoke(it.result)
                     } else {
                         onError.invoke("requestRoadID result rsCrossId is null")

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 exit: Boolean = true
+    private var exit: Boolean = false
 
     private var result: TrafficLightResult? = null
     private var lastResult: TrafficLightStatus? = null
@@ -99,11 +99,14 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
         if (!vip) {
             return
         }
-        if (!exit) {
-            Logger.d(TAG, "驶出路口，返回 , then  resetConditions")
+
+        if (exit) {
+            Logger.d(TAG, "驶离路口，返回 , then  resetConditions")
             resetConditions()
+            exit = false
             return
         }
+
         if (trafficLightResult.currentRoadTrafficLight() == null) {
             Logger.d(
                 TAG,
@@ -112,6 +115,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
             resetConditions()
             return
         }
+
         val currentResult = trafficLightResult.currentRoadTrafficLight()
         lastResult = result?.currentRoadTrafficLight()
         Logger.d(
@@ -228,7 +232,7 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
     override fun onEnterCrossRoad(enter: Boolean) {
         super.onEnterCrossRoad(enter)
         UiThreadHandler.post {
-            this.exit = enter
+            this.exit = !enter
         }
     }