diff --git a/app/build.gradle b/app/build.gradle index 8a3f83c949..be466e31ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -177,7 +177,9 @@ android { shrinkResources false signingConfig signingConfigs.release manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } release { @@ -189,7 +191,9 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' manifestPlaceholders = [ - MAP_SDK_VERSION: properties.getProperty("MAP_SDK_VERSION") + MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION"), + // 高德地图鉴权信息 + AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, ] } } @@ -266,17 +270,15 @@ android { apply from: "./script/vehicleFlavors/fPadLenovo.gradle" apply from: "./script/vehicleFlavors/fOchBus.gradle" apply from: "./script/vehicleFlavors/fOchShuttle.gradle" - apply from: "./script/vehicleFlavors/fOchTaxi.gradle" apply from: "./script/vehicleFlavors/fOchBusPassenger.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassengerM2.gradle" apply from: "./script/vehicleFlavors/fOchShuttlePassenger.gradle" - apply from: "./script/vehicleFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/fOchSweeper.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./script/vehicleFlavors/ochDriverM1.gradle" - apply from: "./script/vehicleFlavors/ochPassengerM1.gradle" + apply from: "./script/vehicleFlavors/ochM1.gradle" apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 9b0a90b4a1..8625c4148c 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -1,26 +1,59 @@ { "mogo": { - "noop" :["fPadLenovo"], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :["fOchTaxi","fOchTaxiPassenger","fMultiDisplayOchTaxi"], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :{ + "driver":["fPadLenovo"] + }, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :{ + "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "passenger": ["ochDFHQ"] + }, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "dali": { - "noop" :[""], - "sweeper" :[""], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :["fOchBus","fOchBusPassenger","fMultiDisplayOchBus","fOchBusPassengerM2"], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" : null, + "sweeper" :null, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :{ + "driver": ["fOchBus","fMultiDisplayOchBus"], + "passenger": ["fOchBusPassenger","fOchBusPassengerM2"] + }, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } }, "yantai": { - "noop" :[""], - "sweeper" :["fOchSweeper"], - "shuttle" :["fOchShuttle","fOchShuttlePassenger"], - "taxi" :[], - "bus" :[], - "charter" :["ochDriverM1","ochPassengerM1"] + "noop" :null, + "sweeper" :{ + "driver": ["fOchSweeper"] + }, + "shuttle" :{ + "driver": ["fOchShuttle"], + "passenger": ["fOchShuttlePassenger"] + }, + "taxi" :null, + "bus" :null, + "charter" :{ + "driver": ["ochM1"], + "passenger": ["ochM1"] + } } } \ No newline at end of file diff --git a/app/script/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle index 83539d1a0f..87c0a86212 100644 --- a/app/script/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -9,22 +9,32 @@ def config = jsonSlurper.parse(file) project.android.variantFilter { variant -> def names = variant.flavors*.name //要检查特定的构建类型，请使用variant.buildType.name ==“ ” +// println "------$names" def projectContain = true - config.each { project,value -> - if(names.contains(project)){ + config.each { projectKey,projectValue -> + if(names.contains(projectKey)){ projectContain = false def productContain = true - value.each{product,vehicles-> - if(names.contains(product)){ + projectValue.each{productKey,productValue-> + if(names.contains(productKey)){ productContain =false - def vehicleContain = true - vehicles.each{vehicle-> - if (names.contains(vehicle)) { - println "need $names" - vehicleContain = false + def roleContain = true + productValue.each{roleKey,roleValue-> + if(names.contains(roleKey)){ + roleContain =false + def vehicleContain = true + roleValue.each{vehicleValue-> + if (names.contains(vehicleValue)) { + println "need $names" + vehicleContain = false + } + } + if(vehicleContain){ + setIgnore(true) + } } } - if(vehicleContain){ + if(roleContain){ setIgnore(true) } } diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 242f2b6437..91ea6b8756 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -42,13 +42,13 @@ project.dependencies { // 包车 - ochDriverM1Implementation (project(':OCH:mogo-och-charter')) - ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) +// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) +// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) // taxi司机端 - fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) // taxi乘客端 - fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) +// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 4be88716bf..81167792a5 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -1,9 +1,15 @@ project.android.productFlavors { bus { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Bus", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Bus\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" } -} \ No newline at end of file +} + diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 5c4afa79cc..8bbfe7d575 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -1,10 +1,36 @@ +apply from: "./script/utils.gradle" + project.android.productFlavors { // 包车业务 charter{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Charter", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Charter\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" + + if(isDriver()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) + } + } + if(isPassenger()){ + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' + if(isCurrentFlavors("charter")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/productFlavors/noop.gradle b/app/script/productFlavors/noop.gradle index 7ad6550b65..d783019507 100644 --- a/app/script/productFlavors/noop.gradle +++ b/app/script/productFlavors/noop.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 空业务 主要是给鹰眼使用 noop { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Noop", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"FPad\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.104\"" diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 5ca041b516..f71bd4001d 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 接驳车业务 shuttle{ dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Shuttle", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/sweeper.gradle b/app/script/productFlavors/sweeper.gradle index 614e731b57..c22cc7fc81 100644 --- a/app/script/productFlavors/sweeper.gradle +++ b/app/script/productFlavors/sweeper.gradle @@ -2,6 +2,11 @@ project.android.productFlavors { // 清扫车业务 sweeper { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Sweeper", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Sweeper\"" // 连接的工控机IP地址 diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 065523cc61..e28d43a682 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -2,9 +2,32 @@ project.android.productFlavors { // 出租车业务 taxi { dimension "product" + + manifestPlaceholders = [ + CHANNEL_VALUE_HEAD : "Taxi", + ] + buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\"" + + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' + // 是否需要重写状态栏 + buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' + + + + if(isDriver()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + } + } + if(isPassenger()){ + if(isCurrentFlavors("taxi")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + } + } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driver.gradle b/app/script/roleFlavors/driver.gradle index 277f53f53f..575ed25af7 100644 --- a/app/script/roleFlavors/driver.gradle +++ b/app/script/roleFlavors/driver.gradle @@ -1,6 +1,34 @@ project.android.productFlavors { driver { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Driver", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/roleFlavors/passenger.gradle b/app/script/roleFlavors/passenger.gradle index 37e4581034..d44c0c5c28 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,7 +1,33 @@ project.android.productFlavors { // 包车业务 - passenger{ + passenger { dimension "role" + externalNativeBuild { + ndk { + // 设置支持的SO库架构 + abiFilters "armeabi-v7a", "arm64-v8a" + } + } + + manifestPlaceholders = [ + CHANNEL_VALUE_BODY : "Passenger", + ] + + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo + versionCode rootProject.versionCode as int + versionName rootProject.versionName + // 应用包名 + applicationId rootProject.ext.android.fLauncherApplicationId + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' + // GPS数据提供源： 0-Android系统，1-工控机，2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" + + // 构建的是否是演示（美化）模式 + buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' } } \ No newline at end of file diff --git a/app/script/utils.gradle b/app/script/utils.gradle new file mode 100644 index 0000000000..0f337cc3ff --- /dev/null +++ b/app/script/utils.gradle @@ -0,0 +1,35 @@ +boolean isDriver() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Driver") | s.contains("driver")) { + return true + } + } + return false +} + +boolean isPassenger() { + for (String s : gradle.startParameter.taskNames) { + if (s.contains("Passenger") | s.contains("passenger")) { + return true + } + } + return false +} + +boolean isCurrentFlavors(String flavors){ + for (String s : gradle.startParameter.taskNames) { + + def lowerCase = flavors.toLowerCase() + if (s.toLowerCase().contains(lowerCase)) { + return true + } + } + return false +} + +ext { + isPassenger = this.&isPassenger + isDriver = this.&isDriver + isCurrentFlavors = this.&isCurrentFlavors + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle index 43c7d267e6..f8a5c5c064 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle @@ -1,43 +1,20 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchBus { - 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的m1对应 matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fMultiDisplayOchBus", + CHANNEL_VALUE_TAIL : "JLKV", ACTIVITY_ROOT : true, SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Bus_Driver_JLKV\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle index cea46ef0a3..70724d6074 100644 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle @@ -1,50 +1,27 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplayOchTaxi { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplayOchTaxi", + CHANNEL_VALUE_TAIL : "DFHQ", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Taxi_Driver_DFHQ\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle index e583e4a173..1cdc26af8e 100644 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle @@ -1,45 +1,21 @@ project.android.productFlavors { // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 fMultiDisplaySweeper { - 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" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fMultiDisplaySweeper", + CHANNEL_VALUE_TAIL : "FT", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Taxi_Driver_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchBus.gradle b/app/script/vehicleFlavors/fOchBus.gradle index ae90dde64a..e8886f42eb 100644 --- a/app/script/vehicleFlavors/fOchBus.gradle +++ b/app/script/vehicleFlavors/fOchBus.gradle @@ -1,44 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchBus { - 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" matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBus", + CHANNEL_VALUE_TAIL : "JL", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Bus_Driver_JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchBusPassenger.gradle b/app/script/vehicleFlavors/fOchBusPassenger.gradle index b7ca01c603..89c0ac0559 100644 --- a/app/script/vehicleFlavors/fOchBusPassenger.gradle +++ b/app/script/vehicleFlavors/fOchBusPassenger.gradle @@ -1,39 +1,21 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchBusPassenger { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的jinlvvan对应 matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE: "fOchBusPassenger", + CHANNEL_VALUE_TAIL : "JL", ACTIVITY_ROOT:true, SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Bus_Passenger_JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttle.gradle b/app/script/vehicleFlavors/fOchShuttle.gradle index 4d529374d3..39e37ccbd0 100644 --- a/app/script/vehicleFlavors/fOchShuttle.gradle +++ b/app/script/vehicleFlavors/fOchShuttle.gradle @@ -1,44 +1,20 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchShuttle { - 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 : "fOchShuttle", ACTIVITY_ROOT: true, + CHANNEL_VALUE_TAIL : "JL", + 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_JL\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' diff --git a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle index 8465694bb4..db2eba2f1e 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassenger.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassenger.gradle @@ -1,43 +1,22 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchShuttlePassenger { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId + dimension "vehicle" matchingFallbacks = ['jinlvvan'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE : "fOchShuttlePassenger", + CHANNEL_VALUE_TAIL: "JL", ACTIVITY_ROOT : true, // Activity的朝向 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_Passenger_JL\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JL\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle index 980f739d7b..840e3b2050 100644 --- a/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle +++ b/app/script/vehicleFlavors/fOchShuttlePassengerM2.gradle @@ -1,39 +1,21 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车-乘客端 fOchShuttlePassengerM2 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" // 和 och/mogo-och-bus-passenger 的flavors的m2对应 matchingFallbacks = ['m2'] - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + //高德地图鉴权信息 manifestPlaceholders = [ - AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, - CHANNEL_VALUE: "fOchBusPassenger", + CHANNEL_VALUE_TAIL : "M2", ACTIVITY_ROOT:true, SCREEN_ORIENTATION: "portrait" ] - // 是否需要实时上报坐标 - 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', "\"Bus_Passenger_M2\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M2\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' diff --git a/app/script/vehicleFlavors/fOchSweeper.gradle b/app/script/vehicleFlavors/fOchSweeper.gradle index 489de575e9..3c377ae261 100644 --- a/app/script/vehicleFlavors/fOchSweeper.gradle +++ b/app/script/vehicleFlavors/fOchSweeper.gradle @@ -1,50 +1,26 @@ project.android.productFlavors { // 衡阳-联想Pad-网约车-小巴车 fOchSweeper { - 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" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchSweeper", + CHANNEL_VALUE_TAIL: "FT", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"Sweeper_Driver_FT\"" - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" + // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' diff --git a/app/script/vehicleFlavors/fOchTaxi.gradle b/app/script/vehicleFlavors/fOchTaxi.gradle deleted file mode 100644 index 516d1de504..0000000000 --- a/app/script/vehicleFlavors/fOchTaxi.gradle +++ /dev/null @@ -1,56 +0,0 @@ -project.android.productFlavors { - - // 衡阳-联想Pad-网约车-出租车 - fOchTaxi { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxi", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - 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', "\"Taxi_Driver_DFHQ\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle b/app/script/vehicleFlavors/fOchTaxiPassenger.gradle deleted file mode 100644 index fdfe6b8a44..0000000000 --- a/app/script/vehicleFlavors/fOchTaxiPassenger.gradle +++ /dev/null @@ -1,55 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-出租车-乘客端 - fOchTaxiPassenger { - 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" - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchTaxiPassenger", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : false, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - 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', "\"Taxi_Passenger_DFHQ\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //Taxi不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fPadLenovo.gradle b/app/script/vehicleFlavors/fPadLenovo.gradle index 35ca4212cf..3a1ad7c8ed 100644 --- a/app/script/vehicleFlavors/fPadLenovo.gradle +++ b/app/script/vehicleFlavors/fPadLenovo.gradle @@ -1,42 +1,24 @@ project.android.productFlavors { // 衡阳-联想Pad fPadLenovo { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId dimension "vehicle" - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + // 配置AndroidManifest.xml中用到的参数 manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, // BUGLY_APP_CHANNEL CHANNEL_VALUE : "fPadLenovo", + CHANNEL_VALUE_TAIL: "Noop", // 在启动的时候把Task给清空 ACTIVITY_ROOT : true, // Activity的朝向 SCREEN_ORIENTATION: "landscape" ] - // 是否需要实时上报坐标 - 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', "\"FPad_Noop_Base\"" + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"Noop\"" + - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' // 构建的是否要动态更换模型 buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' // 是否需要重写状态栏 diff --git a/app/script/vehicleFlavors/ochDFHQ.gradle b/app/script/vehicleFlavors/ochDFHQ.gradle new file mode 100644 index 0000000000..45cf58cca2 --- /dev/null +++ b/app/script/vehicleFlavors/ochDFHQ.gradle @@ -0,0 +1,38 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + + // 衡阳-联想Pad-网约车-出租车 + ochDFHQ { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE_TAIL: "DFHQ", + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" + + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + //Taxi不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' + + + if(isDriver()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",true) + } + if(isPassenger()){ + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT",false) + } + } + +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochDriverM1.gradle b/app/script/vehicleFlavors/ochDriverM1.gradle deleted file mode 100644 index c74762f57d..0000000000 --- a/app/script/vehicleFlavors/ochDriverM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车 - ochDriverM1 { - 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" - matchingFallbacks = ['driverm1'] - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBus", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - 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', "\"Charter_Driver_M1\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M1不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochM1.gradle b/app/script/vehicleFlavors/ochM1.gradle new file mode 100644 index 0000000000..b443d65735 --- /dev/null +++ b/app/script/vehicleFlavors/ochM1.gradle @@ -0,0 +1,35 @@ +apply from: "./script/utils.gradle" + +project.android.productFlavors { + // 衡阳-联想Pad-网约车-小巴车 + ochM1 { + dimension "vehicle" + + // 配置AndroidManifest.xml中用到的参数 + manifestPlaceholders = [ + // BUGLY_APP_CHANNEL + CHANNEL_VALUE : "Charter_Driver_M1", + CHANNEL_VALUE_TAIL: "M1", + // 在启动的时候把Task给清空 + ACTIVITY_ROOT : true, + // Activity的朝向 + SCREEN_ORIENTATION: "landscape" + ] + + // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 + buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"M1\"" + //M1不能启动自驾的档位 + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' + + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' + + if(isDriver()){ + matchingFallbacks = ['driverm1'] + } + if(isPassenger()){ + matchingFallbacks = ['m1'] + } + + } +} \ No newline at end of file diff --git a/app/script/vehicleFlavors/ochPassengerM1.gradle b/app/script/vehicleFlavors/ochPassengerM1.gradle deleted file mode 100644 index 7d7873aeaa..0000000000 --- a/app/script/vehicleFlavors/ochPassengerM1.gradle +++ /dev/null @@ -1,54 +0,0 @@ -project.android.productFlavors { - // 衡阳-联想Pad-网约车-小巴车-乘客端 - ochPassengerM1 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" - } - } - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - // 应用包名 - applicationId rootProject.ext.android.fLauncherApplicationId - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的m1对应 - matchingFallbacks = ['m1'] - - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // 高德地图鉴权信息 - AMAP_API_VALUE : rootProject.ext.android.fLauncherAmapApiValue, - // BUGLY_APP_CHANNEL - CHANNEL_VALUE : "fOchBusPassenger", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 是否需要实时上报坐标 - 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', "\"Charter_Passenger_M1\"" - - // 构建的是否是演示（美化）模式 - buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - - //M1不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93042f91d2..c147f4e189 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ + android:value="${CHANNEL_VALUE_HEAD}_${CHANNEL_VALUE_BODY}_${CHANNEL_VALUE_TAIL}" />