From 4cc553f277beaf49585ee62f9c913ef1e7d6cc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 2 Jul 2021 20:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BD=8E=E7=AB=AF=E6=9C=BA?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 254 --------------------------- app/functions/abiFilters.gradle | 72 -------- app/functions/aicloudservices.gradle | 23 +-- app/functions/basedmap.gradle | 29 +-- app/functions/baseservices.gradle | 22 +-- app/functions/bizguide.gradle | 18 +- app/functions/leftpanel.gradle | 30 +--- app/functions/och.gradle | 26 +-- app/functions/skin.gradle | 86 ++++----- app/functions/tts.gradle | 30 ++-- app/regroup.gradle | 12 +- 11 files changed, 91 insertions(+), 511 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b6ef57b11..5e5bd5f4d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -76,12 +76,6 @@ android { independent { manifest.srcFile 'src/independent/AndroidManifest.xml' } - e8xx { - manifest.srcFile 'src/e8xx/AndroidManifest.xml' - } - em4 { - manifest.srcFile 'src/em4/AndroidManifest.xml' - } f8xxLauncherOnlineRelease { manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' } @@ -393,254 +387,6 @@ android { // 是否需要使用工控机的rtk定位 buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' } - // e系列，采用Launcher方案 - e8xx { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.launcherApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue, CHANNEL_VALUE: "e8xx"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // 同上 - em4 { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.launcherApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue, CHANNEL_VALUE: "em4"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // e系列-2+32，对标D系列2+32，采用独立app的形式 - em3 { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "em3"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // e系列-1+16，对标D系列1+16，采用独立app形式 - em1 { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "em1"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // e系列-1+16，对标D系列1+16，采用独立app形式 - em2 { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "em2"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // d系列 - d8xx { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "d8xx"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // d系列 2 + 32 - d80x { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "d80x"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'true' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'true' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } - // d系列 1+16 版本 - d82x { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - // 应用包名 - applicationId rootProject.ext.android.independentApplicationId - dimension "product" - buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' - // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 - buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' - buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' - manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue,CHANNEL_VALUE: "d82x"] - // 是否使用高德sdk自定义导航 - buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' - // 是否支持换肤 - buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' - // 是否支持查询导航目的地车友 - buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false' - // 是否支持桌面卡片刷新 - buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false' - // 是否基于地图 - buildConfigField 'boolean', 'IS_MAP_BASED', 'false' - // 是否加载引导模块 - buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' - // 分享时是否隐藏 adas - buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' - // 是否需要实时上报坐标 - buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' - // 是否需要使用工控机的rtk定位 - buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' - } // 比亚迪 bydauto { minSdkVersion rootProject.ext.android.minSdkVersion diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle index d66359ad19..50a3b96168 100644 --- a/app/functions/abiFilters.gradle +++ b/app/functions/abiFilters.gradle @@ -82,78 +82,6 @@ project.android.productFlavors { } } } - // e系列，采用Launcher方案 - e8xx { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // 同上 - em4 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // e系列-2+32，对标D系列2+32，采用独立app的形式 - em3 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // e系列-1+16，对标D系列1+16，采用独立app形式 - em1 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // e系列-1+16，对标D系列1+16，采用独立app形式 - em2 { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // d系列 - d8xx { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // d系列 2 + 32 - d80x { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } - // d系列 1+16 版本 - d82x { - externalNativeBuild { - ndk { - // 设置支持的SO库架构 - abiFilters "armeabi-v7a" - } - } - } // 比亚迪 bydauto { externalNativeBuild { diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle index dbee77dc8d..d86632439c 100644 --- a/app/functions/aicloudservices.gradle +++ b/app/functions/aicloudservices.gradle @@ -4,40 +4,27 @@ project.dependencies { bydautoImplementation rootProject.ext.dependencies.mogoaicloudservicesdk phoneImplementation rootProject.ext.dependencies.mogoaicloudservicesdk - d82xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk - em1Implementation rootProject.ext.dependencies.mogoaicloudserviceapk - em2Implementation rootProject.ext.dependencies.mogoaicloudserviceapk - d8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk - d80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk - em4Implementation rootProject.ext.dependencies.mogoaicloudserviceapk - e8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk - fPadLenovoImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk f8AmapImplementation rootProject.ext.dependencies.mogoaicloudserviceapk - em3Implementation rootProject.ext.dependencies.mogoaicloudserviceapk fochtaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk fochbusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk + + fPadLenovoImplementation rootProject.ext.dependencies.mogoaicloudserviceapk fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoaicloudserviceapk fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoaicloudserviceapk } else { bydautoImplementation project(':foudations:mogo-aicloud-services-sdk') phoneImplementation project(':foudations:mogo-aicloud-services-sdk') - d82xImplementation project(':foudations:mogo-aicloud-services-apk') - em1Implementation project(':foudations:mogo-aicloud-services-apk') - em2Implementation project(':foudations:mogo-aicloud-services-apk') - d8xxImplementation project(':foudations:mogo-aicloud-services-apk') - d80xImplementation project(':foudations:mogo-aicloud-services-apk') - em4Implementation project(':foudations:mogo-aicloud-services-apk') - e8xxImplementation project(':foudations:mogo-aicloud-services-apk') f8xxImplementation project(':foudations:mogo-aicloud-services-apk') - fPadLenovoImplementation project(':foudations:mogo-aicloud-services-sdk') f80xImplementation project(':foudations:mogo-aicloud-services-apk') f8AmapImplementation project(':foudations:mogo-aicloud-services-apk') - em3Implementation project(':foudations:mogo-aicloud-services-apk') + fochtaxiImplementation project(':foudations:mogo-aicloud-services-apk') fochbusImplementation project(':foudations:mogo-aicloud-services-apk') + + fPadLenovoImplementation project(':foudations:mogo-aicloud-services-sdk') fPadLenovoOchTaxiImplementation project(':foudations:mogo-aicloud-services-sdk') fPadLenovoOchBusImplementation project(':foudations:mogo-aicloud-services-sdk') } diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle index f860cd50f0..4ad704ff3e 100644 --- a/app/functions/basedmap.gradle +++ b/app/functions/basedmap.gradle @@ -2,46 +2,33 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { - f8xxImplementation rootProject.ext.dependencies.mapcustom - fPadLenovoImplementation rootProject.ext.dependencies.mapcustom f80xImplementation rootProject.ext.dependencies.mapcustom fochtaxiImplementation rootProject.ext.dependencies.mapcustom fochbusImplementation rootProject.ext.dependencies.mapcustom + phoneImplementation rootProject.ext.dependencies.mapcustom + + fPadLenovoImplementation rootProject.ext.dependencies.mapcustom fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mapcustom fPadLenovoOchBusImplementation rootProject.ext.dependencies.mapcustom - phoneImplementation rootProject.ext.dependencies.mapcustom f8AmapImplementation rootProject.ext.dependencies.mapamap bydautoImplementation rootProject.ext.dependencies.mapamap - d82xImplementation rootProject.ext.dependencies.mapamap - em1Implementation rootProject.ext.dependencies.mapamap - em2Implementation rootProject.ext.dependencies.mapamap - d8xxImplementation rootProject.ext.dependencies.mapamap - d80xImplementation rootProject.ext.dependencies.mapamap - em4Implementation rootProject.ext.dependencies.mapamap - e8xxImplementation rootProject.ext.dependencies.mapamap - e8xxImplementation rootProject.ext.dependencies.mapamap - em3Implementation rootProject.ext.dependencies.mapamap + } else { f8xxImplementation project(':libraries:map-custom') - fPadLenovoImplementation project(':libraries:map-custom') f80xImplementation project(':libraries:map-custom') fochtaxiImplementation project(':libraries:map-custom') fochbusImplementation project(':libraries:map-custom') + + fPadLenovoImplementation project(':libraries:map-custom') fPadLenovoOchTaxiImplementation project(':libraries:map-custom') fPadLenovoOchBusImplementation project(':libraries:map-custom') + phoneImplementation project(':libraries:map-custom') f8AmapImplementation project(':libraries:map-amap') bydautoImplementation project(':libraries:map-amap') - d82xImplementation project(':libraries:map-amap') - em1Implementation project(':libraries:map-amap') - em2Implementation project(':libraries:map-amap') - d8xxImplementation project(':libraries:map-amap') - d80xImplementation project(':libraries:map-amap') - em4Implementation project(':libraries:map-amap') - e8xxImplementation project(':libraries:map-amap') - em3Implementation project(':libraries:map-amap') + } } \ No newline at end of file diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle index d55ecb16bb..23d545639c 100644 --- a/app/functions/baseservices.gradle +++ b/app/functions/baseservices.gradle @@ -5,40 +5,26 @@ project.dependencies { bydautoImplementation rootProject.ext.dependencies.mogobaseservicesdk phoneImplementation rootProject.ext.dependencies.mogobaseservicesdk - d82xImplementation rootProject.ext.dependencies.mogobaseserviceapk - em1Implementation rootProject.ext.dependencies.mogobaseserviceapk - em2Implementation rootProject.ext.dependencies.mogobaseserviceapk - d8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk - d80xImplementation rootProject.ext.dependencies.mogobaseserviceapk - em4Implementation rootProject.ext.dependencies.mogobaseserviceapk - e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk f8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk - fPadLenovoImplementation rootProject.ext.dependencies.mogobaseserviceapk f80xImplementation rootProject.ext.dependencies.mogobaseserviceapk f8AmapImplementation rootProject.ext.dependencies.mogobaseserviceapk - em3Implementation rootProject.ext.dependencies.mogobaseserviceapk fochtaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk fochbusImplementation rootProject.ext.dependencies.mogobaseserviceapk + + fPadLenovoImplementation rootProject.ext.dependencies.mogobaseserviceapk fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogobaseserviceapk } else { bydautoImplementation project(':foudations:mogo-base-services-sdk') phoneImplementation project(':foudations:mogo-base-services-sdk') - d82xImplementation project(':foudations:mogo-base-services-apk') - em1Implementation project(':foudations:mogo-base-services-apk') - em2Implementation project(':foudations:mogo-base-services-apk') - d8xxImplementation project(':foudations:mogo-base-services-apk') - d80xImplementation project(':foudations:mogo-base-services-apk') - em4Implementation project(':foudations:mogo-base-services-apk') - e8xxImplementation project(':foudations:mogo-base-services-apk') f8xxImplementation project(':foudations:mogo-base-services-apk') - fPadLenovoImplementation project(':foudations:mogo-base-services-apk') f80xImplementation project(':foudations:mogo-base-services-apk') f8AmapImplementation project(':foudations:mogo-base-services-apk') - em3Implementation project(':foudations:mogo-base-services-apk') fochtaxiImplementation project(':foudations:mogo-base-services-apk') fochbusImplementation project(':foudations:mogo-base-services-apk') + + fPadLenovoImplementation project(':foudations:mogo-base-services-apk') fPadLenovoOchTaxiImplementation project(':foudations:mogo-base-services-apk') fPadLenovoOchBusImplementation project(':foudations:mogo-base-services-apk') } diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle index 2c745ec561..6b621b0750 100644 --- a/app/functions/bizguide.gradle +++ b/app/functions/bizguide.gradle @@ -4,33 +4,27 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.mogomoduleguide phoneImplementation rootProject.ext.dependencies.mogomoduleguide - d8xxImplementation rootProject.ext.dependencies.mogomoduleguide - d80xImplementation rootProject.ext.dependencies.mogomoduleguide - em4Implementation rootProject.ext.dependencies.mogomoduleguide - e8xxImplementation rootProject.ext.dependencies.mogomoduleguide f8xxImplementation rootProject.ext.dependencies.mogomoduleguide - fPadLenovoImplementation rootProject.ext.dependencies.mogomoduleguide f80xImplementation rootProject.ext.dependencies.mogomoduleguide f8AmapImplementation rootProject.ext.dependencies.mogomoduleguide - em3Implementation rootProject.ext.dependencies.mogomoduleguide + fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide fochbusImplementation rootProject.ext.dependencies.mogomoduleguide + + fPadLenovoImplementation rootProject.ext.dependencies.mogomoduleguide fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogomoduleguide fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogomoduleguide } else { bydautoImplementation project(':modules:mogo-module-guide') phoneImplementation project(':modules:mogo-module-guide') - d8xxImplementation project(':modules:mogo-module-guide') - d80xImplementation project(':modules:mogo-module-guide') - em4Implementation project(':modules:mogo-module-guide') - e8xxImplementation project(':modules:mogo-module-guide') + f8xxImplementation project(':modules:mogo-module-guide') - fPadLenovoImplementation project(':modules:mogo-module-guide') f80xImplementation project(':modules:mogo-module-guide') f8AmapImplementation project(':modules:mogo-module-guide') - em3Implementation project(':modules:mogo-module-guide') fochtaxiImplementation project(':modules:mogo-module-guide') fochbusImplementation project(':modules:mogo-module-guide') + + fPadLenovoImplementation project(':modules:mogo-module-guide') fPadLenovoOchTaxiImplementation project(':modules:mogo-module-guide') fPadLenovoOchBusImplementation project(':modules:mogo-module-guide') } diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle index f2db9e564a..c8e07a3939 100644 --- a/app/functions/leftpanel.gradle +++ b/app/functions/leftpanel.gradle @@ -3,44 +3,32 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.moduleleftpanel + phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop - d82xImplementation rootProject.ext.dependencies.moduleleftpanel - em1Implementation rootProject.ext.dependencies.moduleleftpanel - em2Implementation rootProject.ext.dependencies.moduleleftpanel - d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop - d80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop - em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop - e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop - e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop - fPadLenovoImplementation rootProject.ext.dependencies.moduleleftpanelnoop f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop f8AmapImplementation rootProject.ext.dependencies.moduleleftpanelnoop - em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop + fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop + + fPadLenovoImplementation rootProject.ext.dependencies.moduleleftpanelnoop fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop fPadLenovoOchBusImplementation rootProject.ext.dependencies.moduleleftpanelnoop - phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop + } else { bydautoImplementation project(':modules:mogo-module-left-panel') + phoneImplementation project(':modules:mogo-module-left-panel-noop') - d82xImplementation project(':modules:mogo-module-left-panel') - em1Implementation project(':modules:mogo-module-left-panel') - em2Implementation project(':modules:mogo-module-left-panel') - d8xxImplementation project(':modules:mogo-module-left-panel-noop') - d80xImplementation project(':modules:mogo-module-left-panel-noop') - em4Implementation project(':modules:mogo-module-left-panel-noop') - e8xxImplementation project(':modules:mogo-module-left-panel-noop') f8xxImplementation project(':modules:mogo-module-left-panel-noop') - fPadLenovoImplementation project(':modules:mogo-module-left-panel-noop') f80xImplementation project(':modules:mogo-module-left-panel-noop') f8AmapImplementation project(':modules:mogo-module-left-panel-noop') - em3Implementation project(':modules:mogo-module-left-panel-noop') + fochtaxiImplementation project(':modules:mogo-module-left-panel-noop') fochbusImplementation project(':modules:mogo-module-left-panel-noop') + + fPadLenovoImplementation project(':modules:mogo-module-left-panel-noop') fPadLenovoOchTaxiImplementation project(':modules:mogo-module-left-panel-noop') fPadLenovoOchBusImplementation project(':modules:mogo-module-left-panel-noop') - phoneImplementation project(':modules:mogo-module-left-panel-noop') } } \ No newline at end of file diff --git a/app/functions/och.gradle b/app/functions/och.gradle index cdcffebd93..255ba426d5 100644 --- a/app/functions/och.gradle +++ b/app/functions/och.gradle @@ -3,39 +3,29 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.mogoochnoop phoneImplementation rootProject.ext.dependencies.mogoochnoop - d82xImplementation rootProject.ext.dependencies.mogoochnoop - em1Implementation rootProject.ext.dependencies.mogoochnoop - em2Implementation rootProject.ext.dependencies.mogoochnoop - em3Implementation rootProject.ext.dependencies.mogoochnoop - d8xxImplementation rootProject.ext.dependencies.mogoochnoop - d80xImplementation rootProject.ext.dependencies.mogoochnoop + f8xxImplementation rootProject.ext.dependencies.mogoochnoop - fPadLenovoImplementation rootProject.ext.dependencies.mogoochnoop f80xImplementation rootProject.ext.dependencies.mogoochnoop f8AmapImplementation rootProject.ext.dependencies.mogoochnoop - em4Implementation rootProject.ext.dependencies.mogoochnoop - e8xxImplementation rootProject.ext.dependencies.mogoochnoop + fochtaxiImplementation rootProject.ext.dependencies.mogoochtaxi fochbusImplementation rootProject.ext.dependencies.mogoochbus + + fPadLenovoImplementation rootProject.ext.dependencies.mogoochnoop fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoochtaxi fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoochbus } else { bydautoImplementation project(':OCH:mogo-och-noop') phoneImplementation project(':OCH:mogo-och-noop') - d82xImplementation project(':OCH:mogo-och-noop') - em1Implementation project(':OCH:mogo-och-noop') - em2Implementation project(':OCH:mogo-och-noop') - em3Implementation project(':OCH:mogo-och-noop') - d8xxImplementation project(':OCH:mogo-och-noop') - d80xImplementation project(':OCH:mogo-och-noop') + f8xxImplementation project(':OCH:mogo-och-noop') - fPadLenovoImplementation project(':OCH:mogo-och-noop') f80xImplementation project(':OCH:mogo-och-noop') f8AmapImplementation project(':OCH:mogo-och-noop') - em4Implementation project(':OCH:mogo-och-noop') - e8xxImplementation project(':OCH:mogo-och-noop') + fochtaxiImplementation project(':OCH:mogo-och-taxi') fochbusImplementation project(':OCH:mogo-och-bus') + + fPadLenovoImplementation project(':OCH:mogo-och-noop') fPadLenovoOchTaxiImplementation project(':OCH:mogo-och-taxi') fPadLenovoOchBusImplementation project(':OCH:mogo-och-bus') } diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle index 31cd21d8b1..4c2f5725e7 100644 --- a/app/functions/skin.gradle +++ b/app/functions/skin.gradle @@ -1,77 +1,61 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.skinsupportnoop - - d82xImplementation rootProject.ext.dependencies.skinsupportnoop - em1Implementation rootProject.ext.dependencies.skinsupportnoop - em2Implementation rootProject.ext.dependencies.skinsupportnoop - - em3Implementation rootProject.ext.dependencies.skinsupportimpl - d8xxImplementation rootProject.ext.dependencies.skinsupportimpl - d80xImplementation rootProject.ext.dependencies.skinsupportimpl - f8xxImplementation rootProject.ext.dependencies.skinsupportimpl - fPadLenovoImplementation rootProject.ext.dependencies.skinsupportimpl - f80xImplementation rootProject.ext.dependencies.skinsupportimpl - f8AmapImplementation rootProject.ext.dependencies.skinsupportimpl - em4Implementation rootProject.ext.dependencies.skinsupportimpl - e8xxImplementation rootProject.ext.dependencies.skinsupportimpl - fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl - fochbusImplementation rootProject.ext.dependencies.skinsupportimpl - fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl - fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl phoneImplementation rootProject.ext.dependencies.skinsupportimpl + f8xxImplementation rootProject.ext.dependencies.skinsupportimpl + f80xImplementation rootProject.ext.dependencies.skinsupportimpl + f8AmapImplementation rootProject.ext.dependencies.skinsupportimpl + + fochtaxiImplementation rootProject.ext.dependencies.skinsupportimpl + fochbusImplementation rootProject.ext.dependencies.skinsupportimpl + + fPadLenovoImplementation rootProject.ext.dependencies.skinsupportimpl + fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl + fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl + + + phoneImplementation rootProject.ext.dependencies.skinsupportlight + f8xxImplementation rootProject.ext.dependencies.skinsupportlight - fPadLenovoImplementation rootProject.ext.dependencies.skinsupportlight f80xImplementation rootProject.ext.dependencies.skinsupportlight f8AmapImplementation rootProject.ext.dependencies.skinsupportlight - em4Implementation rootProject.ext.dependencies.skinsupportlight - e8xxImplementation rootProject.ext.dependencies.skinsupportlight - d8xxImplementation rootProject.ext.dependencies.skinsupportlight - d80xImplementation rootProject.ext.dependencies.skinsupportlight - em3Implementation rootProject.ext.dependencies.skinsupportlight + fochtaxiImplementation rootProject.ext.dependencies.skinsupportlight fochbusImplementation rootProject.ext.dependencies.skinsupportlight + + fPadLenovoImplementation rootProject.ext.dependencies.skinsupportlight fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportlight - phoneImplementation rootProject.ext.dependencies.skinsupportlight } else { - bydautoImplementation project(':skin:mogo-skin-support-noop') - - d82xImplementation project(':skin:mogo-skin-support-noop') - em1Implementation project(':skin:mogo-skin-support-noop') - em2Implementation project(':skin:mogo-skin-support-noop') - - em3Implementation project(':skin:mogo-skin-support-impl') - d8xxImplementation project(':skin:mogo-skin-support-impl') - d80xImplementation project(':skin:mogo-skin-support-impl') - f8xxImplementation project(':skin:mogo-skin-support-impl') - fPadLenovoImplementation project(':skin:mogo-skin-support-impl') - f80xImplementation project(':skin:mogo-skin-support-impl') - f8AmapImplementation project(':skin:mogo-skin-support-impl') - em4Implementation project(':skin:mogo-skin-support-impl') - e8xxImplementation project(':skin:mogo-skin-support-impl') - fochtaxiImplementation project(':skin:mogo-skin-support-impl') - fochbusImplementation project(':skin:mogo-skin-support-impl') - fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl') - fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl') phoneImplementation project(':skin:mogo-skin-support-impl') + f8xxImplementation project(':skin:mogo-skin-support-impl') + f80xImplementation project(':skin:mogo-skin-support-impl') + f8AmapImplementation project(':skin:mogo-skin-support-impl') + + fochtaxiImplementation project(':skin:mogo-skin-support-impl') + fochbusImplementation project(':skin:mogo-skin-support-impl') + + fPadLenovoImplementation project(':skin:mogo-skin-support-impl') + fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl') + fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl') + + + phoneImplementation project(':skin:mogo-skin-light') + f8xxImplementation project(':skin:mogo-skin-light') - fPadLenovoImplementation project(':skin:mogo-skin-light') f80xImplementation project(':skin:mogo-skin-light') f8AmapImplementation project(':skin:mogo-skin-light') - em4Implementation project(':skin:mogo-skin-light') - e8xxImplementation project(':skin:mogo-skin-light') - d8xxImplementation project(':skin:mogo-skin-light') - d80xImplementation project(':skin:mogo-skin-light') - em3Implementation project(':skin:mogo-skin-light') + fochtaxiImplementation project(':skin:mogo-skin-light') fochbusImplementation project(':skin:mogo-skin-light') + + fPadLenovoImplementation project(':skin:mogo-skin-light') fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-light') fPadLenovoOchBusImplementation project(':skin:mogo-skin-light') - phoneImplementation project(':skin:mogo-skin-light') + } } \ No newline at end of file diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle index cffb706413..bc6ed75bd7 100644 --- a/app/functions/tts.gradle +++ b/app/functions/tts.gradle @@ -1,41 +1,31 @@ project.dependencies { if (Boolean.valueOf(RELEASE)) { bydautoImplementation rootProject.ext.dependencies.ttsdi - d82xImplementation rootProject.ext.dependencies.ttszhi - em1Implementation rootProject.ext.dependencies.ttszhi - em2Implementation rootProject.ext.dependencies.ttszhi - em3Implementation rootProject.ext.dependencies.ttszhi - d8xxImplementation rootProject.ext.dependencies.ttszhi - d80xImplementation rootProject.ext.dependencies.ttszhi + phoneImplementation rootProject.ext.dependencies.ttszhi + f8xxImplementation rootProject.ext.dependencies.ttszhi - fPadLenovoImplementation rootProject.ext.dependencies.ttspad f80xImplementation rootProject.ext.dependencies.ttszhi f8AmapImplementation rootProject.ext.dependencies.ttszhi - em4Implementation rootProject.ext.dependencies.ttszhi - e8xxImplementation 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 - phoneImplementation rootProject.ext.dependencies.ttszhi } else { bydautoImplementation project(':tts:tts-di') - d82xImplementation project(':tts:tts-zhi') - em1Implementation project(':tts:tts-zhi') - em2Implementation project(':tts:tts-zhi') - em3Implementation project(':tts:tts-zhi') - d8xxImplementation project(':tts:tts-zhi') - d80xImplementation project(':tts:tts-zhi') + phoneImplementation project(':tts:tts-zhi') + f8xxImplementation project(':tts:tts-zhi') - fPadLenovoImplementation project(':tts:tts-pad') f80xImplementation project(':tts:tts-zhi') f8AmapImplementation project(':tts:tts-zhi') - em4Implementation project(':tts:tts-zhi') - e8xxImplementation 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') - phoneImplementation project(':tts:tts-zhi') } } \ No newline at end of file diff --git a/app/regroup.gradle b/app/regroup.gradle index 71bf5ac173..01bff408c2 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -2,8 +2,8 @@ afterEvaluate { - def independent = ["em3", "em1", "d80x", "d82x", "bydauto", "em2", "phone"] - def launcher = ["f80x", "f8xx", "f8amap", "em4", "e8xx", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"] + def independent = ["bydauto", "phone"] + def launcher = ["f80x", "f8xx", "f8amap", "fochtaxi", "fochbus", "fPadLenovo", "fPadLenovoOchTaxi", "fPadLenovoOchBus"] it.getTasks().iterator().forEachRemaining { def task = it @@ -12,7 +12,7 @@ afterEvaluate { && taskName.contains("Independent") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { independent.forEach { - if( taskName.toLowerCase().contains(it) ){ + if (taskName.toLowerCase().contains(it)) { task.group = "assembleIndependent" } } @@ -20,7 +20,7 @@ afterEvaluate { && taskName.contains("Launcher") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { launcher.forEach { - if( taskName.toLowerCase().contains(it) ){ + if (taskName.toLowerCase().contains(it)) { task.group = "assembleLauncher" } } @@ -28,7 +28,7 @@ afterEvaluate { && taskName.contains("Independent") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { independent.forEach { - if( taskName.toLowerCase().contains(it) ){ + if (taskName.toLowerCase().contains(it)) { task.group = "installIndependent" } } @@ -36,7 +36,7 @@ afterEvaluate { && taskName.contains("Launcher") && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) { launcher.forEach { - if( taskName.toLowerCase().contains(it) ){ + if (taskName.toLowerCase().contains(it)) { task.group = "installLauncher" } }