Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_MogoAP_eagle-220_211207_8.0.17_merge

# Conflicts:
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
This commit is contained in:
donghongyu
2022-02-17 15:30:57 +08:00
3 changed files with 14 additions and 6 deletions

View File

@@ -43,7 +43,7 @@ import java.util.*
*/
@Route(path = MogoServicePaths.PATH_AUTO_PILOT)
class MoGoAutopilotProvider :
IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener {
IMoGoAutopilotProvider, IMoGoMapDataCollectProvider.OnMapCollectCmdListener {
private val TAG = "MoGoAutoPilotProvider"
private var mContext: Context? = null
@@ -61,6 +61,7 @@ class MoGoAutopilotProvider :
when (FunctionBuildConfig.appIdentityMode) {
0 -> // 司机
{
// 注册地图采集功能
CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
// "192.168.1.102"
val options = AdasOptions.Builder().setClient(false).build()
@@ -95,6 +96,9 @@ class MoGoAutopilotProvider :
}
1 -> // 乘客
{
// 乘客端默认接收绘制全局路径+引导线
FunctionBuildConfig.isDemoMode = true
FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = true
// "192.168.1.102"
val options = AdasOptions.Builder().build()
AdasManager.getInstance().create(context, options)