diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle index 511ed3c4e8..5a585b833b 100644 --- a/app/productFlavors/fOchBusPassenger.gradle +++ b/app/productFlavors/fOchBusPassenger.gradle @@ -43,7 +43,7 @@ project.android.productFlavors { // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' //Bus不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle index a578eb87cc..035eef12a3 100644 --- a/app/productFlavors/fOchShuttlePassenger.gradle +++ b/app/productFlavors/fOchShuttlePassenger.gradle @@ -44,7 +44,7 @@ project.android.productFlavors { // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' //Bus不能启动自驾的档位 buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 1af3a15d1b..87fc4118c7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -123,27 +123,21 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis .build("/noop/api") .navigation(getContext()); } - } - // TODO 董宏宇 目前处于测试阶段,处理一个机器多个屏幕方案 - else { - ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/driver/api") - .navigation(getContext()); - // 启动乘客端Act - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || - AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + } else { + // 目前只有金旅星辰乘客屏是连接的双屏 + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + && AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { + ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() + .build("/passenger/api") + .navigation(getContext()); MultiDisplayUtils.INSTANCE.startActWithSecond( this, - PassengerLauncherActivity.class); + VideoAdAtc.class); + } else { + ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() + .build("/noop/api") + .navigation(getContext()); } - -// // 启动广告视频Atc -// if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || -// AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { -// MultiDisplayUtils.INSTANCE.startActWithSecond( -// this, -// VideoAdAtc.class); -// } } if (ochProvider != null) {