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/.idea/gradle.xml b/.idea/gradle.xml
index 8978cebc20..35c192e3ba 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -52,6 +52,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-tanlu" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
             <option value="$PROJECT_DIR$/services/mogo-service-api" />
diff --git a/app/build.gradle b/app/build.gradle
index 72ac88748b..ac5a0db6ae 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"
@@ -277,6 +294,7 @@ dependencies {
         implementation rootProject.ext.dependencies.moduletanluapi
 
         implementation rootProject.ext.dependencies.mogomonitor
+        implementation rootProject.ext.dependencies.mogomodulewidgets
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
         independentImplementation project(':main-extensions:mogo-module-main-independent')
@@ -293,6 +311,7 @@ dependencies {
         }
         implementation project(':libraries:mogo-tanlu-api')
         implementation project(':modules:mogo-module-monitor')
+        implementation project(':modules:mogo-module-widgets')
     }
 
     apply from: "./functions/baseservices.gradle"
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/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 34312b7381..99cd7e7447 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -11,7 +11,6 @@ import com.bytedance.boost_multidex.BoostMultiDex;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.Utils;
-import com.mogo.commons.storage.SpStorage;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
@@ -22,6 +21,7 @@ import com.mogo.module.push.base.PushUIConstants;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.widgets.MogoWidgetsProvider;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.passport.IMogoTicketCallback;
@@ -58,14 +58,15 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
         //运营位卡片，需要默认显示，放在第一个加载
-        if (DebugConfig.isLauncher() ) {
+        if ( DebugConfig.isLauncher() ) {
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
+        } else {
+            MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) );
         }
-        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
+        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
             MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
         }
-        MogoModulePaths.addModule(new MogoModule(TanluApiConst.MODULE_PATH,
-                TanluApiConst.MODULE_NAME));
+        MogoModulePaths.addModule( new MogoModule( TanluApiConst.MODULE_PATH, TanluApiConst.MODULE_NAME ) );
         MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );
 
