yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gradle]

Browse Source 
[多屏修改]
This commit is contained in:
yangyakun
2023-04-18 14:14:21 +08:00
parent f50e31c9ef
commit 2df00c16ad
15 changed files with 113 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OCH/mogo-och-shuttle-passenger/build.gradle
View File

@@ -52,11 +52,6 @@ android {
dimension "vehicle"
buildConfigField 'int', 'NEW_TEST', '0'
}
// 车型：金旅m1 小巴业务
m1 {
dimension "vehicle"
buildConfigField 'int', 'NEW_TEST', '1'
}
// 车型：金旅m1 小巴业务
m2 {

4
app/build.gradle
View File

@@ -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 {

13
app/script/flavorfilter/flavors.json
View File

@@ -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,

78
app/script/functions/och.gradle
View File

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

20
app/script/productFlavors/bus.gradle
View File

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

12
app/script/productFlavors/charter.gradle
View File

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

24
app/script/productFlavors/shuttle.gradle
View File

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

23
app/script/productFlavors/taxi.gradle
View File

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

36
app/script/roleFlavors/driverpassenger.gradle Normal file
View File

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

3
app/script/roleFlavors/passenger.gradle
View File

@@ -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\""

16
app/script/utils.gradle
View File

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

30
app/script/vehicleFlavors/fMultiDisplayOchBus.gradle
View File

@@ -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<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
}
}

32
app/script/vehicleFlavors/fMultiDisplayOchTaxi.gradle
View File

@@ -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<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
}
}

29
app/script/vehicleFlavors/fMultiDisplaySweeper.gradle
View File

@@ -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<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null'
}
}

2
config.gradle
View File

@@ -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",
]
}