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

Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master

Browse Source 
# Conflicts:
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
#	OCH/sweeper/sweeper/build.gradle
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
#	app/script/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
This commit is contained in:
yangyakun
2023-12-04 11:01:17 +08:00
parent 0dd41f3227 2bf65101ce
commit cce998c410
1322 changed files with 15039 additions and 15346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,8 @@ apply from: "./script/utils.gradle"
// 网约车服务：仅小巴车、出租车渠道用
project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
// fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop)
// Bus司机端
// fMultiDisplayOchBusImplementation(rootProject.ext.dependencies.mogoochbus)
// // Bus乘客端
@@ -12,10 +13,10 @@ project.dependencies {
// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
// // taxi乘客端
// fMultiDisplayOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi)
} else {
if (isCurrentDriver("noop")) {
noopImplementation(project(':OCH:mogo-och-noop'))
} else if (isCurrentDriver("bus")) {
if (isCurrentDriver("bus")) {
implementation project.project(':OCH:bus:driver')
} else if (isCurrentPassenger("bus")) {
implementation project.project(':OCH:bus:passenger')
@@ -40,7 +41,6 @@ project.dependencies {
} else if (isCurrentPassenger("taxi")) {
implementation project.project(':OCH:taxi:passenger')
} else {
noopImplementation(project(':OCH:mogo-och-noop'))
implementation project.project(':OCH:bus:driver')
implementation project.project(':OCH:bus:passenger')
implementation project.project(':OCH:charter:driver')