@@ -101,13 +102,13 @@ public class MogoApplication extends AbsMogoApplication {
     @Override
     protected void init() {
         super.init();
-        prepareBaseService(2_000L);
+        prepareBaseService( 2_000L );
     }
 
     /**
      * 基础服务：passport、location、socket
      */
-    private void prepareBaseService(long delay) {
+    private void prepareBaseService( long delay ) {
         UiThreadHandler.postDelayed( () -> {
             final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
             // 第三方平台的sn是服务端生成的，所以必须在返回后才能开启
diff --git a/config.gradle b/config.gradle
index 36c39fb136..6714fbfaaf 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 = [
@@ -188,5 +194,8 @@ targetSdkVersion        : 22,
             androidxroomruntime      : "androidx.room:room-runtime:2.2.3",
             androidxroomcompiler     : "androidx.room:room-compiler:2.2.3",
             androidxroomktx          : "androidx.room:room-ktx:2.2.3",
+
+            //
+            mogomodulewidgets          : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
     ]
 }
\ No newline at end of file
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/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java b/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
index d5900526a1..0218167b23 100644
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
@@ -57,4 +57,34 @@ public class AppUtils {
             return null;
         }
     }
+
+    public static boolean isAppForeground( Context context ) {
+        if ( context != null ) {
+            ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
+            List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses();
+            for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) {
+                if ( processInfo.processName.equals( context.getPackageName() ) ) {
+                    if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean isAppForeground( Context context, String pkg ) {
+        if ( context != null ) {
+            ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
+            List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses();
+            for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) {
+                if ( processInfo.processName.equals( pkg ) ) {
+                    if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index f3910bfae4..e070196a50 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 # 探路
 MOGO_MODULE_TANLU_VERSION=1.3.1.24
 # 车聊聊
-CARCHATTING_VERSION=1.4.8
+CARCHATTING_VERSION=1.4.9
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导
@@ -89,6 +89,8 @@ MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块
 MOGO_MODULE_LEFT_PANEL_VERSION = 1.2.1.10-SNAPSHOT
 MOGO_MODULE_LEFT_PANEL_NOOP_VERSION = 1.2.1.10-SNAPSHOT
+# 小控件
+MOGO_MODULE_WIDGETS_VERSION = 1.2.1.10-SNAPSHOT
 
 # Boost分包
 BOOST_MULTIDEX_VERSION=1.0.0
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-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
index 946833bfff..4fbbc9dd44 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
@@ -32,7 +32,7 @@ public class MarkerExploreWay implements Serializable {
 
     public String getAddr() {
         if (TextUtils.isEmpty(addr)) {
-            return "";
+            return "未知道路";
         }
         return addr;
     }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java
index 87093e57b9..53f5250437 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java
@@ -1,5 +1,6 @@
 package com.mogo.module.common.entity;
 
+import com.mogo.map.location.MogoLocation;
 import com.mogo.utils.sqlite.annotation.DbDatabase;
 import com.mogo.utils.sqlite.annotation.DbField;
 import com.mogo.utils.sqlite.annotation.DbTable;
@@ -68,4 +69,14 @@ public class V2XHistoryScenarioData {
     public void setDispose(Boolean dispose) {
         isDispose = dispose;
     }
+
+    @Override
+    public V2XHistoryScenarioData clone() throws CloneNotSupportedException {
+        try {
+            return (V2XHistoryScenarioData) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return this;
+    }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java
index 72c5960fd4..a7bcb305c1 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java
@@ -29,6 +29,11 @@ class DialogImpl implements IWindowManagerView {
         return dialog.isShowing();
     }
 
+    @Override
+    public void handleTouchEvent(OnViewClickListener listener) {
+        // do nothings.
+    }
+
     @Override
     public void show() {
         dialog.show();
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java
index d610cea67a..14891ed7d6 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java
@@ -1,18 +1,27 @@
 package com.mogo.module.common.wm;
 
+import android.view.View;
+
 interface IWindowManagerView {
     /**
      * 初始化
+     *
      * @param params contentView包装类
      */
-    void init(WindowManagerView.WMViewParams params);
+    void init( WindowManagerView.WMViewParams params );
 
     /**
      * 是否显示
+     *
      * @return true - 显示中
      */
     boolean isShowing();
 
+    /**
+     * 支持手势拖动，该操作只支持触发点击操作
+     */
+    void handleTouchEvent(OnViewClickListener listener);
+
     /**
      * 显示
      */
@@ -22,4 +31,8 @@ interface IWindowManagerView {
      * 隐藏
      */
     void hide();
+
+    interface OnViewClickListener {
+        void onClick( View view );
+    }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java
index f9b34a59be..d4314d4106 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java
@@ -3,12 +3,9 @@ package com.mogo.module.common.wm;
 import android.content.Context;
 import android.graphics.PixelFormat;
 import android.os.Build;
-import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.WindowManager;
 
-import com.mogo.module.common.utils.CarSeries;
-import com.mogo.utils.WindowUtils;
-
 /**
  * 采用windowManager实现接口
  */
@@ -19,10 +16,13 @@ class WindowManagerImpl implements IWindowManagerView {
     private WindowManagerView.WMViewParams mParams;
     private boolean isShowing;
 
+    private float mLastX, mLastY;
+    private int mOldOffsetX, mOldOffsetY;
+
     @Override
-    public void init(WindowManagerView.WMViewParams params) {
+    public void init( WindowManagerView.WMViewParams params ) {
         mParams = params;
-        mWindowManager = (WindowManager) mParams.mContext.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
+        mWindowManager = ( WindowManager ) mParams.mContext.getApplicationContext().getSystemService( Context.WINDOW_SERVICE );
         mLayoutParams = new WindowManager.LayoutParams();
         if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
             mLayoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
@@ -30,13 +30,13 @@ class WindowManagerImpl implements IWindowManagerView {
             mLayoutParams.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
         }
         mLayoutParams.format = PixelFormat.TRANSLUCENT;
-        mLayoutParams.gravity = Gravity.CENTER;
+        mLayoutParams.gravity = mParams.mGravity;
         mLayoutParams.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
 
         mLayoutParams.width = mParams.mWidth;
         mLayoutParams.height = mParams.mHeight;
-        mLayoutParams.x = mParams.mX;
-        mLayoutParams.y = mParams.mY;
+        mOldOffsetX = mLayoutParams.x = mParams.mX;
+        mOldOffsetY = mLayoutParams.y = mParams.mY;
         mLayoutParams.dimAmount = 0.5f;
     }
 
@@ -45,20 +45,47 @@ class WindowManagerImpl implements IWindowManagerView {
         return isShowing;
     }
 
+    @Override
+    public void handleTouchEvent(OnViewClickListener listener) {
+        mParams.mContentView.setOnTouchListener( ( v, event ) -> {
+            final int action = event.getAction();
+            float x = event.getX();
+            float y = event.getY();
+            if ( action == MotionEvent.ACTION_DOWN ) {
+                mLastX = x;
+                mLastY = y;
+            } else if ( action == MotionEvent.ACTION_MOVE ) {
+                mLayoutParams.x += ( int ) ( x - mLastX ) / 3; // 减小偏移量,防止过度抖动
+                mLayoutParams.y += ( int ) ( y - mLastY ) / 3; // 减小偏移量,防止过度抖动
+                mWindowManager.updateViewLayout( mParams.mContentView, mLayoutParams );
+            } else if ( action == MotionEvent.ACTION_UP ) {
+                int newOffsetX = mLayoutParams.x;
+                int newOffsetY = mLayoutParams.y;
+                // 只要按钮一动位置不是很大,就认为是点击事件
+                if ( Math.abs( mOldOffsetX - newOffsetX ) <= 20
+                        && Math.abs( mOldOffsetY - newOffsetY ) <= 20 ) {
+                    listener.onClick( mParams.mContentView );
+                }
+                mOldOffsetX = newOffsetX;
+                mOldOffsetY = newOffsetY;
+            }
+            return true;
+        } );
+    }
+
     @Override
     public void show() {
-        if(!isShowing){
+        if ( !isShowing ) {
             isShowing = true;
-            mWindowManager.addView(mParams.mContentView,mLayoutParams);
+            mWindowManager.addView( mParams.mContentView, mLayoutParams );
         }
     }
 
     @Override
     public void hide() {
-        if (isShowing && mParams != null) {
-            mWindowManager.removeView(mParams.mContentView);
+        if ( isShowing && mParams != null ) {
+            mWindowManager.removeView( mParams.mContentView );
             isShowing = false;
         }
-
     }
 }
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java
index d0d2cfa4d4..db2b244273 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java
@@ -33,6 +33,10 @@ public class WindowManagerView {
         return mParams.mContentView.findViewById( id );
     }
 
+    public void attachTouchEvent( IWindowManagerView.OnViewClickListener listener ) {
+        mManagerView.handleTouchEvent(listener);
+    }
+
     public void show() {
         mManagerView.show();
     }
@@ -72,6 +76,11 @@ public class WindowManagerView {
             return this;
         }
 
+        public Builder gravity( int gravity ) {
+            mParams.mGravity = gravity;
+            return this;
+        }
+
         /**
          * 默认dialog实现
          *
@@ -105,5 +114,6 @@ public class WindowManagerView {
         public int mHeight;
         public int mX;
         public int mY;
+        public int mGravity;
     }
 }
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-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastReceiver.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
similarity index 86%
rename from modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastReceiver.java
rename to modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
index 242bbbce63..4ddc0f947f 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastReceiver.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java
@@ -1,14 +1,12 @@
 package com.mogo.module.map;
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.text.TextUtils;
 
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.map.navi.MogoNaviConfig;
 import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.service.intent.IMogoIntentListener;
+import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.utils.logger.Logger;
 
 public
@@ -18,21 +16,19 @@ public
  *
  * 接收高德地图车机版广播
  */
-class AutoNaviBroadcastReceiver extends BroadcastReceiver {
+class AutoNaviBroadcastIntentHandler implements IMogoIntentListener {
 
     public static final String TAG = "AutoNaviBroadcastReceiver";
 
     public static final String AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV";
 
-    public void register() {
-        IntentFilter inputFilter = new IntentFilter();
-        inputFilter.addAction( AUTONAVI_STANDARD_BROADCAST_RECV );
-        AbsMogoApplication.getApp().registerReceiver( this, inputFilter );
+    public void register( IMogoIntentManager manager ) {
+        manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this );
     }
 
-    public void unregister() {
+    public void unregister(IMogoIntentManager manager ) {
         mCallback = null;
-        AbsMogoApplication.getApp().unregisterReceiver( this );
+        manager.unregisterIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this );
     }
 
     private OnMapControlCallback mCallback;
@@ -42,7 +38,7 @@ class AutoNaviBroadcastReceiver extends BroadcastReceiver {
     }
 
     @Override
-    public void onReceive( Context context, Intent intent ) {
+    public void onIntentReceived( String intentStr, Intent intent ) {
         String action = intent.getAction();
 
         int keyType = intent.getIntExtra( "KEY_TYPE", 0 );
@@ -122,6 +118,5 @@ class AutoNaviBroadcastReceiver extends BroadcastReceiver {
                     .avoidSpeed( prefer == 3 );
             mCallback.onReCalculatePath( config );
         }
-        mCallback.onEnd( intent );
     }
 }
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
index f72c5dea25..a45306c822 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java
@@ -32,6 +32,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
+import com.mogo.utils.AppUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
@@ -73,23 +74,11 @@ public class MapPresenter extends Presenter< MapView > implements
             mView.getUIController().recoverLockMode();
         }
     };
-    private AutoNaviBroadcastReceiver mAutoNaviReceiver;
+    private AutoNaviBroadcastIntentHandler mAutoNaviReceiver;
     private MapControlCommandHandler mCustomVoiceCommandHandler;
 
     public MapPresenter( MapView view ) {
         super( view );
-        initBroadcast();
-        mCustomVoiceCommandHandler = new MapControlCommandHandler();
-        mCustomVoiceCommandHandler.setCallback( this );
-    }
-
-    /**
-     * opera type为0：0 实时路况开；1实时路况关 type为1：0 放大地图； 1缩小地图 type为2：0切换2d车上； 1切换2d北上；2切换3d车上支持
-     */
-    private void initBroadcast() {
-        mAutoNaviReceiver = new AutoNaviBroadcastReceiver();
-        mAutoNaviReceiver.setCallback( this );
-        mAutoNaviReceiver.register();
     }
 
     @Override
@@ -158,11 +147,10 @@ public class MapPresenter extends Presenter< MapView > implements
         if ( CustomNaviInterrupter.getInstance().interrupt() ) {
             // 导航过程中语音指令退出导航，会出现 activity 不走 onResume 的情况
             UiThreadHandler.postDelayed( () -> {
-                if ( isForeground( getContext() ) && !hasOthersActivity() && !mStatusManager.isMainPageOnResume() ) {
+                if ( AppUtils.isAppForeground( getContext() ) && !hasOthersActivity() && !mStatusManager.isMainPageOnResume() ) {
                     mLauncher.backToLauncher( getContext() );
                 }
             }, 500L );
-            onEnd( intent );
             return;
         }
         mMogoMapService.getNavi( getContext() ).stopNavi();
@@ -176,26 +164,6 @@ public class MapPresenter extends Presenter< MapView > implements
         mMogoMapService.getNavi( getContext() ).reCalculateRoute( config );
     }
 
-    @Override
-    public void onEnd( Intent intent ) {
-        mMogoIntentManager.invoke( AutoNaviBroadcastReceiver.AUTONAVI_STANDARD_BROADCAST_RECV, intent );
-    }
-
-    private boolean isForeground( Context context ) {
-        if ( context != null ) {
-            ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
-            List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses();
-            for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) {
-                if ( processInfo.processName.equals( context.getPackageName() ) ) {
-                    if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
     private boolean hasOthersActivity() {
         ActivityManager am = ( ActivityManager ) getContext().getSystemService( Context.ACTIVITY_SERVICE );
         List< ActivityManager.RunningTaskInfo > list = am.getRunningTasks( 1 );
@@ -298,6 +266,16 @@ public class MapPresenter extends Presenter< MapView > implements
         for ( String cmd : VoiceConstants.sUnUnRegisterCmds ) {
             mMogoIntentManager.registerIntentListener( cmd, this );
         }
+
+        initBroadcast();
+        mCustomVoiceCommandHandler = new MapControlCommandHandler();
+        mCustomVoiceCommandHandler.setCallback( this );
+    }
+
+    private void initBroadcast() {
+        mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler();
+        mAutoNaviReceiver.setCallback( this );
+        mAutoNaviReceiver.register( mMogoIntentManager );
     }
 
     @Override
@@ -309,7 +287,6 @@ public class MapPresenter extends Presenter< MapView > implements
     @Override
     public void onPause( @NonNull LifecycleOwner owner ) {
         super.onPause( owner );
-
         unregisterVoiceCmd();
     }
 
@@ -317,7 +294,7 @@ public class MapPresenter extends Presenter< MapView > implements
     public void onDestroy( @NonNull LifecycleOwner owner ) {
         super.onDestroy( owner );
         if ( mAutoNaviReceiver != null ) {
-            mAutoNaviReceiver.unregister();
+            mAutoNaviReceiver.unregister( mMogoIntentManager );
         }
     }
 
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
index d0d074da5e..cd6263370d 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
@@ -31,9 +31,6 @@ public interface OnMapControlCallback {
     // 重新规划路线
     void onReCalculatePath( MogoNaviConfig config );
 
-    // 结束
-    void onEnd( Intent intent );
-
     // 查看全程
     void onDisplayOverview();
 
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index ed58cdd98f..9b2a255a28 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -274,7 +274,7 @@ public class MogoServices implements IMogoMapListener,
 
     private boolean mIsFirstAccOn = true;
 
-    private IMogoStatusChangedListener statusChangedListener = new StatusChangedAdapter(){
+    private IMogoStatusChangedListener statusChangedListener = new StatusChangedAdapter() {
         @Override
         public void onUserInteracted( boolean userInteracted ) {
             if ( userInteracted ) {
@@ -382,6 +382,8 @@ public class MogoServices implements IMogoMapListener,
         mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_USER_ONLINE, this );
         mIntentManager.registerIntentListener( ServiceConst.COMMAND_ZHIDAO_NEARBY_FRIEND_BYLOCATION, this );
         mIntentManager.registerIntentListener( ServiceConst.COMMAND_BACK, this );
+        mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER, this );
+        mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_SEND, this );
 
         mADASController = MarkerServiceHandler.getADASController();
         mLauncher = MarkerServiceHandler.getLauncher();
@@ -395,6 +397,7 @@ public class MogoServices implements IMogoMapListener,
         if ( DebugConfig.isLaunchLocationService() ) {
             initLocationServiceProcess( context );
         }
+
     }
 
     private void initLocationServiceProcess( Context context ) {
@@ -473,6 +476,8 @@ public class MogoServices implements IMogoMapListener,
         filter.addAction( MogoReceiver.ACTION_VOICE_READY );
         filter.addAction( MogoReceiver.ACTION_MOCK );
         filter.addAction( Intent.ACTION_CLOSE_SYSTEM_DIALOGS );
+        filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER );
+        filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_SEND );
         try {
             context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter );
             Logger.i( TAG, "register voice receiver." );
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
index 42f9bef659..411d36b927 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java
@@ -53,6 +53,11 @@ public class MogoReceiver extends BroadcastReceiver {
 
     public static final String ACTION_MOCK = "com.mogo.mock";
 
+    // 接受其他app发给高德的广播
+    public static final String ACTION_AUTO_NAVI_RECEIVER = "AUTONAVI_STANDARD_BROADCAST_RECV";
+    // 接受高德发过来的广播
+    public static final String ACTION_AUTO_NAVI_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
+
     private IMogoIntentManager mMogoIntentManager;
 
     public MogoReceiver(Context context) {
diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
new file mode 100644
index 0000000000..fd1066746d
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_service_marker_anchor_size">16dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
+    <dimen name="module_service_marker_bubble_width">56px</dimen>
+    <dimen name="module_service_marker_bubble_height">65px</dimen>
+    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
+    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
+
+    <dimen name="module_service_marker_bounds_leftMargin">550px</dimen>
+    <dimen name="module_service_marker_bounds_topMargin">208px</dimen>
+    <dimen name="module_service_marker_bounds_bottomMargin">100px</dimen>
+    <dimen name="module_service_marker_bounds_rightMargin">100px</dimen>
+    <dimen name="module_services_info_window_paddingStart">100px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">54px</dimen>
+    <dimen name="module_service_user_header_width">44px</dimen>
+    <dimen name="module_service_user_header_height">44px</dimen>
+    <dimen name="module_service_content_textSize">14px</dimen>
+    <dimen name="module_service_tag_textSize">12px</dimen>
+    <dimen name="module_service_content_minWidth">64px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..fd1066746d
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_service_marker_anchor_size">16dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
+    <dimen name="module_service_marker_bubble_width">56px</dimen>
+    <dimen name="module_service_marker_bubble_height">65px</dimen>
+    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
+    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
+
+    <dimen name="module_service_marker_bounds_leftMargin">550px</dimen>
+    <dimen name="module_service_marker_bounds_topMargin">208px</dimen>
+    <dimen name="module_service_marker_bounds_bottomMargin">100px</dimen>
+    <dimen name="module_service_marker_bounds_rightMargin">100px</dimen>
+    <dimen name="module_services_info_window_paddingStart">100px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">54px</dimen>
+    <dimen name="module_service_user_header_width">44px</dimen>
+    <dimen name="module_service_user_header_height">44px</dimen>
+    <dimen name="module_service_content_textSize">14px</dimen>
+    <dimen name="module_service_tag_textSize">12px</dimen>
+    <dimen name="module_service_content_minWidth">64px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
new file mode 100644
index 0000000000..341706179d
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_service_marker_anchor_size">20dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
+    <dimen name="module_service_marker_bubble_width">100px</dimen>
+    <dimen name="module_service_marker_bubble_height">117px</dimen>
+    <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
+    <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
+
+    <!-- 导航查看全程显示范围-->
+    <dimen name="module_service_marker_bounds_leftMargin">1000px</dimen>
+    <dimen name="module_service_marker_bounds_topMargin">390px</dimen>
+    <dimen name="module_service_marker_bounds_bottomMargin">200px</dimen>
+    <dimen name="module_service_marker_bounds_rightMargin">200px</dimen>
+    <dimen name="module_services_info_window_paddingStart">10px</dimen>
+    <dimen name="module_services_info_window_paddingEnd">10px</dimen>
+    <dimen name="module_services_info_window_height">100px</dimen>
+    <dimen name="module_service_user_header_width">80px</dimen>
+    <dimen name="module_service_user_header_height">80px</dimen>
+    <dimen name="module_service_content_textSize">24px</dimen>
+    <dimen name="module_service_tag_textSize">20px</dimen>
+    <dimen name="module_service_content_minWidth">120px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index fd1066746d..341706179d 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_service_marker_anchor_size">16dp</dimen>
-    <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
-    <dimen name="module_service_marker_bubble_width">56px</dimen>
-    <dimen name="module_service_marker_bubble_height">65px</dimen>
-    <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
-    <dimen name="module_service_marker_bubble_icon_height">35px</dimen>
-    <dimen name="module_service_marker_bubble_icon_marginBottom">4px</dimen>
+    <dimen name="module_service_marker_anchor_size">20dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
+    <dimen name="module_service_marker_bubble_width">100px</dimen>
+    <dimen name="module_service_marker_bubble_height">117px</dimen>
+    <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
+    <dimen name="module_service_marker_bubble_icon_height">60px</dimen>
+    <dimen name="module_service_marker_bubble_icon_marginBottom">8px</dimen>
 
-    <dimen name="module_service_marker_bounds_leftMargin">550px</dimen>
-    <dimen name="module_service_marker_bounds_topMargin">208px</dimen>
-    <dimen name="module_service_marker_bounds_bottomMargin">100px</dimen>
-    <dimen name="module_service_marker_bounds_rightMargin">100px</dimen>
-    <dimen name="module_services_info_window_paddingStart">100px</dimen>
+    <!-- 导航查看全程显示范围-->
+    <dimen name="module_service_marker_bounds_leftMargin">1000px</dimen>
+    <dimen name="module_service_marker_bounds_topMargin">390px</dimen>
+    <dimen name="module_service_marker_bounds_bottomMargin">200px</dimen>
+    <dimen name="module_service_marker_bounds_rightMargin">200px</dimen>
+    <dimen name="module_services_info_window_paddingStart">10px</dimen>
     <dimen name="module_services_info_window_paddingEnd">10px</dimen>
-    <dimen name="module_services_info_window_height">54px</dimen>
-    <dimen name="module_service_user_header_width">44px</dimen>
-    <dimen name="module_service_user_header_height">44px</dimen>
-    <dimen name="module_service_content_textSize">14px</dimen>
-    <dimen name="module_service_tag_textSize">12px</dimen>
-    <dimen name="module_service_content_minWidth">64px</dimen>
-    <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
-    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
+    <dimen name="module_services_info_window_height">100px</dimen>
+    <dimen name="module_service_user_header_width">80px</dimen>
+    <dimen name="module_service_user_header_height">80px</dimen>
+    <dimen name="module_service_content_textSize">24px</dimen>
+    <dimen name="module_service_tag_textSize">20px</dimen>
+    <dimen name="module_service_content_minWidth">120px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values/strings.xml b/modules/mogo-module-service/src/main/res/values/strings.xml
index 27efab9b88..e25a4adb00 100644
--- a/modules/mogo-module-service/src/main/res/values/strings.xml
+++ b/modules/mogo-module-service/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">mogo-module-service</string>
+    <string name="module_service_app_entrance_text">辅助\n驾驶</string>
 </resources>
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
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
index 69be074449..745865a533 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluListWindow.java
@@ -67,6 +67,7 @@ import com.mogo.module.tanlu.model.NaviResult;
 import com.mogo.module.tanlu.model.PathLineResult;
 import com.mogo.module.tanlu.model.TanluModelData;
 import com.mogo.module.tanlu.model.VoiceCmdData;
+import com.mogo.module.tanlu.model.event.CloseWindowInfo;
 import com.mogo.module.tanlu.model.event.ControlClickUpInfo;
 import com.mogo.module.tanlu.model.event.DataErrorInfo;
 import com.mogo.module.tanlu.model.event.GetInfoError;
@@ -448,6 +449,16 @@ public class TanluListWindow extends RelativeLayout implements IMogoMarkerClickL
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onCloseWindow(final CloseWindowInfo event) {
+        if (event == null) {
+            return;
+        }
+
+        releaseTimer();
+        TanluServiceManager.getIMogoTopViewManager().removeView(TanluListWindow.this);
+    }
+
     /**
      * poi 搜索
      *
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
index 601a7707d3..f17ac07572 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java
@@ -23,7 +23,9 @@ import com.mogo.module.tanlu.R;
 import com.mogo.module.tanlu.callback.IThumbsUpCallback;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.tanlu.model.TanluModelData;
+import com.mogo.module.tanlu.model.event.CloseWindowInfo;
 import com.mogo.module.tanlu.model.event.ControlClickUpInfo;
+import com.mogo.module.tanlu.model.event.DataErrorInfo;
 import com.mogo.module.tanlu.model.event.StartPlayInfo;
 import com.mogo.module.tanlu.model.event.VoiceControlUpInfo;
 import com.mogo.module.tanlu.util.ChartUtil;
@@ -71,6 +73,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
     private LinearLayout mLikeLayout;
     private TextView mTypeTv;
     private IMogoImageloader mogoImageloader;
+    private ImageView mCloseImage;
 
     //media
     private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
@@ -117,6 +120,14 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter<TanluSlideViewHol
         mLikeImage = holder.itemView.findViewById(R.id.tanlu_like_imageView);
         mLikeLayout = holder.itemView.findViewById(R.id.tanlu_like_layout);
         mTypeTv = holder.itemView.findViewById(R.id.tv_information_type);
+        mCloseImage = holder.itemView.findViewById(R.id.tanlu_close_imageView);
+
+        mCloseImage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                EventBus.getDefault().post(new CloseWindowInfo());
+            }
+        });
 
         //有可能不是一个对象
         simpleCoverVideoPlayer.setVisibility(View.VISIBLE);
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/CloseWindowInfo.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/CloseWindowInfo.java
new file mode 100644
index 0000000000..9c036f8cf5
--- /dev/null
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/event/CloseWindowInfo.java
@@ -0,0 +1,15 @@
+package com.mogo.module.tanlu.model.event;
+
+import java.io.Serializable;
+
+/**
+ * @author lixiaopeng
+ * @description push区分类别
+ * @since 2020-01-08
+ */
+public class CloseWindowInfo implements Serializable {
+
+    public CloseWindowInfo() {
+    }
+
+}
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_normal.png
new file mode 100644
index 0000000000..e99eeaf974
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_press.png b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_press.png
new file mode 100644
index 0000000000..095574d6e2
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-ldpi/icon_window_close_press.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_normal.png
new file mode 100644
index 0000000000..e99eeaf974
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_press.png b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_press.png
new file mode 100644
index 0000000000..095574d6e2
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-mdpi/icon_window_close_press.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_normal.png
new file mode 100644
index 0000000000..e99eeaf974
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_press.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_press.png
new file mode 100644
index 0000000000..095574d6e2
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi-1920x1000/icon_window_close_press.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_normal.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_normal.png
new file mode 100644
index 0000000000..e99eeaf974
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_normal.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_press.png b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_press.png
new file mode 100644
index 0000000000..095574d6e2
Binary files /dev/null and b/modules/mogo-module-tanlu/src/main/res/drawable-xhdpi/icon_window_close_press.png differ
diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/selector_btn_close.xml b/modules/mogo-module-tanlu/src/main/res/drawable/selector_btn_close.xml
new file mode 100644
index 0000000000..4c7b91247d
--- /dev/null
+++ b/modules/mogo-module-tanlu/src/main/res/drawable/selector_btn_close.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_window_close_press" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_window_close_normal" android:state_pressed="false" />
+    <item android:drawable="@drawable/icon_window_close_normal" />
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
index 40236319c3..bab3d66b73 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml
@@ -159,6 +159,15 @@
                     android:src="@drawable/icon_heart_like" />
             </LinearLayout>
 
+            <ImageView
+                android:id="@+id/tanlu_close_imageView"
+                android:layout_width="@dimen/tanlu_module_close_height"
+                android:layout_height="@dimen/tanlu_module_close_height"
+                android:layout_centerInParent="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="@dimen/tanlu_module_margin_right"
+                android:src="@drawable/selector_btn_close" />
+
         </RelativeLayout>
     </RelativeLayout>
 
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
index b103b2b1ac..ff75ac58ed 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
@@ -80,6 +80,7 @@
     <dimen name="tanlu_module_card_height">350px</dimen>
     <dimen name="tanlu_module_card_video_width">480px</dimen>
     <dimen name="tanlu_module_card_video_height">320px</dimen>
+    <dimen name="tanlu_module_close_height">45px</dimen>
 
     <dimen name="tanlu_module_card_margin_top">23px</dimen>
     <dimen name="tanlu_module_card_margin_left">15px</dimen>
diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
index 20e89547a3..a39e44cd6d 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -80,6 +80,7 @@
     <dimen name="tanlu_module_card_height">194px</dimen>
     <dimen name="tanlu_module_card_video_width">266px</dimen>
     <dimen name="tanlu_module_card_video_height">194px</dimen>
+    <dimen name="tanlu_module_close_height">45px</dimen>
 
     <dimen name="tanlu_module_card_margin_top">16px</dimen>
     <dimen name="tanlu_module_card_margin_left">8px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
index fc2d014256..bb79de34e4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java
@@ -59,6 +59,7 @@ public class V2XConst {
      */
     public static final String V2X_ROAD_SHOW = "v2x_road_show";
     public static final String V2X_ROAD_EVET = "v2x_road_event";
+    public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click";
     /**
      * V2X 道路事件操作类型
      */
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
index ce10423148..9aac886249 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
@@ -31,6 +31,7 @@ import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
+import com.mogo.service.tanlu.IMogoTanluProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoWindowManager;
 import com.zhidao.carchattingprovider.CallChattingProviderConstant;
@@ -54,7 +55,6 @@ public class V2XServiceManager {
     private static IMogoLocationClient mMogoLocationClient;
     private static IMogoGeoSearch mIMogoGeoSearch;
     private static IMogoSearchManager mIMogoSearchManager;
-
     private static IMogoTopViewManager mMogoTopViewManager;
     private static IMogoStatusManager mMogoStatusManager;
     private static IMogoWindowManager mIMogoWindowManager;
@@ -66,6 +66,7 @@ public class V2XServiceManager {
     private static IMogoRefreshStrategyController mIMogoRefreshStrategyController;
     private static IMogoMarkerService mIMogoMarkerService;
     private static IMogoShareManager mIMogoShareManager;
+    private static IMogoTanluProvider mIMogoTanluProvider;
 
     private static IMogoActionManager mMogoActionManager;
     private static ICarsChattingProvider mCarsChattingProvider;
@@ -105,6 +106,7 @@ public class V2XServiceManager {
         mIMogoSearchManager =  mMogoServiceApis.getSearchManagerApi();
         mIMogoMarkerService = mMogoServiceApis.getMarkerService();
         mIMogoShareManager = mMogoServiceApis.getShareManager();
+        mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
 
         mMarkerManager = mMapService.getMarkerManager(context);
         mNavi = mMapService.getNavi(context);
@@ -250,4 +252,11 @@ public class V2XServiceManager {
     public static IMogoShareManager getMogoShareManager() {
         return mIMogoShareManager;
     }
+
+    public static IMogoTanluProvider getTanluManager() {
+        return mIMogoTanluProvider;
+    }
+
+
+
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java
index b380a66d2d..8e3189ad3d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/SurroundingEventAdapter.java
@@ -79,11 +79,14 @@ public class SurroundingEventAdapter extends RecyclerView.Adapter<SurroundingEve
             }
         });
 
-        //数据绑定 TODO
-//        Glide.with(mContext)
-//                .load(R.drawable.icon_car_red)
-//                .into(mBgImageView);
-        
+        //数据绑定
+        Glide.with(mContext)
+                .load(getTypeRes(surroundingConstruction.getPoiType()))
+                .into(mBgImageView);
+
+        Glide.with(mContext)
+                .load(getTypeSmallRes(surroundingConstruction.getPoiType()))
+                .into(mTypeImageView);
     }
 
     @Override
@@ -91,34 +94,107 @@ public class SurroundingEventAdapter extends RecyclerView.Adapter<SurroundingEve
         return mPoiInfosList == null ? 0 : mPoiInfosList.size();
     }
 
+    private int getTypeSmallRes(String type) {
+        int resId = 0;
+        switch (type) {
+            case MarkerPoiTypeEnum.TRAFFIC_CHECK:
+                resId = R.drawable.mogo_image_jiaotongjiancha_small;
+                break;
+            case MarkerPoiTypeEnum.ROAD_CLOSED:
+                resId = R.drawable.mogo_image_fenglu_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
+                resId = R.drawable.mogo_image_daolushigong_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
+                resId = R.drawable.mogo_image_yongdu_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_PONDING:
+                resId = R.drawable.mogo_image_jishui_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ICE:
+                resId = R.drawable.mogo_image_jiebing_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_FOG:
+                resId = R.drawable.mogo_image_nongwu_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+                resId = R.drawable.mogo_image_accident_small;
+                break;
+            case MarkerPoiTypeEnum.FOURS_LIVING:
+                resId = R.drawable.mogo_image_shishilukuang_small;
+                break;
+            default:
+                resId = R.drawable.mogo_image_shishilukuang_small;
+                break;
+        }
+        return resId;
+    }
+
+    private int getTypeRes(String type) {
+        int resId = 0;
+        switch (type) {
+            case MarkerPoiTypeEnum.TRAFFIC_CHECK:
+                resId = R.drawable.mogo_image_jiaotongjiancha_nor;
+                break;
+            case MarkerPoiTypeEnum.ROAD_CLOSED:
+                resId = R.drawable.mogo_image_fenglu_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
+                resId = R.drawable.mogo_image_daolushigong_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
+                resId = R.drawable.mogo_image_yongdu_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_PONDING:
+                resId = R.drawable.mogo_image_jishui_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ICE:
+                resId = R.drawable.mogo_image_jiebing_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_FOG:
+                resId = R.drawable.mogo_image_nongwu_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_ACCIDENT:
+                resId = R.drawable.mogo_image_jiaotongshigu_nor;
+                break;
+            case MarkerPoiTypeEnum.FOURS_LIVING:
+                resId = R.drawable.mogo_image_shishlukuang_nor;
+                break;
+            default:
+                resId = R.drawable.mogo_image_shishlukuang_nor;
+                break;
+        }
+        return resId;
+    }
 
     private String getTypeName(String type) {
         String typeName = "";
         switch (type) {
-            case MarkerPoiTypeEnum.TRAFFIC_CHECK:
-                typeName = "交通检查";
-                break;
             case MarkerPoiTypeEnum.ROAD_CLOSED:
                 typeName = "封路";
                 break;
-            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
-                typeName = "道路施工";
-                break;
-            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
-                typeName = "道路拥堵";
-                break;
-            case MarkerPoiTypeEnum.FOURS_PONDING:
-                typeName = "道路积水";
-                break;
             case MarkerPoiTypeEnum.FOURS_ICE:
                 typeName = "路面结冰";
                 break;
             case MarkerPoiTypeEnum.FOURS_FOG:
                 typeName = "出现浓雾";
                 break;
+            case MarkerPoiTypeEnum.TRAFFIC_CHECK:
+                typeName = "交通检查";
+                break;
             case MarkerPoiTypeEnum.FOURS_ACCIDENT:
                 typeName = "交通事故";
                 break;
+            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
+                typeName = "道路拥堵";
+                break;
+            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
+                typeName = "道路施工";
+                break;
+            case MarkerPoiTypeEnum.FOURS_PONDING:
+                typeName = "道路积水";
+                break;
             case MarkerPoiTypeEnum.FOURS_LIVING:
                 typeName = "实时路况";
                 break;
@@ -130,5 +206,4 @@ public class SurroundingEventAdapter extends RecyclerView.Adapter<SurroundingEve
     }
 
 
-
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 99ef9dec10..2750ecd74a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -125,7 +125,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                 if (data != null) {
                     String poitype = data.getPoiType();
                     String address = data.getUploadAddress();
-                    String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.M_Yue_d_Ri);
+                    String time = DateTimeUtils.getTimeText(data.getUploadTimestamp(),DateTimeUtils.MM_Yue_dd_Ri_HH_mm);
                     String likeNum = String.valueOf(data.getLikeNum());
                     String notLikeNum = String.valueOf(data.getNotLikeNum());
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
index 22ee1d2379..806981ef15 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
@@ -7,17 +7,21 @@ import android.widget.TextView;
 
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
+import com.mogo.module.common.entity.V2XHistoryScenarioData;
+import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario;
 import com.mogo.module.v2x.utils.RoadConditionUtils;
+import com.mogo.module.v2x.utils.V2XSQLiteUtils;
 import com.mogo.module.v2x.view.HeartLikeView;
 import com.mogo.module.v2x.view.HeartUnLikeView;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
 import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.utils.GsonUtil;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 
@@ -101,6 +105,10 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder<V2XEventShowEntity> {
      */
     @Override
     public void delayedCloseWindow() {
+        V2XHistoryScenarioData v2XHistoryScenarioData =new  V2XHistoryScenarioData();
+        v2XHistoryScenarioData.setScenarioType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING);
+        v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(mExploreWay));
+        V2XSQLiteUtils.updateScenarioHistoryDataIsDispose(v2XHistoryScenarioData);
         itemView.postDelayed(() -> V2XIllegalParkScenario.getInstance().close(), 1000);
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
index d3c525233c..57bb85ae10 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java
@@ -83,6 +83,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
         ivNavi = itemView.findViewById(R.id.ivFaultHelpEventNavi);
         ivNavi.setOnClickListener(v -> {
             triggerStartNavi(mNoveltyInfo);
+            V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
         });
 
         // 设置视图状态监听
@@ -147,6 +148,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder<V2XEventShowEntity> {
             });
 
             ivCall.setOnClickListener(v -> {
+                V2XServiceManager.getV2XRefreshModel().respondingToHelp(mUserInfo.getSn());
                 if (!V2XUtils.isFastClick()) {
                     try {
                         mUserInfo.setSn(mV2XPushMessageEntity.getSn());
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index 1f42c55f26..e729e747b3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -73,12 +73,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
             mOldScenarioData = viewData;
             V2XPushMessageEntity xPushMessageEntity = GsonUtil.objectFromJson(viewData.getEventJsonData(), V2XPushMessageEntity.class);
 
-            if (!viewData.isDispose()) {
-                hideControlButton(View.VISIBLE);
-            } else {
-                hideControlButton(View.GONE);
-            }
-
             mTvFaultHelpName.setText(xPushMessageEntity.getDisplayName());
 
             if (!TextUtils.isEmpty(xPushMessageEntity.getHeadImgUrl())) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index c3eb2c91de..3542bee411 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -11,7 +11,9 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME
 import com.mogo.module.v2x.V2XServiceManager
 import com.mogo.module.v2x.adapter.V2XEventPagerAdapter
 import com.mogo.module.v2x.presenter.EventPanelPresenter
+import com.mogo.module.v2x.utils.TrackUtils
 import com.mogo.module.v2x.utils.V2XSQLiteUtils
+import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.*
 
@@ -29,6 +31,8 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
 
     private var mediator: TabLayoutMediator? = null
 
+    private var mV2XEventPanelHistoryCountView: V2XEventPanelHistoryCountView? = null
+
     companion object {
         private val fragment = V2XEventPanelFragment()
         fun getInstance(): V2XEventPanelFragment {
@@ -44,7 +48,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         Logger.d(MODULE_NAME, "事件面板初始化……")
         fragments = arrayOf(
                 V2XScenarioHistoryFragment(),
-                SurroundingEventFragment(),
+                V2XSurroundingFragment(),
                 V2XShareEventsFragment()
         )
         //禁用预加载
@@ -56,36 +60,37 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
         radioGroup!!.setOnCheckedChangeListener { group, checkedId ->
             when (checkedId) {
                 R.id.rbScenarioHistory -> {
+                    TrackUtils.trackV2xHistoryEvent(2)
                     vpEventPanel.setCurrentItem(0, false)
                 }
                 R.id.rbSurroundingEvent -> {
+                    TrackUtils.trackV2xHistoryEvent(3)
                     vpEventPanel.setCurrentItem(1, false)
                 }
                 R.id.rbShareEvents -> {
+                    TrackUtils.trackV2xHistoryEvent(4)
                     vpEventPanel.setCurrentItem(2, false)
                 }
             }
         }
 
         btnHidePanels.setOnClickListener {
+            TrackUtils.trackV2xHistoryEvent(5)
             hidePanel()
         }
 
-        llEventMore.setOnClickListener {
+        mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context)
+        mV2XEventPanelHistoryCountView!!.setOnClickListener {
+            TrackUtils.trackV2xHistoryEvent(1)
             if (!isPanelShow()) {
                 showPanel()
             } else {
                 hidePanel()
             }
         }
+        V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
 
-        val historyMessage = V2XSQLiteUtils.getScenarioHistoryUnDisposeData()
-        if (historyMessage != null && historyMessage.size > 0) {
-            tvEventCount.visibility = View.VISIBLE
-            tvEventCount.text = "${historyMessage.size}"
-        } else {
-            tvEventCount.visibility = View.GONE
-        }
+        changeEventCount()
     }
 
     override fun onDestroyView() {
@@ -112,4 +117,14 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
     fun isPanelShow(): Boolean {
         return clPanelContainer.visibility == View.VISIBLE
     }
+
+    // 修改未处理消息
+    fun changeEventCount() {
+//        val historyMessage = V2XSQLiteUtils.getScenarioHistoryUnDisposeData()
+//        if (historyMessage != null) {
+//            mV2XEventPanelHistoryCountView?.changeMsgCount(historyMessage.size)
+//        } else {
+//            mV2XEventPanelHistoryCountView?.changeMsgCount(0)
+//        }
+    }
 }
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/SurroundingEventFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
similarity index 75%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/SurroundingEventFragment.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index 0efb4fbb17..79e6bc117c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/SurroundingEventFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -1,6 +1,7 @@
 package com.mogo.module.v2x.fragment;
 
 import android.graphics.Color;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -22,9 +23,12 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;
 import com.mogo.module.common.entity.MarkerExploreWay;
+import com.mogo.module.common.entity.MarkerLocation;
+import com.mogo.module.common.entity.MarkerPoiTypeEnum;
 import com.mogo.module.common.entity.MarkerShowEntity;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.v2x.R;
@@ -34,6 +38,7 @@ import com.mogo.module.v2x.entity.panel.SurroundingConstruction;
 import com.mogo.module.v2x.listener.SurroundingItemClickListener;
 import com.mogo.module.v2x.presenter.SurroundingEventPresenter;
 import com.mogo.module.v2x.view.SurroundingEventView;
+import com.mogo.module.v2x.view.SurroundingMarginDecoration;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.utils.TipToast;
@@ -52,7 +57,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 /**
  * 周边事件
  */
-public class SurroundingEventFragment extends MvpFragment<SurroundingEventView, SurroundingEventPresenter> implements SurroundingEventView,
+public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, SurroundingEventPresenter> implements SurroundingEventView,
         View.OnClickListener, SurroundingItemClickListener {
     private static final String TAG = "SurroundingFragment";
     private RecyclerView mRecyclerView;
@@ -88,6 +93,8 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setOverScrollMode(OVER_SCROLL_NEVER);
         GridLayoutManager layoutManage = new GridLayoutManager(getContext(), 2);
+        int spacingInPixels = getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_size);
+        mRecyclerView.addItemDecoration(new SurroundingMarginDecoration(spacingInPixels));
         mRecyclerView.setLayoutManager(layoutManage);
 
         mAdapter = new SurroundingEventAdapter(getActivity(), poiInfosList, this);
@@ -149,7 +156,7 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
             poiInfosList.addAll(handleMapToList(getPoiTypeMap(exploreWayList)));
             mAdapter.notifyDataSetChanged();
 
-            //总条数 TODO
+            //总条数
             String originStr = String.format(getContext().getResources().getString(R.string.v2x_surrounding_top_brief), exploreWayList.size());
             SpannableString spannableString = new SpannableString(originStr);
             spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#256BFF")), 7, originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -166,7 +173,6 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
 
     private Map<String, SurroundingConstruction> getPoiTypeMap(List<MarkerExploreWay> list) {
         Map<String, SurroundingConstruction> mPoiTypeMarkers = new HashMap<>();
-        Log.d(TAG, "getPoiTypeMap list.size() = " + list.size());
         for (int i = 0; i < list.size(); i++) {
             MarkerExploreWay exploreWay = list.get(i);
             if (!mPoiTypeMarkers.containsKey(exploreWay.getPoiType())) {
@@ -187,11 +193,9 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
         List<SurroundingConstruction> valueList = new ArrayList<>(valueCollection);
 
         Log.d(TAG, "handleMapToList valueList.size() = " + valueList.size());
-
         return valueList;
     }
 
-
     /**
      * 处理marker的显示
      *
@@ -208,7 +212,7 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
             V2XServiceManager.getMarkerManager().removeMarkers(ServiceConst.CARD_TYPE_ROAD_CONDITION);
 
             try {
-                //处理 marker的显示
+                //处理 marker的显示 TODO 是否需要showbound
                 List<MarkerExploreWay> exploreWayList = construction.getConstrutList();
                 Logger.d(TAG, "onItemClickListener exploreWayList.size() = " + exploreWayList.size());
                 if (exploreWayList != null && exploreWayList.size() > 0) {
@@ -245,6 +249,9 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
                             }
                         }, i * 100L);
                     }
+
+                    //自适应显示
+                    showBonndsRoadtion(exploreWayList);
                 } else {
                     Logger.e(TAG, "onItemClickListener  exploreWayList == null");
                 }
@@ -254,6 +261,66 @@ public class SurroundingEventFragment extends MvpFragment<SurroundingEventView,
         }
     }
 
+
+    /**
+     * 自适应显示
+     *
+     * @param exploreWayList
+     */
+    private void showBonndsRoadtion(List<MarkerExploreWay> exploreWayList) {
+        Logger.e(TAG, "showBonndsRoadtion exploreWayList.size() = " + exploreWayList.size());
+        Rect rect = new Rect(
+                (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_left),
+                (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_top),
+                (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_right),
+                (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_bottom));
+
+        moveNotFresh();
+        //第一个参数：调用者,第二个参数：当前自车的位置,第三个参数：需要显示在范围内的点（不包含自车的位置）
+        //第四个参数：显示范围的UI边界,第五个参数：是否锁定自车位置（看业务需要）
+        V2XServiceManager.getMapUIController().showBounds(ServiceConst.CARD_TYPE_ROAD_CONDITION, null, getMogoList(exploreWayList), rect, false);
+    }
+
+    private void moveNotFresh() {
+        V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(TAG, true, false);
+    }
+
+    /**
+     * 构造经纬度列表
+     *
+     * @return
+     */
+    private List<MogoLatLng> getMogoList(List<MarkerExploreWay> markerExploreWayList) {
+        List<MogoLatLng> list = new ArrayList<>();
+        if (markerExploreWayList != null && markerExploreWayList.size() > 0) {
+            if (markerExploreWayList.size() < 6) {
+                for (int i = 0; i < markerExploreWayList.size(); i++) {
+                    MarkerLocation location = markerExploreWayList.get(i).getLocation();
+                    if (location != null) {
+                        MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon());
+                        list.add(mogoLatLng);
+                    } else {
+                        Logger.e(TAG, "getMogoList() < 6 location == null");
+                    }
+                }
+            } else {
+                for (int i = 0; i < 6; i++) {
+                    MarkerLocation location = markerExploreWayList.get(i).getLocation();
+                    if (location != null) {
+                        MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon());
+                        list.add(mogoLatLng);
+                    } else {
+                        Logger.e(TAG, "getMogoList() location == null");
+                    }
+                }
+            }
+        } else {
+            Logger.e(TAG, "getMogoList() markerExploreWay == null");
+        }
+        return list;
+    }
+
+
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
index a5fd840a4d..8bc5a50beb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/presenter/SurroundingEventPresenter.java
@@ -78,7 +78,7 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
                     @Override
                     public void onSuccess(SurroundingResponse data) {
                         super.onSuccess(data);
-                        Log.e("SurroundingFragment", "onSuccess ------ ");
+                        Logger.d("SurroundingFragment", "onSuccess ------> ");
                         if (data != null && data.getResult() != null) {
                             mView.showSurroudingData(data.getResult().getExploreWay());
                         }
@@ -87,7 +87,7 @@ public class SurroundingEventPresenter extends Presenter<SurroundingEventView> {
                     @Override
                     public void onError(String message, int code) {
                         super.onError(message, code);
-                        Log.e("SurroundingFragment", "onError  message = " + message + " >>> code = " + code);
+                        Logger.e("SurroundingFragment", "onError  message = " + message + " >>> code = " + code);
                     }
                 });
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
index a65c213591..67e77da25e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/AbsV2XScenario.java
@@ -106,13 +106,7 @@ public abstract class AbsV2XScenario<T> implements IV2XScenario {
      */
     public void saveLocalStory(int scenarioType, Object markerExploreWay) {
         try {
-            // 进行数据库存储
-            V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData();
-            v2XHistoryScenarioData.setScenarioType(scenarioType);
-            v2XHistoryScenarioData.setTriggerTime(TimeUtils.getNowMills());
-            v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(markerExploreWay));
-            v2XHistoryScenarioData.setDispose(false);
-            V2XSQLiteUtils.getScenarioHistoryDao().insert(v2XHistoryScenarioData);
+            V2XSQLiteUtils.saveLocalStory(scenarioType,markerExploreWay);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index 888fd9088c..029ffe5284 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -5,7 +5,10 @@ import android.content.Intent;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.service.carinfo.CarStateInfo;
 import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.IV2XScenarioManager;
 import com.mogo.module.v2x.scenario.scene.animation.V2XAnimationScenario;
 import com.mogo.module.v2x.scenario.scene.fatigue.V2XFatigueDrivingScenario;
@@ -66,7 +69,6 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                     LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent);
 
                     mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType());
-
                     // 如果没有拿到之前的，根据类型分发
                     if (mV2XScenario == null) {
                         switch (v2XMessageEntity.getType()) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
index 754dc46370..ec404c9b60 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
@@ -5,6 +5,7 @@ import android.view.ViewGroup;
 
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.service.ServiceConst;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
@@ -57,6 +58,10 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
             V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent();
             if (v2XRoadEventEntity != null) {
+                //上报路况
+                V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true);
+                V2XServiceManager.getTanluManager().uploadRoadCondition(v2XRoadEventEntity.getPoiType());
+
                 if (v2XMessageEntity.isShowState()) {
                     if (!isSameScenario(v2XMessageEntity)) {
                         // 更新要提醒的数据
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
index 910f354fe4..bab85f8730 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
@@ -16,6 +16,7 @@ import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.alarm.V2XAlarmServer;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes;
 import com.mogo.module.v2x.utils.TestOnLineCarUtils;
@@ -83,7 +84,11 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
         mBtnTriggerSeekHelpEvent = findViewById(R.id.btnTriggerSeekHelpEvent);
         mBtnTriggerParkEvent = findViewById(R.id.btnTriggerParkEvent);
 
-        mBtnTriggerOpen.setOnClickListener(v -> mFlTestPanel.setVisibility(GONE));
+        mBtnTriggerOpen.setOnClickListener(v ->
+                V2XServiceManager
+                        .getIMogoWindowManager()
+                        .removeView(V2XTestConsoleWindow.getInstance(context))
+        );
 
         mBtnClearRoadEvent.setOnClickListener(v -> {
             V2XAlarmServer.mAlertRoadEventList.clear();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
index ef2475f7f6..9a99e81db8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TrackUtils.java
@@ -39,4 +39,27 @@ public class TrackUtils {
             e.printStackTrace();
         }
     }
+
+    //道路事件操作埋点 V2X_button
+
+    /**
+     * @param type type=1 桌面按钮
+     *             <p>
+     *             type=2 tab1按钮-出行动态
+     *             <p>
+     *             type=3 tab2按钮-周边事件
+     *             <p>
+     *             type=4 tab3按钮-我的分享
+     *             <p>
+     *             type=5 tab4按钮-关闭按钮
+     */
+    public static void trackV2xHistoryEvent(int type) {
+        try {
+            Map<String, Object> properties = new HashMap<>();
+            properties.put("type", type);
+            V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_EVET_HISTORY_BUTTON, properties);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
index 47e52c8be5..1be148ea12 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/V2XSQLiteUtils.java
@@ -2,7 +2,9 @@ package com.mogo.module.v2x.utils;
 
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.v2x.fragment.V2XEventPanelFragment;
 import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.utils.GsonUtil;
 import com.mogo.utils.sqlite.SQLDaoFactory;
 import com.mogo.utils.sqlite.SQLIDao;
 
@@ -61,6 +63,7 @@ public class V2XSQLiteUtils {
         try {
             int result = getScenarioHistoryDao().delete(new V2XHistoryScenarioData());
             Logger.d(V2XConst.MODULE_NAME, "删除数据成功：" + result);
+            V2XEventPanelFragment.Companion.getInstance().changeEventCount();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -73,6 +76,13 @@ public class V2XSQLiteUtils {
         return getScenarioHistoryDao().query(new V2XHistoryScenarioData(), "triggerTime", true);
     }
 
+    /**
+     * 查询当天的指定的V2X数据
+     */
+    public static List<V2XHistoryScenarioData> getTargetScenarioHistoryData(V2XHistoryScenarioData scenarioData) {
+        return getScenarioHistoryDao().query(scenarioData, "triggerTime", true);
+    }
+
     /**
      * 查询当天的未评价V2X数据
      */
@@ -89,6 +99,56 @@ public class V2XSQLiteUtils {
         try {
             int result = getScenarioHistoryDao().update(oldScenarioData, newScenarioData);
             Logger.d(V2XConst.MODULE_NAME, "修改数据成功：" + result);
+            V2XEventPanelFragment.Companion.getInstance().changeEventCount();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 修改指定的数据为已经操作的数据
+     */
+    public static void updateScenarioHistoryDataIsDispose(V2XHistoryScenarioData oldScenarioData) {
+        try {
+            V2XHistoryScenarioData newScenarioData = new V2XHistoryScenarioData();
+            newScenarioData.setDispose(true);
+            newScenarioData.setTriggerTime(TimeUtils.getNowMills());
+            newScenarioData.setEventJsonData(oldScenarioData.getEventJsonData());
+            newScenarioData.setScenarioType(oldScenarioData.getScenarioType());
+
+            int result = getScenarioHistoryDao().update(oldScenarioData, newScenarioData);
+            Logger.d(V2XConst.MODULE_NAME, "修改数据成功：" + result);
+            V2XEventPanelFragment.Companion.getInstance().changeEventCount();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 存储本地数据，每个数据只能存在一次，所以存储之前先查询数据库如果已经存在则修改触碰时间
+     *
+     * @param markerExploreWay 要存储的场景
+     */
+    public static void saveLocalStory(int scenarioType, Object markerExploreWay) {
+        try {
+            // 进行数据库存储
+            V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData();
+            v2XHistoryScenarioData.setScenarioType(scenarioType);
+            v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(markerExploreWay));
+
+            List<V2XHistoryScenarioData> historyScenarioData = getTargetScenarioHistoryData(v2XHistoryScenarioData);
+
+            v2XHistoryScenarioData.setTriggerTime(TimeUtils.getNowMills());
+            v2XHistoryScenarioData.setDispose(false);
+
+            if (historyScenarioData != null && historyScenarioData.size() > 0) {
+                // 更新数据
+                V2XSQLiteUtils.getScenarioHistoryDao().update(historyScenarioData.get(0), v2XHistoryScenarioData);
+            } else {
+                // 存储新数据
+                V2XSQLiteUtils.getScenarioHistoryDao().insert(v2XHistoryScenarioData);
+            }
+            V2XEventPanelFragment.Companion.getInstance().changeEventCount();
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java
new file mode 100644
index 0000000000..38b67e6f3e
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java
@@ -0,0 +1,33 @@
+package com.mogo.module.v2x.view;
+
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * @author lixiaopeng
+ * @description
+ * @since 2020/8/11
+ */
+public class SurroundingMarginDecoration extends RecyclerView.ItemDecoration {
+    private int margin ;
+
+    public SurroundingMarginDecoration(int space) {
+        margin = space;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        outRect.bottom = margin;
+        //由于每行都只有2个，所以第一个都是2的倍数，把左边距设为0
+        if (parent.getChildLayoutPosition(view) % 2 == 0) {
+            outRect.left = 0;
+            outRect.right = margin;
+        } else {
+            outRect.left = margin;
+            outRect.right = 0;
+        }
+    }
+
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java
new file mode 100644
index 0000000000..b372bc373d
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java
@@ -0,0 +1,53 @@
+package com.mogo.module.v2x.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.mogo.module.v2x.R;
+
+/**
+ * 事件面板的提示按钮
+ *
+ * @author donghongyu
+ */
+public class V2XEventPanelHistoryCountView extends LinearLayout {
+    private RelativeLayout mLlEventMore;
+    private ImageView mBtnShowOrHidePanels;
+    private TextView mTvEventCount;
+
+    public V2XEventPanelHistoryCountView(Context context) {
+        this(context, null);
+    }
+
+    public V2XEventPanelHistoryCountView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public V2XEventPanelHistoryCountView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        LayoutInflater.from(context).inflate(R.layout.view_event_panel_history_count, this);
+
+        mLlEventMore = (RelativeLayout) findViewById(R.id.llEventMore);
+        mBtnShowOrHidePanels = (ImageView) findViewById(R.id.btnShowOrHidePanels);
+        mTvEventCount = (TextView) findViewById(R.id.tvEventCount);
+    }
+
+    public void changeMsgCount(int count) {
+        if (mTvEventCount != null) {
+            if (count > 0) {
+                mTvEventCount.setVisibility(View.VISIBLE);
+            } else {
+                mTvEventCount.setVisibility(View.GONE);
+            }
+            mTvEventCount.setText("" + count);
+        }
+    }
+}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png
index 93388e1ef0..0eb58cb3e0 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png
new file mode 100644
index 0000000000..815dc5b40c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_accident_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png
new file mode 100644
index 0000000000..893d02518c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_blank_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png
new file mode 100644
index 0000000000..658a74c2e4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png
new file mode 100644
index 0000000000..33e7d8873e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_daolushigong_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png
new file mode 100644
index 0000000000..d8c73a8404
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png
new file mode 100644
index 0000000000..28f0db939b
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_fenglu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png
new file mode 100644
index 0000000000..7a1c124871
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png
new file mode 100644
index 0000000000..0efac11676
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongjiancha_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png
new file mode 100644
index 0000000000..06163dda3f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiaotongshigu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png
new file mode 100644
index 0000000000..dcef2a496c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png
new file mode 100644
index 0000000000..37ed59c3b4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jiebing_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png
new file mode 100644
index 0000000000..23aaf88e60
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png
new file mode 100644
index 0000000000..c93bd218fb
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_jishui_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png
new file mode 100644
index 0000000000..3901854251
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png
new file mode 100644
index 0000000000..698b84ffbc
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_nongwu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png
new file mode 100644
index 0000000000..f46fe492c4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png
new file mode 100644
index 0000000000..a247ac6428
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_qiuzhu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png
new file mode 100644
index 0000000000..632d1e5ad3
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishilukuang_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png
new file mode 100644
index 0000000000..0a255cbe93
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_shishlukuang_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png
new file mode 100644
index 0000000000..c25514506f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png
new file mode 100644
index 0000000000..bdba45d7e0
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/mogo_image_yongdu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png
new file mode 100644
index 0000000000..815dc5b40c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_accident_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png
new file mode 100644
index 0000000000..c77748e661
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_blank_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png
new file mode 100644
index 0000000000..658a74c2e4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png
new file mode 100644
index 0000000000..33e7d8873e
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png
new file mode 100644
index 0000000000..d8c73a8404
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png
new file mode 100644
index 0000000000..28f0db939b
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png
new file mode 100644
index 0000000000..7a1c124871
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png
new file mode 100644
index 0000000000..0efac11676
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png
new file mode 100644
index 0000000000..06163dda3f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png
new file mode 100644
index 0000000000..dcef2a496c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png
new file mode 100644
index 0000000000..37ed59c3b4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png
new file mode 100644
index 0000000000..23aaf88e60
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png
new file mode 100644
index 0000000000..c93bd218fb
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png
new file mode 100644
index 0000000000..3901854251
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png
new file mode 100644
index 0000000000..698b84ffbc
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png
new file mode 100644
index 0000000000..f46fe492c4
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png
new file mode 100644
index 0000000000..a247ac6428
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_qiuzhu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png
new file mode 100644
index 0000000000..632d1e5ad3
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png
new file mode 100644
index 0000000000..0a255cbe93
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png
new file mode 100644
index 0000000000..c25514506f
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png
new file mode 100644
index 0000000000..bdba45d7e0
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml
new file mode 100644
index 0000000000..b92c805da1
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/surrounding_card_background"/>
+    <corners android:radius="@dimen/module_v2x_surrounding_item_bottom_size" />
+
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml
new file mode 100644
index 0000000000..d7ea85c05e
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_surrounding_item_bottom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/surrounding_item_bottom_color"/>
+    <corners android:bottomLeftRadius="@dimen/module_v2x_surrounding_item_bottom_size"
+        android:bottomRightRadius="@dimen/module_v2x_surrounding_item_bottom_size"/>
+
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index bccdea1990..2452269d9f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -49,6 +49,7 @@
         android:id="@+id/ivIconP"
         android:layout_width="@dimen/module_v2x_history_event_icon_size"
         android:layout_height="@dimen/module_v2x_history_event_icon_size"
+        android:layout_marginEnd="@dimen/dp_16"
         android:src="@drawable/icon_illegal_parking"
         app:layout_constraintTop_toBottomOf="@+id/tagEventType"
         app:layout_constraintTop_toTopOf="@+id/tvAddress" />
@@ -57,7 +58,6 @@
         android:id="@+id/tvAddress"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_16"
         android:layout_marginTop="@dimen/dp_24"
         android:layout_marginRight="@dimen/dp_30"
         android:ellipsize="end"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
index 827dbace7b..742913252d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml
@@ -40,9 +40,11 @@
         android:text="待援助"
         android:textColor="#ffffff"
         android:textSize="@dimen/dp_28"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
         app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
+        app:layout_constraintTop_toTopOf="@+id/tagEventType"
+        tools:visibility="visible" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivFaultHelpHead"
@@ -69,7 +71,7 @@
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginEnd="@dimen/dp_30"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_34"
+        android:textSize="@dimen/dp_33"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
         app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
@@ -82,11 +84,12 @@
         android:id="@+id/tvFaultHelpEventTime"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
         android:layout_marginEnd="@dimen/dp_30"
         android:layout_marginBottom="@dimen/dp_24"
         android:alpha="0.59"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_30"
+        android:textSize="@dimen/dp_29"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/tvFaultHelpDistance"
         app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
@@ -95,16 +98,16 @@
 
     <TextView
         android:id="@+id/tvFaultHelpDistance"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/dp_30"
         android:gravity="center_vertical"
         android:textColor="#FFF"
         android:textSize="@dimen/dp_80"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintBottom_toBottomOf="@+id/tvFaultHelpEventTime"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
-        app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintStart_toEndOf="@+id/tvFaultHelpEventTime"
         tools:text="300M" />
 
     <ImageView
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 359007e137..d46a797d3d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -4,7 +4,7 @@
     android:id="@+id/clPanelContainer"
     android:layout_width="642px"
     android:layout_height="532px"
-    android:background="@color/surrounding_card_background">
+    android:background="@drawable/bg_v2x_event_surrounding_item">
 
     <!--顶部layout-->
     <RelativeLayout
@@ -20,7 +20,6 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="20px"
             android:textSize="18px"
-            android:text="周边5公里，共有23条数据 "
             android:textColor="@color/white" />
 
         <TextView
@@ -43,8 +42,8 @@
         android:id="@+id/list_layout_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="15px"
-        android:layout_marginBottom="30px"
+        android:layout_marginTop="10px"
+        android:layout_marginBottom="20px"
         android:layout_below="@+id/layout_top">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -68,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="59px"
-                android:src="@drawable/icon_default_black_logo" />
+                android:src="@drawable/mogo_image_blank_nor" />
 
             <TextView
                 android:id="@+id/tv_main_empty_1"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
index 8701969d36..bb92f13ae4 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
@@ -2,21 +2,18 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_root"
     android:layout_width="291px"
-    android:layout_height="173px"
-    android:padding="8px"
-    android:background="#FF1B1B">
+    android:layout_height="173px">
 
     <ImageView
         android:id="@+id/iv_event_bg"
-        android:layout_width="291px"
-        android:layout_height="130px"
         android:scaleType="center"
-        android:src="@drawable/icon_default_black_logo" />
+        android:layout_width="280px"
+        android:layout_height="130px" />
 
     <RelativeLayout
         android:layout_below="@+id/iv_event_bg"
-        android:background="@color/surrounding_item_bottom_color"
-        android:layout_width="match_parent"
+        android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
+        android:layout_width="280px"
         android:layout_height="43px">
 
         <ImageView
@@ -43,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="22px"
+            android:layout_marginRight="30px"
             android:layout_centerVertical="true"
             android:textSize="16px"
             android:textColor="@color/transparent_white_30"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index ec35978846..9379fbfae5 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -5,39 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
-        android:id="@+id/llEventMore"
-        android:layout_width="@dimen/dp_132"
-        android:layout_height="@dimen/dp_132"
-        android:background="@drawable/v2x_drawable_event_more_bkg"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:translationZ="1dp">
-
-        <ImageView
-            android:id="@+id/btnShowOrHidePanels"
-            android:layout_width="@dimen/dp_52"
-            android:layout_height="@dimen/dp_52"
-            android:layout_centerInParent="true"
-            android:src="@drawable/icon_event_panel_more" />
-
-        <TextView
-            android:id="@+id/tvEventCount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginEnd="@dimen/dp_12"
-            android:background="@drawable/v2x_drawable_event_message_bkg"
-            android:paddingStart="@dimen/dp_10"
-            android:paddingEnd="@dimen/dp_10"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/dp_28"
-            android:visibility="gone"
-            tools:text="9"
-            tools:visibility="visible" />
-    </RelativeLayout>
-
     <com.mogo.module.v2x.view.RoundConstraintLayout
         android:id="@+id/clPanelContainer"
         android:layout_width="match_parent"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
new file mode 100644
index 0000000000..3358bb6463
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/llEventMore"
+    android:layout_width="@dimen/dp_132"
+    android:layout_height="@dimen/dp_132"
+    android:background="@drawable/v2x_drawable_event_more_bkg"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:translationZ="1dp">
+
+    <ImageView
+        android:id="@+id/btnShowOrHidePanels"
+        android:layout_width="@dimen/dp_52"
+        android:layout_height="@dimen/dp_52"
+        android:layout_centerInParent="true"
+        android:src="@drawable/icon_event_panel_more" />
+
+    <TextView
+        android:id="@+id/tvEventCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginEnd="@dimen/dp_12"
+        android:background="@drawable/v2x_drawable_event_message_bkg"
+        android:paddingStart="@dimen/dp_10"
+        android:paddingEnd="@dimen/dp_10"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/dp_28"
+        android:visibility="gone"
+        tools:text="9"
+        tools:visibility="visible" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
index 2ed3141746..0d93925d85 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -6,8 +6,8 @@
 
     <ImageView
         android:id="@+id/ivEmptyView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_390"
+        android:layout_height="@dimen/dp_390"
         android:layout_marginTop="@dimen/dp_120"
         android:src="@drawable/icon_blank_history_event"
         app:layout_constraintBottom_toTopOf="@+id/tvTrip"
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
index aa04f0d43c..651a0e65b0 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
@@ -16,7 +16,7 @@
     "distance":670,
     "fileType":1,
     "generateTime":1593587904096,
-    "infoId":"727905963169587200",
+    "infoId":"72790596316958720000",
     "items":[
       {
         "illegalCount":0,
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index db75de735e..a7a1f0b66f 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -23,5 +23,11 @@
     <dimen name="module_v2x_event_distance_title">40px</dimen>
 
     <dimen name="module_v2x_history_event_icon_size">80px</dimen>
+    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
+
+    <dimen name="tanlu_module_map_left">550px</dimen>
+    <dimen name="tanlu_module_map_top">200px</dimen>
+    <dimen name="tanlu_module_map_right">200px</dimen>
+    <dimen name="tanlu_module_map_bottom">100px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index d1601948ca..12bbc42e11 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -24,6 +24,11 @@
     <dimen name="module_v2x_event_distance_title">22px</dimen>
 
     <dimen name="module_v2x_history_event_icon_size">40px</dimen>
-
+    <dimen name="module_v2x_surrounding_item_bottom_size">6px</dimen>
+    <dimen name="module_v2x_surrounding_item_size">16px</dimen>
+    <dimen name="tanlu_module_map_left">550px</dimen>
+    <dimen name="tanlu_module_map_top">200px</dimen>
+    <dimen name="tanlu_module_map_right">200px</dimen>
+    <dimen name="tanlu_module_map_bottom">100px</dimen>
 
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values/style.xml b/modules/mogo-module-v2x/src/main/res/values/style.xml
index 391f62efd2..f39c59f7d6 100644
--- a/modules/mogo-module-v2x/src/main/res/values/style.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/style.xml
@@ -6,7 +6,7 @@
 
     <style name="customRatingBarStyle" parent="@style/Widget.AppCompat.RatingBar">
         <item name="android:minHeight">18px</item>
-        <item name="android:maxHeight">18px</item>
+        <item name="android:maxHeight">20px</item>
         <item name="android:maxWidth">16px</item>
         <item name="android:minWidth">16px</item>
         <item name="android:spacing">3.7px</item>
diff --git a/modules/mogo-module-widgets/.gitignore b/modules/mogo-module-widgets/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/modules/mogo-module-widgets/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/README.md b/modules/mogo-module-widgets/README.md
new file mode 100644
index 0000000000..837a8c3cec
--- /dev/null
+++ b/modules/mogo-module-widgets/README.md
@@ -0,0 +1,3 @@
+# 项目介绍
+
+一些独立于其他业务的悬浮小控件
diff --git a/modules/mogo-module-widgets/build.gradle b/modules/mogo-module-widgets/build.gradle
new file mode 100644
index 0000000000..59e1db7c2e
--- /dev/null
+++ b/modules/mogo-module-widgets/build.gradle
@@ -0,0 +1,70 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.android.library'
+apply plugin: 'com.alibaba.arouter'
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    // buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
+    }
+
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.arouter
+    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.rxjava
+    implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.carcallprovider
+
+    if (Boolean.valueOf(RELEASE)) {
+        api rootProject.ext.dependencies.mogomap
+        api rootProject.ext.dependencies.mogomapapi
+        api rootProject.ext.dependencies.mogoutils
+        api rootProject.ext.dependencies.mogocommons
+        api rootProject.ext.dependencies.mogoserviceapi
+        implementation rootProject.ext.dependencies.modulecommon
+        implementation rootProject.ext.dependencies.gpssimulator
+    } else {
+        api project(":libraries:mogo-map")
+        api project(":libraries:mogo-map-api")
+        api project(":foudations:mogo-utils")
+        api project(":foudations:mogo-commons")
+        api project(':services:mogo-service-api')
+        implementation project(':modules:mogo-module-common')
+        implementation project(':modules:mogo-module-gps-simulator')
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-widgets/consumer-rules.pro b/modules/mogo-module-widgets/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-widgets/gradle.properties b/modules/mogo-module-widgets/gradle.properties
new file mode 100644
index 0000000000..0d62fa48dd
--- /dev/null
+++ b/modules/mogo-module-widgets/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-widgets
+VERSION_CODE=1
diff --git a/modules/mogo-module-widgets/proguard-rules.pro b/modules/mogo-module-widgets/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/modules/mogo-module-widgets/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/AndroidManifest.xml b/modules/mogo-module-widgets/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..fb0d21444c
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest package="com.mogo.module.widgets">
+
+
+</manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java
new file mode 100644
index 0000000000..3773c41930
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java
@@ -0,0 +1,137 @@
+package com.mogo.module.widgets;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.Gravity;
+import android.view.WindowManager;
+
+import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.module.common.wm.WindowManagerView;
+import com.mogo.utils.LaunchUtils;
+import com.mogo.utils.ResourcesHelper;
+import com.mogo.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/6/5
+ * <p>
+ * 描述
+ */
+class AutoNaviIntentHandler {
+
+    private static final String TAG = "AutoNaviIntentHandler";
+
+    private static volatile AutoNaviIntentHandler sInstance;
+
+    private AutoNaviIntentHandler() {
+    }
+
+    public static AutoNaviIntentHandler getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( AutoNaviIntentHandler.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new AutoNaviIntentHandler();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private WindowManagerView mWindowManagerView;
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    public void handle( Context context, Intent intent ) {
+        int keyType = intent.getIntExtra( "KEY_TYPE", 0 );
+        switch ( keyType ) {
+            case 10021:
+                closeEntrance();
+                break;
+            case 10019:
+                int extraState = intent.getIntExtra( "EXTRA_STATE", -1 );
+                switch ( extraState ) {
+                    case 3:
+                        syncAutoNaviNavingStatus( context );
+                        break;
+                    case 4:
+                        closeEntrance();
+                        break;
+                    case 8:
+                        showEntrance( context );
+                        break;
+                    case 9:
+                        closeEntrance();
+                        break;
+                }
+                break;
+        }
+    }
+
+    /**
+     * 通过查询高德地图状态后再显示
+     *
+     * @param context
+     */
+    public void preShowEntrance( Context context ) {
+        syncAutoNaviForgroundStatus( context );
+    }
+
+    private void showEntrance( Context context ) {
+        if ( mWindowManagerView == null ) {
+            mWindowManagerView = new WindowManagerView.Builder( AbsMogoApplication.getApp() )
+                    .contentView( R.layout.module_widgets_app_entrance )
+                    .size( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT )
+                    .gravity( Gravity.LEFT | Gravity.TOP )
+                    .position( ResourcesHelper.getDimensionPixelSize( context, R.dimen.module_widgets_app_entrance_x ), ResourcesHelper.getDimensionPixelSize( AbsMogoApplication.getApp(), R.dimen.module_widgets_app_entrance_y ) )
+                    .showInWindowManager();
+            mWindowManagerView.attachTouchEvent( view -> {
+                try {
+                    if ( DebugConfig.isLauncher() ) {
+                        MogoWidgetManger.getInstance().getApis().getLauncherApi().backToLauncher( context );
+                    } else {
+                        LaunchUtils.launchByPkg( context, "com.mogo.launcher.app" );
+                    }
+                } catch ( Exception e ) {
+                    Logger.e( TAG, e, "error." );
+                }
+            } );
+        }
+        try {
+            mWindowManagerView.show();
+        } catch ( Exception e ) {
+            Logger.e( TAG, e, "error." );
+        }
+    }
+
+    public void closeEntrance() {
+        if ( mWindowManagerView == null ) {
+            return;
+        }
+        try {
+            mWindowManagerView.dismiss();
+        } catch ( Exception e ) {
+            Logger.e( TAG, e, "error." );
+        }
+    }
+
+    public void syncAutoNaviForgroundStatus( Context context ) {
+        Intent intent = new Intent();
+        intent.setAction( "AUTONAVI_STANDARD_BROADCAST_RECV" );
+        intent.putExtra( "KEY_TYPE", 12404 );
+        intent.putExtra( "EXTRA_REQUEST_AUTO_STATE", 0 );
+        context.sendBroadcast( intent );
+    }
+
+    public void syncAutoNaviNavingStatus( Context context ) {
+        Intent intent = new Intent();
+        intent.setAction( "AUTONAVI_STANDARD_BROADCAST_RECV" );
+        intent.putExtra( "KEY_TYPE", 12404 );
+        intent.putExtra( "EXTRA_REQUEST_AUTO_STATE", 1 );
+        context.sendBroadcast( intent );
+    }
+}
+
diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java
new file mode 100644
index 0000000000..289c0a30ca
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java
@@ -0,0 +1,108 @@
+package com.mogo.module.widgets;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.map.navi.IMogoNaviListener2;
+import com.mogo.service.IMogoServiceApis;
+import com.mogo.service.intent.IMogoIntentListener;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/8/12
+ *
+ * 描述
+ */
+class MogoWidgetManger implements IMogoNaviListener2, IMogoIntentListener, IMogoStatusChangedListener {
+
+    // 接受其他app发给高德的广播
+    public static final String ACTION_AUTO_NAVI_RECEIVER = "AUTONAVI_STANDARD_BROADCAST_RECV";
+    // 接受高德发过来的广播
+    public static final String ACTION_AUTO_NAVI_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
+
+    private static final String TAG = "MogoWidgetManger";
+
+    private static volatile MogoWidgetManger sInstance;
+
+    private MogoWidgetManger() {
+    }
+
+    public static MogoWidgetManger getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( MogoWidgetManger.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new MogoWidgetManger();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    private Object readResolve() {
+        // 阻止反序列化，必须实现 Serializable 接口
+        return sInstance;
+    }
+
+    private IMogoServiceApis mApis;
+    private Context mContext;
+
+    public IMogoServiceApis getApis() {
+        return mApis;
+    }
+
+    public void init( Context context ) {
+        mContext = context;
+        mApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+        initMapStatusListener();
+        initStatusListener();
+        initIntentListener();
+        AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
+    }
+
+    private void initMapStatusListener() {
+        mApis.getRegisterCenterApi().registerMogoNaviListener( TAG, this );
+    }
+
+    private void initIntentListener() {
+        mApis.getIntentManagerApi().registerIntentListener( ACTION_AUTO_NAVI_RECEIVER, this );
+        mApis.getIntentManagerApi().registerIntentListener( ACTION_AUTO_NAVI_SEND, this );
+    }
+
+    private void initStatusListener() {
+        mApis.getStatusManagerApi().registerStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_RESUME, this );
+    }
+
+    @Override
+    public void onStopNavi() {
+        AutoNaviIntentHandler.getInstance().closeEntrance();
+    }
+
+    @Override
+    public void onStartNavi() {
+        AutoNaviIntentHandler.getInstance().preShowEntrance( mContext );
+    }
+
+    @Override
+    public void onIntentReceived( String intentStr, Intent intent ) {
+        AutoNaviIntentHandler.getInstance().handle( mContext, intent );
+    }
+
+    @Override
+    public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) {
+        if ( descriptor == StatusDescriptor.MAIN_PAGE_RESUME ) {
+            if ( isTrue ) {
+                AutoNaviIntentHandler.getInstance().closeEntrance();
+            } else {
+                AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
+            }
+        }
+    }
+}
diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java
new file mode 100644
index 0000000000..6cc91544a3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java
@@ -0,0 +1,99 @@
+package com.mogo.module.widgets;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.map.listener.IMogoMapListener;
+import com.mogo.map.location.IMogoLocationListener;
+import com.mogo.map.marker.IMogoMarkerClickListener;
+import com.mogo.map.navi.IMogoNaviListener;
+import com.mogo.service.module.IMogoModuleLifecycle;
+import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.module.ModuleType;
+import com.mogo.utils.UiThreadHandler;
+import com.mogo.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/8/12
+ *
+ * 描述
+ */
+@Route( path = MogoWidgetsProvider.PATH )
+class MogoWidgetsProvider implements IMogoModuleProvider {
+
+    private static final String TAG = "MogoWidgetsProvider";
+
+    public static final String PATH = "/widgets/provider";
+    public static final String NAME = "MogoWidgetProvider";
+
+    @Override
+    public Fragment createFragment( Context context, Bundle data ) {
+        return null;
+    }
+
+    @Override
+    public View createView( Context context ) {
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public String getModuleName() {
+        return null;
+    }
+
+    @Override
+    public IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
+
+    @Override
+    public IMogoMapListener getMapListener() {
+        return null;
+    }
+
+    @Override
+    public int getType() {
+        return ModuleType.TYPE_SERVICE;
+    }
+
+    @Override
+    public IMogoNaviListener getNaviListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoLocationListener getLocationListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
+
+    @Override
+    public String getAppPackage() {
+        return null;
+    }
+
+    @Override
+    public String getAppName() {
+        return null;
+    }
+
+    @Override
+    public void init( Context context ) {
+        Logger.d( TAG, "init." );
+        UiThreadHandler.postDelayed( () -> {
+            MogoWidgetManger.getInstance().init( context );
+        }, 5500 );
+    }
+}
diff --git a/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml
new file mode 100644
index 0000000000..b46cff52de
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <gradient android:angle="180" android:endColor="#5CC1FF" android:startColor="#256BFF" />
+            <corners android:radius="@dimen/module_widgets_app_entrance_corner_size" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
new file mode 100644
index 0000000000..cacbb2a8e2
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/module_widgets_app_entrance_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/module_widgets_app_entrance_bkg"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="@dimen/module_widgets_app_entrance_size"
+        android:layout_height="@dimen/module_widgets_app_entrance_size"
+        android:gravity="center"
+        android:text="@string/module_widgets_app_entrance_text"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/module_widgets_app_entrance_textSize" />
+</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
new file mode 100644
index 0000000000..3aa8cdc5a8
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">20px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">15px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
+    <dimen name="module_widgets_app_entrance_y">112px</dimen>
+    <dimen name="module_widgets_app_entrance_x">929px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..3aa8cdc5a8
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">20px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">15px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
+    <dimen name="module_widgets_app_entrance_y">112px</dimen>
+    <dimen name="module_widgets_app_entrance_x">929px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values/dimens.xml b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values/strings.xml b/modules/mogo-module-widgets/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..717eefe1fe
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">mogo-module-service</string>
+    <string name="module_widgets_app_entrance_text">辅助\n驾驶</string>
+</resources>
diff --git a/settings.gradle b/settings.gradle
index a84145fbe0..de58f441e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
+include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
 include ':libraries:mogo-tanlu-api'
 include ':foudations:mogo-base-services-apk'