Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into dev_robotaxi-d-app-module_2120_221017_2.12.0

# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -197,6 +197,8 @@ class MoGoAutopilotProvider :
                                     .build()
                                 AdasManager.getInstance()
                                     .create(options, MoGoAdasMsgConnectStatusListenerImpl())
+                                // 监听ADAS-SDK获取到的工控机数据
+                                AdasManager.getInstance().setOnAdasListener(MoGoAdasListenerImpl())
                                 // 接收司机屏发过来的感知、定位等数据
                                 listenDeviceData()
                             }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt

@@ -1,6 +1,5 @@
 package com.mogo.eagle.core.function.autopilot.telematic
 
-import android.util.Log
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.google.protobuf.TextFormat
@@ -118,10 +117,6 @@ class TeleMsgHandler : IMsgHandler {
                                         "1" -> true
                                         else -> false
                                     }
-                                Logger.d(
-                                    "Route",
-                                    "TeleMsgHandler -> handleMsgFromServer ==> isDemoMode:" + FunctionBuildConfig.isDemoMode + ",isIgnore:" + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData
-                                )
                                 timestamp = currTime
                                 invokeNettyConnResult("乘客屏收到的美化模式isIgnore为：${FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData}")
                             } else {