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

[shuttle]

Browse Source 
[分离shuttle]
This commit is contained in:
yangyakun
2023-03-23 11:37:05 +08:00
parent c7c3782120
commit 2b2ec07a57
379 changed files with 16696 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/README.md
View File

@@ -47,6 +47,6 @@
| 东风、红旗 | fOchTaxi.gradle、fOchTaxiPassenger.gradle | P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| 金旅小巴 | fOchBus.gradle、fOchBusPassenger.gradle、fOchShuttle.gradle、fOchShuttlePassenger.gradle | N、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| M1 | fOchBusPassengerM1.gradle | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |
| M2 | fOchBusPassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| M2 | fOchShuttlePassengerM2.gradle | N、P、R | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet<chassis.Chassis.GearPosition>(){{add(chassis.Chassis.GearPosition.GEAR_N);add(chassis.Chassis.GearPosition.GEAR_P);add(chassis.Chassis.GearPosition.GEAR_R);}}' |
| 清扫车 | fOchSweeper.gradle | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |
| 开沃 | 暂无 | 不限制档位 | buildConfigField 'java.util.Set<chassis.Chassis.GearPosition>', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' |

2
app/build.gradle
View File

@@ -285,7 +285,7 @@ android {
apply from: "./productFlavors/fOchShuttle.gradle"
apply from: "./productFlavors/fOchTaxi.gradle"
apply from: "./productFlavors/fOchBusPassenger.gradle"
apply from: "./productFlavors/fOchBusPassengerM2.gradle"
apply from: "./productFlavors/fOchShuttlePassengerM2.gradle"
apply from: "./productFlavors/fOchShuttlePassenger.gradle"
apply from: "./productFlavors/fOchTaxiPassenger.gradle"
apply from: "./productFlavors/fOchSweeper.gradle"

9
app/functions/och.gradle
View File

@@ -10,7 +10,7 @@ project.dependencies {
// Bus乘客端
fOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus)
fOchBusPassengerM1Implementation(rootProject.ext.dependencies.mogoochbus)
fOchBusPassengerM2Implementation(rootProject.ext.dependencies.mogoochbus)
fOchShuttlePassengerM2Implementation(rootProject.ext.dependencies.mogoochbus)
// taxi司机端
fOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
@@ -39,7 +39,7 @@ project.dependencies {
fOchBusImplementation (project(':OCH:mogo-och-bus'))
// Bus乘客端
fOchBusPassengerImplementation (project(':OCH:mogo-och-bus-passenger'))
fOchBusPassengerM2Implementation (project(':OCH:mogo-och-bus-passenger'))
// 包车
ochDriverM1Implementation (project(':OCH:mogo-och-charter'))
@@ -57,8 +57,9 @@ project.dependencies {
// 多屏幕-taxi司机端
//接驳车司乘端
fOchShuttleImplementation (project(':OCH:mogo-och-bus'))
fOchShuttlePassengerImplementation (project(':OCH:mogo-och-bus-passenger'))
fOchShuttleImplementation (project(':OCH:mogo-och-shuttle'))
fOchShuttlePassengerImplementation (project(':OCH:mogo-och-shuttle-passenger'))
fOchShuttlePassengerM2Implementation (project(':OCH:mogo-och-shuttle-passenger'))
// taxi司机端
fMultiDisplayOchTaxiImplementation (project(':OCH:mogo-och-taxi'))

2
app/productFlavors/fOchBusPassengerM2.gradle → app/productFlavors/fOchShuttlePassengerM2.gradle
View File

@@ -1,6 +1,6 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车-乘客端
fOchBusPassengerM2 {
fOchShuttlePassengerM2 {
externalNativeBuild {
ndk {
// 设置支持的SO库架构

4
app/productFlavors/flavorsFilterConfig.gradle
View File

@@ -20,6 +20,7 @@ project.android.variantFilter { variant ->
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchShuttle")) {
} else if (names.contains("fOchShuttlePassenger")) {
} else if (names.contains("fOchShuttlePassengerM2")) {
} else {
setIgnore(true)
}
@@ -43,7 +44,6 @@ project.android.variantFilter { variant ->
if (names.contains("fOchBus")) {
} else if (names.contains("fOchBusPassenger")) {
} else if (names.contains("fMultiDisplayOchBus")) {
} else if (names.contains("fOchBusPassengerM2")) {
} else {
setIgnore(true)
}
@@ -84,6 +84,7 @@ project.android.variantFilter { variant ->
//Gradle会忽略满足上述条件的所有变体
if (names.contains("fOchShuttle")) {
} else if (names.contains("fOchShuttlePassenger")) {
} else if (names.contains("fOchShuttlePassengerM2")) {
} else {
setIgnore(true)
}
@@ -95,7 +96,6 @@ project.android.variantFilter { variant ->
if (names.contains("fOchBus")) {
} else if (names.contains("fOchBusPassenger")) {
} else if (names.contains("fMultiDisplayOchBus")) {
} else if (names.contains("fOchBusPassengerM2")) {
} else {
setIgnore(true)
}

2
app/regroup.gradle
View File

@@ -8,7 +8,7 @@ afterEvaluate {
"fOchBus",
"fOchBusPassenger",
"fOchBusPassengerM1",
"fOchBusPassengerM2",
"fOchShuttlePassengerM2",
"fOchShuttle",
"fOchShuttlePassenger",
"fOchTaxiPassenger",