diff --git a/.idea/dictionaries/admin.xml b/.idea/dictionaries/admin.xml
new file mode 100644
index 0000000000..b918087fdd
--- /dev/null
+++ b/.idea/dictionaries/admin.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="admin" />
+</component>
\ No newline at end of file
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 = [
diff --git a/foudations/mogo-base-services-apk/src/androidTest/java/com/mogo/base/services/apk/ExampleInstrumentedTest.java b/foudations/mogo-base-services-apk/src/androidTest/java/com/mogo/base/services/apk/ExampleInstrumentedTest.java
deleted file mode 100644
index 3588462fba..0000000000
--- a/foudations/mogo-base-services-apk/src/androidTest/java/com/mogo/base/services/apk/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mogo.base.services.apk;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith( AndroidJUnit4.class )
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals( "com.mogo.base.services.apk.test", appContext.getPackageName() );
-    }
-}
\ No newline at end of file
diff --git a/foudations/mogo-base-services-apk/src/test/java/com/mogo/base/services/apk/ExampleUnitTest.java b/foudations/mogo-base-services-apk/src/test/java/com/mogo/base/services/apk/ExampleUnitTest.java
deleted file mode 100644
index 7b81601a73..0000000000
--- a/foudations/mogo-base-services-apk/src/test/java/com/mogo/base/services/apk/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mogo.base.services.apk;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals( 4, 2 + 2 );
-    }
-}
\ No newline at end of file
diff --git a/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt b/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt
index a2c91715fe..e69de29bb2 100644
--- a/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt
+++ b/libraries/tanlulib/src/test/java/com/zhidao/roadcondition/ExampleUnitTest.kt
@@ -1,17 +0,0 @@
-package com.zhidao.roadcondition
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml
index 10a1675519..6ab6da70d9 100644
--- a/modules/mogo-module-apps/src/main/res/values/strings.xml
+++ b/modules/mogo-module-apps/src/main/res/values/strings.xml
@@ -5,6 +5,7 @@
     <string name="module_apps_str_guide_warning">为了您的安全，导航中不可播放视频</string>
     <string-array name="module_apps_array_filter_packages_f">
         <item>com.mogo.launcher</item>
+        <item>com.mogo.launcher.f</item>
         <item>com.mogo.launcher.app</item>
         <item>com.zhidao.launcher</item>
         <item>com.nwd.android.toolsmanager</item>
@@ -28,6 +29,7 @@
     </string-array>
     <string-array name="module_apps_array_filter_packages">
         <item>com.mogo.launcher</item>
+        <item>com.mogo.launcher.f</item>
         <item>com.mogo.launcher.app</item>
         <item>com.zhidao.launcher</item>
         <item>com.nwd.android.toolsmanager</item>
diff --git a/modules/mogo-module-authorize/src/androidTest/java/com/mogo/module/authorize/ExampleInstrumentedTest.kt b/modules/mogo-module-authorize/src/androidTest/java/com/mogo/module/authorize/ExampleInstrumentedTest.kt
deleted file mode 100644
index d5b381bd09..0000000000
--- a/modules/mogo-module-authorize/src/androidTest/java/com/mogo/module/authorize/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.module.authorize
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.mogo.module.authorize.test", appContext.packageName)
-    }
-}
diff --git a/modules/mogo-module-authorize/src/test/java/com/mogo/module/authorize/ExampleUnitTest.kt b/modules/mogo-module-authorize/src/test/java/com/mogo/module/authorize/ExampleUnitTest.kt
deleted file mode 100644
index f2b7332da6..0000000000
--- a/modules/mogo-module-authorize/src/test/java/com/mogo/module/authorize/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mogo.module.authorize
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
index e92e84e107..db17ed40fc 100644
--- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
+++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java
@@ -45,8 +45,10 @@ public class BackToMainHomeManager {
             return;
         }
 
-        mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, new Intent() );
-
+        Intent intent2 = new Intent(  );
+        // 是否发自系统消息
+        intent2.putExtra( "isHomeKeyDown", false );
+        mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intent2 );
         Logger.d( TAG, "返回桌面" );
 
         Intent intent = new Intent();
diff --git a/modules/mogo-module-left-panel/src/androidTest/java/com/zhidao/mogo/module/left/panel/ExampleInstrumentedTest.kt b/modules/mogo-module-left-panel/src/androidTest/java/com/zhidao/mogo/module/left/panel/ExampleInstrumentedTest.kt
deleted file mode 100644
index dc1ab9fba3..0000000000
--- a/modules/mogo-module-left-panel/src/androidTest/java/com/zhidao/mogo/module/left/panel/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zhidao.mogo.module.left.panel
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zhidao.mogo.module.left.panel.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-left-panel/src/test/java/com/zhidao/mogo/module/left/panel/ExampleUnitTest.kt b/modules/mogo-module-left-panel/src/test/java/com/zhidao/mogo/module/left/panel/ExampleUnitTest.kt
deleted file mode 100644
index fa3e2c384a..0000000000
--- a/modules/mogo-module-left-panel/src/test/java/com/zhidao/mogo/module/left/panel/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhidao.mogo.module.left.panel
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index a0952f38de..e0af518958 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -308,7 +308,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     @Override
     public void onIntentReceived( String intentStr, Intent intent ) {
         if ( TextUtils.equals( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intentStr ) ) {
-            mIsHomeKeyDown = true;
+            mIsHomeKeyDown = intent.getBooleanExtra( "isHomeKeyDown", true );
         }
     }
 
diff --git a/modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt b/modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
deleted file mode 100644
index b0d35cfd07..0000000000
--- a/modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zhidao.mogo.module.byd.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt b/modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
deleted file mode 100644
index 35aae2dff8..0000000000
--- a/modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.zhidao.mogo.module.splash
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file