diff --git a/app/build.gradle b/app/build.gradle index 01fdee2714..bdaf63a783 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -283,6 +283,7 @@ android { apply from: "./productFlavors/fPadLenovo.gradle" apply from: "./productFlavors/fOchBus.gradle" apply from: "./productFlavors/fOchShuttle.gradle" + apply from: "./productFlavors/fOchShuttleM2.gradle" apply from: "./productFlavors/fOchTaxi.gradle" apply from: "./productFlavors/fOchBusPassenger.gradle" apply from: "./productFlavors/fOchShuttlePassengerM2.gradle" diff --git a/app/functions/och.gradle b/app/functions/och.gradle index 242f2b6437..77d27d856a 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -58,6 +58,7 @@ project.dependencies { // 多屏幕-taxi司机端 //接驳车司乘端 fOchShuttleImplementation (project(':OCH:mogo-och-shuttle')) + fOchShuttleM2Implementation (project(':OCH:mogo-och-shuttle')) fOchShuttlePassengerImplementation (project(':OCH:mogo-och-shuttle-passenger')) fOchShuttlePassengerM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) diff --git a/app/productFlavors/fOchShuttleM2.gradle b/app/productFlavors/fOchShuttleM2.gradle new file mode 100644 index 0000000000..686a4442c0 --- /dev/null +++ b/app/productFlavors/fOchShuttleM2.gradle @@ -0,0 +1,56 @@ +project.android.productFlavors { + // 衡阳-联想Pad-网约车-小巴车 + fOchShuttleM2 { + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + dimension "vehicle" + // 和 och/mogo-och-bus-passenger 的flavors的shuttle对应 + matchingFallbacks = ['shuttle'] + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 + manifestPlaceholders = [ + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, + CHANNEL_VALUE : "fOchShuttleM2", ACTIVITY_ROOT: true, + SCREEN_ORIENTATION: "landscape" + ] + + // 是否基于地图 + buildConfigField 'boolean', 'IS_MAP_BASED', 'true' + + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE', "\"Shuttle_Driver_M2\"" + // 连接的工控机IP地址 + buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + //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);}}' + } +} \ No newline at end of file diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle index 5fa348b865..cb76ba69b5 100644 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ b/app/productFlavors/flavorsFilterConfig.gradle @@ -19,6 +19,7 @@ project.android.variantFilter { variant -> if (names.contains("shuttle")) { //Gradle会忽略满足上述条件的所有变体 if (names.contains("fOchShuttle")) { + } else if (names.contains("fOchShuttleM2")) { } else if (names.contains("fOchShuttlePassenger")) { } else if (names.contains("fOchShuttlePassengerM2")) { } else { @@ -83,6 +84,7 @@ project.android.variantFilter { variant -> if (names.contains("shuttle")) { //Gradle会忽略满足上述条件的所有变体 if (names.contains("fOchShuttle")) { + } else if (names.contains("fOchShuttleM2")) { } else if (names.contains("fOchShuttlePassenger")) { } else if (names.contains("fOchShuttlePassengerM2")) { } else { diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index 3e8e790b8c..af1f40a436 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -90,19 +90,18 @@ object ConfigStartUp { if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche - }else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)){ - HdMapBuildConfig.currentCarVrIconRes = R.raw.m2 } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache } else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) { HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei - } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){ + } else if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.m1 + }else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + HdMapBuildConfig.currentCarVrIconRes = R.raw.m2 } - if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java index 49ca031de5..9871608332 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/screen/ScreenHelper.java @@ -25,7 +25,8 @@ public class ScreenHelper { AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { baseWidth = 1920; baseHeight = 1080; - } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { + } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode) && + AppIdentityModeUtils.isPassenger((FunctionBuildConfig.appIdentityMode))) { baseWidth = 1080; baseHeight = 1920; }