diff --git a/app/build.gradle b/app/build.gradle index 72ac88748b..daa2a53d52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,6 +72,9 @@ android { em4 { manifest.srcFile 'src/em4/AndroidManifest.xml' } + f8xxLauncherOnlineRelease{ + manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml' + } } flavorDimensions "product", "basic", "env" @@ -80,7 +83,6 @@ android { //独立app independent{ dimension "basic" - applicationId rootProject.ext.android.independentApplicationId // 是否启动位置服务 buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'false' // 是否使用高德sdk自定义导航 @@ -92,7 +94,6 @@ android { // launcher app launcher{ dimension "basic" - applicationId rootProject.ext.android.launcherApplicationId // 是否启动位置服务 buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true' // 是否使用高德sdk自定义导航 @@ -103,6 +104,7 @@ android { } // f系列-分体机全系列,未细分 f8xx{ + applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' @@ -110,9 +112,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue] } // e系列,采用Launcher方案 e8xx { + applicationId rootProject.ext.android.launcherApplicationId dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' @@ -120,9 +124,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue] } // 同上 em4 { + applicationId rootProject.ext.android.launcherApplicationId dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' @@ -130,9 +136,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue] } // e系列-2+32,对标D系列2+32,采用独立app的形式 em3 { + applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' @@ -140,9 +148,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] } // e系列-1+16,对标D系列1+16,采用独立app形式 em1 { + applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType', '2' @@ -150,9 +160,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] } // d系列 d8xx { + applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用同行者语音 buildConfigField 'int', 'AIType','1' @@ -160,9 +172,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] } // d系列 1+16 版本 d82x{ + applicationId rootProject.ext.android.independentApplicationId dimension "product" // 使用同行者语音 buildConfigField 'int', 'AIType','1' @@ -170,9 +184,11 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue] } // 比亚迪 bydauto{ + applicationId rootProject.ext.android.bydautoIndependentApplicationId dimension "product" // 不使用语音 buildConfigField 'int', 'AIType','0' @@ -180,6 +196,7 @@ android { // 车机类型,主要用于区分自研车机还是别人家的车机,其他车机,比亚迪定为1 buildConfigField 'int', 'CAR_MACHINE_TYPE', '1' buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' + manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue] } qa { dimension "env" diff --git a/app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml b/app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml new file mode 100644 index 0000000000..d755054676 --- /dev/null +++ b/app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/app/src/independent/AndroidManifest.xml b/app/src/independent/AndroidManifest.xml index 57d7908a59..69211733d6 100644 --- a/app/src/independent/AndroidManifest.xml +++ b/app/src/independent/AndroidManifest.xml @@ -12,10 +12,10 @@ android:theme="@style/AppTheme.App" tools:replace="android:label"> - + + + + diff --git a/app/src/launcher/AndroidManifest.xml b/app/src/launcher/AndroidManifest.xml index fa7c043148..cdf501d602 100644 --- a/app/src/launcher/AndroidManifest.xml +++ b/app/src/launcher/AndroidManifest.xml @@ -18,10 +18,10 @@ - + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ccf3dd8248..21e549a0e5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,9 @@ android:supportsRtl="true" android:theme="@style/AppTheme.App" tools:replace="android:label"> +