From 900883260af672d990aaf78abcc5a5de1ec80021 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 27 Jan 2022 20:15:19 +0800 Subject: [PATCH] =?UTF-8?q?[Upload]=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=92=88?= =?UTF-8?q?=E5=AF=B9=E4=B8=8D=E5=90=8C=E8=BA=AB=E4=BB=BD=E7=BB=88=E7=AB=AF?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=B7=A5=E6=8E=A7=E6=9C=BA=E7=9A=84=E7=AD=96?= =?UTF-8?q?=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/productFlavors/fPadLenovo.gradle | 2 +- .../com/mogo/module/adas/AdasProvider.java | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 1f107ee800..3a2685550b 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -27,7 +27,7 @@ project.android.productFlavors { buildConfigField 'int', 'GPS_PROVIDER', "1" // 构建的应用身份类型，司机｜乘客 - buildConfigField 'int', 'APP_IDENTITY_MODE', "0" + buildConfigField 'int', 'APP_IDENTITY_MODE', "-1" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'true' } diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java index 68332600f8..9ab6b53db6 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasProvider.java @@ -5,6 +5,7 @@ import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; @@ -47,7 +48,21 @@ public class AdasProvider implements IProvider { private void initAdas(Context context, AdasEventManager adasEventManager) { CupidLogUtils.setEnableLog(false); CupidLogUtils.setIsWriteLog(false); - AdasManager.getInstance().create(context); + // TODO 临时方案，根据不同的身份标识，连接不同的工控机IP + switch (FunctionBuildConfig.appIdentityMode) { + case 0: + // 司机 + AdasManager.getInstance().create(context, "192.168.1.102"); + break; + case 1: + // 乘客 + AdasManager.getInstance().create(context, "192.168.1.103"); + break; + default: + // 默认采用UDP寻址方式 + AdasManager.getInstance().create(context); + break; + } AdasManager.getInstance().setOnAdasListener(new OnAdasListenerAdapter()); AdasManager.getInstance().setOnAdasConnectStatusListener(adasEventManager); adasEventManager.setProviderBizListener(this::setBasicInfo); @@ -79,19 +94,6 @@ public class AdasProvider implements IProvider { AdasManager.getInstance().aiCloudToAdasData(msg); } - /** - * 查询自动驾驶路线，接口回调至 OnAdasListener - */ - public void queryAutopilotRoute() { - AdasManager.getInstance().queryAutopilotRoute(); - } - - public void cancelPilot() { - if (AdasManager.getInstance().isSocketConnect()) { - AdasManager.getInstance().controlAutopilotCarHead(); - } - } - public AdasAIDLAutopilotStateModel autopilotStateCall() { return adasEventManager.autopilotStateCall(); }