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

Merge branch 'dev_robotaxi-d-app-module_251_220125_2.5.1' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_251_220125_2.5.1

Browse Source 
# Conflicts:
#	app/functions/och.gradle
This commit is contained in:
wangmingjun
2022-01-25 16:47:17 +08:00
parent 8a33a15cd6 46bdb9d200
commit e015ab91a1
8 changed files with 73 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
app/functions/och.gradle
View File

@@ -1,34 +1,15 @@
// 网约车服务：仅小巴车、出租车渠道用
project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
f8xxImplementation (rootProject.ext.dependencies.mogoochnoop){
fPadLenovoImplementation(rootProject.ext.dependencies.mogoochnoop) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
f80xImplementation (rootProject.ext.dependencies.mogoochnoop){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
f8AmapImplementation (rootProject.ext.dependencies.mogoochnoop){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fochtaxiImplementation (rootProject.ext.dependencies.mogoochtaxi){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fochbusImplementation (rootProject.ext.dependencies.mogoochbus){
// Bus司机端
fPadLenovoOchBusImplementation(rootProject.ext.dependencies.mogoochbus) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
@@ -36,55 +17,8 @@ project.dependencies {
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoImplementation (rootProject.ext.dependencies.mogoochnoop){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoOchTaxiImplementation (rootProject.ext.dependencies.mogoochtaxi){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoOchBusImplementation (rootProject.ext.dependencies.mogoochbus){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
}else {
f8xxImplementation (project(':OCH:mogo-och-noop')){
exclude group: 'com.mogo.commons'//by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
f80xImplementation (project(':OCH:mogo-och-noop')){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
f8AmapImplementation (project(':OCH:mogo-och-noop')){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fochtaxiImplementation (project(':OCH:mogo-och-taxi')){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fochbusImplementation (project(':OCH:mogo-och-bus')){
// Bus乘客端
fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
@@ -92,20 +26,60 @@ project.dependencies {
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoImplementation (project(':OCH:mogo-och-noop')){
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi')){
// taxi司机端
fPadLenovoOchTaxiImplementation(rootProject.ext.dependencies.mogoochtaxi) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus')){
// taxi乘客端
fPadLenovoOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
} else {
fPadLenovoImplementation (project(':OCH:mogo-och-noop')) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
// Bus司机端
fPadLenovoOchBusImplementation (project(':OCH:mogo-och-bus')) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
// Bus乘客端
fPadLenovoOchBusPassengerImplementation(rootProject.ext.dependencies.mogoochbus) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
// taxi司机端
fPadLenovoOchTaxiImplementation (project(':OCH:mogo-och-taxi')) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
exclude group: 'com.mogo.eagle.core' //by group
exclude group: 'com.mogo.eagle.core.function' //by group
}
// taxi乘客端
fPadLenovoOchTaxiPassengerImplementation(rootProject.ext.dependencies.mogoochtaxi) {
exclude group: 'com.mogo.commons' //by group
exclude group: 'com.mogo.module' //by group
exclude group: 'com.mogo.map' //by group
@@ -114,4 +88,4 @@ project.dependencies {
}
}
}
}

25
app/functions/tts.gradle
View File

@@ -1,25 +0,0 @@
project.dependencies {
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
f8xxImplementation rootProject.ext.dependencies.ttszhi
f80xImplementation rootProject.ext.dependencies.ttszhi
f8AmapImplementation rootProject.ext.dependencies.ttszhi
fochtaxiImplementation rootProject.ext.dependencies.ttszhi
fochbusImplementation rootProject.ext.dependencies.ttszhi
fPadLenovoImplementation rootProject.ext.dependencies.ttspad
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.ttspad
fPadLenovoOchBusImplementation rootProject.ext.dependencies.ttspad
} else {
f8xxImplementation project(':tts:tts-zhi')
f80xImplementation project(':tts:tts-zhi')
f8AmapImplementation project(':tts:tts-zhi')
fochtaxiImplementation project(':tts:tts-zhi')
fochbusImplementation project(':tts:tts-zhi')
fPadLenovoImplementation project(':tts:tts-pad')
fPadLenovoOchTaxiImplementation project(':tts:tts-pad')
fPadLenovoOchBusImplementation project(':tts:tts-pad')
}
}