Merge branch 'dev_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.9

2021-01-05 10:11:49 +08:00
parent becc8b2ff5 16c9f41a4c
commit ee9ff0c457
73 changed files with 1185 additions and 342 deletions
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
@@ -323,6 +323,10 @@ public class MogoADASController implements IMogoADASController {
                return;
            }

+            if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) {
+                return;
+            }
+
            try {
                AutopilotServiceManage.getInstance().showAdas();
            } catch ( Exception e ) {