From 46bdb9d2008d0d0501a8b5729e4e426cbcfae6a3 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Tue, 25 Jan 2022 16:33:27 +0800 Subject: [PATCH] =?UTF-8?q?[Upload]=20=E5=A2=9E=E5=8A=A0=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 14 ++---- app/functions/och.gradle | 49 +++++++------------ app/functions/tts.gradle | 25 ---------- ...radle => fPadLenovoOchBusPassenger.gradle} | 13 +++-- ...adle => fPadLenovoOchTaxiPassenger.gradle} | 14 +++--- app/regroup.gradle | 2 +- modules.txt | 3 -- settings.gradle | 3 -- 8 files changed, 36 insertions(+), 87 deletions(-) delete mode 100644 app/functions/tts.gradle rename app/productFlavors/{f80x.gradle => fPadLenovoOchBusPassenger.gradle} (79%) rename app/productFlavors/{f8Amap.gradle => fPadLenovoOchTaxiPassenger.gradle} (77%) diff --git a/app/build.gradle b/app/build.gradle index c1354c58fc..d7792288a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -162,9 +162,6 @@ android { main { manifest.srcFile 'src/main/AndroidManifest.xml' } - f8xxLauncherOnlineRelease { - manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' - } } flavorDimensions "product", "basic", "env" @@ -199,14 +196,11 @@ android { } // 配置不同渠道参数，直接影响功能完整度 - apply from: "./productFlavors/f8Amap.gradle" - apply from: "./productFlavors/f8xx.gradle" - apply from: "./productFlavors/f80x.gradle" - apply from: "./productFlavors/fochbus.gradle" - apply from: "./productFlavors/fochtaxi.gradle" apply from: "./productFlavors/fPadLenovo.gradle" apply from: "./productFlavors/fPadLenovoOchBus.gradle" apply from: "./productFlavors/fPadLenovoOchTaxi.gradle" + apply from: "./productFlavors/fPadLenovoOchBusPassenger.gradle" + apply from: "./productFlavors/fPadLenovoOchTaxiPassenger.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' @@ -228,7 +222,6 @@ aspectjx { } - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) //Crash日志收集 @@ -245,11 +238,12 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_function_main + implementation rootProject.ext.dependencies.ttspad } else { implementation project(':core:function-impl:mogo-core-function-main') + implementation project(':tts:tts-pad') } - apply from: "./functions/tts.gradle" apply from: "./functions/och.gradle" androidTestImplementation rootProject.ext.dependencies.androidx_test_core diff --git a/app/functions/och.gradle b/app/functions/och.gradle index ad51544f40..bb149aee40 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -1,33 +1,14 @@ // 网约车服务：仅小巴车、出租车渠道用 project.dependencies { - 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 @@ -35,20 +16,26 @@ 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){ + // 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 } - fPadLenovoOchBusImplementation (rootProject.ext.dependencies.mogoochbus){ + + // 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 + } + + // 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 diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle deleted file mode 100644 index 682094cdc0..0000000000 --- a/app/functions/tts.gradle +++ /dev/null @@ -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') - } -} \ No newline at end of file diff --git a/app/productFlavors/f80x.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle similarity index 79% rename from app/productFlavors/f80x.gradle rename to app/productFlavors/fPadLenovoOchBusPassenger.gradle index 2339f69ab2..de7c8175a8 100644 --- a/app/productFlavors/f80x.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -1,21 +1,21 @@ project.android.productFlavors { - // f系列-分体机 - f80x { + // 衡阳-联想Pad-网约车-小巴车-乘客端 + fPadLenovoOchBusPassenger { externalNativeBuild { ndk { // 设置支持的SO库架构 abiFilters "arm64-v8a" } } - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f80x"] + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchBusPassenger"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否基于地图 @@ -27,5 +27,4 @@ project.android.productFlavors { // GPS数据提供源： 0-Android系统，1-工控机，2-OBU buildConfigField 'int', 'GPS_PROVIDER', "1" } - } \ No newline at end of file diff --git a/app/productFlavors/f8Amap.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle similarity index 77% rename from app/productFlavors/f8Amap.gradle rename to app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 16ace86c59..eab5a045c3 100644 --- a/app/productFlavors/f8Amap.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -1,21 +1,21 @@ project.android.productFlavors { - // f系列-分体机-高德 - f8Amap { + // 衡阳-联想Pad-网约车-出租车-乘客端 + fPadLenovoOchTaxiPassenger { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a" + abiFilters "arm64-v8a" } } - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "f8Amap"] + buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fPadLenovoOchTaxiPassenger"] // 是否使用高德sdk自定义导航 buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否基于地图 diff --git a/app/regroup.gradle b/app/regroup.gradle index 8d6313ec6e..6b249c3b08 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -1,7 +1,7 @@ // 将 install 和 assemble 任务按功能分组 afterEvaluate { - def launcher = ["f80x", "f8xx", "f8amap", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"] + def launcher = [ "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus", "fPadLenovoOchBusPassenger", "fPadLenovoOchTaxiPassenger"] it.getTasks().iterator().forEachRemaining { def task = it diff --git a/modules.txt b/modules.txt index 3f98621a61..7cf07efb7b 100644 --- a/modules.txt +++ b/modules.txt @@ -6,14 +6,11 @@ :core:mogo-core-function-call :foudations:mogo-utils :tts:tts-base -:tts:tts-zhi :tts:tts-pad :libraries:mogo-map-api :services:mogo-service-api :foudations:mogo-aicloud-services-sdk :foudations:mogo-commons -:tts:tts-di -:tts:tts-noop :libraries:map-custom :libraries:mogo-map :modules:mogo-module-carchattingprovider diff --git a/settings.gradle b/settings.gradle index c4f9840172..f9a3493e4d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -67,10 +67,7 @@ include ':modules:mogo-module-chat' // 语音 include ':tts:tts-base' -include ':tts:tts-di' -include ':tts:tts-zhi' include ':tts:tts-pad' -include ':tts:tts-noop' // 测试DEBUG include ':test:crashreport'