diff --git a/OCH/mogo-och-shuttle-passenger/build.gradle b/OCH/mogo-och-shuttle-passenger/build.gradle index 720eb01ca9..3bdddf460d 100644 --- a/OCH/mogo-och-shuttle-passenger/build.gradle +++ b/OCH/mogo-och-shuttle-passenger/build.gradle @@ -52,11 +52,6 @@ android { dimension "vehicle" buildConfigField 'int', 'NEW_TEST', '0' } - // 车型：金旅m1 小巴业务 - m1 { - dimension "vehicle" - buildConfigField 'int', 'NEW_TEST', '1' - } // 车型：金旅m1 小巴业务 m2 { diff --git a/app/build.gradle b/app/build.gradle index e2bebb3a97..881db2900c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -266,6 +266,7 @@ android { } apply from: "./script/roleFlavors/driver.gradle" apply from: "./script/roleFlavors/passenger.gradle" + apply from: "./script/roleFlavors/driverpassenger.gradle" apply from: "./script/productFlavors/bus.gradle" apply from: "./script/productFlavors/charter.gradle" @@ -280,11 +281,8 @@ android { apply from: "./script/vehicleFlavors/ochM2.gradle" apply from: "./script/vehicleFlavors/ochDFHQ.gradle" apply from: "./script/vehicleFlavors/ochFT.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchBus.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplayOchTaxi.gradle" //包车 apply from: "./script/vehicleFlavors/ochM1.gradle" - apply from: "./script/vehicleFlavors/fMultiDisplaySweeper.gradle" apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json index 341227aa67..6ee8b46ae4 100644 --- a/app/script/flavorfilter/flavors.json +++ b/app/script/flavorfilter/flavors.json @@ -11,11 +11,13 @@ "passenger": ["ochJL","ochM2"] }, "taxi" :{ - "driver": ["ochDFHQ","fMultiDisplayOchTaxi"], + "driver": ["ochDFHQ"], + "driverpassenger": ["ochDFHQ"], "passenger": ["ochDFHQ"] }, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -27,12 +29,13 @@ "noop" : null, "sweeper" :null, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, "bus" :{ - "driver": ["ochJL","fMultiDisplayOchBus"], + "driver": ["ochJL"], + "driverpassenger": ["ochJL"], "passenger": ["ochJL"] }, "charter" :{ @@ -46,7 +49,7 @@ "driver": ["ochFT"] }, "shuttle" :{ - "driver": ["ochJL"], + "driver": ["ochJL","ochM2"], "passenger": ["ochJL","ochM2"] }, "taxi" :null, diff --git a/app/script/functions/och.gradle b/app/script/functions/och.gradle index 2dac97319d..29d99eae0f 100644 --- a/app/script/functions/och.gradle +++ b/app/script/functions/och.gradle @@ -2,72 +2,32 @@ project.dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) - // sweeper清扫车 - fOchSweeperImplementation(rootProject.ext.dependencies.mogoochsweeper) // Bus司机端 - fOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) - fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus) - ochM2Implementation(rootProject.ext.dependencies.mogoochbus) +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// // Bus乘客端 +// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) +// // taxi乘客端 +// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi司机端 - fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) - - // Bus司机端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - // Bus乘客端 - fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus) - - //接驳车司乘端 - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - ochJLImplementation(rootProject.ext.dependencies.mogoochbus) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) - // taxi乘客端 - fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) } else { fPadLenovoImplementation (project(':OCH:mogo-och-noop')) - // sweeper 清扫车 -// fOchSweeperImplementation (project(':OCH:mogo-och-sweeper')) - - // Bus司机端 - //fOchBusImplementation (project(':OCH:mogo-och-bus')) - // Bus乘客端 - //fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger')) - - - // 包车 -// ochDriverM1Implementation (project(':OCH:mogo-och-charter')) -// ochPassengerM1Implementation (project(':OCH:mogo-och-charter-passenger')) - - // taxi司机端 -// fOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // taxi乘客端 -// fOchTaxiPassengerImplementation (project(':OCH:mogo-och-taxi-passenger')) // 多屏幕-Bus司机端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) - // 多屏幕-Bus乘客端 - fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) - - // 多屏幕-taxi司机端 - //接驳车司乘端 -// ochJLImplementation (project(':OCH:mogo-och-shuttle')) -// ochJLImplementation (project(':OCH:mogo-och-shuttle-passenger')) -// ochM2Implementation (project(':OCH:mogo-och-shuttle-passenger')) - - // taxi司机端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) - // 多屏幕-taxi乘客端 - fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) - - // 清扫车-多屏幕 - fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus')) +// // 多屏幕-Bus乘客端 +// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus-passenger')) +// +// // taxi司机端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi')) +// // 多屏幕-taxi乘客端 +// fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi-passenger')) +// +// // 清扫车-多屏幕 +// fMultiDisplaySweeperImplementation (project(':OCH:mogo-och-sweeper')) } } diff --git a/app/script/productFlavors/bus.gradle b/app/script/productFlavors/bus.gradle index 8aca69e63c..460df992a1 100644 --- a/app/script/productFlavors/bus.gradle +++ b/app/script/productFlavors/bus.gradle @@ -13,19 +13,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if(isCurrentDriver("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("bus")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if(isCurrentPassenger("bus")){ + project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } diff --git a/app/script/productFlavors/charter.gradle b/app/script/productFlavors/charter.gradle index 8bbfe7d575..3eb2eeddfb 100644 --- a/app/script/productFlavors/charter.gradle +++ b/app/script/productFlavors/charter.gradle @@ -14,23 +14,19 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ + if(isCurrentDriver("charter")){ // 构建的是否要动态更换模型 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')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter')) } - if(isPassenger()){ + if(isCurrentPassenger("charter")){ // 构建的是否要动态更换模型 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')) - } + project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger')) } } } \ No newline at end of file diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle index 36599728c1..f901388097 100644 --- a/app/script/productFlavors/shuttle.gradle +++ b/app/script/productFlavors/shuttle.gradle @@ -2,11 +2,11 @@ apply from: "./script/utils.gradle" project.android.productFlavors { // 接驳车业务 - shuttle{ + shuttle { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Shuttle", + CHANNEL_VALUE_HEAD: "Shuttle", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Shuttle\"" @@ -14,19 +14,15 @@ project.android.productFlavors { // 连接的工控机IP地址 buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\"" - if(isDriver()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' - } + if (isCurrentDriver("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' } - if(isPassenger()){ - if(isCurrentFlavors("shuttle")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - } + if (isCurrentPassenger("shuttle")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger')) + // 构建 是否支持多屏异显异交互 + buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' } } } \ No newline at end of file diff --git a/app/script/productFlavors/taxi.gradle b/app/script/productFlavors/taxi.gradle index 2359d31cf8..4133644d33 100644 --- a/app/script/productFlavors/taxi.gradle +++ b/app/script/productFlavors/taxi.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { dimension "product" manifestPlaceholders = [ - CHANNEL_VALUE_HEAD : "Taxi", + CHANNEL_VALUE_HEAD: "Taxi", ] buildConfigField 'String', 'APP_IDENTITY_MODE_HEAD', "\"Taxi\"" @@ -18,20 +18,15 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - if(isDriver()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",true) - } + if (isCurrentDriver("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", true) } - if(isPassenger()){ - if(isCurrentFlavors("taxi")){ - project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) - // 在启动的时候把Task给清空 - manifestPlaceholders.put("ACTIVITY_ROOT",false) - } + if (isCurrentPassenger("taxi")) { + project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger')) + // 在启动的时候把Task给清空 + manifestPlaceholders.put("ACTIVITY_ROOT", false) } } } \ No newline at end of file diff --git a/app/script/roleFlavors/driverpassenger.gradle b/app/script/roleFlavors/driverpassenger.gradle new file mode 100644 index 0000000000..93f70b51f4 --- /dev/null +++ b/app/script/roleFlavors/driverpassenger.gradle @@ -0,0 +1,36 @@ +project.android.productFlavors { + driverpassenger { + 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_MULTI_DISPLAY', 'true' + + // 构建的是否是演示（美化）模式 + 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 d44c0c5c28..79cc5f23f8 100644 --- a/app/script/roleFlavors/passenger.gradle +++ b/app/script/roleFlavors/passenger.gradle @@ -1,5 +1,4 @@ project.android.productFlavors { - // 包车业务 passenger { dimension "role" externalNativeBuild { @@ -19,6 +18,8 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId + + // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Passenger\"" diff --git a/app/script/utils.gradle b/app/script/utils.gradle index 0f337cc3ff..2e632e3134 100644 --- a/app/script/utils.gradle +++ b/app/script/utils.gradle @@ -1,3 +1,17 @@ +boolean isCurrentDriver(String flavors) { + if(isDriver() && isCurrentFlavors(flavors)){ + return true + } + return false +} + +boolean isCurrentPassenger(String flavors) { + if(isPassenger() && isCurrentFlavors(flavors)){ + return true + } + return false +} + boolean isDriver() { for (String s : gradle.startParameter.taskNames) { if (s.contains("Driver") | s.contains("driver")) { @@ -31,5 +45,7 @@ ext { isPassenger = this.&isPassenger isDriver = this.&isDriver isCurrentFlavors = this.&isCurrentFlavors + isCurrentDriver = this.&isCurrentDriver + isCurrentPassenger = this.&isCurrentPassenger } \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle b/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle deleted file mode 100644 index f8a5c5c064..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchBus.gradle +++ /dev/null @@ -1,30 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchBus { - dimension "vehicle" - // 和 och/mogo-och-bus-passenger 的flavors的m1对应 - matchingFallbacks = ['jinlvvan'] - - //高德地图鉴权信息 - manifestPlaceholders = [ - CHANNEL_VALUE_TAIL : "JLKV", - ACTIVITY_ROOT : true, - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"JLKV\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle b/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle deleted file mode 100644 index 70724d6074..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplayOchTaxi { - dimension "vehicle" - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "DFHQ", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"DFHQ\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - // 是否需要重写状态栏 - buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle b/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle deleted file mode 100644 index 1cdc26af8e..0000000000 --- a/app/script/vehicleFlavors/fMultiDisplaySweeper.gradle +++ /dev/null @@ -1,29 +0,0 @@ -project.android.productFlavors { - // 支持多个屏幕异显示的终端，即一个终端包含司机端、乘客端 - fMultiDisplaySweeper { - dimension "vehicle" - - // 配置AndroidManifest.xml中用到的参数 - manifestPlaceholders = [ - // BUGLY_APP_CHANNEL - CHANNEL_VALUE_TAIL : "FT", - // 在启动的时候把Task给清空 - ACTIVITY_ROOT : true, - // Activity的朝向 - SCREEN_ORIENTATION: "landscape" - ] - - // 构建的应用身份类型，具体查看 README.md APP_IDENTITY_MODE规则 - buildConfigField 'String', 'APP_IDENTITY_MODE_TAIL', "\"FT\"" - - // 构建的是否要动态更换模型 - buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true' - - // 构建 是否支持多屏异显异交互 - buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true' - - //不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' - } - -} \ No newline at end of file diff --git a/config.gradle b/config.gradle index c2c71ebf9c..3bc6477fa7 100644 --- a/config.gradle +++ b/config.gradle @@ -228,8 +228,6 @@ ext { buildToolsVersion : "29.0.2", minSdkVersion : 23, targetSdkVersion : 27, - minSdkVersionPadLenovo : 23, - targetSdkVersionPadLenovo : 27, koomxhook : "com.kuaishou.koom:xhook-static:2.2.0", ] }