增加了针对不同身份终端连接工控机的策略

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-01-27 20:15:19 +08:00
parent b017bff8ba
commit 900883260a
2 changed files with 17 additions and 15 deletions

View File

@@ -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'
}

View File

@@ -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();
}