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

Merge branch 'dev_minibus-d_230425_3.2.0' into merge320tomaster

Browse Source
This commit is contained in:
yangyakun
2023-06-12 16:45:02 +08:00
parent 8d87ad160c af033bd736
commit 566f493203
1091 changed files with 23936 additions and 15523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,5 +50,16 @@
"driver": ["ochM1"],
"passenger": ["ochM1"]
}
},
"saas": {
"shuttle" :{
"driver": ["ochJL","ochM2"],
"passenger": ["ochJL","ochM2"]
},
"bus" :{
"driver": ["ochJL"],
"driverpassenger": ["ochJL"],
"passenger": ["ochJL"]
}
}
}
}

2
app/script/flavorfilter/flavorsFilterConfig.gradle
View File

@@ -25,7 +25,7 @@ project.android.variantFilter { variant ->
def vehicleContain = true
roleValue.each{vehicleValue->
if (names.contains(vehicleValue)) {
println "need $names"
//println "need $names"
vehicleContain = false
}
}

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

@@ -1,3 +1,4 @@
apply from: "./script/utils.gradle"
// 网约车服务：仅小巴车、出租车渠道用
project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
@@ -14,7 +15,46 @@ project.dependencies {
// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
} else {
fPadLenovoImplementation (project(':OCH:mogo-och-noop'))
if (isCurrentDriver("noop")) {
noopImplementation(project(':OCH:mogo-och-noop'))
} else if (isCurrentDriver("bus")) {
implementation project.project(':OCH:mogo-och-bus')
} else if (isCurrentPassenger("bus")) {
implementation project.project(':OCH:mogo-och-bus-passenger')
} else if (isCurrentDriver("charter")) {
implementation project.project(':OCH:mogo-och-charter')
} else if (isCurrentPassenger("charter")) {
implementation project.project(':OCH:mogo-och-charter-passenger')
} else if (isCurrentDriver("shuttle")) {
implementation project(':OCH:mogo-och-shuttle')
} else if (isCurrentPassenger("shuttle")) {
implementation project.project(':OCH:mogo-och-shuttle-passenger')
} else if (isCurrentDriver("sweeperCloud")) {
implementation project.project(':OCH:sweeper:sweeper-cloud')
} else if (isCurrentDriver("sweeperOperate")) {
implementation project.project(':OCH:sweeper:sweeper')
} else if (isCurrentDriver("taxi")) {
implementation project.project(':OCH:mogo-och-taxi')
} else if (isCurrentPassenger("taxi")) {
implementation project.project(':OCH:mogo-och-taxi-passenger')
} else {
noopImplementation(project(':OCH:mogo-och-noop'))
implementation project.project(':OCH:mogo-och-bus')
implementation project.project(':OCH:mogo-och-bus-passenger')
implementation project.project(':OCH:mogo-och-charter')
implementation project.project(':OCH:mogo-och-charter-passenger')
implementation project.project(':OCH:mogo-och-shuttle')
implementation project.project(':OCH:mogo-och-shuttle-passenger')
implementation project.project(':OCH:sweeper:sweeper-cloud')
implementation project.project(':OCH:sweeper:sweeper')
implementation project.project(':OCH:mogo-och-taxi')
implementation project.project(':OCH:mogo-och-taxi-passenger')
}
if(isCurrentFlavors("sweeperCloud")){
project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper-cloud'))
}
// 多屏幕-Bus司机端
// fMultiDisplayOchBusImplementation (project(':OCH:mogo-och-bus'))

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

@@ -19,18 +19,16 @@ project.android.productFlavors {
// ②连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
if (isCurrentDriver("bus")) {
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
} else if (isCurrentPassenger("bus")) {
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
}
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
if(isCurrentDriver("bus")){
project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus'))
}
if(isCurrentPassenger("bus")){
project.dependencies.add('implementation', project.project(':OCH:mogo-och-bus-passenger'))
}
}
}

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

@@ -1,4 +1,4 @@
apply from: "./script/utils.gradle"
project.android.productFlavors {
// 包车业务
@@ -24,12 +24,11 @@ project.android.productFlavors {
if(isCurrentDriver("charter")){
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter'))
}
if(isCurrentPassenger("charter")){
}else if(isCurrentPassenger("charter")){
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
project.dependencies.add('implementation', project.project(':OCH:mogo-och-charter-passenger'))
}else {
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
}
}
}

5
app/script/productFlavors/noop.gradle
View File

@@ -23,10 +23,5 @@ project.android.productFlavors {
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
if(isCurrentDriver("noop")){
project.dependencies.add('implementation', project.project(':OCH:mogo-och-noop'))
}
}
}

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

