From f2c8ba17a4f1ff1ec5c4e232a3f2d1716ed45107 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Mon, 10 Aug 2020 16:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9F=E7=B3=BB=E5=88=97Launcher?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D=E5=92=8C=E6=AF=94=E4=BA=9A=E8=BF=AA=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D=EF=BC=8C=E9=85=8D=E5=A5=97=E4=BF=AE=E6=94=B9=E9=AB=98?=
 =?UTF-8?q?=E5=BE=B7api=20value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 21 +++++++++++++++++--
 .../AndroidManifest.xml                       |  6 ++++++
 app/src/independent/AndroidManifest.xml       |  8 +++----
 app/src/launcher/AndroidManifest.xml          |  8 +++----
 app/src/main/AndroidManifest.xml              |  3 +++
 config.gradle                                 | 18 ++++++++++------
 6 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:sharedUserId="android.uid.system"
+    package="com.mogo.launcher">
+</manifest>
\ 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">
         <!-- 高德地图 -->
-        <meta-data
-            tools:replace="android:value"
-            android:name="com.amap.api.v2.apikey"
-            android:value="1c3fbc5f5e183619ffb1e7bc01e6751f" />
+<!--        <meta-data-->
+<!--            tools:replace="android:value"-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="1c3fbc5f5e183619ffb1e7bc01e6751f" />-->
     </application>
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
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 @@
 <!--            android:authorities="com.zhidao.auto.personal.provider"-->
 <!--            android:enabled="true"-->
 <!--            android:exported="true" />-->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3"
-            tools:replace="android:value" />
+<!--        <meta-data-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="a36b9f7b086fa3951bb35338a5a06dd3"-->
+<!--            tools:replace="android:value" />-->
         <!-- 高德地图 -->
     </application>
 
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">
+        <meta-data
+            android:name="com.amap.api.v2.apikey"
+            android:value="${AMAP_API_VALUE}" />
         <!--保活用-->
         <service
             android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
diff --git a/config.gradle b/config.gradle
index 36c39fb136..254bff2d5f 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,12 +4,18 @@ ext {
     android = [
 //            applicationId       : "com.mogo.launcher",
 //            zhidadoApplicationId: "com.zhidao.launcher",
-launcherApplicationId   : "com.mogo.launcher",
-independentApplicationId: "com.mogo.launcher.app",
-compileSdkVersion       : 28,
-buildToolsVersion       : "29.0.2",
-minSdkVersion           : 19,
-targetSdkVersion        : 22,
+launcherApplicationId          : "com.mogo.launcher",
+independentApplicationId       : "com.mogo.launcher.app",
+fLauncherApplicationId         : "com.mogo.launcher.f",
+bydautoIndependentApplicationId: "com.mogo.launcher.app.bydauto",
+fLauncherAmapApiValue          : "aa2c8a0547378ead2f9a37762d9dd179",
+bydautoIndependentApiValue     : "b1e1d527b02a493913c50985827c943a",
+commonLauncherAmapApiValue     : "a36b9f7b086fa3951bb35338a5a06dd3",
+commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
+compileSdkVersion              : 28,
+buildToolsVersion              : "29.0.2",
+minSdkVersion                  : 19,
+targetSdkVersion               : 22,
     ]
 
     dependencies = [