@@ -23,26 +23,28 @@ project.android.productFlavors {
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle'))
manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape")
}
if (isCurrentPassenger("shuttle")) {
if(isM2()){
} else if (isCurrentPassenger("shuttle")) {
if (isM2()) {
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
manifestPlaceholders.put("SCREEN_ORIENTATION", "portrait")
}
if(isJL()){
if (isJL()) {
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape")
}
project.dependencies.add('implementation', project.project(':OCH:mogo-och-shuttle-passenger'))
} else {
// ③是否需要重写状态栏
buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape")
}
}
}

5
app/script/productFlavors/sweeperOperate.gradle
View File

@@ -23,10 +23,5 @@ project.android.productFlavors {
// ④构建 是否支持多屏异显异交互
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
if(isCurrentFlavors("sweeperOperate")){
project.dependencies.add('implementation', project.project(':OCH:sweeper:sweeper'))
}
}
}

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

@@ -21,14 +21,13 @@ project.android.productFlavors {
buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
if (isCurrentDriver("taxi")) {
project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi'))
// 在启动的时候把Task给清空
manifestPlaceholders.put("ACTIVITY_ROOT", true)
}
if (isCurrentPassenger("taxi")) {
project.dependencies.add('implementation', project.project(':OCH:mogo-och-taxi-passenger'))
}else if (isCurrentPassenger("taxi")) {
// 在启动的时候把Task给清空
manifestPlaceholders.put("ACTIVITY_ROOT", false)
}else {
manifestPlaceholders.put("ACTIVITY_ROOT", false)
}
}
}

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

@@ -25,9 +25,6 @@ project.android.productFlavors {
// ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// ③是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"

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

@@ -25,9 +25,6 @@ project.android.productFlavors {
// ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// ③是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"

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

@@ -24,8 +24,6 @@ project.android.productFlavors {
// ②车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
// ③是否需要实时上报坐标
buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
// ④GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"

1
app/script/vehicleFlavors/ochJL.gradle
View File

@@ -3,6 +3,7 @@ project.android.productFlavors {
ochJL {
dimension "vehicle"
matchingFallbacks = ['jinlvvan']
missingDimensionStrategy "vehicle", "jinlvvan", "m2", "jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [

9
app/script/vehicleFlavors/ochM1.gradle
View File

@@ -4,6 +4,8 @@ project.android.productFlavors {
// 金旅M1车
ochM1 {
dimension "vehicle"
matchingFallbacks = ['driverm1']
missingDimensionStrategy "vehicle", "driverm1","m2", "jinlvvan"
// 配置AndroidManifest.xml中用到的参数
manifestPlaceholders = [
@@ -19,12 +21,5 @@ project.android.productFlavors {
// ③不能启动自驾的档位
buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
if(isDriver()){
matchingFallbacks = ['driverm1']
}
if(isPassenger()){
matchingFallbacks = ['m1']
}
}
}

3
app/script/vehicleFlavors/ochM2.gradle
View File

@@ -4,8 +4,7 @@ project.android.productFlavors {
dimension "vehicle"
// 和 och/mogo-och-bus-passenger 的flavors的m2对应
matchingFallbacks = ['m2']
missingDimensionStrategy "vehicle", "m2", "jinlvvan", 'driverm1'
//高德地图鉴权信息
manifestPlaceholders = [
CHANNEL_VALUE_TAIL: "M2",