diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 3b38944592..11a28982c5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -42,6 +42,9 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
             <option value="$PROJECT_DIR$/modules/mogo-module-media" />
             <option value="$PROJECT_DIR$/modules/mogo-module-obu" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push-base" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
diff --git a/app/build.gradle b/app/build.gradle
index 39683d4750..2f8c0e5c6e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,9 +50,9 @@ android {
             signingConfig signingConfigs.release
         }
         release {
-            minifyEnabled true
-            zipAlignEnabled true
-            shrinkResources true
+            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -265,6 +265,7 @@ dependencies {
     implementation rootProject.ext.dependencies.moduletanlu, {
         exclude group: 'com.mogo.module', module: 'module-share'
     }
+    implementation rootProject.ext.dependencies.mogologlib
 
     if (Boolean.valueOf(RELEASE)) {
         launcherImplementation rootProject.ext.dependencies.modulemainlauncher
diff --git a/app/functions/socketpush.gradle b/app/functions/socketpush.gradle
index ef9923abfd..b42be11b59 100644
--- a/app/functions/socketpush.gradle
+++ b/app/functions/socketpush.gradle
@@ -1,7 +1,13 @@
 // 基于socket长链的push推送
 
 project.dependencies {
-    implementation rootProject.ext.dependencies.modulepushbase
-    launcherImplementation rootProject.ext.dependencies.modulepush
-    independentImplementation rootProject.ext.dependencies.modulepushnoop
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.modulepushbase
+        launcherImplementation rootProject.ext.dependencies.modulepush
+        independentImplementation rootProject.ext.dependencies.modulepushnoop
+    } else {
+        implementation project(":modules:mogo-module-push-base")
+        launcherImplementation project(":modules:mogo-module-push")
+        independentImplementation project(":modules:mogo-module-push-noop")
+    }
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 1e2af9ad7a..3f451d8bed 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -335,9 +335,12 @@
 
 #-----Netty-----
 -keepattributes Signature,InnerClasses
--keepclasseswithmembers class io.netty.** {
-    *;
-}
+-keep class io.netty.** {*;}
+-keep class org.apache.** {*;}
+-keep class org.apache.logging.**{*;}
+-keepclasseswithmembers class io.netty.** {*;}
+-keepclasseswithmembers class org.apache.logging.**{*;}
+-keep class org.apache.http.**{*;}
 -dontwarn io.netty.**
 -dontwarn sun.**
 
@@ -354,8 +357,17 @@
 -keep class com.zhidao.autopilot.support.**{*;}
 -keep class com.zhidao.voice.library.**{*;}
 -keep class com.zhidao.voicesdk.**{*;}
+-keep class com.zhidao.smartv2x.**{*;}
+-keep class com.zhidao.accountsdk.**{*;}
+-keep class com.zhidao.account.**{*;}
+-keep class com.zhidao.locupload.**{*;}
+-keep class com.zhidao.tcloginsdk.**{*;}
+-keep class com.zhidao.utils.**{*;}
+-keep class com.hw.videoprocessor.**{*;}
 -dontwarn com.elegant.network.**
 
+-keep class com.bytedance.boost_multidex.**{*;}
+
 
 
 
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 2fd042befb..d37549c3ee 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -67,14 +67,13 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );
 
-        MogoModulePaths.addModule( new MogoModule( EventPanelConstants.PATH_NAME,
-                EventPanelConstants.MODULE_NAME ) );
-        MogoModulePaths.addModule( new MogoModule( LeftPanelConst.PATH_NAME,
-                LeftPanelConst.MODULE_NAME ) );
+        MogoModulePaths.addModule( new MogoModule( EventPanelConstants.PATH_NAME, EventPanelConstants.MODULE_NAME ) );
+        MogoModulePaths.addModule( new MogoModule( LeftPanelConst.PATH_NAME, LeftPanelConst.MODULE_NAME ) );
 
         MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) );
         MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) );
         MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) );
+        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_LOG_LIB, "LogLib"));
 
         if ( !DebugConfig.isLauncher() ) {
             PersistentManager.getInstance().initManager( this );
diff --git a/config.gradle b/config.gradle
index c0a81ac099..ea7d423463 100644
--- a/config.gradle
+++ b/config.gradle
@@ -131,7 +131,7 @@ targetSdkVersion        : 22,
             jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0",
 
             // 统一登录
-            accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.8",
+            accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.11",
             // crash
             crashSdk                 : "com.zhidaoauto.crash.log:library:1.0.5",
             kotlinstdlibjdk7         : "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
@@ -173,5 +173,16 @@ targetSdkVersion        : 22,
             // 基础服务实现
             mogobaseservicesdk       : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}",
             mogobaseserviceapk       : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}",
+            // loglib
+            mogologlib               : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
+
+            // google
+            googlezxing              : "com.google.zxing:core:3.3.3",
+            litezxing                : "com.google.zxing:litezxing:1.0.29.8",
+
+            // android - room
+            androidxroomruntime      : "androidx.room:room-runtime:2.2.3",
+            androidxroomcompiler     : "androidx.room:room-compiler:2.2.3",
+            androidxroomktx          : "androidx.room:room-ktx:2.2.3",
     ]
 }
\ No newline at end of file
diff --git a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java
index 2a23051695..ede1bc990e 100644
--- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -10,6 +10,7 @@ import com.mogo.service.passport.IMogoPassportManager;
 import com.mogo.service.passport.IMogoTicketCallback;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.account.sdk.AccountClientManager;
+import com.zhidao.account.sdk.Environment;
 import com.zhidao.account.sdk.callback.TicketInfoCallback;
 import com.zhidao.account.sdk.network.NetEnvironManager;
 
@@ -27,13 +28,14 @@ class PassportManager implements IMogoPassportManager {
 
     private static volatile PassportManager sInstance;
 
-    private PassportManager(){}
+    private PassportManager() {
+    }
 
     @Keep
-    public static PassportManager getInstance(){
-        if( sInstance == null ){
-            synchronized( PassportManager.class ) {
-                if( sInstance == null ){
+    public static PassportManager getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( PassportManager.class ) {
+                if ( sInstance == null ) {
                     sInstance = new PassportManager();
                 }
             }
@@ -41,7 +43,7 @@ class PassportManager implements IMogoPassportManager {
         return sInstance;
     }
 
-    public synchronized void release(){
+    public synchronized void release() {
         sInstance = null;
     }
 
@@ -77,11 +79,25 @@ class PassportManager implements IMogoPassportManager {
 
     @Override
     public void init( Context context ) {
+        AccountClientManager.init( context.getApplicationContext(), getNetEnvironment(), NetEnvironManager.OS_2C, "os2.0-launcher" );
+    }
+
+    private Environment getNetEnvironment() {
         int mode = DebugConfig.getNetMode();
         if ( mode == DebugConfig.NET_MODE_DEMO ) {
             // 演示环境用 qa 的
             mode = DebugConfig.NET_MODE_QA;
         }
-        AccountClientManager.init( context.getApplicationContext(), mode, NetEnvironManager.OS_2C, "os2.0-launcher" );
+        switch ( mode ) {
+            case DebugConfig.NET_MODE_DEV:
+                return Environment.dev;
+            case DebugConfig.NET_MODE_DEMO:
+            case DebugConfig.NET_MODE_QA:
+                return Environment.qa;
+            case DebugConfig.NET_MODE_RELEASE:
+            default:
+                return Environment.release;
+
+        }
     }
 }
diff --git a/foudations/mogo-base-services-sdk/build.gradle b/foudations/mogo-base-services-sdk/build.gradle
index 7237542631..6a9ad088e4 100644
--- a/foudations/mogo-base-services-sdk/build.gradle
+++ b/foudations/mogo-base-services-sdk/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     // 长链
     implementation 'com.zhidao.socket:built-in-socket:1.0.15'
     // passport
-    implementation 'com.zhidao.tcloginsdk:tclogin:1.1.0'
+    implementation 'com.zhidao.tcloginsdk:tclogin:1.1.3'
 
     annotationProcessor 'com.elegant.spi:compiler:1.0.3'
 
diff --git a/gradle.properties b/gradle.properties
index bd95a0fa2d..96dd28b93c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -64,7 +64,7 @@ MAP_CUSTOM_VERSION=1.2.1.9
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.16
+MOGO_MODULE_TANLU_VERSION=1.3.1.20
 # 车聊聊
 CARCHATTING_VERSION=1.4.8
 # 车聊聊接口
@@ -76,13 +76,13 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # 推送
-MOGO_MODULE_PUSH_VERSION=1.1.5.7
+MOGO_MODULE_PUSH_VERSION=1.1.6.1
 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5
 MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.16
+TANLULIB_VERSION=1.3.1.20
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块
@@ -101,8 +101,11 @@ MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT
 MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT
 
-## 产品库必备配置
+# loglib
+LOGLIB_VERSION = 1.0.0-SNAPSHOT
+
+## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
-versionName=8.0.7-qa_1.1
\ No newline at end of file
+versionName=8.0.7
\ No newline at end of file
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java
index a551c302bc..89dfeac7f4 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java
@@ -26,6 +26,7 @@ import java.util.Set;
 public class ALocationClient implements IMogoLocationClient {
 
     private static final String TAG = "LocationClient";
+    private final Context mContext;
 
     private Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
     private MogoLocation mLastLocation;
@@ -34,12 +35,7 @@ public class ALocationClient implements IMogoLocationClient {
     private boolean mIsDestroyed = false;
 
     public ALocationClient( Context context ) {
-        mClient = new AMapLocationClient( context );
-        mClient.setLocationListener( mListener );
-        mLastLocation = ObjectUtils.fromAMap( mClient.getLastKnownLocation() );
-        if ( mLastLocation == null ) {
-            mLastLocation = new MogoLocation();
-        }
+        mContext = context;
     }
 
     private AMapLocationClient mClient;
@@ -51,11 +47,12 @@ public class ALocationClient implements IMogoLocationClient {
 
     @Override
     public void start( long interval ) {
-        if ( mIsDestroyed ) {
-            destroyWarming();
-            return;
+        if ( mClient == null ) {
+            mClient = new AMapLocationClient( mContext );
+            mClient.setLocationListener( mListener );
+            mLastLocation = ObjectUtils.fromAMap( mClient.getLastKnownLocation() );
         }
-        if ( mClient != null ) {
+        if ( !mClient.isStarted() ) {
             AMapLocationClientOption option = new AMapLocationClientOption();
             option.setLocationMode( AMapLocationClientOption.AMapLocationMode.Hight_Accuracy );
             option.setNeedAddress( true );
@@ -109,6 +106,9 @@ public class ALocationClient implements IMogoLocationClient {
             destroyWarming();
             return null;
         }
+        if ( mLastLocation == null ) {
+            mLastLocation = new MogoLocation();
+        }
         return mLastLocation;
     }
 
@@ -140,7 +140,7 @@ public class ALocationClient implements IMogoLocationClient {
                     aMapLocation.getLongitude() == 0.0D ) {
                 return;
             }
-            Trace.beginSection("timer.onLocationChanged");
+            Trace.beginSection( "timer.onLocationChanged" );
             mLastLocation = ObjectUtils.fromAMap( aMapLocation );
             synchronized ( sListeners ) {
                 Iterator< IMogoLocationListener > listenerIterator = sListeners.iterator();
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
index fbaae3255b..1adc5272ea 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java
@@ -129,6 +129,11 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
         overridePendingTransition( R.anim.module_apps_anim_enter, R.anim.module_apps_anim_exit );
     }
 
+    @Override
+    public void executeFinish() {
+        finish();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
index caf44c1c72..0ad09a3b10 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java
@@ -13,6 +13,7 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.intent.IMogoIntentManager;
+import com.mogo.utils.logger.Logger;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -38,6 +39,7 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog
         super.onCreate( owner );
         mIntentManager = ( IMogoIntentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_INTENT_MANAGER ).navigation( getContext() );
         mIntentManager.registerIntentListener( AppsConst.COMMAND_OPERATION, this );
+        mIntentManager.registerIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this );
         AIAssist.getInstance( getContext() ).registerUnWakeupCommand( AppsConst.CMD_UN_WAKE_CLOSE_APP_LIST, AppsConst.CMD_UN_WAKE_WORDS_CLOSE_APP_LIST, this );
     }
 
@@ -56,6 +58,9 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog
             } catch ( JSONException e ) {
                 e.printStackTrace();
             }
+        } else if ( Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals( intentStr ) ) {
+            Logger.d( TAG, "home 键导致 app 列表关闭" );
+            mView.executeFinish();
         }
     }
 
@@ -90,6 +95,7 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog
     public void onDestroy( @NonNull LifecycleOwner owner ) {
         super.onDestroy( owner );
         mIntentManager.unregisterIntentListener( AppsConst.COMMAND_OPERATION, this );
+        mIntentManager.unregisterIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this );
         AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( AppsConst.CMD_UN_WAKE_CLOSE_APP_LIST );
     }
 }
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java
index d3ec317ed7..ee38e7c05d 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java
@@ -11,4 +11,6 @@ import com.mogo.commons.mvp.IView;
 public interface AppsListView extends IView {
 
     void closeAppsPanel();
+
+    void executeFinish();
 }
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 4ded331a36..1194734bb3 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
@@ -34,8 +34,8 @@ public class BackToMainHomeManager {
     }
 
     public static void backToLauncher() {
-        if (mStatusManager == null) {
-            Logger.e(TAG,"未初始化完成");
+        if ( mStatusManager == null ) {
+            Logger.e( TAG, "未初始化完成" );
             return;
         }
         if ( mStatusManager.isMainPageOnResume() ) {
@@ -45,6 +45,10 @@ public class BackToMainHomeManager {
             return;
         }
 
+        if ( mStatusManager.isAppListUIShow() ) {
+            mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, new Intent() );
+        }
+
         Logger.d( TAG, "返回桌面" );
 
         Intent intent = new Intent();
@@ -75,7 +79,7 @@ public class BackToMainHomeManager {
         params.x = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left );
         params.y = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top );
         params.gravity = Gravity.LEFT | Gravity.CENTER;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
             params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
         } else {
             params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
index b2065a807c..1d4cdb1e0b 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java
@@ -22,16 +22,9 @@ public class MapCenterPointStrategy {
 
     public static final MapCenterPoint DEFAULT = new MapCenterPoint( 0.677734D, 0.5733333D );
 
-    public static void init()  {
-        // 普通场景，使用高德内部值
-        {
-            Map< Integer, MapCenterPoint > common = new HashMap<>();
-            common.put( CarSeries.CAR_SERIES_D80X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_E84X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_E84XCD, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            common.put( CarSeries.CAR_SERIES_F80X, new MapCenterPoint( 0.5D, 0.666666666D ) );
-            sStrategies.put( Scene.COMMON, common );
-        }
+    private static MapCenterPoint sLastPoint = DEFAULT;
+
+    public static void init() {
 
         {
             // 选点场景，定位中心点
@@ -112,6 +105,22 @@ public class MapCenterPointStrategy {
             categoryV2XEvent.put( CarSeries.CAR_SERIES_F80X, new MapCenterPoint( 0.6963541D, 0.65D ) );
             sStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent );
         }
+
+        try {
+            sLastPoint = sStrategies.get( Scene.AIMLESS ).get( CarSeries.getSeries() );
+        } catch ( Exception e ) {
+            sLastPoint = DEFAULT;
+        }
+    }
+
+    public static void restoreLastScene( IMogoMapUIController controller ) {
+        if ( sLastPoint == null ) {
+            return;
+        }
+        if ( controller == null ) {
+            return;
+        }
+        controller.setPointToCenter( sLastPoint.x, sLastPoint.y );
     }
 
     public static void addScene( int scene, Map< Integer, MapCenterPoint > config ) {
@@ -138,6 +147,7 @@ public class MapCenterPointStrategy {
         if ( !sStrategies.containsKey( scene ) ) {
             Logger.w( TAG, "no strategy for scene: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
         Map< Integer, MapCenterPoint > points = sStrategies.get( scene );
@@ -145,14 +155,17 @@ public class MapCenterPointStrategy {
         if ( !points.containsKey( car ) ) {
             Logger.w( TAG, "no strategy for series: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
         MapCenterPoint point = points.get( car );
         if ( point == null ) {
             Logger.w( TAG, "no strategy config for series: %s, use DEFAULT", scene );
             controller.setPointToCenter( DEFAULT.x, DEFAULT.y );
+            sLastPoint = DEFAULT;
             return;
         }
+        sLastPoint = point;
         controller.setPointToCenter( point.x, point.y );
     }
 
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index f977a83e41..a15d148a4b 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -192,6 +192,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                     UiThreadHandler.removeCallbacks(mLockCarRunnable);
                 }
                 mStatusManager.setUserInteractionStatus(TAG, true, false);
+                MapCenterPointStrategy.restoreLastScene( mMApUIController );
                 mMApUIController.recoverLockMode();
             }
         });
@@ -293,9 +294,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         });
         mMsgCounter = findViewById(R.id.module_ext_id_msg_counter);
         mUserHeadImg.setOnClickListener(view -> {
-            // todo 测试代码
-//            mApis.getEventPanelManager().showPanel();
-            // 原始逻辑
             try {
                 LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal");
                 // 埋点
@@ -354,6 +352,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     public void onDestroyView() {
         super.onDestroyView();
         isClickShare = false;
+        TopViewAnimHelper.getInstance().removeAllView();
     }
 
     @Override
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
index 177aa0c2a8..9359557453 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -662,4 +662,21 @@ public class TopViewAnimHelper {
         tvTurnInfo.setVisibility(visibility);
 
     }
+
+    public void removeAllView(){
+        Logger.d(TAG, "remove all view");
+        isTopViewOut = true;
+        int lastCount = topContainer.getChildCount();
+        for (int i = 0; i < lastCount; i++) {
+            View child = topContainer.getChildAt(i);
+            viewCaches.remove(child);
+            IMogoTopViewStatusListener listener = statusListenerMap.remove(child);
+            if (listener != null) {
+                listener.onViewRemoved(child);
+            }
+        }
+        topContainer.removeAllViews();
+        hideNaviView();
+        MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, Scene.AIMLESS);
+    }
 }
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/AutoNaviBroadcastReceiver.java
new file mode 100644
index 0000000000..242bbbce63
--- /dev/null
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastReceiver.java
@@ -0,0 +1,127 @@
+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.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/30
+ *
+ * 接收高德地图车机版广播
+ */
+class AutoNaviBroadcastReceiver extends BroadcastReceiver {
+
+    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 unregister() {
+        mCallback = null;
+        AbsMogoApplication.getApp().unregisterReceiver( this );
+    }
+
+    private OnMapControlCallback mCallback;
+
+    public void setCallback( OnMapControlCallback mCallback ) {
+        this.mCallback = mCallback;
+    }
+
+    @Override
+    public void onReceive( Context context, Intent intent ) {
+        String action = intent.getAction();
+
+        int keyType = intent.getIntExtra( "KEY_TYPE", 0 );
+        int type = intent.getIntExtra( "EXTRA_TYPE", -1 );
+        int operaType = intent.getIntExtra( "EXTRA_OPERA", -1 );
+
+        Logger.d( TAG, "action = %s, keyType=%s, type=%s, operType=%s", action, keyType, type, operaType );
+
+        if ( !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_RECV ) ) {
+            return;
+        }
+
+        if ( mCallback == null ) {
+            return;
+        }
+
+        if ( keyType == 10027 ) {
+            if ( type == 0 ) {
+                mCallback.onTrafficModeChanged( operaType == 0 );
+            } else if ( type == 2 ) {
+                if ( operaType == 0 ) {
+                    mCallback.onCameraModeChanged( EnumMapUI.CarUp_2D );
+                } else if ( operaType == 1 ) {
+                    mCallback.onCameraModeChanged( EnumMapUI.NorthUP_2D );
+                } else if ( operaType == 2 ) {
+                    mCallback.onCameraModeChanged( EnumMapUI.CarUp_3D );
+                }
+            }
+        } else if ( keyType == 10048 ) {
+            //0：自动; 1：白天; 2：黑夜;
+            int dayNightMode = intent.getIntExtra( "EXTRA_DAY_NIGHT_MODE", -1 );
+            if ( dayNightMode == 0 ) {
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_AUTO_LIGHT_Night );
+            } else if ( dayNightMode == 1 ) {
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_Light );
+            } else if ( dayNightMode == 2 ) {
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_Night );
+            }
+        } else if ( keyType == 10049 ) {
+            //继续导航
+            boolean extraEnduranceData = intent.getBooleanExtra( "EXTRA_ENDURANCE_DATA", false );
+            if ( extraEnduranceData ) {
+                mCallback.onContinueNavi();
+            }
+        } else if ( keyType == 20009 ) {
+            mCallback.onOpenNavi();
+        } else if ( keyType == 10038 || keyType == 10007 ) {
+            double lat;
+            double lon;
+
+            if ( type == 10007 ) {
+                lat = intent.getDoubleExtra( "ENTRY_LAT", 0.0 );
+                lon = intent.getDoubleExtra( "ENTRY_LON", 0.0 );
+            } else {
+                lat = intent.getDoubleExtra( "LAT", 0.0 );
+                lon = intent.getDoubleExtra( "LON", 0.0 );
+            }
+            mCallback.onCalculatePath( lon, lat );
+        } else if ( keyType == 10021 ) {
+            mCallback.onStopNaviInternal( intent );
+        } else if ( keyType == 10005 ) {
+            // 仅在导航场景下，⽀持第三⽅进⾏路线偏好的重新选择。
+            // 避免收费 | 1
+            // 多策略算路 | 2
+            // 不走高速 | 3
+            // 躲避拥堵 | 4
+            // 不走高速且避免收费 | 5
+            // 不走高速且躲避拥堵 | 6
+            // 躲避收费和拥堵 | 7
+            // 不走高速躲避收费和拥堵 | 8
+            // 高速优先 | 20
+            // 躲避拥堵且高速优先 | 24
+            int prefer = intent.getIntExtra( "NAVI_ROUTE_PREFER", 0 );
+            MogoNaviConfig config = new MogoNaviConfig().congestion( prefer == 4 )
+                    .cost( prefer == 1 || prefer == 7 )
+                    .highSpeed( prefer == 20 )
+                    .avoidSpeed( prefer == 3 );
+            mCallback.onReCalculatePath( config );
+        }
+        mCallback.onEnd( intent );
+    }
+}
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
new file mode 100644
index 0000000000..e8a38b4c45
--- /dev/null
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java
@@ -0,0 +1,94 @@
+package com.mogo.module.map;
+
+import com.mogo.map.uicontroller.EnumMapUI;
+import com.mogo.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/30
+ * <p>
+ * 语音控制地图
+ */
+class MapControlCommandHandler {
+
+    private static final String TAG = "CustomVoiceCommandHandler";
+
+    private OnMapControlCallback mCallback;
+
+    public void setCallback( OnMapControlCallback mCallback ) {
+        this.mCallback = mCallback;
+    }
+
+    public void handleVoiceCommand( String cmd ) {
+        Logger.d( TAG, cmd );
+        switch ( cmd ) {
+            case VoiceConstants.CMD_MAP_TRAFFIC_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_TRAFFIC_MODE:
+                mCallback.onTrafficModeChanged( true );
+                break;
+            case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE:
+                mCallback.onTrafficModeChanged( false );
+                break;
+            case VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_ZOOM_IN:
+                mCallback.onZoomMap( true );
+                break;
+            case VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_ZOOM_OUT:
+                mCallback.onZoomMap( false );
+                break;
+            case VoiceConstants.CMD_MAP_2D_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_2D:
+            case VoiceConstants.CMD_MAP_NORTH_UP_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_NORTH_UP_MODE:
+                mCallback.onCameraModeChanged( EnumMapUI.NorthUP_2D );
+                break;
+            case VoiceConstants.CMD_MAP_3D_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_3D:
+                mCallback.onCameraModeChanged( EnumMapUI.CarUp_3D );
+                break;
+            case VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_DAY_TIME_MODE:
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_Light );
+                break;
+            case VoiceConstants.CMD_MAP_HISTORY_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_HISTORY:
+                mCallback.onOpenNavi();
+                break;
+            case VoiceConstants.CMD_MAP_STOP_NAVI_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_STOP_NAVI_MODE:
+                break;
+            case VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_NIGHT_MODE:
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_Night );
+                break;
+            case VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE:
+                mCallback.onDayNightModeChanged( EnumMapUI.Type_AUTO_LIGHT_Night );
+                break;
+            case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE:
+                mCallback.onDisplayOverview();
+                break;
+            case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE:
+                mCallback.onContinueNavi();
+                break;
+            case VoiceConstants.CMD_MAP_CAR_UP_MODE_UN_WAKEUP:
+            case VoiceConstants.CMD_MAP_CAR_UP_MODE:
+                mCallback.onCameraModeChanged( EnumMapUI.CarUp_2D );
+                break;
+            case VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE:
+            case VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_UN_WAKEUP:
+                break;
+            case VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE:
+            case VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_UN_WAKEUP:
+                break;
+            case VoiceConstants.CMD_MAP_SPEAK_REMAIN:
+                break;
+            default:
+                break;
+
+        }
+    }
+}
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index 9a51a52573..a563efc7da 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -39,9 +39,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
 
     @Override
     protected void initViews() {
-        //mMogoMapView = findViewById( R.id.module_map_id_map );
-        //mMogoMap = mMogoMapView.getMap();
-        //mMogoMap.getUIController().showMyLocation( true );
     }
 
     @Override
@@ -63,9 +60,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
     @Override
     public void onActivityCreated( @Nullable Bundle savedInstanceState ) {
         super.onActivityCreated( savedInstanceState );
-        //if ( mMogoMapView != null ) {
-        //    mMogoMapView.onCreate( savedInstanceState );
-        //}
         initMapView();
     }
 
@@ -125,7 +119,7 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
                 uiSettings.setZoomControlsEnabled( false );
                 //设置双指缩放手势是否可用。
                 uiSettings.setZoomGesturesEnabled( true );
-                mMogoMap.getUIController().changeMapMode(EnumMapUI.NorthUP_2D);
+                mMogoMap.getUIController().changeMapMode( EnumMapUI.NorthUP_2D );
             }
         }
     }
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 f05f600046..f72c5dea25 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
@@ -1,16 +1,12 @@
 package com.mogo.module.map;
 
 import android.app.ActivityManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.graphics.Rect;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.UiThread;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -34,10 +30,8 @@ import com.mogo.service.launcher.IMogoLauncher;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
-import com.mogo.service.module.IMogoSettingManager;
 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;
@@ -54,10 +48,10 @@ import java.util.Map;
 public class MapPresenter extends Presenter< MapView > implements
         IMogoIntentListener,
         IMogoVoiceCmdCallBack,
-        IMogoNaviListener2 {
+        IMogoNaviListener2,
+        OnMapControlCallback {
 
     private static final String TAG = "MapPresenter";
-    private static final String AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV";
     private IMogoMapService mMogoMapService;
     private IMogoIntentManager mMogoIntentManager;
     private IMogoSearchManager mSearchManager;
@@ -66,7 +60,6 @@ public class MapPresenter extends Presenter< MapView > implements
     private IMogoRegisterCenter mRegisterCenter;
     private IMogoLauncher mLauncher;
     private IMogoSearchManager mMogoSearchManager;
-    private IMogoSettingManager mSettingManager;
     private Rect mDisplayOverviewBounds;
 
 
@@ -80,113 +73,112 @@ public class MapPresenter extends Presenter< MapView > implements
             mView.getUIController().recoverLockMode();
         }
     };
+    private AutoNaviBroadcastReceiver mAutoNaviReceiver;
+    private MapControlCommandHandler mCustomVoiceCommandHandler;
 
     public MapPresenter( MapView view ) {
         super( view );
         initBroadcast();
+        mCustomVoiceCommandHandler = new MapControlCommandHandler();
+        mCustomVoiceCommandHandler.setCallback( this );
     }
 
-    private BroadcastReceiver broadcastReceiver;
-
     /**
      * opera type为0：0 实时路况开；1实时路况关 type为1：0 放大地图； 1缩小地图 type为2：0切换2d车上； 1切换2d北上；2切换3d车上支持
      */
     private void initBroadcast() {
-        // 高德地图免唤醒
-        broadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive( Context context, Intent intent ) {
-                String action = intent.getAction();
-                Logger.d( TAG, "action = %s", action );
+        mAutoNaviReceiver = new AutoNaviBroadcastReceiver();
+        mAutoNaviReceiver.setCallback( this );
+        mAutoNaviReceiver.register();
+    }
 
-                if ( !TextUtils.equals( action, AUTONAVI_STANDARD_BROADCAST_RECV ) ) {
-                    return;
+    @Override
+    public void onTrafficModeChanged( boolean open ) {
+        mView.getUIController().setTrafficEnabled( open );
+    }
+
+    @Override
+    public void onCameraModeChanged( EnumMapUI mode ) {
+        mView.getUIController().changeMapMode( mode );
+    }
+
+    @Override
+    public void onDayNightModeChanged( EnumMapUI mode ) {
+        mView.getUIController().changeMapMode( mode );
+    }
+
+    @Override
+    public void onContinueNavi() {
+        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+            return;
+        }
+        if ( mStatusManager.isMainPageOnResume() ) {
+            mStatusManager.setDisplayOverview( TAG, false );
+            mView.getUIController().recoverLockMode();
+            AIAssist.getInstance( getContext() ).speakTTSVoice( "已为您继续导航" );
+            UiThreadHandler.removeCallbacks( mLockCarRunnable );
+        } else {
+            mLauncher.backToLauncher( getContext() );
+            UiThreadHandler.postDelayed( () -> {
+                try {
+                    mStatusManager.setDisplayOverview( TAG, false );
+                    mView.getUIController().recoverLockMode();
+                    AIAssist.getInstance( getContext() ).speakTTSVoice( "已为您继续导航" );
+                    UiThreadHandler.removeCallbacks( mLockCarRunnable );
+                } catch ( Exception e ) {
+                    e.printStackTrace();
                 }
-                int key_type = intent.getIntExtra( "KEY_TYPE", 0 );
-                int type = intent.getIntExtra( "EXTRA_TYPE", -1 );
-                int opera_type = intent.getIntExtra( "EXTRA_OPERA", -1 );
-                Logger.d( TAG, "key_type" + key_type );
-                if ( key_type == 10027 ) {
-                    if ( type == 0 ) {
-                        onChangeTrafficMode( opera_type );
-                    } else if ( type == 2 ) {
-                        onChangeCameraMode( opera_type );
-                    }
-                } else if ( key_type == 10048 ) {
-                    //0：自动; 1：白天; 2：黑夜;
-                    int day_night_mode = intent.getIntExtra( "EXTRA_DAY_NIGHT_MODE", -1 );
-                    onChangeDayNightMode( day_night_mode );
-                    //继续导航
-                } else if ( key_type == 10049 ) {
-                    if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                        return;
-                    }
-                    boolean extra_endurance_data = intent.getBooleanExtra( "EXTRA_ENDURANCE_DATA", false );
-                    if ( extra_endurance_data ) {
-                        onContinueNavigation();
-                    }
-                } else if ( key_type == 10006 ) {
-                    // 避免冲突，会同时发送两个广播，这里不操作。
-                    //int extra_is_show = intent.getIntExtra( "EXTRA_IS_SHOW", 0 );
-                    //if ( extra_is_show == 0 ) {
-                    //    onDisplayOverview();
-                    //} else {
-                    //    onContinueNavigation();
-                    //}
-                } else if ( key_type == 10005 ) {
-                    int navi_route_prefer = intent.getIntExtra( "NAVI_ROUTE_PREFER", type );
-                } else if ( key_type == 20009 ) {
-                    if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                        return;
-                    }
-                    onOpenNavi();
-                } else if ( key_type == 10038 || key_type == 10007 ) {
-                    if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                        return;
-                    }
+            }, 2_000L );
+        }
+    }
+
+    @Override
+    public void onOpenNavi() {
+        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+            return;
+        }
+        mLauncher.backToLauncher( getContext() );
+        if ( !mMogoMapService.getNavi( getContext() ).isNaviing() && !mStatusManager.isSearchUIShow() ) {
+            mSearchManager.showSearch();
+        }
+        AIAssist.getInstance( getContext() ).speakTTSVoice( "已打开" );
+    }
+
+    @Override
+    public void onCalculatePath( double lon, double lat ) {
+        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+            return;
+        }
+        mLauncher.backToLauncher( getContext() );
+        mMogoSearchManager.calculatePath( new MogoLatLng( lat, lon ) );
+    }
+
+    @Override
+    public void onStopNaviInternal( Intent intent ) {
+        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+            // 导航过程中语音指令退出导航，会出现 activity 不走 onResume 的情况
+            UiThreadHandler.postDelayed( () -> {
+                if ( isForeground( getContext() ) && !hasOthersActivity() && !mStatusManager.isMainPageOnResume() ) {
                     mLauncher.backToLauncher( getContext() );
-                    onChoosePath( intent, key_type );
-                } else if ( key_type == 10021 ) {
-                    if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                        // 导航过程中语音指令退出导航，会出现 activity 不走 onResume 的情况
-                        UiThreadHandler.postDelayed( () -> {
-                            if ( isForeground( getContext() ) && !hasOthersActivity() && !mStatusManager.isMainPageOnResume() ) {
-                                mLauncher.backToLauncher( getContext() );
-                            }
-                        }, 500L );
-                        return;
-                    }
-                    onStopNaviInternal();
-                } else if ( key_type == 10005 ) {
-                    // 仅在导航场景下，⽀持第三⽅进⾏路线偏好的重新选择。
-                    // 避免收费 | 1
-                    // 多策略算路 | 2
-                    // 不走高速 | 3
-                    // 躲避拥堵 | 4
-                    // 不走高速且避免收费 | 5
-                    // 不走高速且躲避拥堵 | 6
-                    // 躲避收费和拥堵 | 7
-                    // 不走高速躲避收费和拥堵 | 8
-                    // 高速优先 | 20
-                    // 躲避拥堵且高速优先 | 24
-                    if ( CustomNaviInterrupter.getInstance().interrupt() ) {
-                        return;
-                    }
-                    int prefer = intent.getIntExtra( "NAVI_ROUTE_PREFER", 0 );
-                    MogoNaviConfig config = new MogoNaviConfig().congestion( prefer == 4 )
-                            .cost( prefer == 1 || prefer == 7 )
-                            .highSpeed( prefer == 20 )
-                            .avoidSpeed( prefer == 3 );
-                    mMogoMapService.getNavi( getContext() ).reCalculateRoute( config );
-
                 }
-                mMogoIntentManager.invoke( AUTONAVI_STANDARD_BROADCAST_RECV, intent );
-            }
-        };
+            }, 500L );
+            onEnd( intent );
+            return;
+        }
+        mMogoMapService.getNavi( getContext() ).stopNavi();
+    }
 
-        IntentFilter inputFilter = new IntentFilter();
-        inputFilter.addAction( AUTONAVI_STANDARD_BROADCAST_RECV );
-        getContext().registerReceiver( broadcastReceiver, inputFilter );
+    @Override
+    public void onReCalculatePath( MogoNaviConfig config ) {
+        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+            return;
+        }
+        mMogoMapService.getNavi( getContext() ).reCalculateRoute( config );
+    }
+
+    @Override
+    public void onEnd( Intent intent ) {
+        mMogoIntentManager.invoke( AutoNaviBroadcastReceiver.AUTONAVI_STANDARD_BROADCAST_RECV, intent );
     }
 
     private boolean isForeground( Context context ) {
@@ -217,91 +209,8 @@ public class MapPresenter extends Presenter< MapView > implements
         return true;
     }
 
-    /**
-     * 切换交通态势模式
-     *
-     * @param mode
-     */
-    private void onChangeTrafficMode( int mode ) {
-        mView.getUIController().setTrafficEnabled( mode == 0 );
-    }
-
-    /**
-     * 切换地图视图朝向模式
-     */
-    private void onChangeCameraMode( int mode ) {
-        if ( mode == 0 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.CarUp_2D );
-        } else if ( mode == 1 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.NorthUP_2D );
-        } else if ( mode == 2 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.CarUp_3D );
-        }
-    }
-
-    /**
-     * 切换白天黑夜模式
-     *
-     * @param mode
-     */
-    private void onChangeDayNightMode( int mode ) {
-        if ( mode == 0 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.Type_AUTO_LIGHT_Night );
-        } else if ( mode == 1 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.Type_Light );
-        } else if ( mode == 2 ) {
-            mView.getUIController().changeMapMode( EnumMapUI.Type_Night );
-        }
-    }
-
-    private void onStopNaviInternal() {
-        mMogoMapService.getNavi( getContext() ).stopNavi();
-    }
-
-
-    /**
-     * 唤醒指令导航去哪里
-     */
-    private void onChoosePath( Intent intent, int type ) {
-        double lat;
-        double lon;
-
-        if ( type == 10007 ) {
-            lat = intent.getDoubleExtra( "ENTRY_LAT", 0.0 );
-            lon = intent.getDoubleExtra( "ENTRY_LON", 0.0 );
-        } else {
-            lat = intent.getDoubleExtra( "LAT", 0.0 );
-            lon = intent.getDoubleExtra( "LON", 0.0 );
-        }
-        mMogoSearchManager.calculatePath( new MogoLatLng( lat, lon ) );
-    }
-
-    /**
-     * 继续导航
-     */
-    private void onContinueNavigation() {
-
-        if ( mStatusManager.isMainPageOnResume() ) {
-            mStatusManager.setDisplayOverview( TAG, false );
-            mView.getUIController().recoverLockMode();
-            AIAssist.getInstance( getContext() ).speakTTSVoice( "已为您继续导航" );
-            UiThreadHandler.removeCallbacks( mLockCarRunnable );
-        } else {
-            mLauncher.backToLauncher( getContext() );
-            UiThreadHandler.postDelayed( () -> {
-                try {
-                    mStatusManager.setDisplayOverview( TAG, false );
-                    mView.getUIController().recoverLockMode();
-                    AIAssist.getInstance( getContext() ).speakTTSVoice( "已为您继续导航" );
-                    UiThreadHandler.removeCallbacks( mLockCarRunnable );
-                } catch ( Exception e ) {
-                    e.printStackTrace();
-                }
-            }, 2_000L );
-        }
-    }
-
-    private void onDisplayOverview() {
+    @Override
+    public void onDisplayOverview() {
         if ( !mMogoMapService.getNavi( getContext() ).isNaviing() ) {
             Logger.d( TAG, "未开始导航." );
             return;
@@ -328,7 +237,8 @@ public class MapPresenter extends Presenter< MapView > implements
         UiThreadHandler.postDelayed( mLockCarRunnable, 20_000 );
     }
 
-    private void zoomMap( boolean zoomIn ) {
+    @Override
+    public void onZoomMap( boolean zoomIn ) {
         boolean isLocked = mMogoMapService.getMapUIController().isCarLocked();
         MapControlResult result = mView.getUIController().changeZoom( zoomIn );
         if ( !CustomNaviInterrupter.getInstance().interrupt() ) {
@@ -355,14 +265,6 @@ public class MapPresenter extends Presenter< MapView > implements
         }
     }
 
-    private void onOpenNavi() {
-        mLauncher.backToLauncher( getContext() );
-        if ( !mMogoMapService.getNavi( getContext() ).isNaviing() && !mStatusManager.isSearchUIShow() ) {
-            mSearchManager.showSearch();
-        }
-        AIAssist.getInstance( getContext() ).speakTTSVoice( "已打开" );
-    }
-
     @Override
     public void onCreate( @NonNull LifecycleOwner owner ) {
         super.onCreate( owner );
@@ -377,7 +279,6 @@ public class MapPresenter extends Presenter< MapView > implements
         mRegisterCenter.registerMogoNaviListener( TAG, this );
         mLauncher = apis.getLauncherApi();
         mMogoSearchManager = apis.getSearchManagerApi();
-        mSettingManager = apis.getSettingManagerApi();
 
         IMogoNavi mogoNavi = mMogoMapService.getNavi( getContext() );
         mogoNavi.setCalculatePathDisplayBounds( new Rect(
@@ -415,8 +316,8 @@ public class MapPresenter extends Presenter< MapView > implements
     @Override
     public void onDestroy( @NonNull LifecycleOwner owner ) {
         super.onDestroy( owner );
-        if ( broadcastReceiver != null ) {
-            getContext().unregisterReceiver( broadcastReceiver );
+        if ( mAutoNaviReceiver != null ) {
+            mAutoNaviReceiver.unregister();
         }
     }
 
@@ -453,82 +354,7 @@ public class MapPresenter extends Presenter< MapView > implements
     @Override
     public void onCmdSelected( String cmd ) {
         Logger.d( TAG, cmd );
-        switch ( cmd ) {
-            case VoiceConstants.CMD_MAP_TRAFFIC_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_TRAFFIC_MODE:
-                mView.getUIController().setTrafficEnabled( true );
-                break;
-            case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE:
-                mView.getUIController().setTrafficEnabled( false );
-                break;
-            case VoiceConstants.CMD_MAP_ZOOM_IN_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_ZOOM_IN:
-                zoomMap( true );
-                break;
-            case VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_ZOOM_OUT:
-                zoomMap( false );
-                break;
-            case VoiceConstants.CMD_MAP_2D_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_2D:
-            case VoiceConstants.CMD_MAP_NORTH_UP_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_NORTH_UP_MODE:
-                mView.getUIController().changeMapMode( EnumMapUI.NorthUP_2D );
-                break;
-            case VoiceConstants.CMD_MAP_3D_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_3D:
-                mView.getUIController().changeMapMode( EnumMapUI.CarUp_3D );
-                break;
-            case VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_DAY_TIME_MODE:
-                mView.getUIController().changeMapMode( EnumMapUI.Type_Light );
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_HISTORY_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_HISTORY:
-                onOpenNavi();
-                break;
-            case VoiceConstants.CMD_MAP_STOP_NAVI_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_STOP_NAVI_MODE:
-                mLauncher.backToLauncher( getContext() );
-                break;
-            case VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_NIGHT_MODE:
-                mView.getUIController().changeMapMode( EnumMapUI.Type_Night );
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE:
-                mView.getUIController().changeMapMode( EnumMapUI.Type_AUTO_LIGHT_Night );
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE:
-                onDisplayOverview();
-                break;
-            case VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE:
-                onContinueNavigation();
-                break;
-            case VoiceConstants.CMD_MAP_CAR_UP_MODE_UN_WAKEUP:
-            case VoiceConstants.CMD_MAP_CAR_UP_MODE:
-                mView.getUIController().changeMapMode( EnumMapUI.CarUp_2D );
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE:
-            case VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_UN_WAKEUP:
-                mSettingManager.speakDraft();
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE:
-            case VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_UN_WAKEUP:
-                mSettingManager.speakDetail();
-                AIAssist.getInstance( getContext() ).speakTTSVoice( "已切换", null );
-                break;
-            case VoiceConstants.CMD_MAP_SPEAK_REMAIN:
-                break;
-            default:
-                break;
-        }
+        mCustomVoiceCommandHandler.handleVoiceCommand( cmd );
     }
 
     @Override
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
new file mode 100644
index 0000000000..d0d074da5e
--- /dev/null
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java
@@ -0,0 +1,42 @@
+package com.mogo.module.map;
+
+import android.content.Intent;
+
+import com.mogo.map.navi.MogoNaviConfig;
+import com.mogo.map.uicontroller.EnumMapUI;
+
+public interface OnMapControlCallback {
+
+    // 交通态势
+    void onTrafficModeChanged( boolean open );
+
+    // 2d、3d模式切换、正北、车头
+    void onCameraModeChanged( EnumMapUI mode);
+
+    // 白天、黑夜模式切换
+    void onDayNightModeChanged( EnumMapUI mode );
+
+    // 继续导航
+    void onContinueNavi();
+
+    // 打开导航
+    void onOpenNavi();
+
+    // 开始路径规划
+    void onCalculatePath( double lon, double lat );
+
+    // 调用停止导航方法
+    void onStopNaviInternal( Intent intent );
+
+    // 重新规划路线
+    void onReCalculatePath( MogoNaviConfig config );
+
+    // 结束
+    void onEnd( Intent intent );
+
+    // 查看全程
+    void onDisplayOverview();
+
+    // 缩放地图
+    void onZoomMap( boolean zoomIn );
+}
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java
new file mode 100644
index 0000000000..4270a87d06
--- /dev/null
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/NoopPresenter.java
@@ -0,0 +1,52 @@
+package com.mogo.module.media.presenter;
+
+import android.content.Context;
+
+import com.mogo.module.media.model.MediaInfoData;
+import com.mogo.module.media.view.IMusicView;
+
+/**
+ * 空presenter实现，为了减少各种空判断
+ *
+ * @author tongchenfei
+ */
+public class NoopPresenter extends BaseMediaPresenter<IMusicView> {
+    public NoopPresenter(IMusicView view) {
+        super(view);
+    }
+
+    @Override
+    public void init(Context context) {
+
+    }
+
+    @Override
+    public void play(MediaInfoData mediaInfoData) {
+
+    }
+
+    @Override
+    public void pause(MediaInfoData mediaInfoData) {
+
+    }
+
+    @Override
+    public void stop(MediaInfoData mediaInfoData) {
+
+    }
+
+    @Override
+    public void pre() {
+
+    }
+
+    @Override
+    public void next() {
+
+    }
+
+    @Override
+    public void openApp() {
+
+    }
+}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java
new file mode 100644
index 0000000000..c5661387b7
--- /dev/null
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/PresenterFactory.java
@@ -0,0 +1,45 @@
+package com.mogo.module.media.presenter;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+import com.mogo.module.media.view.IMusicView;
+
+import java.util.List;
+
+/**
+ * Presenter简单工厂，根据包名判断选择哪个presenter
+ *
+ * @author tongchenfei
+ */
+public class PresenterFactory {
+    private static final String KW_PKG_NAME = "cn.kuwo.kwmusiccar";
+    private static final String WE_CAR_FLOW_PKG_NAME = "com.tencent.wecarflow";
+
+    /**
+     * 获取泛型是IMusicView的BaseMediaPresenter
+     *
+     * @param context 上下文，用来遍历机器上的包名
+     * @param view    IMusicView，用来做view展示
+     * @return presenter
+     */
+    public static BaseMediaPresenter<IMusicView> createMusicViewPresenter(Context context,
+                                                                          IMusicView view) {
+        BaseMediaPresenter<IMusicView> result = null;
+        PackageManager pkm = context.getPackageManager();
+        List<PackageInfo> pkgInfoList = pkm.getInstalledPackages(0);
+        // 只做了两级优先级判断，比较简单
+        for (PackageInfo pkgInfo : pkgInfoList) {
+            if (pkgInfo.packageName.equals(KW_PKG_NAME)) {
+                result = new KwPresenter(view);
+            } else if (pkgInfo.packageName.equals(WE_CAR_FLOW_PKG_NAME) && result == null) {
+                result = new WeCarFlowPresenter(view);
+            }
+        }
+        if (result == null) {
+            result = new NoopPresenter(view);
+        }
+        return result;
+    }
+}
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 55eb757511..5991f1ed25 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -17,7 +17,9 @@ import com.mogo.module.media.ServiceMediaHandler;
 import com.mogo.module.media.constants.MusicConstant;
 import com.mogo.module.media.listener.NoDoubleClickListener;
 import com.mogo.module.media.model.MediaInfoData;
+import com.mogo.module.media.presenter.BaseMediaPresenter;
 import com.mogo.module.media.presenter.KwPresenter;
+import com.mogo.module.media.presenter.PresenterFactory;
 import com.mogo.module.media.utils.Utils;
 import com.mogo.module.media.view.IMusicView;
 import com.mogo.module.media.widget.AnimCircleImageView;
@@ -41,7 +43,7 @@ public class MediaWindow2 implements IMusicView {
 
     public static final String TAG = MediaWindow2.class.getName();
     private Context mContext;
-    private KwPresenter mPresenter;
+    private BaseMediaPresenter<IMusicView> mPresenter;
 
     private MediaInfoData mMediaInfoData = new MediaInfoData();
 
@@ -60,7 +62,7 @@ public class MediaWindow2 implements IMusicView {
 
     public void initMedia(Context context) {
         mContext = context;
-        mPresenter = new KwPresenter(this);
+        mPresenter = PresenterFactory.createMusicViewPresenter(context, this);
         mPresenter.init(context);
 
         if(DebugConfig.isLauncher()) {
diff --git a/modules/mogo-module-push-base/.gitignore b/modules/mogo-module-push-base/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/modules/mogo-module-push-base/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/modules/mogo-module-push-base/build.gradle b/modules/mogo-module-push-base/build.gradle
new file mode 100644
index 0000000000..3f5839e3b9
--- /dev/null
+++ b/modules/mogo-module-push-base/build.gradle
@@ -0,0 +1,47 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+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'
+        kapt {
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        targetCompatibility 1.8
+        sourceCompatibility 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-push-base/consumer-rules.pro b/modules/mogo-module-push-base/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-push-base/gradle.properties b/modules/mogo-module-push-base/gradle.properties
new file mode 100644
index 0000000000..653f4713ca
--- /dev/null
+++ b/modules/mogo-module-push-base/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-push-base
+VERSION_CODE=1
diff --git a/modules/mogo-module-push-base/proguard-rules.pro b/modules/mogo-module-push-base/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/modules/mogo-module-push-base/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
diff --git a/modules/mogo-module-push-base/src/main/AndroidManifest.xml b/modules/mogo-module-push-base/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..9a8574da7b
--- /dev/null
+++ b/modules/mogo-module-push-base/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.module.push.base"></manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-push-base/src/main/java/com/mogo/module/push/base/PushUIConstants.java b/modules/mogo-module-push-base/src/main/java/com/mogo/module/push/base/PushUIConstants.java
new file mode 100644
index 0000000000..4cfde10760
--- /dev/null
+++ b/modules/mogo-module-push-base/src/main/java/com/mogo/module/push/base/PushUIConstants.java
@@ -0,0 +1,7 @@
+package com.mogo.module.push.base;
+
+public class PushUIConstants {
+    public static final String NAME = "PUSH_UI";
+    public static final String PATH = "/push/ui";
+    public static final String Push_MESSAGE_ACTIVITY_PATH = "/push/ui/message"; //消息列表activity
+}
diff --git a/modules/mogo-module-push-noop/.gitignore b/modules/mogo-module-push-noop/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/modules/mogo-module-push-noop/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/modules/mogo-module-push-noop/README.md b/modules/mogo-module-push-noop/README.md
new file mode 100644
index 0000000000..a15717364f
--- /dev/null
+++ b/modules/mogo-module-push-noop/README.md
@@ -0,0 +1,4 @@
+# 基于 socketserver 实现的push推送（空）
+
+---
+目前，仅 launcher 实现推送，独立 app 不用
\ No newline at end of file
diff --git a/modules/mogo-module-push-noop/build.gradle b/modules/mogo-module-push-noop/build.gradle
new file mode 100644
index 0000000000..369d2a1a49
--- /dev/null
+++ b/modules/mogo-module-push-noop/build.gradle
@@ -0,0 +1,57 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+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'
+        kapt {
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        targetCompatibility 1.8
+        sourceCompatibility 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    // 小智语音，免唤醒词等服务
+    compileOnly rootProject.ext.dependencies.mogoserviceapi
+    compileOnly rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+
+    if( Boolean.valueOf(RELEASE) ){
+        implementation rootProject.ext.dependencies.modulepushbase
+    } else {
+        implementation project(":modules:mogo-module-push-base")
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-push-noop/consumer-rules.pro b/modules/mogo-module-push-noop/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-push-noop/gradle.properties b/modules/mogo-module-push-noop/gradle.properties
new file mode 100644
index 0000000000..9142345995
--- /dev/null
+++ b/modules/mogo-module-push-noop/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-push-noop
+VERSION_CODE=1
diff --git a/modules/mogo-module-push-noop/proguard-rules.pro b/modules/mogo-module-push-noop/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/modules/mogo-module-push-noop/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
diff --git a/modules/mogo-module-push-noop/src/main/AndroidManifest.xml b/modules/mogo-module-push-noop/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..50c17495d9
--- /dev/null
+++ b/modules/mogo-module-push-noop/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.module.push.noop"></manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-push-noop/src/main/java/com/mogo/module/push/noop/PushModuleProvider.java b/modules/mogo-module-push-noop/src/main/java/com/mogo/module/push/noop/PushModuleProvider.java
new file mode 100644
index 0000000000..11555a184c
--- /dev/null
+++ b/modules/mogo-module-push-noop/src/main/java/com/mogo/module/push/noop/PushModuleProvider.java
@@ -0,0 +1,80 @@
+package com.mogo.module.push.noop;
+
+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.module.push.base.PushUIConstants;
+import com.mogo.service.module.IMogoModuleLifecycle;
+import com.mogo.service.module.IMogoModuleProvider;
+
+@Route(path = PushUIConstants.PATH)
+public class PushModuleProvider implements IMogoModuleProvider {
+    @Override
+    public Fragment createFragment(Context context, Bundle data) {
+        return null;
+    }
+
+    @Override
+    public View createView(Context context) {
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public String getModuleName() {
+        return "";
+    }
+
+    @Override
+    public IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
+
+    @Override
+    public IMogoMapListener getMapListener() {
+        return null;
+    }
+
+    @Override
+    public int getType() {
+        return 0;
+    }
+
+    @Override
+    public IMogoNaviListener getNaviListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoLocationListener getLocationListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
+
+    @Override
+    public String getAppPackage() {
+        return " ";
+    }
+
+    @Override
+    public String getAppName() {
+        return " ";
+    }
+
+    @Override
+    public void init(final Context context) {
+    }
+}
diff --git a/modules/mogo-module-push/.gitignore b/modules/mogo-module-push/.gitignore
new file mode 100644
index 0000000000..796b96d1c4
--- /dev/null
+++ b/modules/mogo-module-push/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/modules/mogo-module-push/README.md b/modules/mogo-module-push/README.md
new file mode 100644
index 0000000000..e262a8de52
--- /dev/null
+++ b/modules/mogo-module-push/README.md
@@ -0,0 +1,12 @@
+# 基于 socketserver 实现的push推送
+
+---
+目前，仅 launcher 实现推送，独立 app 不用
+
+## launcher 在前台
+
+    通过launcher内部空白区域的弹层承载推送内容
+
+## launcher 在后台
+
+    通过 windowmanger 方式承载推送内容
\ No newline at end of file
diff --git a/modules/mogo-module-push/build.gradle b/modules/mogo-module-push/build.gradle
new file mode 100644
index 0000000000..80fa923f80
--- /dev/null
+++ b/modules/mogo-module-push/build.gradle
@@ -0,0 +1,71 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+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'
+        kapt {
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        targetCompatibility 1.8
+        sourceCompatibility 1.8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    // 小智语音，免唤醒词等服务
+    compileOnly rootProject.ext.dependencies.mogomap
+    compileOnly rootProject.ext.dependencies.mogoutils
+    compileOnly rootProject.ext.dependencies.mogocommons
+    compileOnly rootProject.ext.dependencies.mogoserviceapi
+    compileOnly rootProject.ext.dependencies.modulecommon
+    compileOnly rootProject.ext.dependencies.androidxconstraintlayout
+    compileOnly rootProject.ext.dependencies.arouter
+    compileOnly rootProject.ext.dependencies.aiassist
+    kapt rootProject.ext.dependencies.aroutercompiler
+    compileOnly rootProject.ext.dependencies.androidxrecyclerview
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+    implementation rootProject.ext.dependencies.androidxccorektx
+    implementation rootProject.ext.dependencies.litezxing
+    implementation rootProject.ext.dependencies.androidxroomruntime
+    implementation rootProject.ext.dependencies.androidxroomktx
+    kapt rootProject.ext.dependencies.androidxroomcompiler
+
+    if( Boolean.valueOf(RELEASE) ){
+        implementation rootProject.ext.dependencies.modulepushbase
+    } else {
+        implementation project(":modules:mogo-module-push-base")
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-push/consumer-rules.pro b/modules/mogo-module-push/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-push/gradle.properties b/modules/mogo-module-push/gradle.properties
new file mode 100644
index 0000000000..cf466ecef3
--- /dev/null
+++ b/modules/mogo-module-push/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-push
+VERSION_CODE=1
diff --git a/modules/mogo-module-push/proguard-rules.pro b/modules/mogo-module-push/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/modules/mogo-module-push/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
diff --git a/modules/mogo-module-push/src/main/AndroidManifest.xml b/modules/mogo-module-push/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3334a218b2
--- /dev/null
+++ b/modules/mogo-module-push/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.module.push">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application>
+        <activity
+            android:name=".activity.PushMessageActivity"
+            android:theme="@style/ModulePushMessageTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt
new file mode 100644
index 0000000000..d5de33e9d7
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt
@@ -0,0 +1,20 @@
+package com.mogo.module.push
+
+object Config {
+    const val PUSH_TYPE = 100  //注册长连接类型
+    const val NEWS_ARRIVE = "news_arrive" //Push到达
+    const val NEWS_CARD_SHOW = "news_card_show"//push 展示
+    const val NEWS_CARD_DISAPPEAR = "news_card_disappear"//	push 展示到期，自动消失
+    const val NEWS_CARD_CLICK = "news_card_click"//点击消息体
+    const val NEWS_CARD_SWIPE = "news_card_swipe"//划掉消息
+    const val NEWS_CARD_CLICK_BTN = "news_card_click_btn"//点击按钮
+
+
+    const val NEWS_HISTORY_OPEN = "news_history_open"//打开消息列表
+    const val NEWS_HISTORY_CLOSE = "news_history_close"//关闭消息列表
+    const val NEWS_HISTORY_ALL_CLEAR = "news_history_all_clear"//清除消息列表
+    const val NEWS_HISTORY_ONE_CLEAR = "news_history_one_clear"//清除消息历史中的消息
+    const val NEWS_HISTORY_ONE_CLICK = "news_history_one_click"//点击消息历史中的消息
+
+
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java
new file mode 100644
index 0000000000..83ef3d1b42
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java
@@ -0,0 +1,89 @@
+package com.mogo.module.push;
+
+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.module.push.base.PushUIConstants;
+import com.mogo.module.push.repository.PushRepository;
+import com.mogo.module.push.utils.HandlerUtils;
+import com.mogo.service.module.IMogoModuleLifecycle;
+import com.mogo.service.module.IMogoModuleProvider;
+
+
+@Route(path = PushUIConstants.PATH)
+public class PushModuleProvider implements IMogoModuleProvider {
+    @Override
+    public Fragment createFragment(Context context, Bundle data) {
+        return null;
+    }
+
+    @Override
+    public View createView(Context context) {
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public String getModuleName() {
+        return "";
+    }
+
+    @Override
+    public IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
+
+    @Override
+    public IMogoMapListener getMapListener() {
+        return null;
+    }
+
+    @Override
+    public int getType() {
+        return 0;
+    }
+
+    @Override
+    public IMogoNaviListener getNaviListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoLocationListener getLocationListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
+
+    @Override
+    public String getAppPackage() {
+        return " ";
+    }
+
+    @Override
+    public String getAppName() {
+        return " ";
+    }
+
+    @Override
+    public void init(final Context context) {
+        HandlerUtils.INSTANCE.getMBgHandler().post(new Runnable() {
+            @Override
+            public void run() {
+                PushRepository.Companion.init(context);
+            }
+        });
+    }
+}
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt
new file mode 100644
index 0000000000..195aa828ab
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt
@@ -0,0 +1,126 @@
+package com.mogo.module.push.activity
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.module.push.Config
+import com.mogo.module.push.R
+import com.mogo.module.push.adapter.PushMessageAdapter
+import com.mogo.module.push.base.PushUIConstants
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.repository.PushRepository
+import com.mogo.module.push.utils.AnalyticsUtils
+import com.mogo.module.push.utils.HandlerUtils
+import com.mogo.module.push.utils.startClearAnimator
+import com.mogo.module.push.view.PushItemAnimator
+import com.mogo.module.push.view.SwipeItemLayout
+import com.mogo.module.push.view.getApis
+import com.mogo.module.push.viewmodel.MessageViewModel
+import com.mogo.service.intent.IMogoIntentListener
+import com.mogo.utils.UiThreadHandler
+import com.mogo.utils.logger.Logger
+import kotlinx.android.synthetic.main.module_push_message_activity.*
+
+@Route(path = PushUIConstants.Push_MESSAGE_ACTIVITY_PATH)
+class PushMessageActivity : AppCompatActivity(), IMogoIntentListener {
+    private lateinit var viewModel: MessageViewModel
+    private var adapter = PushMessageAdapter()
+    private var clearing = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+//        window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+        setContentView(R.layout.module_push_message_activity)
+        AnalyticsUtils.track(Config.NEWS_HISTORY_OPEN)
+        module_push_activity_close.setOnClickListener {
+            AnalyticsUtils.track(Config.NEWS_HISTORY_CLOSE)
+            finish()
+        }
+        module_push_activity_clear.setOnClickListener {
+            AnalyticsUtils.track(Config.NEWS_HISTORY_ALL_CLEAR)
+            if (!clearing) {
+                clearing = true
+                startClearAnimator(module_push_activity_recycler_view) {
+                    viewModel.deleteAll()
+                    clearing = false
+                }
+            }
+        }
+        adapter.deletePushBean = object : PushMessageAdapter.PushAdapterListener {
+            override fun lastItemShow(show: Boolean) {
+                if (!show && !clearing) {
+                    val size = viewModel.list?.size ?: 0
+                    if (size > 0 && size < module_push_activity_recycler_view.childCount) {
+                        return
+                    }
+                }
+                module_push_activity_clear.visibility =
+                        if (show) View.VISIBLE else View.GONE
+            }
+
+            override fun deleteBean(bean: PushBean, action: Boolean) {
+                if (clearing) return
+                viewModel.delete(bean)
+                if (action) {
+                    AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLICK, "title", bean.title)
+                    finish()
+                } else {
+                    AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLEAR, "title", bean.title)
+                    adapter.removeItem(bean)
+                    if (adapter.datas?.size ?: 0 == 0) {
+                        module_push_activity_not_data.visibility = View.VISIBLE
+                    }
+                    updateHistoryMessageCount()
+                }
+            }
+        }
+        module_push_activity_recycler_view.layoutManager = LinearLayoutManager(this)
+        module_push_activity_recycler_view.adapter = adapter
+        module_push_activity_recycler_view.itemAnimator = PushItemAnimator()
+        module_push_activity_recycler_view.addOnItemTouchListener(
+                SwipeItemLayout.OnSwipeItemTouchListener(this)
+        )
+        viewModel = MessageViewModel(object :
+                MessageViewModel.MessageListChange {
+            override fun messageListChange(list: MutableList<PushBean>?) {
+                runOnUiThread {
+                    var size = list?.size ?: 0
+                    adapter.datas = list
+                    module_push_activity_not_data.visibility = if (size > 0) View.GONE else View.VISIBLE
+                    updateHistoryMessageCount()
+                }
+            }
+        })
+
+        getApis(this).intentManagerApi.registerIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this)
+    }
+
+    private fun updateHistoryMessageCount(){
+        HandlerUtils.mBgHandler.post{
+            var count = PushRepository.pushRepository.pushBeanDao.getAllCount()
+            UiThreadHandler.post {
+                module_push_activity_title.text = if (count > 0) "历史消息（${count}）" else "历史消息"
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        adapter.notifyDataSetChanged()
+    }
+
+    override fun onIntentReceived(intentStr: String?, intent: Intent?) {
+        if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intentStr)) {
+            Logger.d("PushMessageActivity", "close by home key.")
+            finish()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        getApis(this).intentManagerApi.unregisterIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this)
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt
new file mode 100644
index 0000000000..868a609d29
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt
@@ -0,0 +1,127 @@
+package com.mogo.module.push.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.mogo.module.push.R
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.repository.PushRepository
+import com.mogo.module.push.utils.dealSchema
+import com.mogo.module.push.utils.stringConverterBitmap
+import com.mogo.module.push.view.getApis
+import com.mogo.service.imageloader.MogoImageView
+import kotlin.math.abs
+
+class PushMessageAdapter : RecyclerView.Adapter<PushMessageAdapter.MessageViewHolder>() {
+    interface PushAdapterListener {
+        fun deleteBean(bean: PushBean, action: Boolean)
+
+        fun lastItemShow(show: Boolean)
+    }
+
+    var onAttachStateChangeListener = object : View.OnAttachStateChangeListener {
+        override fun onViewDetachedFromWindow(p0: View?) {
+            deletePushBean.lastItemShow(false)
+        }
+
+        override fun onViewAttachedToWindow(p0: View?) {
+            deletePushBean.lastItemShow(true)
+        }
+
+    }
+
+    lateinit var deletePushBean: PushAdapterListener
+
+    var datas: MutableList<PushBean>? = null
+        set(value) {
+            field = value
+            notifyDataSetChanged()
+        }
+
+    fun removeItem(bean: PushBean) {
+        datas?.let {
+            val position = it.indexOf(bean)
+            if (position >= 0) {
+                it.removeAt(position)
+                notifyItemRemoved(position)
+            }
+            if (itemCount == 0) {
+                deletePushBean.lastItemShow(false)
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessageViewHolder {
+        return MessageViewHolder(
+            LayoutInflater.from(parent.context).inflate(
+                R.layout.module_push_message_item,
+                parent,
+                false
+            )
+        )
+    }
+
+    override fun getItemCount(): Int {
+        return datas?.size ?: 0
+    }
+
+    override fun onBindViewHolder(holder: MessageViewHolder, position: Int) {
+        holder.setPushBean(datas!![position], position)
+    }
+
+
+    inner class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        private val pushAppIcon: MogoImageView = view.findViewById(R.id.module_push_item_app_icon)
+        private val pushTitle: TextView = view.findViewById(R.id.module_push_item_title)
+        private val pushContent: TextView = view.findViewById(R.id.module_push_item_content)
+        private val pushImage: MogoImageView = view.findViewById(R.id.module_push_item_image)
+        private val pushTimer: TextView = view.findViewById(R.id.module_push_item_time)
+        private val pushDelete: TextView = view.findViewById(R.id.module_push_item_delete)
+        private val pushClick: View = view.findViewById(R.id.module_push_item_click)
+
+        fun setPushBean(bean: PushBean, position: Int) {
+            if (position == (datas?.size ?: 0) - 1) {
+                itemView.addOnAttachStateChangeListener(onAttachStateChangeListener)
+            } else {
+                itemView.removeOnAttachStateChangeListener(onAttachStateChangeListener)
+            }
+            pushDelete.setOnClickListener {
+                deletePushBean.deleteBean(bean, false)
+            }
+            if (!bean.mainSchema.isNullOrEmpty()) {
+                pushClick.setOnClickListener {
+                    dealSchema(bean.mainSchema, itemView.context)
+                    deletePushBean.deleteBean(bean, true)
+                }
+            } else {
+                pushClick.setOnClickListener(null)
+            }
+            getApis(itemView.context).imageLoaderApi.displayImage(bean.appIcon, pushAppIcon)
+            pushTitle.text = bean.title
+            pushContent.text = bean.content
+            pushContent.visibility = if (bean.content.isNullOrEmpty()) View.GONE else View.VISIBLE
+            if (bean.QRCode.isNullOrEmpty() && bean.imageUrl.isNotEmpty()) {
+                getApis(itemView.context).imageLoaderApi.displayImage(bean.imageUrl, pushImage)
+            }
+            if (!bean.QRCode.isNullOrEmpty()) {
+                pushImage.setImageBitmap(
+                    stringConverterBitmap(
+                        bean.QRCode,
+                        pushImage.context.resources.getDimensionPixelSize(R.dimen.module_push_message_item_image_size),
+                        pushImage.context.resources.getDimensionPixelSize(R.dimen.module_push_message_item_image_size)
+                    )
+                )
+            }
+            val diff = abs((System.currentTimeMillis() - bean.timestamp) / 1000).toInt()
+            pushTimer.text = when {
+                diff == 0 -> "现在"
+                diff < 60 -> "${diff}秒前"
+                diff < 60 * 60 -> "${diff / 60}分钟前"
+                diff < 60 * 60 * 24 -> "${diff / 60 / 60}小时前"
+                else -> "${diff / 60 / 60 / 24}天前"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt
new file mode 100644
index 0000000000..ff2548093d
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt
@@ -0,0 +1,25 @@
+package com.mogo.module.push.dao
+
+import androidx.room.*
+import com.mogo.module.push.model.PushBean
+
+@Dao
+interface PushBeanDao {
+    @Query("SELECT * FROM pushBean  ORDER BY timestamp DESC")
+    fun getAll(): MutableList<PushBean>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    fun insertAll(vararg bean: PushBean)
+
+    @Delete
+    fun delete(vararg bean: PushBean)
+
+    @Query("DELETE FROM pushBean")
+    fun deleteAll()
+
+    @Query("SELECT count(1) FROM pushBean")
+    fun getAllCount(): Int
+
+    @Query("DELETE FROM pushBean WHERE timestamp IN  (SELECT MIN(timestamp) FROM pushBean)")
+    fun deleteMin()
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt
new file mode 100644
index 0000000000..7631c88a18
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt
@@ -0,0 +1,10 @@
+package com.mogo.module.push.dao
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import com.mogo.module.push.model.PushBean
+
+@Database(entities = [PushBean::class], version = 1)
+abstract class PushBeanDatabase : RoomDatabase() {
+    abstract fun pushBeanDao(): PushBeanDao
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt
new file mode 100644
index 0000000000..452a62f19e
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt
@@ -0,0 +1,54 @@
+package com.mogo.module.push.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+import com.google.gson.annotations.SerializedName
+
+@Entity
+data class PushBean(
+    @Ignore
+    val speedLimit: Int = 0, //超过速度后延迟显示
+    @Ignore
+    var showTimeout: Int = 0, //显示等待时长
+    @Ignore
+    var showTimeoutShadow: Int = 0, //  显示等待时长备份
+    @ColumnInfo(name = "icon")
+    var appIcon: String = "", //目标app icon图标地址
+    @ColumnInfo(name = "title")
+    var title: String = "",  //标题
+    @ColumnInfo(name = "content")
+    var content: String = "",  //详细内容
+    @ColumnInfo(name = "image")
+    var imageUrl: String = "", //图片地址
+    @ColumnInfo(name = "qr")
+    var QRCode: String = "", //二维码地址
+    @Ignore
+    val tts: String = "",  //语音播报词
+    @ColumnInfo(name = "scheme")
+    var mainSchema: String = "", //schema跳转协议
+    @Ignore
+    val mainVoiceCmd: List<String>? = null, //触发主schema 命令词
+    @Ignore
+    val cancelVoiceCmd: List<String>? = null, //隐藏当前push命令词
+    @Ignore
+    val buttons: List<Button>? = null, //底部buttons列表
+    @PrimaryKey
+    var timestamp: Long = System.currentTimeMillis()
+
+
+) {
+    override fun equals(other: Any?): Boolean {
+        if (other is PushBean) {
+            return timestamp == other.timestamp
+        }
+        return super.equals(other)
+    }
+}
+
+data class Button(
+    val text: String = "",   // button名称
+    val action: String = "", //scheme 协议
+    val voiceCmd: List<String>? = null //注册命令词
+)
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt
new file mode 100644
index 0000000000..c48ae6ea08
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt
@@ -0,0 +1,233 @@
+package com.mogo.module.push.repository
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.room.Room
+import com.mogo.module.push.Config
+import com.mogo.module.push.base.PushUIConstants
+import com.mogo.module.push.dao.PushBeanDatabase
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.utils.AnalyticsUtils
+import com.mogo.module.push.utils.HandlerUtils
+import com.mogo.module.push.view.getApis
+import com.mogo.module.push.viewmodel.PushViewModel
+import com.mogo.service.connection.IMogoOnMessageListener
+import com.mogo.service.statusmanager.IMogoStatusChangedListener
+import com.mogo.service.statusmanager.StatusDescriptor
+import com.mogo.utils.logger.Logger
+import java.util.*
+import kotlin.collections.HashSet
+
+class PushRepository(mContext: Context) {
+
+    companion object {
+        private lateinit var appContext: Context
+        fun init(context: Context) {
+            appContext = context.applicationContext
+            pushRepository
+        }
+
+        val globalContext: Context by lazy {
+            appContext
+        }
+
+        val pushRepository: PushRepository by lazy {
+            PushRepository(appContext)
+        }
+
+        @JvmField
+        val TAG: String = "PushRepository.kt"
+    }
+
+    // 被中断的push消息仅再次展示一次
+    private val singleRePushSet = HashSet<PushBean>()
+
+    private val pushViewModel: PushViewModel = PushViewModel(mContext, this)
+    private val pushBeanQueue: Queue<PushBean> = LinkedList()
+    private val statusManager = getApis(mContext).statusManagerApi
+    private val msgCenter = getApis(mContext).msgCenterApi
+    val pushBeanDao by lazy {
+        Room.databaseBuilder(appContext, PushBeanDatabase::class.java, "database_push").build()
+            .pushBeanDao()
+    }
+    private val locationClient =
+        getApis(mContext).mapServiceApi.getSingletonLocationClient(appContext)
+
+    private val mHandler = Handler(Looper.getMainLooper())
+
+    private val statusChangedListener: IMogoStatusChangedListener =
+        IMogoStatusChangedListener { sd, open ->
+            Log.d("PushRepository", "sd = $sd open = $open")
+        }
+
+    init {
+        // 注册push通道监听 type 100时为push消息
+        getApis(mContext).getSocketManagerApi(mContext)
+            .registerOnMessageListener(Config.PUSH_TYPE, object : IMogoOnMessageListener<PushBean> {
+                override fun target(): Class<PushBean> {
+                    return PushBean::class.java
+                }
+
+                override fun onMsgReceived(bean: PushBean?) {
+                    Log.d("PushRepository", "pushBean = $bean")
+                    if (bean != null) {
+                        AnalyticsUtils.track(Config.NEWS_ARRIVE, "title", bean.title)
+                        if (bean.mainSchema == null || bean.mainSchema == "") {
+                            bean.mainSchema = ""
+                        }
+                        if (bean.imageUrl == null || bean.imageUrl == "null") {
+                            bean.imageUrl = ""
+                        }
+                        if (bean.appIcon == null || bean.appIcon == "null") {
+                            bean.appIcon = ""
+                        }
+                        pushBeanQueue.offer(bean)
+                    }
+                    startIterate()
+                }
+            })
+        HandlerUtils.mBgHandler.postDelayed({
+            updateMsgNum()
+        }, 5000)
+    }
+
+    private fun updateMsgNum() {
+        val num = pushBeanDao.getAllCount()
+        if (num > 100) { //历史消息最多保留100条
+            pushBeanDao.deleteMin()
+            updateMsgNum()
+            return
+        }
+        mHandler.post {
+            msgCenter.setMsgStatus(num > 0, num)
+        }
+    }
+
+    private fun startIterate() {
+        Log.d("PushRepository", "startIterate ${pushViewModel.pushBean}")
+        if (!pushViewModel.isAddWindow()) {
+            val bean = pushBeanQueue.peek()
+            if (bean != null) {
+                if (needDelay(bean)) {
+                    mHandler.removeCallbacks(delayRunnable)
+                    mHandler.postDelayed(delayRunnable, 15000)
+                    return
+                }
+            } else {
+                return
+            }
+            iterateNext()
+        }
+    }
+
+    /**
+     * 缓存被中断的push消息
+     */
+    fun push(pushBean: PushBean) {
+        if (singleRePushSet.contains(pushBean)) {
+            return
+        }
+        Logger.d(TAG, "保存待下一次开启")
+        singleRePushSet.add(pushBean)
+        pushBeanQueue.offer(pushBean)
+    }
+
+    private var delayRunnable = {
+        startIterate()
+    }
+
+    private inline fun needDelay(bean: PushBean): Boolean {
+        if (bean == null) {
+            return false
+        }
+        if (locationClient.lastKnowLocation != null) {
+            if (bean.speedLimit > 0 && bean.speedLimit <= locationClient.lastKnowLocation.speed * 18 / 5) {
+                Log.d("PushRepository", "speedLimit" + locationClient.lastKnowLocation.speed)
+                return true
+            }
+        }
+        if (statusManager.isV2XShow) {
+            return true
+        }
+        if (statusManager.isVoiceShow) {
+            return true
+        }
+        return false
+    }
+
+    fun iterateNext(needSave: Boolean = false) {
+        if (needSave && pushViewModel.pushBean != null) {
+            val bean = pushViewModel.pushBean!!
+            HandlerUtils.mBgHandler.post {
+                pushBeanDao.insertAll(bean)
+                updateMsgNum()
+            }
+        }
+        try {
+            val nextBean = pushBeanQueue.peek()
+            if (nextBean == null) {
+                pushViewModel.pushBean = nextBean
+                return
+            }
+            if (needDelay(nextBean)) {
+                mHandler.removeCallbacksAndMessages(null)
+                mHandler.postDelayed({
+                    iterateNext(needSave)
+                }, 15000)
+                return
+            }
+            pushViewModel.pushBean = pushBeanQueue.poll()
+        } catch (e: Exception) {
+            Logger.e(TAG, e, "")
+        }
+        if (pushViewModel.pushBean != null) {
+            statusManager.registerStatusChangedListener(
+                PushUIConstants.PATH,
+                StatusDescriptor.V2X_UI,
+                statusChangedListener
+            )
+            statusManager.registerStatusChangedListener(
+                PushUIConstants.PATH,
+                StatusDescriptor.VOICE_UI,
+                statusChangedListener
+            )
+        } else {
+            statusManager.unregisterStatusChangedListener(
+                PushUIConstants.PATH,
+                StatusDescriptor.VOICE_UI,
+                statusChangedListener
+            )
+            statusManager.unregisterStatusChangedListener(
+                PushUIConstants.PATH,
+                StatusDescriptor.V2X_UI,
+                statusChangedListener
+            )
+        }
+    }
+
+    fun setPushUIShow(show: Boolean) {
+        statusManager.setPushUIShow(PushUIConstants.PATH, show)
+    }
+
+    fun delete(bean: PushBean) {
+        HandlerUtils.mBgHandler.post {
+            pushBeanDao.delete(bean)
+            updateMsgNum()
+        }
+    }
+
+    fun deleteAll() {
+        HandlerUtils.mBgHandler.post {
+            pushBeanDao.deleteAll()
+            mHandler.post {
+                msgCenter.setMsgStatus(false, 0)
+            }
+        }
+    }
+
+    fun getAll(): MutableList<PushBean> {
+        return pushBeanDao.getAll()
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt
new file mode 100644
index 0000000000..4bc5fabfdd
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt
@@ -0,0 +1,22 @@
+package com.mogo.module.push.utils
+
+import android.util.ArrayMap
+import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.module.push.repository.PushRepository
+import com.mogo.service.MogoServicePaths
+import com.mogo.service.analytics.IMogoAnalytics
+
+object AnalyticsUtils {
+    private val Analytics =
+        ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(PushRepository.globalContext) as IMogoAnalytics
+
+    fun track(event: String, vararg keyValue: String) {
+        val map = ArrayMap<String, Any>()
+        if (keyValue.isNotEmpty()) {
+            for (i in 0..keyValue.size - 2 step 2) {
+                map[keyValue[i]] = keyValue[i + 1]
+            }
+        }
+        Analytics.track(event, map)
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt
new file mode 100644
index 0000000000..44f9b5b7fe
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt
@@ -0,0 +1,25 @@
+package com.mogo.module.push.utils
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.get
+import androidx.core.view.isNotEmpty
+
+fun startClearAnimator(root: ViewGroup, method: () -> Unit) {
+    if (root.isNotEmpty()) {
+        var view: View
+        var size = root.childCount - 1
+        for (i in size downTo 0) {
+            view = root[i]
+            view.animate().translationX(-view.width.toFloat()).apply {
+                if (i == 0) {
+                    withEndAction(method)
+                }
+                duration = 200
+                startDelay = 100 * (size - i).toLong()
+            }
+        }
+    } else {
+        method()
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt
new file mode 100644
index 0000000000..06ee277f7c
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt
@@ -0,0 +1,14 @@
+package com.mogo.module.push.utils
+
+import android.os.Handler
+import android.os.HandlerThread
+
+object HandlerUtils {
+    private val handlerThread = HandlerThread("push_ui_thread")
+    val mBgHandler: Handler
+
+    init {
+        handlerThread.start()
+        mBgHandler = Handler(handlerThread.looper)
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt
new file mode 100644
index 0000000000..750c9256f0
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt
@@ -0,0 +1,130 @@
+package com.mogo.module.push.utils
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import android.util.Log
+
+private const val ACTION = "AUTONAVI_STANDARD_BROADCAST_RECV"
+private const val KEY_TYPE = "KEY_TYPE"
+private const val KEYWORDS = "KEYWORDS"
+private const val SOURCE_APP = "SOURCE_APP"
+private const val VALUE_TYPE = "10036"
+private const val MAP_SCHEME = "map"
+private const val WELFARE_SCHEME = "welfare"
+private const val BROADCAST = "broadcast"
+private const val PACKAGE = "package_name"
+
+
+fun dealSchema(content: String, context: Context): Boolean {
+    if (!content.isNullOrEmpty()) {
+        val uri = Uri.parse(content)
+        if (uri != null && !uri.scheme.isNullOrEmpty()) {
+            if (mapIsValid(content) && startMap(
+                    context,
+                    uri
+                )
+            ) {
+                return true
+            }
+            if (checkBroadcastNeedSend(context, uri)) {
+                return true
+            }
+            if (schemeIsValid(context, uri)) {
+                return startActivityForUri(context, uri)
+            }
+        }
+    }
+    return false
+}
+
+private fun checkBroadcastNeedSend(context: Context, uri: Uri): Boolean {
+    if (BROADCAST == uri.scheme) {
+        if (!uri.host.isNullOrEmpty()) {
+            val intent = Intent(uri.host)
+            intent.putExtra("uri", uri.toString())
+            val packageName = uri.getQueryParameter(PACKAGE)
+            val set = uri.queryParameterNames
+            if (!set.isNullOrEmpty()) {
+                for (key in set) {
+                    if(key.isNotEmpty()) {
+                        intent.putExtra(key, uri.getQueryParameter(key) ?: "")
+                    }
+                }
+            }
+            if (!packageName.isNullOrEmpty()) {
+                intent.setPackage(packageName)
+            }
+            context.sendBroadcast(intent)
+            return true
+        }
+    }
+    return false
+}
+
+private fun startActivityForUri(context: Context, uri: Uri): Boolean {
+    return try {
+        val intent = Intent()
+        intent.action = "android.intent.action.VIEW"
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        intent.data = uri
+        context.startActivity(intent)
+        true
+    } catch (e: Exception) {
+        false
+    }
+}
+
+private fun mapIsValid(uri: String): Boolean {
+    if (!TextUtils.isEmpty(uri)) {
+        val uriTmp = Uri.parse(uri)
+        return MAP_SCHEME == uriTmp.scheme && VALUE_TYPE.equals(
+            uriTmp.getQueryParameter(KEY_TYPE.toLowerCase())!!,
+            ignoreCase = true
+        )
+    }
+    return false
+}
+
+private fun welfareIsValid(uri: String): Boolean {
+    if (!TextUtils.isEmpty(uri)) {
+        val uriTmp = Uri.parse(uri)
+        return WELFARE_SCHEME == uriTmp.scheme
+    }
+    return false
+}
+
+private fun startMap(context: Context, uri: Uri): Boolean {
+    val intent = Intent(ACTION)
+    return try {
+        intent.putExtra(
+            KEY_TYPE, Integer.valueOf(
+                uri.getQueryParameter(
+                    KEY_TYPE.toLowerCase()
+                )!!
+            )
+        )
+        intent.putExtra(KEYWORDS, uri.getQueryParameter(KEYWORDS.toLowerCase()))
+        intent.putExtra(SOURCE_APP, uri.getQueryParameter(SOURCE_APP.toLowerCase()))
+        context.sendBroadcast(intent)
+        true
+    } catch (e: NumberFormatException) {
+        Log.e("CustomMessageInfo", e.localizedMessage)
+        false
+    }
+}
+
+private fun schemeIsValid(context: Context, uri: Uri): Boolean {
+    val packageManager = context.packageManager
+    val intent = Intent(Intent.ACTION_VIEW, uri)
+    val activities = packageManager.queryIntentActivities(intent, 0)
+    var isValid = false
+    try {
+        isValid = activities.isNotEmpty()
+    } catch (e: Exception) {
+        e.printStackTrace()
+    }
+
+    return isValid
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt
new file mode 100644
index 0000000000..8bdfa03869
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt
@@ -0,0 +1,33 @@
+package com.mogo.module.push.utils
+
+import android.graphics.Bitmap
+import com.google.zxing.EncodeHintType
+import java.util.*
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.qrcode.QRCodeWriter
+
+
+fun stringConverterBitmap(address: String, width: Int, height: Int): Bitmap? {
+    val hints = Hashtable<EncodeHintType, String>()
+    hints[EncodeHintType.CHARACTER_SET] = "utf-8"
+    val bitMatrix = QRCodeWriter().encode(
+        address,
+        BarcodeFormat.QR_CODE, width, height, hints
+    )
+    val pixels = IntArray(width * height)
+    //下面这里按照二维码的算法，逐个生成二维码的图片，
+    //两个for循环是图片横列扫描的结果
+    for (y in 0 until height) {
+        for (x in 0 until width) {
+            if (bitMatrix.get(x, y)) {
+                pixels[y * width + x] = -0x1000000
+            } else {
+                pixels[y * width + x] = -0x1
+            }
+        }
+    }
+    //生成二维码图片的格式，使用ARGB_8888
+    var bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    bitmap.setPixels(pixels, 0, width, 0, 0, width, height)
+    return bitmap
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt
new file mode 100644
index 0000000000..51b81b71a5
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt
@@ -0,0 +1,563 @@
+package com.mogo.module.push.view
+
+import android.animation.Animator
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.graphics.PixelFormat
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.view.*
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.Scroller
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.animation.doOnEnd
+import androidx.core.view.isVisible
+import com.elegant.analytics.utils.Logger
+import com.mogo.commons.voice.AIAssist
+import com.mogo.module.push.Config
+import com.mogo.module.push.R
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.utils.AnalyticsUtils
+import com.mogo.module.push.utils.stringConverterBitmap
+import com.mogo.module.push.view.roundimage.RoundedImageView
+import com.mogo.module.push.viewmodel.PushViewModel
+import com.mogo.service.windowview.IMogoTopViewManager
+import com.mogo.service.windowview.IMogoTopViewStatusListener
+import com.mogo.utils.ResourcesHelper
+import com.mogo.utils.ThreadPoolService
+import com.mogo.utils.UiThreadHandler
+import com.mogo.utils.glide.GlideApp
+
+class FloatView constructor(
+    private val pushViewModel: PushViewModel,
+    private val context: Context
+) {
+
+    companion object {
+        const val TYPE_TOP_VIEW = 1
+        const val TYPE_WINDOW_MANAGER = 2
+        const val TAG: String = "FloatView.kt"
+    }
+
+    interface PushViewController {
+        fun show(bean: PushBean?)
+        fun hide()
+        fun timer(time: Int)
+        fun inflateView(@LayoutRes layoutId: Int)
+    }
+
+    open abstract inner class PushView(context: Context) : FrameLayout(context),
+        PushViewController {
+        lateinit var appIcon: ImageView
+        lateinit var titleIconContainer: View
+        lateinit var pushTitle: TextView
+        lateinit var pushImage: RoundedImageView
+        lateinit var pushContent: TextView
+        lateinit var pushTimer: TextView
+        lateinit var pushButtonLeft: TextView
+        lateinit var pushButtonRight: TextView
+        lateinit var pushButton: View
+
+        override fun inflateView(layoutId: Int) {
+            LayoutInflater.from(context).inflate(layoutId, this, true)
+            appIcon = findViewById(R.id.module_push_app_icon)
+            pushTitle = findViewById(R.id.module_push_title)
+            pushImage = findViewById(R.id.module_push_image)
+            pushContent = findViewById(R.id.module_push_content)
+            pushButtonLeft = findViewById(R.id.module_push_button_left)
+            pushButtonRight = findViewById(R.id.module_push_button_right)
+            pushTimer = findViewById(R.id.module_push_timer)
+            titleIconContainer = findViewById(R.id.module_push_app_icon_title)
+            pushButton = findViewById(R.id.module_push_buttons)
+            setOnClickListener {
+                pushViewModel.dealCmd(PushViewModel.VOICE_ACTION_PUSH_MAIN, "1")
+                turnNextMessage()
+            }
+            pushButtonLeft.setOnClickListener {
+                pushViewModel.dealCmd(PushViewModel.VOICE_ACTION_PUSH_LEFT, "1")
+                turnNextMessage()
+            }
+            pushButtonRight.setOnClickListener {
+                pushViewModel.dealCmd(PushViewModel.VOICE_ACTION_PUSH_RIGHT, "1")
+                turnNextMessage()
+            }
+        }
+
+        private fun turnNextMessage() {
+            pushViewModel?.pushBean?.apply {
+                showTimeout = 0
+                updateTimer()
+            }
+        }
+
+        fun hasButtons(bean: PushBean?): Boolean {
+            bean?.buttons?.forEach {
+                if (!it?.text?.isNullOrEmpty()) {
+                    return true
+                }
+            }
+            return false
+        }
+
+        fun hasTextContent(bean: PushBean?): Boolean =
+            bean?.content?.isNullOrEmpty()?.not() ?: false
+
+        fun hasImgContent(bean: PushBean?): Boolean = bean?.QRCode?.isNullOrEmpty()?.not() ?: false
+
+        open fun setBean(bean: PushBean) {
+            // app icon
+            if (!bean.appIcon.isNullOrEmpty()) {
+                appIcon.visible()
+                GlideApp.with(this).load(bean.appIcon).into(appIcon)
+            } else {
+                appIcon.gone()
+            }
+
+            // title
+            pushTitle.text = bean.title
+
+            // decrease timer
+            pushTimer.text = if (bean.showTimeout > 99) "" else "${bean.showTimeout}s"
+
+            // image
+            if (bean.imageUrl.isNullOrEmpty() && bean.QRCode.isNullOrEmpty()) {
+                pushImage.gone()
+            } else if (!bean.imageUrl.isNullOrEmpty()) {
+                var params = pushImage.layoutParams
+                params.width = getImgWidth()
+                params.height = getImgHeight()
+                pushImage.layoutParams = params
+                pushImage.visible()
+                GlideApp.with(this).load(bean.imageUrl).into(pushImage)
+            } else if (!bean.QRCode.isNullOrEmpty()) {
+                var params = pushImage.layoutParams
+                params.width = getQrImgWidth()
+                params.height = getQrImgHeight()
+                pushImage.layoutParams = params
+                ThreadPoolService.execute {
+                    val bmp = stringConverterBitmap(
+                        bean.QRCode,
+                        getQrImgWidth(),
+                        getQrImgHeight()
+                    )
+                    UiThreadHandler.post {
+                        pushImage.setImageBitmap(bmp)
+                        pushImage.visible()
+                    }
+                }
+            }
+
+            // button
+            pushButton.gone()
+            pushButtonLeft.gone()
+            pushButtonRight.gone()
+            if (!bean.buttons.isNullOrEmpty()) {
+                if (bean.buttons[0].text.isNotEmpty()) {
+                    pushButton.visible()
+                    pushButtonLeft.text = bean.buttons[0].text
+                    pushButtonLeft.visible()
+                }
+                if (bean.buttons.size > 1 && bean.buttons[1].text.isNotEmpty()) {
+                    pushButtonRight.text = bean.buttons[1].text
+                    pushButtonRight.visible()
+                }
+            }
+
+            // content
+            if (bean.content.isNullOrEmpty()) {
+                pushContent.gone()
+            } else {
+                pushContent.text = bean.content
+                pushContent.visible()
+            }
+
+            // tts
+            if (!bean?.tts?.isNullOrEmpty()) {
+                AIAssist.getInstance(context).speakTTSVoice(bean.tts)
+            }
+        }
+
+        abstract fun getImgWidth(): Int
+        abstract fun getImgHeight(): Int
+        abstract fun getQrImgWidth(): Int
+        abstract fun getQrImgHeight(): Int
+
+        override fun timer(time: Int) {
+            Logger.d(TAG, "time = $time")
+            pushTimer.text = "${time}s"
+        }
+
+        override fun show(bean: PushBean?) {
+            isAddWindow = true
+            uiHandler.removeCallbacks(delayClosePush)
+        }
+
+        override fun hide() {
+            isAddWindow = false
+        }
+    }
+
+    open inner class PushViewInTopView(context: Context) : PushView(context) {
+
+        private val mTopViewManager: IMogoTopViewManager = getApis(context).topViewManager
+
+        init {
+            inflateView(R.layout.module_push_item)
+        }
+
+        private var topViewStatusListener = object : IMogoTopViewStatusListener {
+            override fun onViewRemoved(view: View?) {
+                isAddWindow = false
+                if (pushViewModel?.pushBean?.showTimeout ?: 0 > 0) {
+                    if (getApis(context).statusManagerApi.isV2XShow) {
+                        // 被中断的消息，需要再次被显示一次
+                        uiHandler.removeCallbacks(delayClosePush)
+                        pushViewModel.push()
+                        pushViewModel.pushMessageFinish()
+                        return
+                    }
+                }
+            }
+
+            override fun onViewAdded(view: View?) {
+                if (pushViewModel.pushBean != null) {
+                    startClosePush()
+                }
+            }
+
+            override fun beforeViewRemoveAnim(view: View?) {
+            }
+
+            override fun beforeViewAddAnim(view: View?) {
+            }
+        }
+
+        override fun show(bean: PushBean?) {
+            super.show(bean)
+            mLastVisibleType = TYPE_TOP_VIEW
+            mTopViewManager.addView(this, topViewStatusListener)
+            setBean(bean!!)
+        }
+
+        override fun hide() {
+            super.hide()
+            mTopViewManager.removeView(this)
+        }
+
+        override fun getImgWidth(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width)
+
+        override fun getImgHeight(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height)
+
+        override fun getQrImgWidth(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height)
+
+        override fun getQrImgHeight(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height)
+    }
+
+    inner class PushViewInWindowView(context: Context) : PushView(context), View.OnTouchListener {
+
+        private val mContentContainer: View
+        private val mWindowManager =
+            context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+        private val params = WindowManager.LayoutParams()
+
+        init {
+
+            params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT
+            params.flags = (WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                    or WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+                    or WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE
+                    or WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
+                    or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+            params.width = WindowManager.LayoutParams.WRAP_CONTENT
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT
+            params.gravity = Gravity.LEFT or Gravity.BOTTOM
+            params.format = PixelFormat.TRANSLUCENT
+            params.x = context.resources.getDimensionPixelSize(R.dimen.module_push_window_x)
+            params.y = context.resources.getDimensionPixelSize(R.dimen.module_push_window_x)
+            if (Build.VERSION.SDK_INT > 25) {
+                params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
+            }
+
+            inflateView(R.layout.module_push_item_vertical)
+            mContentContainer = findViewById(R.id.module_push_content_container)
+            setOnTouchListener(this)
+        }
+
+        override fun show(bean: PushBean?) {
+            super.show(bean)
+            mLastVisibleType = TYPE_WINDOW_MANAGER
+            setBean(bean!!)
+
+            try {
+                mWindowManager.addView(this, params)
+            } catch (e: Exception) {
+                mWindowManager.updateViewLayout(this, params)
+            }
+            translationXAnimation(
+                -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical),
+                0f
+            ) {
+                if (pushViewModel.pushBean != null) {
+                    startClosePush()
+                }
+            }
+        }
+
+        private fun translationXAnimation(
+            from: Float,
+            to: Float,
+            doOnEnd: (animator: Animator) -> Unit
+        ) {
+            val transitionXAnimator: ObjectAnimator =
+                ObjectAnimator.ofFloat(
+                    this,
+                    View.TRANSLATION_X,
+                    from,
+                    to
+                )
+            transitionXAnimator.duration = 200
+            transitionXAnimator.doOnEnd(doOnEnd)
+            transitionXAnimator.start()
+        }
+
+        override fun setBean(bean: PushBean) {
+            super.setBean(bean)
+            var paddingBottom: Int = 0
+            if (pushButton.isVisible) {
+                paddingBottom =
+                    context.resources.getDimensionPixelSize(R.dimen.module_push_content_paddingBottom_vertical)
+            }
+            mContentContainer.setPadding(0, 0, 0, paddingBottom)
+        }
+
+        override fun hide() {
+            super.hide()
+            translationXAnimation(
+                this.x,
+                -ResourcesHelper.getDimension(context, R.dimen.module_push_ui_width_vertical)
+            ) {
+                Logger.d(TAG, "here")
+                this.x = 0f
+                mWindowManager.removeViewImmediate(this)
+            }
+        }
+
+        override fun onTouch(v: View?, ev: MotionEvent?): Boolean {
+
+            if (mLastVisibleType != TYPE_WINDOW_MANAGER) {
+                return false
+            }
+            when (ev?.action) {
+                MotionEvent.ACTION_DOWN -> {
+                    needInterceptClick = false
+                    startX = ev.x
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    moveX = startX - ev.x
+                    scrollBy(moveX.toInt(), 0)
+                    startX = ev.x
+                    if (scrollX < 0) {
+                        scrollTo(0, 0)
+                    }
+                    if (!needInterceptClick && scrollX > 20) {
+                        needInterceptClick = true
+                    }
+                    invalidate()
+                }
+                MotionEvent.ACTION_UP -> {
+                    if (scrollX > 0) {
+                        mScroller.startScroll(scrollX, 0, width - scrollX, 0)
+                        invalidate()
+                        return true
+                    }
+                    if (needInterceptClick) {
+                        return true
+                    }
+                }
+                else -> {
+                    startX = 0f
+                    moveX = 0f
+                }
+            }
+            return false
+        }
+
+        override fun computeScroll() {
+            if (mScroller.computeScrollOffset()) {
+                scrollTo(mScroller.currX, mScroller.currY)
+                invalidate()
+            } else {
+                if (mScroller.currX == 0) {
+                    return
+                }
+                mScroller.finalX = 0
+                removeCallbacks(delayClosePush)
+                if (isAddWindow) {
+                    if (currentBean != null) {
+                        AnalyticsUtils.track(Config.NEWS_CARD_SWIPE, "trigger_type", "1")
+                    }
+                    mWindowManager.removeView(this)
+                    isAddWindow = false
+                }
+                pushViewModel.pushBean?.showTimeout = 0
+                updateTimer()
+            }
+        }
+
+        override fun getImgWidth(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_width_vertical)
+
+        override fun getImgHeight(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_ui_image_height_vertical)
+
+        override fun getQrImgWidth(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical)
+
+        override fun getQrImgHeight(): Int =
+            context.resources.getDimensionPixelSize(R.dimen.module_push_image_qr_size_vertical)
+    }
+
+    private val delayClosePush: Runnable
+    private var isAddWindow = false
+    private val uiHandler = Handler(Looper.getMainLooper())
+
+    private var startX = 0f
+    private var moveX = 0f
+    private val mScroller: Scroller = Scroller(context)
+    private var needInterceptClick = false
+    private var pause = false
+
+    private var currentBean: PushBean? = null
+
+
+    private var mLastVisibleType = -1
+    private var pushViewController: PushViewController? = null
+
+    init {
+        delayClosePush = Runnable {
+            updateTimer()
+        }
+    }
+
+    fun pushBeanChanged(bean: PushBean?) {
+        uiHandler.post {
+            uiHandler.removeCallbacks(delayClosePush)
+            if (bean == null) {
+                if (currentBean != null) {
+                    AnalyticsUtils.track(Config.NEWS_CARD_DISAPPEAR, "title", currentBean!!.title)
+                }
+                hide()
+            } else {
+                show(bean)
+                AnalyticsUtils.track(Config.NEWS_CARD_SHOW, "title", bean.title)
+            }
+            currentBean = bean
+        }
+    }
+
+    private fun updateTimer() {
+        uiHandler.removeCallbacks(delayClosePush)
+        var time = pushViewModel.pushBean?.showTimeout ?: 0
+        if (time > 0) {
+            pushViewModel.pushBean!!.showTimeout--
+            pushViewController?.timer(time)
+            uiHandler.postDelayed(delayClosePush, 1000)
+        } else {
+            pushViewController?.timer(0)
+            pushViewModel.pushMessageFinish(true)
+        }
+    }
+
+    private fun show(bean: PushBean) {
+        if (isAddWindow) {
+            if (getApis(context).statusManagerApi.isMainPageOnResume) {
+                if (mLastVisibleType != TYPE_TOP_VIEW) {
+                    hide()
+                    (pushViewController as View).postDelayed({
+                        show(bean)
+                    }, 750L)
+                } else {
+                    showByTopView(bean)
+                }
+            } else {
+                if (mLastVisibleType != TYPE_WINDOW_MANAGER) {
+                    hide()
+                    (pushViewController as View).postDelayed({
+                        show(bean)
+                    }, 750L)
+                } else {
+                    showByWindowManager(bean)
+                }
+            }
+            startClosePush()
+        } else {
+            if (getApis(context).statusManagerApi.isMainPageOnResume) {
+                showByTopView(bean)
+            } else {
+                showByWindowManager(bean)
+            }
+        }
+    }
+
+    private fun showByTopView(bean: PushBean) {
+        if (pushViewController !is PushViewInTopView) {
+            pushViewController = PushViewInTopView(context)
+        }
+        pushViewController?.show(bean)
+    }
+
+    private fun showByWindowManager(bean: PushBean?) {
+        if (pushViewController !is PushViewInWindowView) {
+            pushViewController = PushViewInWindowView(context)
+        }
+        pushViewController?.show(bean)
+    }
+
+    private fun startClosePush() {
+        uiHandler.removeCallbacks(delayClosePush)
+        uiHandler.postDelayed(
+            delayClosePush,
+            1000L
+        )
+    }
+
+
+    fun hide() {
+        if (!isAddWindow) {
+            return
+        }
+        try {
+            pushViewController?.hide()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+
+    fun pauseTimer(on: Boolean) {
+        if (on) {
+            uiHandler.removeCallbacks(delayClosePush)
+        } else {
+            updateTimer()
+            uiHandler.post {
+                if (on) {
+                    pause = true
+                    uiHandler.removeCallbacks(delayClosePush)
+                } else if (pause) {
+                    pause = false
+                    updateTimer()
+                }
+            }
+        }
+    }
+
+    fun isAddWindow(): Boolean = isAddWindow
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt
new file mode 100644
index 0000000000..c553825f6a
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt
@@ -0,0 +1,40 @@
+package com.mogo.module.push.view
+
+import android.content.Context
+import android.view.View
+import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.service.IMogoServiceApis
+import com.mogo.service.MogoServicePaths
+
+/**
+ * @author congtaowang
+ * @since 2020/6/28
+ *
+ * 描述
+ */
+private var apis: IMogoServiceApis? = null
+
+fun getApis(context: Context): IMogoServiceApis {
+    if (apis == null) {
+        apis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context) as IMogoServiceApis;
+    }
+    return apis!!
+}
+
+fun View.gone() {
+    if (this.visibility != View.GONE) {
+        this.visibility = View.GONE
+    }
+}
+
+fun View.visible() {
+    if (this.visibility != View.VISIBLE) {
+        this.visibility = View.VISIBLE
+    }
+}
+
+fun View.invisible() {
+    if (this.visibility != View.INVISIBLE) {
+        this.visibility = View.INVISIBLE
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java
new file mode 100644
index 0000000000..20a603751e
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java
@@ -0,0 +1,657 @@
+package com.mogo.module.push.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This implementation of {@link RecyclerView.ItemAnimator} provides basic
+ * animations on remove, add, and move events that happen to the items in
+ * a RecyclerView. RecyclerView uses a DefaultItemAnimator by default.
+ *
+ * @see RecyclerView#setItemAnimator(RecyclerView.ItemAnimator)
+ */
+public class PushItemAnimator extends SimpleItemAnimator {
+    private static final boolean DEBUG = false;
+
+    private static TimeInterpolator sDefaultInterpolator;
+
+    private ArrayList<RecyclerView.ViewHolder> mPendingRemovals = new ArrayList<>();
+    private ArrayList<RecyclerView.ViewHolder> mPendingAdditions = new ArrayList<>();
+    private ArrayList<MoveInfo> mPendingMoves = new ArrayList<>();
+    private ArrayList<ChangeInfo> mPendingChanges = new ArrayList<>();
+
+    ArrayList<ArrayList<RecyclerView.ViewHolder>> mAdditionsList = new ArrayList<>();
+    ArrayList<ArrayList<MoveInfo>> mMovesList = new ArrayList<>();
+    ArrayList<ArrayList<ChangeInfo>> mChangesList = new ArrayList<>();
+
+    ArrayList<RecyclerView.ViewHolder> mAddAnimations = new ArrayList<>();
+    ArrayList<RecyclerView.ViewHolder> mMoveAnimations = new ArrayList<>();
+    ArrayList<RecyclerView.ViewHolder> mRemoveAnimations = new ArrayList<>();
+    ArrayList<RecyclerView.ViewHolder> mChangeAnimations = new ArrayList<>();
+
+    private static class MoveInfo {
+        public RecyclerView.ViewHolder holder;
+        public int fromX, fromY, toX, toY;
+
+        MoveInfo(RecyclerView.ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+            this.holder = holder;
+            this.fromX = fromX;
+            this.fromY = fromY;
+            this.toX = toX;
+            this.toY = toY;
+        }
+    }
+
+    private static class ChangeInfo {
+        public RecyclerView.ViewHolder oldHolder, newHolder;
+        public int fromX, fromY, toX, toY;
+
+        private ChangeInfo(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder) {
+            this.oldHolder = oldHolder;
+            this.newHolder = newHolder;
+        }
+
+        ChangeInfo(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,
+                   int fromX, int fromY, int toX, int toY) {
+            this(oldHolder, newHolder);
+            this.fromX = fromX;
+            this.fromY = fromY;
+            this.toX = toX;
+            this.toY = toY;
+        }
+
+        @Override
+        public String toString() {
+            return "ChangeInfo{"
+                    + "oldHolder=" + oldHolder
+                    + ", newHolder=" + newHolder
+                    + ", fromX=" + fromX
+                    + ", fromY=" + fromY
+                    + ", toX=" + toX
+                    + ", toY=" + toY
+                    + '}';
+        }
+    }
+
+    @Override
+    public void runPendingAnimations() {
+        boolean removalsPending = !mPendingRemovals.isEmpty();
+        boolean movesPending = !mPendingMoves.isEmpty();
+        boolean changesPending = !mPendingChanges.isEmpty();
+        boolean additionsPending = !mPendingAdditions.isEmpty();
+        if (!removalsPending && !movesPending && !additionsPending && !changesPending) {
+            // nothing to animate
+            return;
+        }
+        // First, remove stuff
+        for (RecyclerView.ViewHolder holder : mPendingRemovals) {
+            animateRemoveImpl(holder);
+        }
+        mPendingRemovals.clear();
+        // Next, move stuff
+        if (movesPending) {
+            final ArrayList<MoveInfo> moves = new ArrayList<>();
+            moves.addAll(mPendingMoves);
+            mMovesList.add(moves);
+            mPendingMoves.clear();
+            Runnable mover = new Runnable() {
+                @Override
+                public void run() {
+                    for (MoveInfo moveInfo : moves) {
+                        animateMoveImpl(moveInfo.holder, moveInfo.fromX, moveInfo.fromY,
+                                moveInfo.toX, moveInfo.toY);
+                    }
+                    moves.clear();
+                    mMovesList.remove(moves);
+                }
+            };
+            if (removalsPending) {
+                View view = moves.get(0).holder.itemView;
+                ViewCompat.postOnAnimationDelayed(view, mover, getRemoveDuration());
+            } else {
+                mover.run();
+            }
+        }
+        // Next, change stuff, to run in parallel with move animations
+        if (changesPending) {
+            final ArrayList<ChangeInfo> changes = new ArrayList<>();
+            changes.addAll(mPendingChanges);
+            mChangesList.add(changes);
+            mPendingChanges.clear();
+            Runnable changer = new Runnable() {
+                @Override
+                public void run() {
+                    for (ChangeInfo change : changes) {
+                        animateChangeImpl(change);
+                    }
+                    changes.clear();
+                    mChangesList.remove(changes);
+                }
+            };
+            if (removalsPending) {
+                RecyclerView.ViewHolder holder = changes.get(0).oldHolder;
+                ViewCompat.postOnAnimationDelayed(holder.itemView, changer, getRemoveDuration());
+            } else {
+                changer.run();
+            }
+        }
+        // Next, add stuff
+        if (additionsPending) {
+            final ArrayList<RecyclerView.ViewHolder> additions = new ArrayList<>();
+            additions.addAll(mPendingAdditions);
+            mAdditionsList.add(additions);
+            mPendingAdditions.clear();
+            Runnable adder = new Runnable() {
+                @Override
+                public void run() {
+                    for (RecyclerView.ViewHolder holder : additions) {
+                        animateAddImpl(holder);
+                    }
+                    additions.clear();
+                    mAdditionsList.remove(additions);
+                }
+            };
+            if (removalsPending || movesPending || changesPending) {
+                long removeDuration = removalsPending ? getRemoveDuration() : 0;
+                long moveDuration = movesPending ? getMoveDuration() : 0;
+                long changeDuration = changesPending ? getChangeDuration() : 0;
+                long totalDelay = removeDuration + Math.max(moveDuration, changeDuration);
+                View view = additions.get(0).itemView;
+                ViewCompat.postOnAnimationDelayed(view, adder, totalDelay);
+            } else {
+                adder.run();
+            }
+        }
+    }
+
+    @Override
+    public boolean animateRemove(final RecyclerView.ViewHolder holder) {
+        resetAnimation(holder);
+        mPendingRemovals.add(holder);
+        return true;
+    }
+
+    private void animateRemoveImpl(final RecyclerView.ViewHolder holder) {
+        final View view = holder.itemView;
+        final ViewPropertyAnimator animation = view.animate();
+        mRemoveAnimations.add(holder);
+        animation.setDuration(getRemoveDuration()).alpha(0).translationX(-view.getWidth()).setListener(
+                new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationStart(Animator animator) {
+                        dispatchRemoveStarting(holder);
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animator) {
+                        animation.setListener(null);
+                        view.setAlpha(1);
+                        dispatchRemoveFinished(holder);
+                        mRemoveAnimations.remove(holder);
+                        dispatchFinishedWhenDone();
+                    }
+                }).start();
+    }
+
+    @Override
+    public boolean animateAdd(final RecyclerView.ViewHolder holder) {
+        resetAnimation(holder);
+        holder.itemView.setAlpha(0);
+        mPendingAdditions.add(holder);
+        return true;
+    }
+
+    void animateAddImpl(final RecyclerView.ViewHolder holder) {
+        final View view = holder.itemView;
+        final ViewPropertyAnimator animation = view.animate();
+        mAddAnimations.add(holder);
+        animation.alpha(1).setDuration(getAddDuration())
+                .setListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationStart(Animator animator) {
+                        dispatchAddStarting(holder);
+                    }
+
+                    @Override
+                    public void onAnimationCancel(Animator animator) {
+                        view.setAlpha(1);
+                    }
+
+                    @Override
+                    public void onAnimationEnd(Animator animator) {
+                        animation.setListener(null);
+                        dispatchAddFinished(holder);
+                        mAddAnimations.remove(holder);
+                        dispatchFinishedWhenDone();
+                    }
+                }).start();
+    }
+
+    @Override
+    public boolean animateMove(final RecyclerView.ViewHolder holder, int fromX, int fromY,
+                               int toX, int toY) {
+        final View view = holder.itemView;
+        fromX += (int) holder.itemView.getTranslationX();
+        fromY += (int) holder.itemView.getTranslationY();
+        resetAnimation(holder);
+        int deltaX = toX - fromX;
+        int deltaY = toY - fromY;
+        if (deltaX == 0 && deltaY == 0) {
+            dispatchMoveFinished(holder);
+            return false;
+        }
+        if (deltaX != 0) {
+            view.setTranslationX(-deltaX);
+        }
+        if (deltaY != 0) {
+            view.setTranslationY(-deltaY);
+        }
+        mPendingMoves.add(new MoveInfo(holder, fromX, fromY, toX, toY));
+        return true;
+    }
+
+    void animateMoveImpl(final RecyclerView.ViewHolder holder, int fromX, int fromY, int toX, int toY) {
+        final View view = holder.itemView;
+        final int deltaX = toX - fromX;
+        final int deltaY = toY - fromY;
+        if (deltaX != 0) {
+            view.animate().translationX(0);
+        }
+        if (deltaY != 0) {
+            view.animate().translationY(0);
+        }
+        // TODO: make EndActions end listeners instead, since end actions aren't called when
+        // vpas are canceled (and can't end them. why?)
+        // need listener functionality in VPACompat for this. Ick.
+        final ViewPropertyAnimator animation = view.animate();
+        mMoveAnimations.add(holder);
+        animation.setDuration(getMoveDuration()).setListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+                dispatchMoveStarting(holder);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+                if (deltaX != 0) {
+                    view.setTranslationX(0);
+                }
+                if (deltaY != 0) {
+                    view.setTranslationY(0);
+                }
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                animation.setListener(null);
+                dispatchMoveFinished(holder);
+                mMoveAnimations.remove(holder);
+                dispatchFinishedWhenDone();
+            }
+        }).start();
+    }
+
+    @Override
+    public boolean animateChange(RecyclerView.ViewHolder oldHolder, RecyclerView.ViewHolder newHolder,
+                                 int fromX, int fromY, int toX, int toY) {
+        if (oldHolder == newHolder) {
+            // Don't know how to run change animations when the same view holder is re-used.
+            // run a move animation to handle position changes.
+            return animateMove(oldHolder, fromX, fromY, toX, toY);
+        }
+        final float prevTranslationX = oldHolder.itemView.getTranslationX();
+        final float prevTranslationY = oldHolder.itemView.getTranslationY();
+        final float prevAlpha = oldHolder.itemView.getAlpha();
+        resetAnimation(oldHolder);
+        int deltaX = (int) (toX - fromX - prevTranslationX);
+        int deltaY = (int) (toY - fromY - prevTranslationY);
+        // recover prev translation state after ending animation
+        oldHolder.itemView.setTranslationX(prevTranslationX);
+        oldHolder.itemView.setTranslationY(prevTranslationY);
+        oldHolder.itemView.setAlpha(prevAlpha);
+        if (newHolder != null) {
+            // carry over translation values
+            resetAnimation(newHolder);
+            newHolder.itemView.setTranslationX(-deltaX);
+            newHolder.itemView.setTranslationY(-deltaY);
+            newHolder.itemView.setAlpha(0);
+        }
+        mPendingChanges.add(new ChangeInfo(oldHolder, newHolder, fromX, fromY, toX, toY));
+        return true;
+    }
+
+    void animateChangeImpl(final ChangeInfo changeInfo) {
+        final RecyclerView.ViewHolder holder = changeInfo.oldHolder;
+        final View view = holder == null ? null : holder.itemView;
+        final RecyclerView.ViewHolder newHolder = changeInfo.newHolder;
+        final View newView = newHolder != null ? newHolder.itemView : null;
+        if (view != null) {
+            final ViewPropertyAnimator oldViewAnim = view.animate().setDuration(
+                    getChangeDuration());
+            mChangeAnimations.add(changeInfo.oldHolder);
+            oldViewAnim.translationX(changeInfo.toX - changeInfo.fromX);
+            oldViewAnim.translationY(changeInfo.toY - changeInfo.fromY);
+            oldViewAnim.alpha(0).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animator) {
+                    dispatchChangeStarting(changeInfo.oldHolder, true);
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animator) {
+                    oldViewAnim.setListener(null);
+                    view.setAlpha(1);
+                    view.setTranslationX(0);
+                    view.setTranslationY(0);
+                    dispatchChangeFinished(changeInfo.oldHolder, true);
+                    mChangeAnimations.remove(changeInfo.oldHolder);
+                    dispatchFinishedWhenDone();
+                }
+            }).start();
+        }
+        if (newView != null) {
+            final ViewPropertyAnimator newViewAnimation = newView.animate();
+            mChangeAnimations.add(changeInfo.newHolder);
+            newViewAnimation.translationX(0).translationY(0).setDuration(getChangeDuration())
+                    .alpha(1).setListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animator) {
+                    dispatchChangeStarting(changeInfo.newHolder, false);
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animator) {
+                    newViewAnimation.setListener(null);
+                    newView.setAlpha(1);
+                    newView.setTranslationX(0);
+                    newView.setTranslationY(0);
+                    dispatchChangeFinished(changeInfo.newHolder, false);
+                    mChangeAnimations.remove(changeInfo.newHolder);
+                    dispatchFinishedWhenDone();
+                }
+            }).start();
+        }
+    }
+
+    private void endChangeAnimation(List<ChangeInfo> infoList, RecyclerView.ViewHolder item) {
+        for (int i = infoList.size() - 1; i >= 0; i--) {
+            ChangeInfo changeInfo = infoList.get(i);
+            if (endChangeAnimationIfNecessary(changeInfo, item)) {
+                if (changeInfo.oldHolder == null && changeInfo.newHolder == null) {
+                    infoList.remove(changeInfo);
+                }
+            }
+        }
+    }
+
+    private void endChangeAnimationIfNecessary(ChangeInfo changeInfo) {
+        if (changeInfo.oldHolder != null) {
+            endChangeAnimationIfNecessary(changeInfo, changeInfo.oldHolder);
+        }
+        if (changeInfo.newHolder != null) {
+            endChangeAnimationIfNecessary(changeInfo, changeInfo.newHolder);
+        }
+    }
+
+    private boolean endChangeAnimationIfNecessary(ChangeInfo changeInfo, RecyclerView.ViewHolder item) {
+        boolean oldItem = false;
+        if (changeInfo.newHolder == item) {
+            changeInfo.newHolder = null;
+        } else if (changeInfo.oldHolder == item) {
+            changeInfo.oldHolder = null;
+            oldItem = true;
+        } else {
+            return false;
+        }
+        item.itemView.setAlpha(1);
+        item.itemView.setTranslationX(0);
+        item.itemView.setTranslationY(0);
+        dispatchChangeFinished(item, oldItem);
+        return true;
+    }
+
+    @Override
+    public void endAnimation(RecyclerView.ViewHolder item) {
+        final View view = item.itemView;
+        // this will trigger end callback which should set properties to their target values.
+        view.animate().cancel();
+        // TODO if some other animations are chained to end, how do we cancel them as well?
+        for (int i = mPendingMoves.size() - 1; i >= 0; i--) {
+            MoveInfo moveInfo = mPendingMoves.get(i);
+            if (moveInfo.holder == item) {
+                view.setTranslationY(0);
+                view.setTranslationX(0);
+                dispatchMoveFinished(item);
+                mPendingMoves.remove(i);
+            }
+        }
+        endChangeAnimation(mPendingChanges, item);
+        if (mPendingRemovals.remove(item)) {
+            view.setAlpha(1);
+            dispatchRemoveFinished(item);
+        }
+        if (mPendingAdditions.remove(item)) {
+            view.setAlpha(1);
+            dispatchAddFinished(item);
+        }
+
+        for (int i = mChangesList.size() - 1; i >= 0; i--) {
+            ArrayList<ChangeInfo> changes = mChangesList.get(i);
+            endChangeAnimation(changes, item);
+            if (changes.isEmpty()) {
+                mChangesList.remove(i);
+            }
+        }
+        for (int i = mMovesList.size() - 1; i >= 0; i--) {
+            ArrayList<MoveInfo> moves = mMovesList.get(i);
+            for (int j = moves.size() - 1; j >= 0; j--) {
+                MoveInfo moveInfo = moves.get(j);
+                if (moveInfo.holder == item) {
+                    view.setTranslationY(0);
+                    view.setTranslationX(0);
+                    dispatchMoveFinished(item);
+                    moves.remove(j);
+                    if (moves.isEmpty()) {
+                        mMovesList.remove(i);
+                    }
+                    break;
+                }
+            }
+        }
+        for (int i = mAdditionsList.size() - 1; i >= 0; i--) {
+            ArrayList<RecyclerView.ViewHolder> additions = mAdditionsList.get(i);
+            if (additions.remove(item)) {
+                view.setAlpha(1);
+                dispatchAddFinished(item);
+                if (additions.isEmpty()) {
+                    mAdditionsList.remove(i);
+                }
+            }
+        }
+
+        // animations should be ended by the cancel above.
+        //noinspection PointlessBooleanExpression,ConstantConditions
+        if (mRemoveAnimations.remove(item) && DEBUG) {
+            throw new IllegalStateException("after animation is cancelled, item should not be in "
+                    + "mRemoveAnimations list");
+        }
+
+        //noinspection PointlessBooleanExpression,ConstantConditions
+        if (mAddAnimations.remove(item) && DEBUG) {
+            throw new IllegalStateException("after animation is cancelled, item should not be in "
+                    + "mAddAnimations list");
+        }
+
+        //noinspection PointlessBooleanExpression,ConstantConditions
+        if (mChangeAnimations.remove(item) && DEBUG) {
+            throw new IllegalStateException("after animation is cancelled, item should not be in "
+                    + "mChangeAnimations list");
+        }
+
+        //noinspection PointlessBooleanExpression,ConstantConditions
+        if (mMoveAnimations.remove(item) && DEBUG) {
+            throw new IllegalStateException("after animation is cancelled, item should not be in "
+                    + "mMoveAnimations list");
+        }
+        dispatchFinishedWhenDone();
+    }
+
+    private void resetAnimation(RecyclerView.ViewHolder holder) {
+        if (sDefaultInterpolator == null) {
+            sDefaultInterpolator = new ValueAnimator().getInterpolator();
+        }
+        holder.itemView.animate().setInterpolator(sDefaultInterpolator);
+        endAnimation(holder);
+    }
+
+    @Override
+    public boolean isRunning() {
+        return (!mPendingAdditions.isEmpty()
+                || !mPendingChanges.isEmpty()
+                || !mPendingMoves.isEmpty()
+                || !mPendingRemovals.isEmpty()
+                || !mMoveAnimations.isEmpty()
+                || !mRemoveAnimations.isEmpty()
+                || !mAddAnimations.isEmpty()
+                || !mChangeAnimations.isEmpty()
+                || !mMovesList.isEmpty()
+                || !mAdditionsList.isEmpty()
+                || !mChangesList.isEmpty());
+    }
+
+    /**
+     * Check the state of currently pending and running animations. If there are none
+     * pending/running, call {@link #dispatchAnimationsFinished()} to notify any
+     * listeners.
+     */
+    void dispatchFinishedWhenDone() {
+        if (!isRunning()) {
+            dispatchAnimationsFinished();
+        }
+    }
+
+    @Override
+    public void endAnimations() {
+        int count = mPendingMoves.size();
+        for (int i = count - 1; i >= 0; i--) {
+            MoveInfo item = mPendingMoves.get(i);
+            View view = item.holder.itemView;
+            view.setTranslationY(0);
+            view.setTranslationX(0);
+            dispatchMoveFinished(item.holder);
+            mPendingMoves.remove(i);
+        }
+        count = mPendingRemovals.size();
+        for (int i = count - 1; i >= 0; i--) {
+            RecyclerView.ViewHolder item = mPendingRemovals.get(i);
+            dispatchRemoveFinished(item);
+            mPendingRemovals.remove(i);
+        }
+        count = mPendingAdditions.size();
+        for (int i = count - 1; i >= 0; i--) {
+            RecyclerView.ViewHolder item = mPendingAdditions.get(i);
+            item.itemView.setAlpha(1);
+            dispatchAddFinished(item);
+            mPendingAdditions.remove(i);
+        }
+        count = mPendingChanges.size();
+        for (int i = count - 1; i >= 0; i--) {
+            endChangeAnimationIfNecessary(mPendingChanges.get(i));
+        }
+        mPendingChanges.clear();
+        if (!isRunning()) {
+            return;
+        }
+
+        int listCount = mMovesList.size();
+        for (int i = listCount - 1; i >= 0; i--) {
+            ArrayList<MoveInfo> moves = mMovesList.get(i);
+            count = moves.size();
+            for (int j = count - 1; j >= 0; j--) {
+                MoveInfo moveInfo = moves.get(j);
+                RecyclerView.ViewHolder item = moveInfo.holder;
+                View view = item.itemView;
+                view.setTranslationY(0);
+                view.setTranslationX(0);
+                dispatchMoveFinished(moveInfo.holder);
+                moves.remove(j);
+                if (moves.isEmpty()) {
+                    mMovesList.remove(moves);
+                }
+            }
+        }
+        listCount = mAdditionsList.size();
+        for (int i = listCount - 1; i >= 0; i--) {
+            ArrayList<RecyclerView.ViewHolder> additions = mAdditionsList.get(i);
+            count = additions.size();
+            for (int j = count - 1; j >= 0; j--) {
+                RecyclerView.ViewHolder item = additions.get(j);
+                View view = item.itemView;
+                view.setAlpha(1);
+                dispatchAddFinished(item);
+                additions.remove(j);
+                if (additions.isEmpty()) {
+                    mAdditionsList.remove(additions);
+                }
+            }
+        }
+        listCount = mChangesList.size();
+        for (int i = listCount - 1; i >= 0; i--) {
+            ArrayList<ChangeInfo> changes = mChangesList.get(i);
+            count = changes.size();
+            for (int j = count - 1; j >= 0; j--) {
+                endChangeAnimationIfNecessary(changes.get(j));
+                if (changes.isEmpty()) {
+                    mChangesList.remove(changes);
+                }
+            }
+        }
+
+        cancelAll(mRemoveAnimations);
+        cancelAll(mMoveAnimations);
+        cancelAll(mAddAnimations);
+        cancelAll(mChangeAnimations);
+
+        dispatchAnimationsFinished();
+    }
+
+    void cancelAll(List<RecyclerView.ViewHolder> viewHolders) {
+        for (int i = viewHolders.size() - 1; i >= 0; i--) {
+            viewHolders.get(i).itemView.animate().cancel();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * If the payload list is not empty, DefaultItemAnimator returns <code>true</code>.
+     * When this is the case:
+     * <ul>
+     * <li>If you override {@link #animateChange(RecyclerView.ViewHolder, RecyclerView.ViewHolder, int, int, int, int)}, both
+     * ViewHolder arguments will be the same instance.
+     * </li>
+     * <li>
+     * If you are not overriding {@link #animateChange(RecyclerView.ViewHolder, RecyclerView.ViewHolder, int, int, int, int)},
+     * then DefaultItemAnimator will call {@link #animateMove(RecyclerView.ViewHolder, int, int, int, int)} and
+     * run a move animation instead.
+     * </li>
+     * </ul>
+     */
+    @Override
+    public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder,
+                                             @NonNull List<Object> payloads) {
+        return !payloads.isEmpty() || super.canReuseUpdatedViewHolder(viewHolder, payloads);
+    }
+}
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java
new file mode 100644
index 0000000000..2f68af07c6
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java
@@ -0,0 +1,790 @@
+package com.mogo.module.push.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.animation.Interpolator;
+import android.widget.Scroller;
+
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * recyclerview滑动删除类
+ */
+public class SwipeItemLayout extends ViewGroup {
+    enum Mode {
+        RESET, DRAG, FLING, TAP
+    }
+
+    private Mode mTouchMode;
+
+    private ViewGroup mMainView;
+    private ViewGroup mSideView;
+
+    private ScrollRunnable mScrollRunnable;
+    private int mScrollOffset;
+    private int mMaxScrollOffset;
+
+    private boolean mInLayout;
+    private boolean mIsLaidOut;
+
+    public void setOpenSwipe(boolean mOpenSwipe) {
+        this.mOpenSwipe = mOpenSwipe;
+    }
+
+    private boolean mOpenSwipe = true;
+
+    public SwipeItemLayout(Context context) {
+        this(context, null);
+    }
+
+    public SwipeItemLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mTouchMode = Mode.RESET;
+        mScrollOffset = 0;
+        mIsLaidOut = false;
+
+        mScrollRunnable = new ScrollRunnable(context);
+    }
+
+    public boolean isOpen() {
+        return mScrollOffset != 0;
+    }
+
+    Mode getTouchMode() {
+        return mTouchMode;
+    }
+
+    void setTouchMode(Mode mode) {
+        switch (mTouchMode) {
+            case FLING:
+                mScrollRunnable.abort();
+                break;
+            case RESET:
+                break;
+        }
+
+        mTouchMode = mode;
+    }
+
+    public void open() {
+        if (mScrollOffset != -mMaxScrollOffset) {
+            //正在open，不需要处理
+            if (mTouchMode == Mode.FLING && mScrollRunnable.isScrollToLeft())
+                return;
+
+            //当前正在向右滑，abort
+            if (mTouchMode == Mode.FLING /*&& !mScrollRunnable.mScrollToLeft*/)
+                mScrollRunnable.abort();
+
+            mScrollRunnable.startScroll(mScrollOffset, -mMaxScrollOffset);
+        }
+    }
+
+    @Override
+    public void addOnAttachStateChangeListener(OnAttachStateChangeListener listener) {
+        super.addOnAttachStateChangeListener(listener);
+    }
+
+    public void close() {
+        if (mScrollOffset != 0) {
+            //正在close，不需要处理
+            if (mTouchMode == Mode.FLING && !mScrollRunnable.isScrollToLeft())
+                return;
+
+            //当前正向左滑，abort
+            if (mTouchMode == Mode.FLING /*&& mScrollRunnable.mScrollToLeft*/)
+                mScrollRunnable.abort();
+
+            mScrollRunnable.startScroll(mScrollOffset, 0);
+        }
+    }
+
+    void fling(int xVel) {
+        mScrollRunnable.startFling(mScrollOffset, xVel);
+    }
+
+    void revise() {
+        if (mScrollOffset < -mMaxScrollOffset / 2)
+            open();
+        else
+            close();
+    }
+
+    boolean trackMotionScroll(int deltaX) {
+        if (deltaX == 0)
+            return false;
+
+        boolean over = false;
+        int newLeft = mScrollOffset + deltaX;
+        if ((deltaX > 0 && newLeft > 0) || (deltaX < 0 && newLeft < -mMaxScrollOffset)) {
+            over = true;
+            newLeft = Math.min(newLeft, 0);
+            newLeft = Math.max(newLeft, -mMaxScrollOffset);
+        }
+
+        offsetChildrenLeftAndRight(newLeft - mScrollOffset);
+        mScrollOffset = newLeft;
+        return over;
+    }
+
+    private boolean ensureChildren() {
+        int childCount = getChildCount();
+
+        if (childCount != 2)
+            return false;
+
+        View childView = getChildAt(0);
+        if (!(childView instanceof ViewGroup))
+            return false;
+        mMainView = (ViewGroup) childView;
+
+        childView = getChildAt(1);
+        if (!(childView instanceof ViewGroup))
+            return false;
+        mSideView = (ViewGroup) childView;
+        return true;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (!ensureChildren())
+            throw new RuntimeException("SwipeItemLayout的子视图不符合规定");
+
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+
+        MarginLayoutParams lp = null;
+        int horizontalMargin, verticalMargin;
+        int horizontalPadding = getPaddingLeft() + getPaddingRight();
+        int verticalPadding = getPaddingTop() + getPaddingBottom();
+
+        lp = (MarginLayoutParams) mMainView.getLayoutParams();
+        horizontalMargin = lp.leftMargin + lp.rightMargin;
+        verticalMargin = lp.topMargin + lp.bottomMargin;
+        measureChildWithMargins(mMainView,
+                widthMeasureSpec, horizontalMargin + horizontalPadding,
+                heightMeasureSpec, verticalMargin + verticalPadding);
+
+        if (widthMode == MeasureSpec.AT_MOST)
+            widthSize = Math.min(widthSize, mMainView.getMeasuredWidth() + horizontalMargin + horizontalPadding);
+        else if (widthMode == MeasureSpec.UNSPECIFIED)
+            widthSize = mMainView.getMeasuredWidth() + horizontalMargin + horizontalPadding;
+
+        if (heightMode == MeasureSpec.AT_MOST)
+            heightSize = Math.min(heightSize, mMainView.getMeasuredHeight() + verticalMargin + verticalPadding);
+        else if (heightMode == MeasureSpec.UNSPECIFIED)
+            heightSize = mMainView.getMeasuredHeight() + verticalMargin + verticalPadding;
+
+        setMeasuredDimension(widthSize, heightSize);
+
+        //side layout大小为自身实际大小
+        lp = (MarginLayoutParams) mSideView.getLayoutParams();
+        verticalMargin = lp.topMargin + lp.bottomMargin;
+        mSideView.measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+                MeasureSpec.makeMeasureSpec(getMeasuredHeight() - verticalMargin - verticalPadding, MeasureSpec.EXACTLY));
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        if (!ensureChildren())
+            throw new RuntimeException("SwipeItemLayout的子视图不符合规定");
+
+        mInLayout = true;
+
+        int pl = getPaddingLeft();
+        int pt = getPaddingTop();
+        int pr = getPaddingRight();
+        int pb = getPaddingBottom();
+
+        MarginLayoutParams mainLp = (MarginLayoutParams) mMainView.getLayoutParams();
+        MarginLayoutParams sideParams = (MarginLayoutParams) mSideView.getLayoutParams();
+
+        int childLeft = pl + mainLp.leftMargin;
+        int childTop = pt + mainLp.topMargin;
+        int childRight = getWidth() - (pr + mainLp.rightMargin);
+        int childBottom = getHeight() - (mainLp.bottomMargin + pb);
+        mMainView.layout(childLeft, childTop, childRight, childBottom);
+
+        childLeft = childRight + sideParams.leftMargin;
+        childTop = pt + sideParams.topMargin;
+        childRight = childLeft + sideParams.leftMargin + sideParams.rightMargin + mSideView.getMeasuredWidth();
+        childBottom = getHeight() - (sideParams.bottomMargin + pb);
+        mSideView.layout(childLeft, childTop, childRight, childBottom);
+        if (mOpenSwipe) {
+            mMaxScrollOffset = mSideView.getWidth() + sideParams.leftMargin + sideParams.rightMargin;
+        } else {
+            mMaxScrollOffset = 0;
+        }
+        mScrollOffset = mScrollOffset < -mMaxScrollOffset / 2 ? -mMaxScrollOffset : 0;
+
+        offsetChildrenLeftAndRight(mScrollOffset);
+        mInLayout = false;
+        mIsLaidOut = true;
+    }
+
+    void offsetChildrenLeftAndRight(int delta) {
+        ViewCompat.offsetLeftAndRight(mMainView, delta);
+        ViewCompat.offsetLeftAndRight(mSideView, delta);
+    }
+
+    @Override
+    public void requestLayout() {
+        if (!mInLayout) {
+            super.requestLayout();
+        }
+    }
+
+    @Override
+    protected LayoutParams generateDefaultLayoutParams() {
+        return new MarginLayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    }
+
+    @Override
+    protected LayoutParams generateLayoutParams(LayoutParams p) {
+        return p instanceof MarginLayoutParams ? p : new MarginLayoutParams(p);
+    }
+
+    @Override
+    protected boolean checkLayoutParams(LayoutParams p) {
+        return p instanceof MarginLayoutParams && super.checkLayoutParams(p);
+    }
+
+    @Override
+    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new MarginLayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mScrollOffset != 0 && mIsLaidOut) {
+            offsetChildrenLeftAndRight(-mScrollOffset);
+            mScrollOffset = 0;
+        } else
+            mScrollOffset = 0;
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mScrollOffset != 0 && mIsLaidOut) {
+            offsetChildrenLeftAndRight(-mScrollOffset);
+            mScrollOffset = 0;
+        } else
+            mScrollOffset = 0;
+        removeCallbacks(mScrollRunnable);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        final int action = ev.getActionMasked();
+        //click main view，但是它处于open状态，所以，不需要点击效果，直接拦截不调用click listener
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                final int x = (int) ev.getX();
+                final int y = (int) ev.getY();
+                View pointView = findTopChildUnder(this, x, y);
+                if (pointView != null && pointView == mMainView && mScrollOffset != 0)
+                    return true;
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE:
+            case MotionEvent.ACTION_CANCEL:
+                break;
+
+            case MotionEvent.ACTION_UP: {
+                final int x = (int) ev.getX();
+                final int y = (int) ev.getY();
+                View pointView = findTopChildUnder(this, x, y);
+                if (pointView != null && pointView == mMainView && mTouchMode == Mode.TAP && mScrollOffset != 0)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        final int action = ev.getActionMasked();
+        //click main view，但是它处于open状态，所以，不需要点击效果，直接拦截不调用click listener
+        switch (action) {
+            case MotionEvent.ACTION_DOWN: {
+                final int x = (int) ev.getX();
+                final int y = (int) ev.getY();
+                View pointView = findTopChildUnder(this, x, y);
+                if (pointView != null && pointView == mMainView && mScrollOffset != 0)
+                    return true;
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE:
+            case MotionEvent.ACTION_CANCEL:
+                break;
+
+            case MotionEvent.ACTION_UP: {
+                final int x = (int) ev.getX();
+                final int y = (int) ev.getY();
+                View pointView = findTopChildUnder(this, x, y);
+                if (pointView != null && pointView == mMainView && mTouchMode == Mode.TAP && mScrollOffset != 0) {
+                    close();
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onVisibilityChanged(View changedView, int visibility) {
+        super.onVisibilityChanged(changedView, visibility);
+        if (getVisibility() != View.VISIBLE) {
+            mScrollOffset = 0;
+            invalidate();
+        }
+    }
+
+    private static final Interpolator sInterpolator = new Interpolator() {
+        @Override
+        public float getInterpolation(float t) {
+            t -= 1.0f;
+            return t * t * t * t * t + 1.0f;
+        }
+    };
+
+    class ScrollRunnable implements Runnable {
+        private static final int FLING_DURATION = 200;
+        private Scroller mScroller;
+        private boolean mAbort;
+        private int mMinVelocity;
+        private boolean mScrollToLeft;
+
+        ScrollRunnable(Context context) {
+            mScroller = new Scroller(context, sInterpolator);
+            mAbort = false;
+            mScrollToLeft = false;
+
+            ViewConfiguration configuration = ViewConfiguration.get(context);
+            mMinVelocity = configuration.getScaledMinimumFlingVelocity();
+        }
+
+        void startScroll(int startX, int endX) {
+            if (startX != endX) {
+//                Log.e("scroll - startX - endX", "" + startX + " " + endX);
+                setTouchMode(Mode.FLING);
+                mAbort = false;
+                mScrollToLeft = endX < startX;
+                mScroller.startScroll(startX, 0, endX - startX, 0, 400);
+                ViewCompat.postOnAnimation(SwipeItemLayout.this, this);
+            }
+        }
+
+        void startFling(int startX, int xVel) {
+//            Log.e("fling - startX", "" + startX);
+
+            if (xVel > mMinVelocity && startX != 0) {
+                startScroll(startX, 0);
+                return;
+            }
+
+            if (xVel < -mMinVelocity && startX != -mMaxScrollOffset) {
+                startScroll(startX, -mMaxScrollOffset);
+                return;
+            }
+
+            startScroll(startX, startX > -mMaxScrollOffset / 2 ? 0 : -mMaxScrollOffset);
+        }
+
+        void abort() {
+            if (!mAbort) {
+                mAbort = true;
+                if (!mScroller.isFinished()) {
+                    mScroller.abortAnimation();
+                    removeCallbacks(this);
+                }
+            }
+        }
+
+        //是否正在滑动需要另外判断
+        boolean isScrollToLeft() {
+            return mScrollToLeft;
+        }
+
+        @Override
+        public void run() {
+//            Log.e("abort", Boolean.toString(mAbort));
+            if (!mAbort) {
+                boolean more = mScroller.computeScrollOffset();
+                int curX = mScroller.getCurrX();
+//                Log.e("curX", "" + curX);
+
+                boolean atEdge = trackMotionScroll(curX - mScrollOffset);
+                if (more && !atEdge) {
+                    ViewCompat.postOnAnimation(SwipeItemLayout.this, this);
+                    return;
+                }
+
+                if (atEdge) {
+                    removeCallbacks(this);
+                    if (!mScroller.isFinished())
+                        mScroller.abortAnimation();
+                    setTouchMode(Mode.RESET);
+                }
+
+                if (!more) {
+                    setTouchMode(Mode.RESET);
+                    //绝对不会出现这种意外的！！！可以注释掉
+                    if (mScrollOffset != 0) {
+                        if (Math.abs(mScrollOffset) > mMaxScrollOffset / 2)
+                            mScrollOffset = -mMaxScrollOffset;
+                        else
+                            mScrollOffset = 0;
+                        ViewCompat.postOnAnimation(SwipeItemLayout.this, this);
+                    }
+                }
+            }
+        }
+    }
+
+    public static class OnSwipeItemTouchListener implements RecyclerView.OnItemTouchListener {
+        private SwipeItemLayout mCaptureItem;
+        private float mLastMotionX;
+        private float mLastMotionY;
+        private VelocityTracker mVelocityTracker;
+
+        private int mActivePointerId;
+
+        private int mTouchSlop;
+        private int mMaximumVelocity;
+
+        private boolean mDealByParent;
+        private boolean mIsProbeParent;
+
+        public OnSwipeItemTouchListener(Context context) {
+            ViewConfiguration configuration = ViewConfiguration.get(context);
+            mTouchSlop = configuration.getScaledTouchSlop();
+            mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+            mActivePointerId = -1;
+            mDealByParent = false;
+            mIsProbeParent = false;
+        }
+
+        @Override
+        public boolean onInterceptTouchEvent(RecyclerView rv, MotionEvent ev) {
+            if (mIsProbeParent)
+                return false;
+
+            boolean intercept = false;
+            final int action = ev.getActionMasked();
+
+            if (mVelocityTracker == null) {
+                mVelocityTracker = VelocityTracker.obtain();
+            }
+            mVelocityTracker.addMovement(ev);
+
+            switch (action) {
+                case MotionEvent.ACTION_DOWN: {
+                    mActivePointerId = ev.getPointerId(0);
+                    final float x = ev.getX();
+                    final float y = ev.getY();
+                    mLastMotionX = x;
+                    mLastMotionY = y;
+
+                    boolean pointOther = false;
+                    SwipeItemLayout pointItem = null;
+                    //首先知道ev针对的是哪个item
+                    View pointView = findTopChildUnder(rv, (int) x, (int) y);
+                    if (pointView == null || !(pointView instanceof SwipeItemLayout)) {
+                        //可能是head view或bottom view
+                        pointOther = true;
+                    } else
+                        pointItem = (SwipeItemLayout) pointView;
+
+                    //此时的pointOther=true，意味着点击的view为空或者点击的不是item
+                    //还没有把点击的是item但是不是capture item给过滤出来
+                    if (!pointOther && (mCaptureItem == null || mCaptureItem != pointItem))
+                        pointOther = true;
+
+                    //点击的是capture item
+                    if (!pointOther) {
+                        Mode touchMode = mCaptureItem.getTouchMode();
+
+                        //如果它在fling，就转为drag
+                        //需要拦截，并且requestDisallowInterceptTouchEvent
+                        boolean disallowIntercept = false;
+                        if (touchMode == Mode.FLING) {
+                            mCaptureItem.setTouchMode(Mode.DRAG);
+                            disallowIntercept = true;
+                            intercept = true;
+                        } else {//如果是expand的，就不允许parent拦截
+                            mCaptureItem.setTouchMode(Mode.TAP);
+                            if (mCaptureItem.isOpen())
+                                disallowIntercept = true;
+                        }
+
+                        if (disallowIntercept) {
+                            final ViewParent parent = rv.getParent();
+                            if (parent != null)
+                                parent.requestDisallowInterceptTouchEvent(true);
+                        }
+                    } else {//capture item为null或者与point item不一样
+                        //直接将其close掉
+                        if (mCaptureItem != null && mCaptureItem.isOpen()) {
+                            mCaptureItem.close();
+                            mCaptureItem = null;
+                            intercept = true;
+                        }
+
+                        if (pointItem != null) {
+                            mCaptureItem = pointItem;
+                            mCaptureItem.setTouchMode(Mode.TAP);
+                        } else
+                            mCaptureItem = null;
+                    }
+
+                    //如果parent处于fling状态，此时，parent就会转为drag。此时，应该将后续move都交给parent处理
+                    mIsProbeParent = true;
+                    mDealByParent = rv.onInterceptTouchEvent(ev);
+                    mIsProbeParent = false;
+                    if (mDealByParent)
+                        intercept = false;
+                    break;
+                }
+
+                case MotionEvent.ACTION_POINTER_DOWN: {
+                    final int actionIndex = ev.getActionIndex();
+                    mActivePointerId = ev.getPointerId(actionIndex);
+
+                    mLastMotionX = ev.getX(actionIndex);
+                    mLastMotionY = ev.getY(actionIndex);
+                    break;
+                }
+
+                case MotionEvent.ACTION_POINTER_UP: {
+                    final int actionIndex = ev.getActionIndex();
+                    final int pointerId = ev.getPointerId(actionIndex);
+                    if (pointerId == mActivePointerId) {
+                        final int newIndex = actionIndex == 0 ? 1 : 0;
+                        mActivePointerId = ev.getPointerId(newIndex);
+
+                        mLastMotionX = ev.getX(newIndex);
+                        mLastMotionY = ev.getY(newIndex);
+                    }
+                    break;
+                }
+
+                //down时，已经将capture item定下来了。所以，后面可以安心考虑event处理
+                case MotionEvent.ACTION_MOVE: {
+                    final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+                    if (activePointerIndex == -1)
+                        break;
+
+                    //在down时，就被认定为parent的drag，所以，直接交给parent处理即可
+                    if (mDealByParent) {
+                        if (mCaptureItem != null && mCaptureItem.isOpen())
+                            mCaptureItem.close();
+                        return false;
+                    }
+
+                    final int x = (int) (ev.getX(activePointerIndex) + .5f);
+                    final int y = (int) ((int) ev.getY(activePointerIndex) + .5f);
+
+                    int deltaX = (int) (x - mLastMotionX);
+                    int deltaY = (int) (y - mLastMotionY);
+                    final int xDiff = Math.abs(deltaX);
+                    final int yDiff = Math.abs(deltaY);
+
+                    if (mCaptureItem != null && !mDealByParent) {
+                        Mode touchMode = mCaptureItem.getTouchMode();
+
+                        if (touchMode == Mode.TAP) {
+                            //如果capture item是open的，下拉有两种处理方式：
+                            //  1、下拉后，直接close item
+                            //  2、只要是open的，就拦截所有它的消息，这样如果点击open的，就只能滑动该capture item
+                            //网易邮箱，在open的情况下，下拉直接close
+                            //QQ，在open的情况下，下拉也是close。但是，做的不够好，没有达到该效果。
+                            if (xDiff > mTouchSlop && xDiff > yDiff) {
+                                mCaptureItem.setTouchMode(Mode.DRAG);
+                                final ViewParent parent = rv.getParent();
+                                parent.requestDisallowInterceptTouchEvent(true);
+
+                                deltaX = deltaX > 0 ? deltaX - mTouchSlop : deltaX + mTouchSlop;
+                            } else {// if(yDiff>mTouchSlop){
+                                mIsProbeParent = true;
+                                boolean isParentConsume = rv.onInterceptTouchEvent(ev);
+                                mIsProbeParent = false;
+                                if (isParentConsume) {
+                                    //表明不是水平滑动，即不判定为SwipeItemLayout的滑动
+                                    //但是，可能是下拉刷新SwipeRefreshLayout或者RecyclerView的滑动
+                                    //一般的下拉判定，都是yDiff>mTouchSlop，所以，此处这么写不会出问题
+                                    //这里这么做以后，如果判定为下拉，就直接close
+                                    mDealByParent = true;
+                                    mCaptureItem.close();
+                                }
+                            }
+                        }
+
+                        touchMode = mCaptureItem.getTouchMode();
+                        if (touchMode == Mode.DRAG) {
+                            intercept = true;
+                            mLastMotionX = x;
+                            mLastMotionY = y;
+
+                            //对capture item进行拖拽
+                            mCaptureItem.trackMotionScroll(deltaX);
+                        }
+                    }
+                    break;
+                }
+
+                case MotionEvent.ACTION_UP:
+                    if (mCaptureItem != null) {
+                        Mode touchMode = mCaptureItem.getTouchMode();
+                        if (touchMode == Mode.DRAG) {
+                            final VelocityTracker velocityTracker = mVelocityTracker;
+                            velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
+                            int xVel = (int) velocityTracker.getXVelocity(mActivePointerId);
+                            mCaptureItem.fling(xVel);
+
+                            intercept = true;
+                        }
+                    }
+                    cancel();
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    if (mCaptureItem != null)
+                        mCaptureItem.revise();
+                    cancel();
+                    break;
+            }
+
+            return intercept;
+        }
+
+        @Override
+        public void onTouchEvent(RecyclerView rv, MotionEvent ev) {
+            final int action = ev.getActionMasked();
+            final int actionIndex = ev.getActionIndex();
+
+            if (mVelocityTracker == null) {
+                mVelocityTracker = VelocityTracker.obtain();
+            }
+            mVelocityTracker.addMovement(ev);
+
+            switch (action) {
+                case MotionEvent.ACTION_POINTER_DOWN:
+                    mActivePointerId = ev.getPointerId(actionIndex);
+
+                    mLastMotionX = ev.getX(actionIndex);
+                    mLastMotionY = ev.getY(actionIndex);
+                    break;
+
+                case MotionEvent.ACTION_POINTER_UP:
+                    final int pointerId = ev.getPointerId(actionIndex);
+                    if (pointerId == mActivePointerId) {
+                        final int newIndex = actionIndex == 0 ? 1 : 0;
+                        mActivePointerId = ev.getPointerId(newIndex);
+
+                        mLastMotionX = ev.getX(newIndex);
+                        mLastMotionY = ev.getY(newIndex);
+                    }
+                    break;
+
+                //down时，已经将capture item定下来了。所以，后面可以安心考虑event处理
+                case MotionEvent.ACTION_MOVE: {
+                    final int activePointerIndex = ev.findPointerIndex(mActivePointerId);
+                    if (activePointerIndex == -1)
+                        break;
+
+                    final float x = ev.getX(activePointerIndex);
+                    final float y = (int) ev.getY(activePointerIndex);
+
+                    int deltaX = (int) (x - mLastMotionX);
+
+                    if (mCaptureItem != null && mCaptureItem.getTouchMode() == Mode.DRAG) {
+                        mLastMotionX = x;
+                        mLastMotionY = y;
+
+                        //对capture item进行拖拽
+                        mCaptureItem.trackMotionScroll(deltaX);
+                    }
+                    break;
+                }
+
+                case MotionEvent.ACTION_UP:
+                    if (mCaptureItem != null) {
+                        Mode touchMode = mCaptureItem.getTouchMode();
+                        if (touchMode == Mode.DRAG) {
+                            final VelocityTracker velocityTracker = mVelocityTracker;
+                            velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
+                            int xVel = (int) velocityTracker.getXVelocity(mActivePointerId);
+                            mCaptureItem.fling(xVel);
+                        }
+                    }
+                    cancel();
+                    break;
+
+                case MotionEvent.ACTION_CANCEL:
+                    if (mCaptureItem != null)
+                        mCaptureItem.revise();
+
+                    cancel();
+                    break;
+
+            }
+        }
+
+        @Override
+        public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+        }
+
+        void cancel() {
+            mDealByParent = false;
+            mActivePointerId = -1;
+            if (mVelocityTracker != null) {
+                mVelocityTracker.recycle();
+                mVelocityTracker = null;
+            }
+        }
+
+    }
+
+    static View findTopChildUnder(ViewGroup parent, int x, int y) {
+        final int childCount = parent.getChildCount();
+        for (int i = childCount - 1; i >= 0; i--) {
+            final View child = parent.getChildAt(i);
+            if (x >= child.getLeft() && x < child.getRight()
+                    && y >= child.getTop() && y < child.getBottom()) {
+                return child;
+            }
+        }
+        return null;
+    }
+
+    public static void closeAllItems(RecyclerView recyclerView) {
+        for (int i = 0; i < recyclerView.getChildCount(); i++) {
+            View child = recyclerView.getChildAt(i);
+            if (child instanceof SwipeItemLayout) {
+                SwipeItemLayout swipeItemLayout = (SwipeItemLayout) child;
+                if (swipeItemLayout.isOpen())
+                    swipeItemLayout.close();
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java
new file mode 100644
index 0000000000..86900b2810
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java
@@ -0,0 +1,19 @@
+package com.mogo.module.push.view.roundimage;
+
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.SOURCE)
+@IntDef({
+    Corner.TOP_LEFT, Corner.TOP_RIGHT,
+    Corner.BOTTOM_LEFT, Corner.BOTTOM_RIGHT
+})
+public @interface Corner {
+  int TOP_LEFT = 0;
+  int TOP_RIGHT = 1;
+  int BOTTOM_RIGHT = 2;
+  int BOTTOM_LEFT = 3;
+}
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java
new file mode 100644
index 0000000000..0561fb8285
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java
@@ -0,0 +1,633 @@
+/*
+* Copyright (C) 2015 Vincent Mi
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.mogo.module.push.view.roundimage;
+
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.util.Log;
+import android.widget.ImageView.ScaleType;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@SuppressWarnings("UnusedDeclaration")
+public class RoundedDrawable extends Drawable {
+
+  public static final String TAG = "RoundedDrawable";
+  public static final int DEFAULT_BORDER_COLOR = Color.BLACK;
+
+  private final RectF mBounds = new RectF();
+  private final RectF mDrawableRect = new RectF();
+  private final RectF mBitmapRect = new RectF();
+  private final Bitmap mBitmap;
+  private final Paint mBitmapPaint;
+  private final int mBitmapWidth;
+  private final int mBitmapHeight;
+  private final RectF mBorderRect = new RectF();
+  private final Paint mBorderPaint;
+  private final Matrix mShaderMatrix = new Matrix();
+  private final RectF mSquareCornersRect = new RectF();
+
+  private Shader.TileMode mTileModeX = Shader.TileMode.CLAMP;
+  private Shader.TileMode mTileModeY = Shader.TileMode.CLAMP;
+  private boolean mRebuildShader = true;
+
+  // [ topLeft, topRight, bottomLeft, bottomRight ]
+  private float mCornerRadius = 0f;
+  private final boolean[] mCornersRounded = new boolean[] { true, true, true, true };
+
+  private boolean mOval = false;
+  private float mBorderWidth = 0;
+  private ColorStateList mBorderColor = ColorStateList.valueOf(DEFAULT_BORDER_COLOR);
+  private ScaleType mScaleType = ScaleType.FIT_CENTER;
+
+  public RoundedDrawable(Bitmap bitmap) {
+    mBitmap = bitmap;
+
+    mBitmapWidth = bitmap.getWidth();
+    mBitmapHeight = bitmap.getHeight();
+    mBitmapRect.set(0, 0, mBitmapWidth, mBitmapHeight);
+
+    mBitmapPaint = new Paint();
+    mBitmapPaint.setStyle(Paint.Style.FILL);
+    mBitmapPaint.setAntiAlias(true);
+
+    mBorderPaint = new Paint();
+    mBorderPaint.setStyle(Paint.Style.STROKE);
+    mBorderPaint.setAntiAlias(true);
+    mBorderPaint.setColor(mBorderColor.getColorForState(getState(), DEFAULT_BORDER_COLOR));
+    mBorderPaint.setStrokeWidth(mBorderWidth);
+  }
+
+  public static RoundedDrawable fromBitmap(Bitmap bitmap) {
+    if (bitmap != null) {
+      return new RoundedDrawable(bitmap);
+    } else {
+      return null;
+    }
+  }
+
+  public static Drawable fromDrawable(Drawable drawable) {
+    if (drawable != null) {
+      if (drawable instanceof RoundedDrawable) {
+        // just return if it's already a RoundedDrawable
+        return drawable;
+      } else if (drawable instanceof LayerDrawable) {
+        LayerDrawable ld = (LayerDrawable) drawable;
+        int num = ld.getNumberOfLayers();
+
+        // loop through layers to and change to RoundedDrawables if possible
+        for (int i = 0; i < num; i++) {
+          Drawable d = ld.getDrawable(i);
+          ld.setDrawableByLayerId(ld.getId(i), fromDrawable(d));
+        }
+        return ld;
+      }
+
+      // try to get a bitmap from the drawable and
+      Bitmap bm = drawableToBitmap(drawable);
+      if (bm != null) {
+        return new RoundedDrawable(bm);
+      }
+    }
+    return drawable;
+  }
+
+  public static Bitmap drawableToBitmap(Drawable drawable) {
+    if (drawable instanceof BitmapDrawable) {
+      return ((BitmapDrawable) drawable).getBitmap();
+    }
+
+    Bitmap bitmap;
+    int width = Math.max(drawable.getIntrinsicWidth(), 2);
+    int height = Math.max(drawable.getIntrinsicHeight(), 2);
+    try {
+      bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+      Canvas canvas = new Canvas(bitmap);
+      drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+      drawable.draw(canvas);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Log.w(TAG, "Failed to create bitmap from drawable!");
+      bitmap = null;
+    }
+
+    return bitmap;
+  }
+
+  public Bitmap getSourceBitmap() {
+    return mBitmap;
+  }
+
+  @Override
+  public boolean isStateful() {
+    return mBorderColor.isStateful();
+  }
+
+  @Override
+  protected boolean onStateChange(int[] state) {
+    int newColor = mBorderColor.getColorForState(state, 0);
+    if (mBorderPaint.getColor() != newColor) {
+      mBorderPaint.setColor(newColor);
+      return true;
+    } else {
+      return super.onStateChange(state);
+    }
+  }
+
+  private void updateShaderMatrix() {
+    float scale;
+    float dx;
+    float dy;
+
+    switch (mScaleType) {
+      case CENTER:
+        mBorderRect.set(mBounds);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+
+        mShaderMatrix.reset();
+        mShaderMatrix.setTranslate((int) ((mBorderRect.width() - mBitmapWidth) * 0.5f + 0.5f),
+            (int) ((mBorderRect.height() - mBitmapHeight) * 0.5f + 0.5f));
+        break;
+
+      case CENTER_CROP:
+        mBorderRect.set(mBounds);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+
+        mShaderMatrix.reset();
+
+        dx = 0;
+        dy = 0;
+
+        if (mBitmapWidth * mBorderRect.height() > mBorderRect.width() * mBitmapHeight) {
+          scale = mBorderRect.height() / (float) mBitmapHeight;
+          dx = (mBorderRect.width() - mBitmapWidth * scale) * 0.5f;
+        } else {
+          scale = mBorderRect.width() / (float) mBitmapWidth;
+          dy = (mBorderRect.height() - mBitmapHeight * scale) * 0.5f;
+        }
+
+        mShaderMatrix.setScale(scale, scale);
+        mShaderMatrix.postTranslate((int) (dx + 0.5f) + mBorderWidth / 2,
+            (int) (dy + 0.5f) + mBorderWidth / 2);
+        break;
+
+      case CENTER_INSIDE:
+        mShaderMatrix.reset();
+
+        if (mBitmapWidth <= mBounds.width() && mBitmapHeight <= mBounds.height()) {
+          scale = 1.0f;
+        } else {
+          scale = Math.min(mBounds.width() / (float) mBitmapWidth,
+              mBounds.height() / (float) mBitmapHeight);
+        }
+
+        dx = (int) ((mBounds.width() - mBitmapWidth * scale) * 0.5f + 0.5f);
+        dy = (int) ((mBounds.height() - mBitmapHeight * scale) * 0.5f + 0.5f);
+
+        mShaderMatrix.setScale(scale, scale);
+        mShaderMatrix.postTranslate(dx, dy);
+
+        mBorderRect.set(mBitmapRect);
+        mShaderMatrix.mapRect(mBorderRect);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
+        break;
+
+      default:
+      case FIT_CENTER:
+        mBorderRect.set(mBitmapRect);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.CENTER);
+        mShaderMatrix.mapRect(mBorderRect);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
+        break;
+
+      case FIT_END:
+        mBorderRect.set(mBitmapRect);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.END);
+        mShaderMatrix.mapRect(mBorderRect);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
+        break;
+
+      case FIT_START:
+        mBorderRect.set(mBitmapRect);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBounds, Matrix.ScaleToFit.START);
+        mShaderMatrix.mapRect(mBorderRect);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+        mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
+        break;
+
+      case FIT_XY:
+        mBorderRect.set(mBounds);
+        mBorderRect.inset(mBorderWidth / 2, mBorderWidth / 2);
+        mShaderMatrix.reset();
+        mShaderMatrix.setRectToRect(mBitmapRect, mBorderRect, Matrix.ScaleToFit.FILL);
+        break;
+    }
+
+    mDrawableRect.set(mBorderRect);
+  }
+
+  @Override
+  protected void onBoundsChange(@NonNull Rect bounds) {
+    super.onBoundsChange(bounds);
+
+    mBounds.set(bounds);
+
+    updateShaderMatrix();
+  }
+
+  @Override
+  public void draw(@NonNull Canvas canvas) {
+    if (mRebuildShader) {
+      BitmapShader bitmapShader = new BitmapShader(mBitmap, mTileModeX, mTileModeY);
+      if (mTileModeX == Shader.TileMode.CLAMP && mTileModeY == Shader.TileMode.CLAMP) {
+        bitmapShader.setLocalMatrix(mShaderMatrix);
+      }
+      mBitmapPaint.setShader(bitmapShader);
+      mRebuildShader = false;
+    }
+
+    if (mOval) {
+      if (mBorderWidth > 0) {
+        canvas.drawOval(mDrawableRect, mBitmapPaint);
+        canvas.drawOval(mBorderRect, mBorderPaint);
+      } else {
+        canvas.drawOval(mDrawableRect, mBitmapPaint);
+      }
+    } else {
+      if (any(mCornersRounded)) {
+        float radius = mCornerRadius;
+        if (mBorderWidth > 0) {
+          canvas.drawRoundRect(mDrawableRect, radius, radius, mBitmapPaint);
+          canvas.drawRoundRect(mBorderRect, radius, radius, mBorderPaint);
+          redrawBitmapForSquareCorners(canvas);
+          redrawBorderForSquareCorners(canvas);
+        } else {
+          canvas.drawRoundRect(mDrawableRect, radius, radius, mBitmapPaint);
+          redrawBitmapForSquareCorners(canvas);
+        }
+      } else {
+        canvas.drawRect(mDrawableRect, mBitmapPaint);
+        if (mBorderWidth > 0) {
+          canvas.drawRect(mBorderRect, mBorderPaint);
+        }
+      }
+    }
+  }
+
+  private void redrawBitmapForSquareCorners(Canvas canvas) {
+    if (all(mCornersRounded)) {
+      // no square corners
+      return;
+    }
+
+    if (mCornerRadius == 0) {
+      return; // no round corners
+    }
+
+    float left = mDrawableRect.left;
+    float top = mDrawableRect.top;
+    float right = left + mDrawableRect.width();
+    float bottom = top + mDrawableRect.height();
+    float radius = mCornerRadius;
+
+    if (!mCornersRounded[Corner.TOP_LEFT]) {
+      mSquareCornersRect.set(left, top, left + radius, top + radius);
+      canvas.drawRect(mSquareCornersRect, mBitmapPaint);
+    }
+
+    if (!mCornersRounded[Corner.TOP_RIGHT]) {
+      mSquareCornersRect.set(right - radius, top, right, radius);
+      canvas.drawRect(mSquareCornersRect, mBitmapPaint);
+    }
+
+    if (!mCornersRounded[Corner.BOTTOM_RIGHT]) {
+      mSquareCornersRect.set(right - radius, bottom - radius, right, bottom);
+      canvas.drawRect(mSquareCornersRect, mBitmapPaint);
+    }
+
+    if (!mCornersRounded[Corner.BOTTOM_LEFT]) {
+      mSquareCornersRect.set(left, bottom - radius, left + radius, bottom);
+      canvas.drawRect(mSquareCornersRect, mBitmapPaint);
+    }
+  }
+
+  private void redrawBorderForSquareCorners(Canvas canvas) {
+    if (all(mCornersRounded)) {
+      // no square corners
+      return;
+    }
+
+    if (mCornerRadius == 0) {
+      return; // no round corners
+    }
+
+    float left = mDrawableRect.left;
+    float top = mDrawableRect.top;
+    float right = left + mDrawableRect.width();
+    float bottom = top + mDrawableRect.height();
+    float radius = mCornerRadius;
+    float offset = mBorderWidth / 2;
+
+    if (!mCornersRounded[Corner.TOP_LEFT]) {
+      canvas.drawLine(left - offset, top, left + radius, top, mBorderPaint);
+      canvas.drawLine(left, top - offset, left, top + radius, mBorderPaint);
+    }
+
+    if (!mCornersRounded[Corner.TOP_RIGHT]) {
+      canvas.drawLine(right - radius - offset, top, right, top, mBorderPaint);
+      canvas.drawLine(right, top - offset, right, top + radius, mBorderPaint);
+    }
+
+    if (!mCornersRounded[Corner.BOTTOM_RIGHT]) {
+      canvas.drawLine(right - radius - offset, bottom, right + offset, bottom, mBorderPaint);
+      canvas.drawLine(right, bottom - radius, right, bottom, mBorderPaint);
+    }
+
+    if (!mCornersRounded[Corner.BOTTOM_LEFT]) {
+      canvas.drawLine(left - offset, bottom, left + radius, bottom, mBorderPaint);
+      canvas.drawLine(left, bottom - radius, left, bottom, mBorderPaint);
+    }
+  }
+
+  @Override
+  public int getOpacity() {
+    return PixelFormat.TRANSLUCENT;
+  }
+
+  @Override
+  public int getAlpha() {
+    return mBitmapPaint.getAlpha();
+  }
+
+  @Override
+  public void setAlpha(int alpha) {
+    mBitmapPaint.setAlpha(alpha);
+    invalidateSelf();
+  }
+
+  @Override
+  public ColorFilter getColorFilter() {
+    return mBitmapPaint.getColorFilter();
+  }
+
+  @Override
+  public void setColorFilter(ColorFilter cf) {
+    mBitmapPaint.setColorFilter(cf);
+    invalidateSelf();
+  }
+
+  @Override
+  public void setDither(boolean dither) {
+    mBitmapPaint.setDither(dither);
+    invalidateSelf();
+  }
+
+  @Override
+  public void setFilterBitmap(boolean filter) {
+    mBitmapPaint.setFilterBitmap(filter);
+    invalidateSelf();
+  }
+
+  @Override
+  public int getIntrinsicWidth() {
+    return mBitmapWidth;
+  }
+
+  @Override
+  public int getIntrinsicHeight() {
+    return mBitmapHeight;
+  }
+
+  /**
+   * @return the corner radius.
+   */
+  public float getCornerRadius() {
+    return mCornerRadius;
+  }
+
+  /**
+   * @param corner the specific corner to get radius of.
+   * @return the corner radius of the specified corner.
+   */
+  public float getCornerRadius(@Corner int corner) {
+    return mCornersRounded[corner] ? mCornerRadius : 0f;
+  }
+
+  /**
+   * Sets all corners to the specified radius.
+   *
+   * @param radius the radius.
+   * @return the {@link RoundedDrawable} for chaining.
+   */
+  public RoundedDrawable setCornerRadius(float radius) {
+    setCornerRadius(radius, radius, radius, radius);
+    return this;
+  }
+
+  /**
+   * Sets the corner radius of one specific corner.
+   *
+   * @param corner the corner.
+   * @param radius the radius.
+   * @return the {@link RoundedDrawable} for chaining.
+   */
+  public RoundedDrawable setCornerRadius(@Corner int corner, float radius) {
+    if (radius != 0 && mCornerRadius != 0 && mCornerRadius != radius) {
+      throw new IllegalArgumentException("Multiple nonzero corner radii not yet supported.");
+    }
+
+    if (radius == 0) {
+      if (only(corner, mCornersRounded)) {
+        mCornerRadius = 0;
+      }
+      mCornersRounded[corner] = false;
+    } else {
+      if (mCornerRadius == 0) {
+        mCornerRadius = radius;
+      }
+      mCornersRounded[corner] = true;
+    }
+
+    return this;
+  }
+
+  /**
+   * Sets the corner radii of all the corners.
+   *
+   * @param topLeft top left corner radius.
+   * @param topRight top right corner radius
+   * @param bottomRight bototm right corner radius.
+   * @param bottomLeft bottom left corner radius.
+   * @return the {@link RoundedDrawable} for chaining.
+   */
+  public RoundedDrawable setCornerRadius(float topLeft, float topRight, float bottomRight,
+      float bottomLeft) {
+    Set<Float> radiusSet = new HashSet<>(4);
+    radiusSet.add(topLeft);
+    radiusSet.add(topRight);
+    radiusSet.add(bottomRight);
+    radiusSet.add(bottomLeft);
+
+    radiusSet.remove(0f);
+
+    if (radiusSet.size() > 1) {
+      throw new IllegalArgumentException("Multiple nonzero corner radii not yet supported.");
+    }
+
+    if (!radiusSet.isEmpty()) {
+      float radius = radiusSet.iterator().next();
+      if (Float.isInfinite(radius) || Float.isNaN(radius) || radius < 0) {
+        throw new IllegalArgumentException("Invalid radius value: " + radius);
+      }
+      mCornerRadius = radius;
+    } else {
+      mCornerRadius = 0f;
+    }
+
+    mCornersRounded[Corner.TOP_LEFT] = topLeft > 0;
+    mCornersRounded[Corner.TOP_RIGHT] = topRight > 0;
+    mCornersRounded[Corner.BOTTOM_RIGHT] = bottomRight > 0;
+    mCornersRounded[Corner.BOTTOM_LEFT] = bottomLeft > 0;
+    return this;
+  }
+
+  public float getBorderWidth() {
+    return mBorderWidth;
+  }
+
+  public RoundedDrawable setBorderWidth(float width) {
+    mBorderWidth = width;
+    mBorderPaint.setStrokeWidth(mBorderWidth);
+    return this;
+  }
+
+  public int getBorderColor() {
+    return mBorderColor.getDefaultColor();
+  }
+
+  public RoundedDrawable setBorderColor(@ColorInt int color) {
+    return setBorderColor(ColorStateList.valueOf(color));
+  }
+
+  public ColorStateList getBorderColors() {
+    return mBorderColor;
+  }
+
+  public RoundedDrawable setBorderColor(ColorStateList colors) {
+    mBorderColor = colors != null ? colors : ColorStateList.valueOf(0);
+    mBorderPaint.setColor(mBorderColor.getColorForState(getState(), DEFAULT_BORDER_COLOR));
+    return this;
+  }
+
+  public boolean isOval() {
+    return mOval;
+  }
+
+  public RoundedDrawable setOval(boolean oval) {
+    mOval = oval;
+    return this;
+  }
+
+  public ScaleType getScaleType() {
+    return mScaleType;
+  }
+
+  public RoundedDrawable setScaleType(ScaleType scaleType) {
+    if (scaleType == null) {
+      scaleType = ScaleType.FIT_CENTER;
+    }
+    if (mScaleType != scaleType) {
+      mScaleType = scaleType;
+      updateShaderMatrix();
+    }
+    return this;
+  }
+
+  public Shader.TileMode getTileModeX() {
+    return mTileModeX;
+  }
+
+  public RoundedDrawable setTileModeX(Shader.TileMode tileModeX) {
+    if (mTileModeX != tileModeX) {
+      mTileModeX = tileModeX;
+      mRebuildShader = true;
+      invalidateSelf();
+    }
+    return this;
+  }
+
+  public Shader.TileMode getTileModeY() {
+    return mTileModeY;
+  }
+
+  public RoundedDrawable setTileModeY(Shader.TileMode tileModeY) {
+    if (mTileModeY != tileModeY) {
+      mTileModeY = tileModeY;
+      mRebuildShader = true;
+      invalidateSelf();
+    }
+    return this;
+  }
+
+  private static boolean only(int index, boolean[] booleans) {
+    for (int i = 0, len = booleans.length; i < len; i++) {
+      if (booleans[i] != (i == index)) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private static boolean any(boolean[] booleans) {
+    for (boolean b : booleans) {
+      if (b) { return true; }
+    }
+    return false;
+  }
+
+  private static boolean all(boolean[] booleans) {
+    for (boolean b : booleans) {
+      if (b) { return false; }
+    }
+    return true;
+  }
+
+  public Bitmap toBitmap() {
+    return drawableToBitmap(this);
+  }
+}
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java
new file mode 100644
index 0000000000..9b2afdaa5b
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java
@@ -0,0 +1,587 @@
+/*
+* Copyright (C) 2015 Vincent Mi
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.mogo.module.push.view.roundimage;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.ColorFilter;
+import android.graphics.Shader;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ImageView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.mogo.module.push.R;
+
+@SuppressWarnings("UnusedDeclaration")
+public class RoundedImageView extends AppCompatImageView {
+
+  // Constants for tile mode attributes
+  private static final int TILE_MODE_UNDEFINED = -2;
+  private static final int TILE_MODE_CLAMP = 0;
+  private static final int TILE_MODE_REPEAT = 1;
+  private static final int TILE_MODE_MIRROR = 2;
+
+  public static final String TAG = "RoundedImageView";
+  public static final float DEFAULT_RADIUS = 0f;
+  public static final float DEFAULT_BORDER_WIDTH = 0f;
+  public static final Shader.TileMode DEFAULT_TILE_MODE = Shader.TileMode.CLAMP;
+  private static final ImageView.ScaleType[] SCALE_TYPES = {
+      ImageView.ScaleType.MATRIX,
+      ImageView.ScaleType.FIT_XY,
+      ImageView.ScaleType.FIT_START,
+      ImageView.ScaleType.FIT_CENTER,
+      ImageView.ScaleType.FIT_END,
+      ImageView.ScaleType.CENTER,
+      ImageView.ScaleType.CENTER_CROP,
+      ImageView.ScaleType.CENTER_INSIDE
+  };
+
+  private final float[] mCornerRadii =
+      new float[] { DEFAULT_RADIUS, DEFAULT_RADIUS, DEFAULT_RADIUS, DEFAULT_RADIUS };
+
+  private Drawable mBackgroundDrawable;
+  private ColorStateList mBorderColor =
+      ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
+  private float mBorderWidth = DEFAULT_BORDER_WIDTH;
+  private ColorFilter mColorFilter = null;
+  private boolean mColorMod = false;
+  private Drawable mDrawable;
+  private boolean mHasColorFilter = false;
+  private boolean mIsOval = false;
+  private boolean mMutateBackground = false;
+  private int mResource;
+  private int mBackgroundResource;
+  private ImageView.ScaleType mScaleType;
+  private Shader.TileMode mTileModeX = DEFAULT_TILE_MODE;
+  private Shader.TileMode mTileModeY = DEFAULT_TILE_MODE;
+
+  public RoundedImageView(Context context) {
+    super(context);
+  }
+
+  public RoundedImageView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public RoundedImageView(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+
+    TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RoundedImageView, defStyle, 0);
+
+    int index = a.getInt(R.styleable.RoundedImageView_android_scaleType, -1);
+    if (index >= 0) {
+      setScaleType(SCALE_TYPES[index]);
+    } else {
+      // default scaletype to FIT_CENTER
+      setScaleType(ImageView.ScaleType.FIT_CENTER);
+    }
+
+    float cornerRadiusOverride =
+        a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_corner_radius, -1);
+
+    mCornerRadii[Corner.TOP_LEFT] =
+        a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_corner_radius_top_left, -1);
+    mCornerRadii[Corner.TOP_RIGHT] =
+        a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_corner_radius_top_right, -1);
+    mCornerRadii[Corner.BOTTOM_RIGHT] =
+        a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_corner_radius_bottom_right, -1);
+    mCornerRadii[Corner.BOTTOM_LEFT] =
+        a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_corner_radius_bottom_left, -1);
+
+    boolean any = false;
+    for (int i = 0, len = mCornerRadii.length; i < len; i++) {
+      if (mCornerRadii[i] < 0) {
+        mCornerRadii[i] = 0f;
+      } else {
+        any = true;
+      }
+    }
+
+    if (!any) {
+      if (cornerRadiusOverride < 0) {
+        cornerRadiusOverride = DEFAULT_RADIUS;
+      }
+      for (int i = 0, len = mCornerRadii.length; i < len; i++) {
+        mCornerRadii[i] = cornerRadiusOverride;
+      }
+    }
+
+    mBorderWidth = a.getDimensionPixelSize(R.styleable.RoundedImageView_riv_border_width, -1);
+    if (mBorderWidth < 0) {
+      mBorderWidth = DEFAULT_BORDER_WIDTH;
+    }
+
+    mBorderColor = a.getColorStateList(R.styleable.RoundedImageView_riv_border_color);
+    if (mBorderColor == null) {
+      mBorderColor = ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
+    }
+
+    mMutateBackground = a.getBoolean(R.styleable.RoundedImageView_riv_mutate_background, false);
+    mIsOval = a.getBoolean(R.styleable.RoundedImageView_riv_oval, false);
+
+    final int tileMode = a.getInt(R.styleable.RoundedImageView_riv_tile_Mode, TILE_MODE_UNDEFINED);
+    if (tileMode != TILE_MODE_UNDEFINED) {
+      setTileModeX(parseTileMode(tileMode));
+      setTileModeY(parseTileMode(tileMode));
+    }
+
+    final int tileModeX =
+        a.getInt(R.styleable.RoundedImageView_riv_tile_Mode_x, TILE_MODE_UNDEFINED);
+    if (tileModeX != TILE_MODE_UNDEFINED) {
+      setTileModeX(parseTileMode(tileModeX));
+    }
+
+    final int tileModeY =
+        a.getInt(R.styleable.RoundedImageView_riv_tile_Mode_y, TILE_MODE_UNDEFINED);
+    if (tileModeY != TILE_MODE_UNDEFINED) {
+      setTileModeY(parseTileMode(tileModeY));
+    }
+
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(true);
+
+    if (mMutateBackground) {
+      // when setBackground() is called by View constructor, mMutateBackground is not loaded from the attribute,
+      // so it's false by default, what doesn't allow to create the RoundedDrawable. At this point, after load
+      // mMutateBackground and updated BackgroundDrawable to RoundedDrawable, the View's background drawable needs to
+      // be changed to this new drawable.
+      //noinspection deprecation
+      super.setBackgroundDrawable(mBackgroundDrawable);
+    }
+
+    a.recycle();
+  }
+
+  private static Shader.TileMode parseTileMode(int tileMode) {
+    switch (tileMode) {
+      case TILE_MODE_CLAMP:
+        return Shader.TileMode.CLAMP;
+      case TILE_MODE_REPEAT:
+        return Shader.TileMode.REPEAT;
+      case TILE_MODE_MIRROR:
+        return Shader.TileMode.MIRROR;
+      default:
+        return null;
+    }
+  }
+
+  @Override
+  protected void drawableStateChanged() {
+    super.drawableStateChanged();
+    invalidate();
+  }
+
+  @Override
+  public ImageView.ScaleType getScaleType() {
+    return mScaleType;
+  }
+
+  @Override
+  public void setScaleType(ImageView.ScaleType scaleType) {
+    assert scaleType != null;
+
+    if (mScaleType != scaleType) {
+      mScaleType = scaleType;
+
+      switch (scaleType) {
+        case CENTER:
+        case CENTER_CROP:
+        case CENTER_INSIDE:
+        case FIT_CENTER:
+        case FIT_START:
+        case FIT_END:
+        case FIT_XY:
+          super.setScaleType(ImageView.ScaleType.FIT_XY);
+          break;
+        default:
+          super.setScaleType(scaleType);
+          break;
+      }
+
+      updateDrawableAttrs();
+      updateBackgroundDrawableAttrs(false);
+      invalidate();
+    }
+  }
+
+  @Override
+  public void setImageDrawable(Drawable drawable) {
+    mResource = 0;
+    mDrawable = RoundedDrawable.fromDrawable(drawable);
+    updateDrawableAttrs();
+    super.setImageDrawable(mDrawable);
+  }
+
+  @Override
+  public void setImageBitmap(Bitmap bm) {
+    mResource = 0;
+    mDrawable = RoundedDrawable.fromBitmap(bm);
+    updateDrawableAttrs();
+    super.setImageDrawable(mDrawable);
+  }
+
+  @Override
+  public void setImageResource(@DrawableRes int resId) {
+    if (mResource != resId) {
+      mResource = resId;
+      mDrawable = resolveResource();
+      updateDrawableAttrs();
+      super.setImageDrawable(mDrawable);
+    }
+  }
+
+  @Override public void setImageURI(Uri uri) {
+    super.setImageURI(uri);
+    setImageDrawable(getDrawable());
+  }
+
+  private Drawable resolveResource() {
+    Resources rsrc = getResources();
+    if (rsrc == null) { return null; }
+
+    Drawable d = null;
+
+    if (mResource != 0) {
+      try {
+        d = rsrc.getDrawable(mResource);
+      } catch (Exception e) {
+        Log.w(TAG, "Unable to find resource: " + mResource, e);
+        // Don't try again.
+        mResource = 0;
+      }
+    }
+    return RoundedDrawable.fromDrawable(d);
+  }
+
+  @Override
+  public void setBackground(Drawable background) {
+    setBackgroundDrawable(background);
+  }
+
+  @Override
+  public void setBackgroundResource(@DrawableRes int resId) {
+    if (mBackgroundResource != resId) {
+      mBackgroundResource = resId;
+      mBackgroundDrawable = resolveBackgroundResource();
+      setBackgroundDrawable(mBackgroundDrawable);
+    }
+  }
+
+  @Override
+  public void setBackgroundColor(int color) {
+    mBackgroundDrawable = new ColorDrawable(color);
+    setBackgroundDrawable(mBackgroundDrawable);
+  }
+
+  private Drawable resolveBackgroundResource() {
+    Resources rsrc = getResources();
+    if (rsrc == null) { return null; }
+
+    Drawable d = null;
+
+    if (mBackgroundResource != 0) {
+      try {
+        d = rsrc.getDrawable(mBackgroundResource);
+      } catch (Exception e) {
+        Log.w(TAG, "Unable to find resource: " + mBackgroundResource, e);
+        // Don't try again.
+        mBackgroundResource = 0;
+      }
+    }
+    return RoundedDrawable.fromDrawable(d);
+  }
+
+  private void updateDrawableAttrs() {
+    updateAttrs(mDrawable, mScaleType);
+  }
+
+  private void updateBackgroundDrawableAttrs(boolean convert) {
+    if (mMutateBackground) {
+      if (convert) {
+        mBackgroundDrawable = RoundedDrawable.fromDrawable(mBackgroundDrawable);
+      }
+      updateAttrs(mBackgroundDrawable, ImageView.ScaleType.FIT_XY);
+    }
+  }
+
+  @Override public void setColorFilter(ColorFilter cf) {
+    if (mColorFilter != cf) {
+      mColorFilter = cf;
+      mHasColorFilter = true;
+      mColorMod = true;
+      applyColorMod();
+      invalidate();
+    }
+  }
+
+  private void applyColorMod() {
+    // Only mutate and apply when modifications have occurred. This should
+    // not reset the mColorMod flag, since these filters need to be
+    // re-applied if the Drawable is changed.
+    if (mDrawable != null && mColorMod) {
+      mDrawable = mDrawable.mutate();
+      if (mHasColorFilter) {
+        mDrawable.setColorFilter(mColorFilter);
+      }
+      //mDrawable.setXfermode(mXfermode);
+      //mDrawable.setAlpha(mAlpha * mViewAlphaScale >> 8);
+    }
+  }
+
+  private void updateAttrs(Drawable drawable, ImageView.ScaleType scaleType) {
+    if (drawable == null) { return; }
+
+    if (drawable instanceof RoundedDrawable) {
+      ((RoundedDrawable) drawable)
+              .setScaleType(scaleType)
+              .setBorderWidth(mBorderWidth)
+              .setBorderColor(mBorderColor)
+              .setOval(mIsOval)
+              .setTileModeX(mTileModeX)
+              .setTileModeY(mTileModeY);
+
+      if (mCornerRadii != null) {
+        ((RoundedDrawable) drawable).setCornerRadius(
+            mCornerRadii[Corner.TOP_LEFT],
+            mCornerRadii[Corner.TOP_RIGHT],
+            mCornerRadii[Corner.BOTTOM_RIGHT],
+            mCornerRadii[Corner.BOTTOM_LEFT]);
+      }
+
+      applyColorMod();
+    } else if (drawable instanceof LayerDrawable) {
+      // loop through layers to and set drawable attrs
+      LayerDrawable ld = ((LayerDrawable) drawable);
+      for (int i = 0, layers = ld.getNumberOfLayers(); i < layers; i++) {
+        updateAttrs(ld.getDrawable(i), scaleType);
+      }
+    }
+  }
+
+  @Override
+  @Deprecated
+  public void setBackgroundDrawable(Drawable background) {
+    mBackgroundDrawable = background;
+    updateBackgroundDrawableAttrs(true);
+    //noinspection deprecation
+    super.setBackgroundDrawable(mBackgroundDrawable);
+  }
+
+  /**
+   * @return the largest corner radius.
+   */
+  public float getCornerRadius() {
+    return getMaxCornerRadius();
+  }
+
+  /**
+   * @return the largest corner radius.
+   */
+  public float getMaxCornerRadius() {
+    float maxRadius = 0;
+    for (float r : mCornerRadii) {
+      maxRadius = Math.max(r, maxRadius);
+    }
+    return maxRadius;
+  }
+
+  /**
+   * Get the corner radius of a specified corner.
+   *
+   * @param corner the corner.
+   * @return the radius.
+   */
+  public float getCornerRadius(@Corner int corner) {
+    return mCornerRadii[corner];
+  }
+
+  /**
+   * Set all the corner radii from a dimension resource id.
+   *
+   * @param resId dimension resource id of radii.
+   */
+  public void setCornerRadiusDimen(@DimenRes int resId) {
+    float radius = getResources().getDimension(resId);
+    setCornerRadius(radius, radius, radius, radius);
+  }
+
+  /**
+   * Set the corner radius of a specific corner from a dimension resource id.
+   *
+   * @param corner the corner to set.
+   * @param resId the dimension resource id of the corner radius.
+   */
+  public void setCornerRadiusDimen(@Corner int corner, @DimenRes int resId) {
+    setCornerRadius(corner, getResources().getDimensionPixelSize(resId));
+  }
+
+  /**
+   * Set the corner radii of all corners in px.
+   *
+   * @param radius the radius to set.
+   */
+  public void setCornerRadius(float radius) {
+    setCornerRadius(radius, radius, radius, radius);
+  }
+
+  /**
+   * Set the corner radius of a specific corner in px.
+   *
+   * @param corner the corner to set.
+   * @param radius the corner radius to set in px.
+   */
+  public void setCornerRadius(@Corner int corner, float radius) {
+    if (mCornerRadii[corner] == radius) {
+      return;
+    }
+    mCornerRadii[corner] = radius;
+
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  /**
+   * Set the corner radii of each corner individually. Currently only one unique nonzero value is
+   * supported.
+   *
+   * @param topLeft radius of the top left corner in px.
+   * @param topRight radius of the top right corner in px.
+   * @param bottomRight radius of the bottom right corner in px.
+   * @param bottomLeft radius of the bottom left corner in px.
+   */
+  public void setCornerRadius(float topLeft, float topRight, float bottomLeft, float bottomRight) {
+    if (mCornerRadii[Corner.TOP_LEFT] == topLeft
+        && mCornerRadii[Corner.TOP_RIGHT] == topRight
+        && mCornerRadii[Corner.BOTTOM_RIGHT] == bottomRight
+        && mCornerRadii[Corner.BOTTOM_LEFT] == bottomLeft) {
+      return;
+    }
+
+    mCornerRadii[Corner.TOP_LEFT] = topLeft;
+    mCornerRadii[Corner.TOP_RIGHT] = topRight;
+    mCornerRadii[Corner.BOTTOM_LEFT] = bottomLeft;
+    mCornerRadii[Corner.BOTTOM_RIGHT] = bottomRight;
+
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  public float getBorderWidth() {
+    return mBorderWidth;
+  }
+
+  public void setBorderWidth(@DimenRes int resId) {
+    setBorderWidth(getResources().getDimension(resId));
+  }
+
+  public void setBorderWidth(float width) {
+    if (mBorderWidth == width) { return; }
+
+    mBorderWidth = width;
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  @ColorInt
+  public int getBorderColor() {
+    return mBorderColor.getDefaultColor();
+  }
+
+  public void setBorderColor(@ColorInt int color) {
+    setBorderColor(ColorStateList.valueOf(color));
+  }
+
+  public ColorStateList getBorderColors() {
+    return mBorderColor;
+  }
+
+  public void setBorderColor(ColorStateList colors) {
+    if (mBorderColor.equals(colors)) { return; }
+
+    mBorderColor =
+        (colors != null) ? colors : ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR);
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    if (mBorderWidth > 0) {
+      invalidate();
+    }
+  }
+
+  public boolean isOval() {
+    return mIsOval;
+  }
+
+  public void setOval(boolean oval) {
+    mIsOval = oval;
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  public Shader.TileMode getTileModeX() {
+    return mTileModeX;
+  }
+
+  public void setTileModeX(Shader.TileMode tileModeX) {
+    if (this.mTileModeX == tileModeX) { return; }
+
+    this.mTileModeX = tileModeX;
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  public Shader.TileMode getTileModeY() {
+    return mTileModeY;
+  }
+
+  public void setTileModeY(Shader.TileMode tileModeY) {
+    if (this.mTileModeY == tileModeY) { return; }
+
+    this.mTileModeY = tileModeY;
+    updateDrawableAttrs();
+    updateBackgroundDrawableAttrs(false);
+    invalidate();
+  }
+
+  public boolean mutatesBackground() {
+    return mMutateBackground;
+  }
+
+  public void mutateBackground(boolean mutate) {
+    if (mMutateBackground == mutate) { return; }
+
+    mMutateBackground = mutate;
+    updateBackgroundDrawableAttrs(true);
+    invalidate();
+  }
+}
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt
new file mode 100644
index 0000000000..a5f6da8766
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt
@@ -0,0 +1,33 @@
+package com.mogo.module.push.viewmodel
+
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.repository.PushRepository
+import com.mogo.module.push.utils.HandlerUtils
+
+class MessageViewModel(private val messageViewModel: MessageListChange) {
+
+    var list: MutableList<PushBean>? = null
+        set(value) {
+            field = value
+            messageViewModel.messageListChange(value)
+        }
+
+    init {
+        HandlerUtils.mBgHandler.post {
+            list = PushRepository.pushRepository.getAll()
+        }
+    }
+
+    interface MessageListChange {
+        fun messageListChange(list: MutableList<PushBean>?)
+    }
+
+    fun delete(bean: PushBean) {
+        PushRepository.pushRepository.delete(bean)
+    }
+
+    fun deleteAll() {
+        list = null
+        PushRepository.pushRepository.deleteAll()
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt
new file mode 100644
index 0000000000..6c48a688bc
--- /dev/null
+++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt
@@ -0,0 +1,192 @@
+package com.mogo.module.push.viewmodel
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.Log
+import com.mogo.commons.voice.AIAssist
+import com.mogo.commons.voice.IMogoVoiceCmdCallBack
+import com.mogo.module.push.Config
+import com.zhidao.auto.platform.voice.VoiceClient
+import com.mogo.module.push.model.PushBean
+import com.mogo.module.push.repository.PushRepository
+import com.mogo.module.push.utils.AnalyticsUtils
+import com.mogo.module.push.utils.dealSchema
+import com.mogo.module.push.view.FloatView
+
+class PushViewModel(
+    private val mContext: Context,
+    private val pushRepository: PushRepository
+) {
+    companion object {
+        const val VOICE_ACTION_PUSH_MAIN = "VOICE_ACTION_PUSH_MAIN"
+        const val VOICE_ACTION_PUSH_LEFT = "VOICE_ACTION_PUSH_LEFT"
+        const val VOICE_ACTION_PUSH_RIGHT = "VOICE_ACTION_PUSH_RIGHT"
+        const val VOICE_ACTION_PUSH_CANCEL = "VOICE_ACTION_PUSH_CANCEL"
+    }
+
+    var floatView: FloatView? = null
+
+    private var mVoiceClient: AIAssist = AIAssist.getInstance(mContext)
+
+    private val voiceCmdCallback = object : IMogoVoiceCmdCallBack {
+        override fun onSpeakEnd(speakText: String?) {
+        }
+
+        override fun onCmdSelected(cmd: String?) {
+            if (!cmd.isNullOrEmpty()) {
+                dealCmd(cmd)
+            }
+        }
+
+        override fun onCmdAction(speakText: String?) {
+        }
+
+        override fun onCmdCancel(speakText: String?) {
+        }
+
+        override fun onSpeakSelectTimeOut(speakText: String?) {
+        }
+    }
+
+    fun dealCmd(cmd: String, isClick: String = "2") {
+        if (TextUtils.isEmpty(cmd)) {
+            return
+        }
+        pushBean?.let {
+            when (cmd) {
+                VOICE_ACTION_PUSH_MAIN -> {
+                    AnalyticsUtils.track(Config.NEWS_CARD_CLICK, "trigger_type", isClick)
+                    if (isClick == "2") {
+                        mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
+                    }
+                    if (!it.mainSchema.isNullOrEmpty()) {
+                        dealSchema(it.mainSchema, mContext)
+                    }
+                }
+                VOICE_ACTION_PUSH_LEFT -> {
+                    if (it.buttons.isNullOrEmpty()) {
+                        return
+                    }
+                    AnalyticsUtils.track(
+                        Config.NEWS_CARD_CLICK_BTN,
+                        "trigger_type",
+                        isClick, "btn_text", it.buttons[0].text
+                    )
+                    if (isClick == "2") {
+                        mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
+                    }
+                    if (!it.buttons[0].action.isNullOrEmpty()) {
+                        dealSchema(it.buttons[0].action, mContext)
+                    }
+                }
+                VOICE_ACTION_PUSH_RIGHT -> {
+                    if (it.buttons.isNullOrEmpty()) {
+                        return
+                    }
+                    AnalyticsUtils.track(
+                        Config.NEWS_CARD_CLICK_BTN,
+                        "trigger_type",
+                        isClick, "btn_text", it.buttons[1].text
+                    )
+                    if (isClick == "2") {
+                        mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
+                    }
+                    if (!it.buttons[1].action.isNullOrEmpty()) {
+                        dealSchema(it.buttons[1].action, mContext)
+                    }
+                }
+                VOICE_ACTION_PUSH_CANCEL -> {
+                    AnalyticsUtils.track(
+                        Config.NEWS_CARD_SWIPE,
+                        "trigger_type",
+                        isClick
+                    )
+                    if (isClick == "2") {
+                        mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
+                    }
+                }
+            }
+        }
+    }
+
+    var pushBean: PushBean? = null
+        set(value) {
+            field = value
+            if (value == null) {
+                floatView?.hide()
+                floatView = null
+                return
+            }
+            field?.showTimeoutShadow = field?.showTimeout?:0
+            Log.d("yilz", "pushbean = $value")
+            if (value != null && value!!.imageUrl == null) {
+                value!!.imageUrl = ""
+            }
+            if (floatView == null) {
+                floatView = FloatView(this, mContext)
+            }
+            floatView?.pushBeanChanged(field)
+            registerVoiceCMD()
+            pushRepository.setPushUIShow(field != null)
+        }
+
+    fun pushMessageFinish(needSave: Boolean = false) {
+        pushRepository.iterateNext(needSave)
+    }
+
+    private fun registerVoiceCMD() {
+        mVoiceClient.unregisterUnWakeupCommand(VOICE_ACTION_PUSH_CANCEL)
+        mVoiceClient.unregisterUnWakeupCommand(VOICE_ACTION_PUSH_MAIN)
+        mVoiceClient.unregisterUnWakeupCommand(VOICE_ACTION_PUSH_LEFT)
+        mVoiceClient.unregisterUnWakeupCommand(VOICE_ACTION_PUSH_RIGHT)
+
+        if (pushBean != null && !pushBean!!.cancelVoiceCmd.isNullOrEmpty()) {
+            mVoiceClient.registerUnWakeupCommand(
+                VOICE_ACTION_PUSH_CANCEL,
+                pushBean!!.cancelVoiceCmd!!.toTypedArray(),
+                voiceCmdCallback
+            )
+        } else {
+            mVoiceClient.registerUnWakeupCommand(
+                VOICE_ACTION_PUSH_CANCEL,
+                arrayOf("忽略", "取消", "算了", "不要", "不要了", "不看了", "关闭"),
+                voiceCmdCallback
+            )
+        }
+
+        if (pushBean != null && !pushBean!!.mainVoiceCmd.isNullOrEmpty()) {
+            mVoiceClient.registerUnWakeupCommand(
+                VOICE_ACTION_PUSH_MAIN,
+                pushBean!!.mainVoiceCmd!!.toTypedArray(),
+                voiceCmdCallback
+            )
+        }
+
+        pushBean?.buttons?.forEach {
+            it?.voiceCmd?.apply {
+                mVoiceClient.registerUnWakeupCommand(
+                    VOICE_ACTION_PUSH_RIGHT,
+                    toTypedArray(),
+                    voiceCmdCallback
+                )
+            }
+        }
+    }
+
+    fun speakDefault(voice: String) {
+        mVoiceClient.speakTTSVoice(voice, voiceCmdCallback)
+    }
+
+    fun pauseAnimator(on: Boolean) {
+        floatView?.pauseTimer(on)
+    }
+
+    fun isAddWindow(): Boolean = floatView?.isAddWindow() ?: false
+
+    fun push() {
+        pushBean?.apply {
+            showTimeout = showTimeoutShadow
+            pushRepository.push(this)
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png
new file mode 100644
index 0000000000..73e64634fd
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png
new file mode 100644
index 0000000000..71a46c2cc2
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_activity_clear_bg.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_activity_clear_bg.xml
new file mode 100644
index 0000000000..cb38368310
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_activity_clear_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/module_push_clear_bg_radius" />
+    <solid android:color="#FF494B66 "/>
+</shape>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable/module_push_close.png
new file mode 100644
index 0000000000..71a46c2cc2
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable/module_push_close.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml
new file mode 100644
index 0000000000..5e39ae0d22
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/module_push_content_only_line_space" />
+    <solid android:color=" #222533" />
+</shape>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_decrease_timer_bkg.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_decrease_timer_bkg.xml
new file mode 100644
index 0000000000..7031a78049
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_decrease_timer_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>
+            <corners android:radius="@dimen/module_push_ui_decrease_timer_corner"/>
+            <solid android:color="#7F000000"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml
new file mode 100644
index 0000000000..0d24d54394
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/module_push_ui_bkg_corner" />
+    <solid android:color="#F23F4057" />
+</shape>
+
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_left_button.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_left_button.xml
new file mode 100644
index 0000000000..c17bfd5f97
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_left_button.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape>
+            <corners android:radius="@dimen/module_push_ui_button_radius" />
+            <gradient android:angle="135" android:endColor="#1F7EFF" android:startColor="#1E57A4" android:type="linear" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape>
+            <corners android:radius="@dimen/module_push_ui_button_radius" />
+            <gradient android:angle="135" android:endColor="#124C9A" android:startColor="#123463" android:type="linear" />
+        </shape>
+    </item>
+</selector>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml
new file mode 100644
index 0000000000..0c3a036b3e
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FA36374A"/>
+</shape>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml
new file mode 100644
index 0000000000..d755aba46d
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="@dimen/module_push_button_margin_top" />
+    <solid android:color="#242736" />
+    <!--  <gradient
+          android:angle="-90"
+          android:endColor="#2F3047"
+          android:startColor="#3F4057"
+          android:type="linear" />-->
+</shape>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_right_button.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_right_button.xml
new file mode 100644
index 0000000000..3f828dcc61
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_right_button.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/module_push_ui_button_radius" />
+            <gradient android:angle="135" android:endColor="#616381" android:startColor="#48495E" />
+        </shape>
+
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/module_push_ui_button_radius" />
+            <gradient android:angle="135" android:endColor="#3A3B4D" android:startColor="#2B2C38" />
+        </shape>
+    </item>
+</selector>
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_ui_delay_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_ui_delay_background.xml
new file mode 100644
index 0000000000..77a14ee943
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/drawable/module_push_ui_delay_background.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees="0"
+    android:pivotX="50%"
+    android:pivotY="50%"
+    android:toDegrees="360">
+    <shape
+        android:innerRadius="@dimen/module_push_timer_inner_radius"
+        android:shape="ring"
+        android:thickness="@dimen/module_push_timer_thickness"
+        android:useLevel="false">
+        <gradient
+            android:centerY="0.50"
+            android:endColor="#001F7FFF"
+            android:startColor="#7A8199"
+            android:type="sweep"
+            android:useLevel="false" />
+    </shape>
+</rotate>  
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_ui_ic_message2.png b/modules/mogo-module-push/src/main/res/drawable/module_push_ui_ic_message2.png
new file mode 100644
index 0000000000..10f53d3374
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable/module_push_ui_ic_message2.png differ
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml
new file mode 100644
index 0000000000..ad00bcb08d
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_item.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="@dimen/module_push_ui_height"
+    android:background="@drawable/module_push_item_background">
+
+    <com.mogo.module.push.view.roundimage.RoundedImageView
+        android:id="@+id/module_push_image"
+        android:layout_width="@dimen/module_push_ui_image_width"
+        android:layout_height="@dimen/module_push_ui_image_height"
+        android:layout_marginLeft="@dimen/module_push_ui_image_marLeft"
+        android:background="#333333"
+        android:scaleType="fitXY"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:riv_corner_radius="@dimen/module_push_ui_image_corner" />
+
+    <LinearLayout
+        android:id="@+id/module_push_app_icon_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin"
+        android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/module_push_ui_app_icon_size"
+        app:layout_constraintRight_toLeftOf="@+id/module_push_progress_bar_frame"
+        app:layout_constraintLeft_toRightOf="@+id/module_push_image"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin">
+
+        <ImageView
+            android:id="@+id/module_push_app_icon"
+            android:layout_width="@dimen/module_push_ui_app_icon_size"
+            android:layout_height="@dimen/module_push_ui_app_icon_size"
+            android:layout_marginRight="@dimen/module_push_title_margin_start"
+            android:background="@drawable/module_push_ui_ic_message2" />
+
+        <TextView
+            android:id="@+id/module_push_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical|left"
+            android:maxWidth="@dimen/module_push_title_mix_width"
+            android:singleLine="true"
+            android:maxLength="25"
+            tools:text="标题标题标题标题标题标题标题"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/module_push_ui_title_textSize"
+            app:layout_constrainedWidth="true" />
+    </LinearLayout>
+
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
+        app:layout_constraintRight_toRightOf="@id/module_push_progress_bar_frame"
+        app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
+
+        <TextView
+            android:id="@+id/module_push_content"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:maxLines="3"
+            android:layout_above="@+id/module_push_buttons"
+            android:ellipsize="end"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/module_push_ui_title_text_size"
+            tools:text="文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内文本内容文本内容文本内" />
+
+        <LinearLayout
+            android:id="@+id/module_push_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/module_push_button_height"
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="@dimen/module_push_button_margin_top"
+            android:layout_marginBottom="@dimen/module_push_button_margin_bottom"
+            android:gravity="center"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/module_push_button_left"
+                android:layout_width="@dimen/module_push_button_width"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/module_push_left_button"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:enabled="true"
+                android:lines="1"
+                android:maxWidth="@dimen/module_push_button_maxWidth"
+                android:maxLength="6"
+                android:text="查看"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/module_push_title_text_size"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/module_push_button_right"
+                android:layout_width="@dimen/module_push_button_width"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/module_push_button_right_marLeft"
+                android:layout_weight="1"
+                android:background="@drawable/module_push_right_button"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:lines="1"
+                android:maxWidth="@dimen/module_push_button_maxWidth"
+                android:maxLength="6"
+                android:text="忽略"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/module_push_title_text_size"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <FrameLayout
+        android:id="@+id/module_push_progress_bar_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_push_progress_bar_frame_marginTop"
+        android:layout_marginEnd="@dimen/module_push_progress_bar_frame_marginEnd"
+        android:background="@drawable/module_push_decrease_timer_bkg"
+        android:paddingLeft="@dimen/module_push_progress_bar_frame_padding"
+        android:paddingRight="@dimen/module_push_progress_bar_frame_padding"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/module_push_timer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:textColor="#80FFFFFF"
+            android:textSize="@dimen/module_push_ui_timer_textSize"
+            tools:text="11s" />
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml b/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml
new file mode 100644
index 0000000000..8d9c1d7579
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_item_vertical.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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:layout_width="@dimen/module_push_ui_width_vertical"
+    android:layout_height="wrap_content"
+    android:background="@drawable/module_push_item_background"
+    android:maxHeight="@dimen/module_push_item_maxHeight_vertical"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/module_push_ui_app_icon_leftMargin_vertical"
+    android:paddingRight="@dimen/module_push_ui_app_icon_leftMargin_vertical">
+
+    <LinearLayout
+        android:id="@+id/module_push_content_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/module_push_content_paddingBottom_vertical">
+
+        <RelativeLayout
+            android:id="@+id/module_push_app_icon_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin_vertical"
+            android:layout_marginBottom="@dimen/module_push_image_marginTop_vertical"
+            android:minHeight="@dimen/module_push_ui_app_icon_size">
+
+            <ImageView
+                android:id="@+id/module_push_app_icon"
+                android:layout_width="@dimen/module_push_ui_app_icon_size"
+                android:layout_height="@dimen/module_push_ui_app_icon_size"
+                android:layout_marginRight="@dimen/module_push_title_margin_start"
+                tools:background="@drawable/module_push_ui_ic_message2" />
+
+            <TextView
+                android:id="@+id/module_push_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/module_push_app_icon"
+                android:ellipsize="end"
+                android:gravity="center_vertical|left"
+                android:maxWidth="@dimen/module_push_title_mix_width"
+                android:singleLine="true"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/module_push_ui_title_textSize"
+                tools:text="push title" />
+
+            <FrameLayout
+                android:id="@+id/module_push_progress_bar_frame"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@drawable/module_push_decrease_timer_bkg"
+                android:paddingLeft="@dimen/module_push_progress_bar_frame_padding"
+                android:paddingRight="@dimen/module_push_progress_bar_frame_padding">
+
+                <TextView
+                    android:id="@+id/module_push_timer"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:textColor="#80FFFFFF"
+                    android:textSize="@dimen/module_push_ui_timer_textSize"
+                    tools:text="11s" />
+            </FrameLayout>
+        </RelativeLayout>
+
+        <com.mogo.module.push.view.roundimage.RoundedImageView
+            android:id="@+id/module_push_image"
+            android:layout_width="@dimen/module_push_ui_image_width_vertical"
+            android:layout_height="@dimen/module_push_ui_image_height_vertical"
+            android:layout_gravity="center"
+            android:background="#333333"
+            android:layout_marginBottom="@dimen/module_push_ui_content_marginTop_vertical"
+            android:scaleType="fitXY"
+            app:riv_corner_radius="@dimen/module_push_ui_image_corner" />
+
+        <TextView
+            android:id="@+id/module_push_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/module_push_button_margin_top"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="4"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/module_push_ui_title_text_size"
+            tools:text="文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内文本内容文本内" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/module_push_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/module_push_button_height"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="@dimen/module_push_button_margin_bottom"
+        android:gravity="center">
+
+        <TextView
+            android:id="@+id/module_push_button_left"
+            android:layout_width="@dimen/module_push_button_width"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/module_push_left_button"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:lines="1"
+            android:maxWidth="@dimen/module_push_button_maxWidth"
+            android:maxLength="6"
+            android:text="查看"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/module_push_title_text_size"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/module_push_button_right"
+            android:layout_width="@dimen/module_push_button_width"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/module_push_button_right_marLeft"
+            android:layout_weight="1"
+            android:background="@drawable/module_push_right_button"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:lines="1"
+            android:maxWidth="@dimen/module_push_button_maxWidth"
+            android:maxLength="6"
+            android:text="忽略"
+            android:textColor="#FFFFFF"
+            android:textSize="@dimen/module_push_title_text_size"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_activity.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_activity.xml
new file mode 100644
index 0000000000..c6231299a0
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_activity.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical">
+
+    <TextView
+        android:id="@+id/module_push_activity_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/module_push_activity_title_margin_top"
+        android:text="历史消息（2）"
+        android:textColor="#FFFFFFFF"
+        android:textSize="@dimen/module_push_activity_title_text_size" />
+
+    <ImageView
+        android:id="@+id/module_push_activity_close"
+        android:layout_width="@dimen/module_push_margin_start"
+        android:layout_height="@dimen/module_push_margin_start"
+        android:layout_gravity="end"
+        android:layout_marginTop="@dimen/module_push_activity_close_margin_top"
+        android:layout_marginEnd="@dimen/module_push_activity_close_margin_end"
+        android:padding="@dimen/module_push_activity_close_padding"
+        android:src="@drawable/module_push_close" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/module_push_activity_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/module_push_activity_recycler_view_margin_top"
+        android:layout_marginEnd="@dimen/module_push_activity_close_margin_end" />
+
+    <TextView
+        android:id="@+id/module_push_activity_not_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="暂无消息"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_push_activity_not_data_text_size" />
+
+    <TextView
+        android:id="@+id/module_push_activity_clear"
+        android:layout_width="@dimen/module_push_content_only_height"
+        android:layout_height="@dimen/module_push_button_height"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="@dimen/module_push_activity_clear_margin_bottom"
+        android:background="@drawable/module_push_activity_clear_bg"
+        android:gravity="center"
+        android:text="清空历史消息"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/module_push_title_text_size"
+        android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml
new file mode 100644
index 0000000000..b966a07fca
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/layout/module_push_message_item.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.mogo.module.push.view.SwipeItemLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/module_push_content_only_line_space">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/module_push_message_item_height">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/module_push_item_click"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/module_push_activity_close_margin_end"
+            android:background="@drawable/module_push_recycler_item_background">
+
+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/module_push_item_app_icon"
+                android:layout_width="@dimen/module_push_message_app_icon_size"
+                android:layout_height="@dimen/module_push_message_app_icon_size"
+                android:layout_marginStart="@dimen/module_push_message_margin_start"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/module_push_item_title"
+                android:layout_width="@dimen/module_push_item_content_width"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/module_push_image_margin_top"
+                android:layout_marginTop="@dimen/module_push_item_title_margin_top"
+                android:layout_marginBottom="@dimen/module_push_item_title_margin_bottom"
+                android:ellipsize="end"
+                android:gravity="left"
+                android:maxLines="1"
+                android:text="push title"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/module_push_title_text_size"
+                app:layout_constraintBottom_toTopOf="@+id/module_push_item_content"
+                app:layout_constraintLeft_toRightOf="@+id/module_push_item_app_icon"
+                app:layout_constraintWidth_max="@dimen/module_push_item_content_width"
+                app:layout_goneMarginBottom="@dimen/module_push_item_title_gone_margin_bottom" />
+
+            <TextView
+                android:id="@+id/module_push_item_content"
+                android:layout_width="@dimen/module_push_item_content_width"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/module_push_item_content_margin_end"
+                android:layout_marginBottom="@dimen/module_push_item_content_margin_bottom"
+                android:ellipsize="end"
+                android:gravity="left"
+                android:maxLines="1"
+                android:text="发现系统新版本，共140.3M。部分功能优化，建议下载升级。"
+                android:textColor="#80FFFFFF"
+                android:textSize="@dimen/module_push_item_content_text_size"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="@+id/module_push_item_title" />
+
+            <com.mogo.service.imageloader.MogoImageView
+                android:id="@+id/module_push_item_image"
+                android:layout_width="@dimen/module_push_message_item_image_size"
+                android:layout_height="@dimen/module_push_message_item_image_size"
+                android:layout_marginEnd="@dimen/module_push_message_item_image_margin_end"
+                android:scaleType="centerCrop"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:miv_radius="@dimen/module_push_item_image_radius"
+                app:miv_shape="round" />
+
+            <TextView
+                android:id="@+id/module_push_item_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/module_push_image_margin_top"
+                android:layout_marginEnd="@dimen/module_push_image_margin_top"
+                android:gravity="right"
+                android:maxLines="1"
+                android:text="3:20"
+                android:textColor="#80FFFFFF"
+                android:textSize="@dimen/module_push_massage_time_text_size"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/module_push_button_margin_top">
+
+        <TextView
+            android:id="@+id/module_push_item_delete"
+            android:layout_width="@dimen/module_push_message_item_height"
+            android:layout_height="@dimen/module_push_message_item_height"
+            android:layout_marginStart="@dimen/module_push_button_margin_top"
+            android:background="@drawable/module_push_recycler_item_background"
+            android:gravity="center"
+            android:text="清除"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/module_push_title_text_size" />
+    </FrameLayout>
+</com.mogo.module.push.view.SwipeItemLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
new file mode 100644
index 0000000000..d56348824f
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_push_margin_top">16px</dimen>
+    <dimen name="module_push_size">352px</dimen>
+    <dimen name="module_push_margin_start">32px</dimen>
+    <dimen name="module_push_app_icon_size">32px</dimen>
+    <dimen name="module_push_app_icon_margin_start">16.5px</dimen>
+    <dimen name="module_push_title_margin_start">12px</dimen>
+    <dimen name="module_push_title_margin_top">20px</dimen>
+    <dimen name="module_push_title_text_size">18px</dimen>
+    <dimen name="module_push_title_mix_width">210px</dimen>
+    <dimen name="module_push_timer_margin_end">13px</dimen>
+    <dimen name="module_push_timer_text_size">15px</dimen>
+    <dimen name="module_push_timer_margin_top">18px</dimen>
+    <dimen name="module_push_image_width">320px</dimen>
+    <dimen name="module_push_image_height">180px</dimen>
+    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_content_only_width">320px</dimen>
+    <dimen name="module_push_content_only_height">160px</dimen>
+    <dimen name="module_push_content_only_line_space">9px</dimen>
+    <dimen name="module_push_content_only_padding">20px</dimen>
+    <dimen name="module_push_button_width">0px</dimen>
+    <dimen name="module_push_button_height">48px</dimen>
+    <dimen name="module_push_button_margin_top">10px</dimen>
+    <dimen name="module_push_button_margin_bottom">14px</dimen>
+    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_text_size">20px</dimen>
+    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_end">90px</dimen>
+    <dimen name="module_push_activity_close_padding">5px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_not_data_text_size">38px</dimen>
+    <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
+    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_app_icon_size">64px</dimen>
+    <dimen name="module_push_message_margin_start">24px</dimen>
+    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
+    <dimen name="module_push_item_title_margin_bottom">2px</dimen>
+    <dimen name="module_push_item_content_margin_end">20px</dimen>
+    <dimen name="module_push_item_content_margin_bottom">27px</dimen>
+    <dimen name="module_push_item_content_text_size">16px</dimen>
+    <dimen name="module_push_message_item_image_size">64px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
+    <dimen name="module_push_massage_time_text_size">14px</dimen>
+
+    <dimen name="module_push_image_margin_bottom">22px</dimen>
+    <dimen name="module_push_button_radius">27px</dimen>
+    <dimen name="module_push_timer_inner_radius">14px</dimen>
+    <dimen name="module_push_timer_thickness">1.5px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
+    <dimen name="module_push_image_radius">10px</dimen>
+    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_content_width">560px</dimen>
+    <dimen name="module_push_ui_height">194px</dimen>
+    <dimen name="module_push_ui_image_width">266px</dimen>
+    <dimen name="module_push_ui_image_height">178px</dimen>
+    <dimen name="module_push_ui_image_marLeft">8px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
+    <dimen name="module_push_ui_app_icon_size">30px</dimen>
+    <dimen name="module_push_ui_title_textSize">16px</dimen>
+    <dimen name="module_push_ui_decrease_timer_corner">8px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginTop">17px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginEnd">19px</dimen>
+    <dimen name="module_push_ui_timer_textSize">16px</dimen>
+    <dimen name="module_push_progress_bar_frame_padding">11px</dimen>
+    <dimen name="module_push_ui_content_marginTop">6px</dimen>
+    <dimen name="module_push_ui_title_text_size">18px</dimen>
+    <dimen name="module_push_ui_button_radius">10px</dimen>
+    <dimen name="module_push_ui_bkg_corner">17px</dimen>
+    <dimen name="module_push_button_right_marLeft">10px</dimen>
+    <dimen name="module_push_ui_image_corner">8px</dimen>
+    <dimen name="module_push_button_maxWidth">242px</dimen>
+    <dimen name="module_push_ui_height_vertical">270px</dimen>
+    <dimen name="module_push_ui_width_vertical">374px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin_vertical">24px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin_vertical">19px</dimen>
+    <dimen name="module_push_image_marginTop_vertical">8px</dimen>
+    <dimen name="module_push_ui_image_width_vertical">328px</dimen>
+    <dimen name="module_push_ui_image_height_vertical">164px</dimen>
+    <dimen name="module_push_ui_content_marginTop_vertical">15px</dimen>
+    <dimen name="module_push_image_qr_size_vertical">150px</dimen>
+    <dimen name="module_push_window_x">20px</dimen>
+    <dimen name="module_push_window_y">0px</dimen>
+    <dimen name="module_push_item_minHeight_vertical">310px</dimen>
+    <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
+    <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..d56348824f
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_push_margin_top">16px</dimen>
+    <dimen name="module_push_size">352px</dimen>
+    <dimen name="module_push_margin_start">32px</dimen>
+    <dimen name="module_push_app_icon_size">32px</dimen>
+    <dimen name="module_push_app_icon_margin_start">16.5px</dimen>
+    <dimen name="module_push_title_margin_start">12px</dimen>
+    <dimen name="module_push_title_margin_top">20px</dimen>
+    <dimen name="module_push_title_text_size">18px</dimen>
+    <dimen name="module_push_title_mix_width">210px</dimen>
+    <dimen name="module_push_timer_margin_end">13px</dimen>
+    <dimen name="module_push_timer_text_size">15px</dimen>
+    <dimen name="module_push_timer_margin_top">18px</dimen>
+    <dimen name="module_push_image_width">320px</dimen>
+    <dimen name="module_push_image_height">180px</dimen>
+    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_content_only_width">320px</dimen>
+    <dimen name="module_push_content_only_height">160px</dimen>
+    <dimen name="module_push_content_only_line_space">9px</dimen>
+    <dimen name="module_push_content_only_padding">20px</dimen>
+    <dimen name="module_push_button_width">0px</dimen>
+    <dimen name="module_push_button_height">48px</dimen>
+    <dimen name="module_push_button_margin_top">10px</dimen>
+    <dimen name="module_push_button_margin_bottom">14px</dimen>
+    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_text_size">20px</dimen>
+    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_end">90px</dimen>
+    <dimen name="module_push_activity_close_padding">5px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_not_data_text_size">38px</dimen>
+    <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
+    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_app_icon_size">64px</dimen>
+    <dimen name="module_push_message_margin_start">24px</dimen>
+    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
+    <dimen name="module_push_item_title_margin_bottom">2px</dimen>
+    <dimen name="module_push_item_content_margin_end">20px</dimen>
+    <dimen name="module_push_item_content_margin_bottom">27px</dimen>
+    <dimen name="module_push_item_content_text_size">16px</dimen>
+    <dimen name="module_push_message_item_image_size">64px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
+    <dimen name="module_push_massage_time_text_size">14px</dimen>
+
+    <dimen name="module_push_image_margin_bottom">22px</dimen>
+    <dimen name="module_push_button_radius">27px</dimen>
+    <dimen name="module_push_timer_inner_radius">14px</dimen>
+    <dimen name="module_push_timer_thickness">1.5px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
+    <dimen name="module_push_image_radius">10px</dimen>
+    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_content_width">560px</dimen>
+    <dimen name="module_push_ui_height">194px</dimen>
+    <dimen name="module_push_ui_image_width">266px</dimen>
+    <dimen name="module_push_ui_image_height">178px</dimen>
+    <dimen name="module_push_ui_image_marLeft">8px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
+    <dimen name="module_push_ui_app_icon_size">30px</dimen>
+    <dimen name="module_push_ui_title_textSize">16px</dimen>
+    <dimen name="module_push_ui_decrease_timer_corner">8px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginTop">17px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginEnd">19px</dimen>
+    <dimen name="module_push_ui_timer_textSize">16px</dimen>
+    <dimen name="module_push_progress_bar_frame_padding">11px</dimen>
+    <dimen name="module_push_ui_content_marginTop">6px</dimen>
+    <dimen name="module_push_ui_title_text_size">18px</dimen>
+    <dimen name="module_push_ui_button_radius">10px</dimen>
+    <dimen name="module_push_ui_bkg_corner">17px</dimen>
+    <dimen name="module_push_button_right_marLeft">10px</dimen>
+    <dimen name="module_push_ui_image_corner">8px</dimen>
+    <dimen name="module_push_button_maxWidth">242px</dimen>
+    <dimen name="module_push_ui_height_vertical">270px</dimen>
+    <dimen name="module_push_ui_width_vertical">374px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin_vertical">24px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin_vertical">19px</dimen>
+    <dimen name="module_push_image_marginTop_vertical">8px</dimen>
+    <dimen name="module_push_ui_image_width_vertical">328px</dimen>
+    <dimen name="module_push_ui_image_height_vertical">164px</dimen>
+    <dimen name="module_push_ui_content_marginTop_vertical">15px</dimen>
+    <dimen name="module_push_image_qr_size_vertical">150px</dimen>
+    <dimen name="module_push_window_x">20px</dimen>
+    <dimen name="module_push_window_y">0px</dimen>
+    <dimen name="module_push_item_minHeight_vertical">310px</dimen>
+    <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
+    <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 0000000000..80ded7f4aa
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_push_margin_top">30px</dimen>
+    <dimen name="module_push_size">660px</dimen>
+    <dimen name="module_push_margin_start">60px</dimen>
+    <dimen name="module_push_app_icon_size">60px</dimen>
+    <dimen name="module_push_app_icon_margin_start">31px</dimen>
+    <dimen name="module_push_title_margin_start">22px</dimen>
+    <dimen name="module_push_title_margin_top">38px</dimen>
+    <dimen name="module_push_title_text_size">32px</dimen>
+    <dimen name="module_push_title_mix_width">394px</dimen>
+    <dimen name="module_push_timer_margin_end">24px</dimen>
+    <dimen name="module_push_timer_text_size">28px</dimen>
+    <dimen name="module_push_timer_margin_top">34px</dimen>
+    <dimen name="module_push_image_width">600px</dimen>
+    <dimen name="module_push_image_height">338px</dimen>
+    <dimen name="module_push_image_margin_top">40px</dimen>
+    <dimen name="module_push_content_only_width">605px</dimen>
+    <dimen name="module_push_content_only_height">300px</dimen>
+    <dimen name="module_push_content_only_line_space">16px</dimen>
+    <dimen name="module_push_content_only_padding">53px</dimen>
+    <dimen name="module_push_button_width">0px</dimen>
+    <dimen name="module_push_button_height">90px</dimen>
+    <dimen name="module_push_button_margin_top">20px</dimen>
+    <dimen name="module_push_button_margin_bottom">26px</dimen>
+    <dimen name="module_push_activity_title_margin_top">66px</dimen>
+    <dimen name="module_push_activity_title_text_size">38px</dimen>
+    <dimen name="module_push_activity_close_margin_top">54px</dimen>
+    <dimen name="module_push_activity_close_margin_end">160px</dimen>
+    <dimen name="module_push_activity_close_padding">10px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">173px</dimen>
+    <dimen name="module_push_activity_not_data_text_size">72px</dimen>
+    <dimen name="module_push_activity_clear_margin_bottom">68px</dimen>
+    <dimen name="module_push_message_item_height">200px</dimen>
+    <dimen name="module_push_message_app_icon_size">120px</dimen>
+    <dimen name="module_push_message_margin_start">50px</dimen>
+    <dimen name="module_push_item_title_margin_top">43px</dimen>
+    <dimen name="module_push_item_title_margin_bottom">6px</dimen>
+    <dimen name="module_push_item_title_gone_margin_bottom">84px</dimen>
+
+    <dimen name="module_push_item_content_margin_end">40px</dimen>
+    <dimen name="module_push_item_content_margin_bottom">52px</dimen>
+    <dimen name="module_push_item_content_text_size">30px</dimen>
+    <dimen name="module_push_message_item_image_size">120px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">180px</dimen>
+    <dimen name="module_push_massage_time_text_size">34px</dimen>
+    <dimen name="module_push_image_margin_bottom">42px</dimen>
+    <dimen name="module_push_button_radius">51px</dimen>
+    <dimen name="module_push_timer_inner_radius">27px</dimen>
+    <dimen name="module_push_timer_thickness">3px</dimen>
+    <dimen name="module_push_clear_bg_radius">45px</dimen>
+    <dimen name="module_push_image_radius">20px</dimen>
+    <dimen name="module_push_item_image_radius">8px</dimen>
+    <dimen name="module_push_item_content_width">1000px</dimen>
+    <dimen name="module_push_ui_height">350px</dimen>
+    <dimen name="module_push_ui_image_width">480px</dimen>
+    <dimen name="module_push_ui_image_height">320px</dimen>
+    <dimen name="module_push_ui_image_marLeft">17px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin">30px</dimen>
+    <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
+    <dimen name="module_push_ui_app_icon_size">50px</dimen>
+    <dimen name="module_push_ui_title_textSize">30px</dimen>
+    <dimen name="module_push_ui_decrease_timer_corner">14px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginTop">30px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginEnd">27px</dimen>
+    <dimen name="module_push_ui_timer_textSize">30px</dimen>
+    <dimen name="module_push_progress_bar_frame_padding">21px</dimen>
+    <dimen name="module_push_ui_content_marginTop">11px</dimen>
+    <dimen name="module_push_ui_title_text_size">34px</dimen>
+    <dimen name="module_push_ui_button_radius">20px</dimen>
+    <dimen name="module_push_ui_bkg_corner">30px</dimen>
+    <dimen name="module_push_button_right_marLeft">20px</dimen>
+    <dimen name="module_push_ui_image_corner">15px</dimen>
+    <dimen name="module_push_button_maxWidth">242px</dimen>
+    <dimen name="module_push_ui_height_vertical">486px</dimen>
+    <dimen name="module_push_ui_width_vertical">700px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin_vertical">30px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin_vertical">33px</dimen>
+    <dimen name="module_push_image_marginTop_vertical">16px</dimen>
+    <dimen name="module_push_ui_image_width_vertical">640px</dimen>
+    <dimen name="module_push_ui_image_height_vertical">296px</dimen>
+    <dimen name="module_push_ui_content_marginTop_vertical">30px</dimen>
+    <dimen name="module_push_image_qr_size_vertical">250px</dimen>
+    <dimen name="module_push_window_x">20px</dimen>
+    <dimen name="module_push_window_y">0px</dimen>
+    <dimen name="module_push_item_minHeight_vertical">618px</dimen>
+    <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
+    <dimen name="module_push_content_paddingBottom_vertical">120px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/attr.xml b/modules/mogo-module-push/src/main/res/values/attr.xml
new file mode 100644
index 0000000000..8972302147
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values/attr.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="RoundedImageView">
+        <attr name="riv_corner_radius" format="dimension" />
+        <attr name="riv_corner_radius_top_left" format="dimension" />
+        <attr name="riv_corner_radius_top_right" format="dimension" />
+        <attr name="riv_corner_radius_bottom_left" format="dimension" />
+        <attr name="riv_corner_radius_bottom_right" format="dimension" />
+        <attr name="riv_border_width" format="dimension" />
+        <attr name="riv_border_color" format="color" />
+        <attr name="riv_mutate_background" format="boolean" />
+        <attr name="riv_oval" format="boolean" />
+        <attr name="android:scaleType" />
+        <attr name="riv_tile_Mode">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+        <attr name="riv_tile_Mode_x">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+        <attr name="riv_tile_Mode_y">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/modules/mogo-module-push/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..d56348824f
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values/dimens.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <dimen name="module_push_margin_top">16px</dimen>
+    <dimen name="module_push_size">352px</dimen>
+    <dimen name="module_push_margin_start">32px</dimen>
+    <dimen name="module_push_app_icon_size">32px</dimen>
+    <dimen name="module_push_app_icon_margin_start">16.5px</dimen>
+    <dimen name="module_push_title_margin_start">12px</dimen>
+    <dimen name="module_push_title_margin_top">20px</dimen>
+    <dimen name="module_push_title_text_size">18px</dimen>
+    <dimen name="module_push_title_mix_width">210px</dimen>
+    <dimen name="module_push_timer_margin_end">13px</dimen>
+    <dimen name="module_push_timer_text_size">15px</dimen>
+    <dimen name="module_push_timer_margin_top">18px</dimen>
+    <dimen name="module_push_image_width">320px</dimen>
+    <dimen name="module_push_image_height">180px</dimen>
+    <dimen name="module_push_image_margin_top">21px</dimen>
+    <dimen name="module_push_content_only_width">320px</dimen>
+    <dimen name="module_push_content_only_height">160px</dimen>
+    <dimen name="module_push_content_only_line_space">9px</dimen>
+    <dimen name="module_push_content_only_padding">20px</dimen>
+    <dimen name="module_push_button_width">0px</dimen>
+    <dimen name="module_push_button_height">48px</dimen>
+    <dimen name="module_push_button_margin_top">10px</dimen>
+    <dimen name="module_push_button_margin_bottom">14px</dimen>
+    <dimen name="module_push_activity_title_margin_top">35px</dimen>
+    <dimen name="module_push_activity_title_text_size">20px</dimen>
+    <dimen name="module_push_activity_close_margin_top">29px</dimen>
+    <dimen name="module_push_activity_close_margin_end">90px</dimen>
+    <dimen name="module_push_activity_close_padding">5px</dimen>
+    <dimen name="module_push_activity_recycler_view_margin_top">92px</dimen>
+    <dimen name="module_push_activity_not_data_text_size">38px</dimen>
+    <dimen name="module_push_activity_clear_margin_bottom">36px</dimen>
+    <dimen name="module_push_message_item_height">106px</dimen>
+    <dimen name="module_push_message_app_icon_size">64px</dimen>
+    <dimen name="module_push_message_margin_start">24px</dimen>
+    <dimen name="module_push_item_title_margin_top">25px</dimen>
+    <dimen name="module_push_item_title_gone_margin_bottom">44px</dimen>
+    <dimen name="module_push_item_title_margin_bottom">2px</dimen>
+    <dimen name="module_push_item_content_margin_end">20px</dimen>
+    <dimen name="module_push_item_content_margin_bottom">27px</dimen>
+    <dimen name="module_push_item_content_text_size">16px</dimen>
+    <dimen name="module_push_message_item_image_size">64px</dimen>
+    <dimen name="module_push_message_item_image_margin_end">100px</dimen>
+    <dimen name="module_push_massage_time_text_size">14px</dimen>
+
+    <dimen name="module_push_image_margin_bottom">22px</dimen>
+    <dimen name="module_push_button_radius">27px</dimen>
+    <dimen name="module_push_timer_inner_radius">14px</dimen>
+    <dimen name="module_push_timer_thickness">1.5px</dimen>
+    <dimen name="module_push_clear_bg_radius">24px</dimen>
+    <dimen name="module_push_image_radius">10px</dimen>
+    <dimen name="module_push_item_image_radius">4px</dimen>
+    <dimen name="module_push_item_content_width">560px</dimen>
+    <dimen name="module_push_ui_height">194px</dimen>
+    <dimen name="module_push_ui_image_width">266px</dimen>
+    <dimen name="module_push_ui_image_height">178px</dimen>
+    <dimen name="module_push_ui_image_marLeft">8px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
+    <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
+    <dimen name="module_push_ui_app_icon_size">30px</dimen>
+    <dimen name="module_push_ui_title_textSize">16px</dimen>
+    <dimen name="module_push_ui_decrease_timer_corner">8px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginTop">17px</dimen>
+    <dimen name="module_push_progress_bar_frame_marginEnd">19px</dimen>
+    <dimen name="module_push_ui_timer_textSize">16px</dimen>
+    <dimen name="module_push_progress_bar_frame_padding">11px</dimen>
+    <dimen name="module_push_ui_content_marginTop">6px</dimen>
+    <dimen name="module_push_ui_title_text_size">18px</dimen>
+    <dimen name="module_push_ui_button_radius">10px</dimen>
+    <dimen name="module_push_ui_bkg_corner">17px</dimen>
+    <dimen name="module_push_button_right_marLeft">10px</dimen>
+    <dimen name="module_push_ui_image_corner">8px</dimen>
+    <dimen name="module_push_button_maxWidth">242px</dimen>
+    <dimen name="module_push_ui_height_vertical">270px</dimen>
+    <dimen name="module_push_ui_width_vertical">374px</dimen>
+    <dimen name="module_push_ui_app_icon_leftMargin_vertical">24px</dimen>
+    <dimen name="module_push_ui_app_icon_topMargin_vertical">19px</dimen>
+    <dimen name="module_push_image_marginTop_vertical">8px</dimen>
+    <dimen name="module_push_ui_image_width_vertical">328px</dimen>
+    <dimen name="module_push_ui_image_height_vertical">164px</dimen>
+    <dimen name="module_push_ui_content_marginTop_vertical">15px</dimen>
+    <dimen name="module_push_image_qr_size_vertical">150px</dimen>
+    <dimen name="module_push_window_x">20px</dimen>
+    <dimen name="module_push_window_y">0px</dimen>
+    <dimen name="module_push_item_minHeight_vertical">310px</dimen>
+    <dimen name="module_push_item_maxHeight_vertical">350px</dimen>
+    <dimen name="module_push_content_paddingBottom_vertical">60px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-push/src/main/res/values/strings.xml b/modules/mogo-module-push/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..a740d57bd3
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">mogo-module-push</string>
+</resources>
diff --git a/modules/mogo-module-push/src/main/res/values/styles.xml b/modules/mogo-module-push/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..4c65dec536
--- /dev/null
+++ b/modules/mogo-module-push/src/main/res/values/styles.xml
@@ -0,0 +1,9 @@
+<resources>
+
+    <style name="ModulePushMessageTheme" parent="Theme.AppCompat.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+        <item name="android:windowBackground">@drawable/module_push_message_activity_background</item>
+    </style>
+</resources>
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
index 79950ef3c4..3d9d2105b8 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
@@ -2,58 +2,24 @@ package com.mogo.module.service;
 
 
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.text.TextUtils;
-import android.view.MotionEvent;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.map.MogoLatLng;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
-import com.mogo.map.location.MogoLocation;
 import com.mogo.map.marker.IMogoMarkerClickListener;
-import com.mogo.map.marker.IMogoMarkerManager;
-import com.mogo.map.model.MogoPoi;
 import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.map.navi.MogoNaviInfo;
-import com.mogo.map.navi.MogoTraffic;
-import com.mogo.map.uicontroller.EnumMapUI;
-import com.mogo.map.uicontroller.IMogoMapUIController;
-import com.mogo.module.common.MogoModule;
-import com.mogo.module.common.MogoModulePaths;
-import com.mogo.module.service.network.RefreshCallback;
-import com.mogo.module.service.network.RefreshModel;
-import com.mogo.module.service.receiver.MogoReceiver;
-import com.mogo.module.service.refresh.AutoRefreshStrategy;
-import com.mogo.module.service.refresh.CustomRefreshStrategy;
-import com.mogo.service.MogoServicePaths;
-import com.mogo.service.intent.IMogoIntentListener;
-import com.mogo.service.intent.IMogoIntentManager;
-import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoModuleLifecycle;
 import com.mogo.service.module.IMogoModuleProvider;
-import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.ModuleType;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * @author congtaowang
  * @since 2020-01-03
@@ -128,6 +94,8 @@ public class MogoServiceProvider implements IMogoModuleProvider {
 
     @Override
     public void init( Context context ) {
+        Logger.d( TAG, "init" );
+        MarkerServiceHandler.init( context );
         UiThreadHandler.postDelayed( () -> {
             MogoServices.getInstance().init( AbsMogoApplication.getApp() );
         }, 5_000L );
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 0acfe90eae..7e44a00665 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
@@ -56,6 +56,7 @@ import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.TipToast;
+import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 
@@ -63,6 +64,8 @@ import org.json.JSONObject;
 
 import java.util.List;
 
+import retrofit2.http.HEAD;
+
 /**
  * @author congtaowang
  * @since 2020-01-03
@@ -273,12 +276,13 @@ public class MogoServices implements IMogoMapListener,
 
     private boolean mIsMainPageFirstResume = true;
 
+    private boolean mIsFirstAccOn = true;
+
     public void init( Context context ) {
         mContext = context;
 
         initWorkThread();
 
-        MarkerServiceHandler.init( mContext );
         mRefreshModel = new RefreshModel( context );
         mMogoMapService = MarkerServiceHandler.getMapService();
         mUiController = mMogoMapService.getMapUIController();
@@ -366,6 +370,7 @@ public class MogoServices implements IMogoMapListener,
                     if ( msg.obj instanceof RefreshObject ) {
                         RefreshObject ro = ( ( RefreshObject ) msg.obj );
                         if ( ro.mLonLat == null ) {
+                            Logger.w( TAG, "lonLat is null." );
                             return;
                         }
                         mRefreshModel.refreshData( ro.mLonLat, ro.mRadius, ro.mAmount, ro.mCallback );
@@ -619,9 +624,7 @@ public class MogoServices implements IMogoMapListener,
         // 自动刷新触发
         final MogoLatLng point = new MogoLatLng( location.getLatitude(), location.getLongitude() );
         if ( mLastAutoRefreshLocation == null ) {
-            mLastAutoRefreshLocation = point;
-            mLoopRequest = true;
-            notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback );
+            startFirstLocationRequest( point );
             return;
         }
         float distance = Utils.calculateLineDistance( mLastAutoRefreshLocation, point );
@@ -635,8 +638,27 @@ public class MogoServices implements IMogoMapListener,
         }
     }
 
+    /**
+     * 首次定位成功后，执行道路事件的刷新
+     *
+     * @param point
+     */
+    private void startFirstLocationRequest( MogoLatLng point ) {
+        mLastAutoRefreshLocation = point;
+        mLoopRequest = true;
+        notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback );
+    }
+
     @Override
     public void onCarLocationChanged2( Location latLng ) {
+        if ( latLng == null ) {
+            return;
+        }
+        // poi 定位无法获取时，使用该定位
+        if ( mLastAutoRefreshLocation == null ) {
+            MogoLatLng point = new MogoLatLng( latLng.getLatitude(), latLng.getLongitude() );
+            startFirstLocationRequest( point );
+        }
     }
 
     @Override
@@ -717,18 +739,20 @@ public class MogoServices implements IMogoMapListener,
                 break;
             case ACC_STATUS:
                 if ( isTrue ) {
+                    if ( mIsFirstAccOn ) {
+                        mIsFirstAccOn = false;
+                        return;
+                    }
                     initLocationServiceProcess( mContext );
                     mADASController.showADAS();
-                    refreshStrategy();
-                    MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).stop();
+                    MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start();
+                    MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers();
+                    UiThreadHandler.postDelayed( () -> {
+                        refreshStrategy();
+                    }, 3_000L );
                 } else {
-                    try {
-                        MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers();
-                        MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start();
-                    } catch ( Exception e ) {
-                        Logger.e( TAG, e, "error." );
-                    }
-                    refreshStrategy();
+                    MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).stop();
+                    MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers();
                 }
                 break;
         }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
index 5a9def8162..38a6de48b4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
@@ -3,10 +3,11 @@ package com.mogo.module.service.intent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.service.MarkerServiceHandler;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.service.receiver.AccStatusReceiver;
-import com.mogo.module.service.receiver.MogoReceiver;
+import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 
 public
@@ -18,16 +19,21 @@ public
  */
 class AccStatusIntentHandler implements IntentHandler {
 
+    public static final byte ACC_ON = 1;
+    public static final byte ACC_OFF = 0;
+    public static final byte ACC_OFF_DELAY = 3;
+
     private static final String TAG = "AccStatusIntentHandler";
 
     private static volatile AccStatusIntentHandler sInstance;
 
-    private AccStatusIntentHandler(){}
+    private AccStatusIntentHandler() {
+    }
 
-    public static AccStatusIntentHandler getInstance(){
-        if( sInstance == null ){
-            synchronized( AccStatusIntentHandler.class ) {
-                if( sInstance == null ){
+    public static AccStatusIntentHandler getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( AccStatusIntentHandler.class ) {
+                if ( sInstance == null ) {
                     sInstance = new AccStatusIntentHandler();
                 }
             }
@@ -35,7 +41,7 @@ class AccStatusIntentHandler implements IntentHandler {
         return sInstance;
     }
 
-    public synchronized void release(){
+    public synchronized void release() {
         sInstance = null;
     }
 
@@ -43,15 +49,26 @@ class AccStatusIntentHandler implements IntentHandler {
     public void handle( Context context, Intent intent ) {
         String action = intent.getAction();
         if ( Intent.ACTION_POWER_CONNECTED.equals( action ) ) {
-            MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, true );
-            Logger.d( TAG, "acc status: %s", true );
+            if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
+                MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, true );
+                Logger.d( TAG, "acc status: %s", true );
+            }
         } else if ( Intent.ACTION_POWER_DISCONNECTED.equals( action ) ) {
-            MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, false );
-            Logger.d( TAG, "acc status: %s", false );
+            if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) {
+                MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, false );
+                Logger.d( TAG, "acc status: %s", false );
+            }
         } else if ( AccStatusReceiver.ACTION_NWD_ACC.equals( action ) ) {
-            int state = intent.getByteExtra( AccStatusReceiver.PARAM_ACC_STATUS, ( byte ) 0 );
-            Logger.d( TAG, "acc status: %s", state == 1 );
-            MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, state == 1 );
+            int state = intent.getByteExtra( AccStatusReceiver.PARAM_ACC_STATUS, ACC_OFF );
+            if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) {
+                return;
+            }
+            boolean accOn = state == ACC_ON;
+            if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) {
+                return;
+            }
+            Logger.d( TAG, "acc status: %s", state );
+            MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, accOn );
         }
     }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
index 9595d20a9b..12d74cddc5 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
@@ -77,7 +77,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
     private Rect mMarkerDisplayBounds;
 
     private MapMarkerManager() {
-        mContext = AbsMogoApplication.getApp();
     }
 
     public static synchronized MapMarkerManager getInstance() {
@@ -96,6 +95,14 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
      * @param context
      */
     public void init( Context context ) {
+
+        if ( mContext != null ) {
+            return;
+        }
+
+        Logger.d( TAG, "初始化" );
+
+        mContext = context.getApplicationContext();
         mRefreshModel = new RefreshModel( mContext );
 
         // 长连接
@@ -357,7 +364,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
         }
         int size = getAppropriateSize( maxAmount, exploreWayList );
         Map< String, IMogoMarker > existCarMap = purgeMarkerData( exploreWayList, ModuleNames.CARD_TYPE_ROAD_CONDITION );
-        Logger.i( TAG, "existCarMap: size = %d", existCarMap.size() );for ( int i = 0; i < size; i++ ) {
+        Logger.i( TAG, "existCarMap: size = %d", existCarMap.size() );
+        for ( int i = 0; i < size; i++ ) {
             MarkerExploreWay markerExploreWay = exploreWayList.get( i );
             if ( !markerExploreWay.getCanLive() ) {
                 MarkerLocation markerLocation = markerExploreWay.getLocation();
@@ -395,7 +403,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 return;
             }
             IMogoMarker marker = drawMapMarker( entity, ServiceConst.MARKER_Z_INDEX_HIGH );
-            marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f,300, new LinearInterpolator(), new OnMarkerAnimationListener() {
+            if ( marker == null ) {
+                return;
+            }
+            marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() {
                 @Override
                 public void onAnimStart() {
                     Logger.d( TAG, " onAnimStart ---1----> " );
@@ -403,7 +414,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
 
                 @Override
                 public void onAnimEnd() {
-                    if ( marker.isDestroyed() ) {
+                    if ( marker == null || marker.isDestroyed() ) {
                         return;
                     }
                     marker.startScaleAnimation( 1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null );
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
index ab6e93a532..424ca24100 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java
@@ -7,12 +7,15 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.mogo.map.MogoLatLng;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerLocation;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
+import com.mogo.module.service.Utils;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.scenario.scene.fatigue.V2XFatigueDrivingScenario;
+import com.mogo.module.v2x.utils.LocationUtils;
 import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
 import com.mogo.module.v2x.voice.V2XVoiceConstants;
@@ -85,6 +88,13 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder {
         } else {
             mTvAddress.setText("");
         }
+        // 计算距离
+        float calculateDistance = Utils.calculateLineDistance(
+                new MogoLatLng(mV2XPushMessageEntity.getLat(), mV2XPushMessageEntity.getLon()),
+                LocationUtils.getCurrentLatLon()
+        );
+        mV2XPushMessageEntity.setDistance(calculateDistance);
+
         SpanUtils.with(mTvAddressDistance)
                 .append("" + (int) mV2XPushMessageEntity.getDistance())
                 .setFontSize((int) itemView.getResources().getDimension(R.dimen.dp_80))
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 dae163a823..a4d323c44e 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
@@ -17,6 +17,7 @@ import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.scene.fatigue.V2XFatigueDrivingScenario;
+import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpScenario;
 import com.mogo.module.v2x.utils.ChartingUtil;
 import com.mogo.module.v2x.utils.SpanUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
@@ -74,7 +75,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder {
 
     public V2XOtherSeekHelpVH(ViewGroup viewGroup) {
         super(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.window_fault_help, viewGroup, false));
+                .inflate(R.layout.item_v2x_fault_help, viewGroup, false));
         ivHead = itemView.findViewById(R.id.ivFaultHelpHead);
         tvName = itemView.findViewById(R.id.tvFaultHelpName);
         tvDistance = itemView.findViewById(R.id.tvFaultHelpDistance);
@@ -168,7 +169,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder {
             }
             tvName.setText(mV2XPushMessageEntity.getDisplayName());
             SpanUtils.with(tvDistance)
-                    .append("" + mV2XPushMessageEntity.getDistance())
+                    .append("" + (int) mV2XPushMessageEntity.getDistance())
                     .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
                     .append("M")
                     .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
@@ -188,7 +189,7 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder {
      */
     @Override
     public void delayedCloseWindow() {
-        itemView.postDelayed(() -> V2XFatigueDrivingScenario.getInstance().close(), 1000);
+        itemView.postDelayed(() -> V2XSeekHelpScenario.getInstance().close(), 1000);
     }
 
 }
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 f6c3fe4523..0a792aa42a 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
@@ -27,11 +27,11 @@ import com.mogo.utils.logger.Logger;
  */
 public abstract class AbsV2XScenario<T> implements IV2XScenario {
     protected String TAG = "AbsV2XScenario";
-    protected IV2XWindow mV2XWindow;
-    protected IV2XButton mV2XButton;
-    protected IV2XMarker<T> mV2XMarker;
-    protected IMoGoV2XStatusManager mV2XStatusManager;
-    protected V2XMessageEntity<T> mV2XMessageEntity;
+    private IV2XWindow mV2XWindow;
+    private IV2XButton mV2XButton;
+    private IV2XMarker<T> mV2XMarker;
+    private IMoGoV2XStatusManager mV2XStatusManager;
+    private V2XMessageEntity<T> mV2XMessageEntity;
 
     protected AbsV2XScenario() {
         this.mV2XStatusManager = V2XServiceManager.getMoGoV2XStatusManager();
@@ -62,6 +62,14 @@ public abstract class AbsV2XScenario<T> implements IV2XScenario {
         this.mV2XWindow = mV2XWindow;
     }
 
+    public IV2XMarker<T> getV2XMarker() {
+        return mV2XMarker;
+    }
+
+    public IV2XButton getV2XButton() {
+        return mV2XButton;
+    }
+
     public void setV2XButton(@Nullable IV2XButton mV2XButton) {
         this.mV2XButton = mV2XButton;
     }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java
index bc55ad50a9..0318dd5296 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationScenario.java
@@ -61,11 +61,11 @@ public class V2XAnimationScenario extends AbsV2XScenario<V2XPushMessageEntity> {
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.setWindowStatusListener(new V2XWindowStatusListener() {
+        if (getV2XWindow() != null) {
+            getV2XWindow().setWindowStatusListener(new V2XWindowStatusListener() {
                 @Override
                 public void onViewShow() {
-                    ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), mV2XMessageEntity.getContent());
+                    ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), getV2XMessageEntity().getContent());
                 }
 
                 @Override
@@ -74,48 +74,48 @@ public class V2XAnimationScenario extends AbsV2XScenario<V2XPushMessageEntity> {
                     clearPOI();
                 }
             });
-            mV2XWindow.show(mV2XMessageEntity.getContent());
+            getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager
                     .getIMogoWindowManager()
-                    .addView(mV2XWindow.getView(), 0, 0, false);
+                    .addView(getV2XWindow().getView(), 0, 0, false);
             V2XServiceManager.getMoGoV2XStatusManager().setV2XAnimationWindowShow(TAG, true);
         }
     }
 
     @Override
     public void closeWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setV2XAnimationWindowShow(TAG, false);
     }
 
     @Override
     public void showButton() {
-        if (mV2XButton != null) {
-            mV2XButton.show();
+        if (getV2XButton() != null) {
+            getV2XButton().show();
         }
     }
 
     @Override
     public void closeButton() {
-        if (mV2XButton != null) {
-            mV2XButton.close();
+        if (getV2XButton() != null) {
+            getV2XButton().close();
         }
     }
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+        if (getV2XMarker() != null) {
+            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
         }
     }
 
     @Override
     public void clearPOI() {
         setV2XMessageEntity(null);
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
index f529d85065..aee983ba03 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java
@@ -76,23 +76,23 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
+        if (getV2XWindow() != null) {
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
-                    .addView(mV2XWindow.getView(), layoutParams, this);
-            mV2XWindow.show(mV2XMessageEntity.getContent());
+                    .addView(getV2XWindow().getView(), layoutParams, this);
+            getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager.getMoGoV2XStatusManager().setFatigueDrivingWindowShow(TAG, true);
         }
     }
 
     @Override
     public void closeWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
     }
 
@@ -141,14 +141,15 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario<V2XPushMessageEnti
      * 导航规划路线
      */
     private void startNavi() {
-        if (mV2XMessageEntity.getContent() != null) {
+        if (getV2XMessageEntity().getContent() != null) {
             // 反注册语音交互
             V2XVoiceManager.INSTANCE
                     .unRegisterWakeCmd(
                             V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI)
                     .unRegisterUnWakeVoice(
                             V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP);
-            MogoLatLng endPoint = new MogoLatLng(mV2XMessageEntity.getContent().getLat(), mV2XMessageEntity.getContent().getLon());
+            MogoLatLng endPoint = new MogoLatLng(getV2XMessageEntity().getContent().getLat(),
+                    getV2XMessageEntity().getContent().getLon());
             V2XServiceManager.getNavi().naviTo(endPoint);
             close();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
index 7a363a060e..7b037675eb 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
@@ -20,8 +20,6 @@ import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.adapter.V2XRoadEventAdapter;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.voice.V2XVoiceConstants;
-import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
@@ -71,7 +69,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
 
     public void initView(Context context) {
         Logger.w(MODULE_NAME, "V2X-初始化疲劳驾驶");
-        LayoutInflater.from(context).inflate(R.layout.window_road_event_detail, this);
+        LayoutInflater.from(context).inflate(R.layout.window_fault_help, this);
         // 详情列表
         mRecyclerView = findViewById(R.id.rvRoadEventList);
         mV2XRoadEventAdapter = new V2XRoadEventAdapter(mItemList);
@@ -119,12 +117,6 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
 
     @Override
     public void close() {
-        // 反注册语音交互
-        V2XVoiceManager.INSTANCE
-                .unRegisterWakeCmd(
-                        V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI)
-                .unRegisterUnWakeVoice(
-                        V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP);
         // 停止倒计时
         if (handlerV2XEvent != null && runnableV2XEvent != null) {
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
index 3e0cda95a1..5cc1180a9a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java
@@ -6,9 +6,9 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpButton;
 import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpDialog;
@@ -64,8 +64,8 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
         if (v2XMessageEntity == null) {
             return;
         }
-        mV2XMessageEntity = v2XMessageEntity;
-        Boolean isShow = mV2XMessageEntity.getContent();
+        setV2XMessageEntity(v2XMessageEntity);
+        Boolean isShow = getV2XMessageEntity().getContent();
         if (isShow) {
             showButton();
             mySeekHelpCountDownTimerCancel();
@@ -108,9 +108,9 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
         Logger.d(TAG, "打开自车求助按钮!");
         // 设置Button的显示
         V2XUtils.runOnUiThread(() -> {
-            if (mV2XButton != null) {
-                mV2XButton.setOnActionListener(this::showDialog);
-                mV2XButton.show();
+            if (getV2XButton() != null) {
+                getV2XButton().setOnActionListener(this::showDialog);
+                getV2XButton().show();
             }
         });
     }
@@ -120,8 +120,8 @@ public class V2XCarForHelpScenario extends AbsV2XScenario<Boolean> implements IM
         if (V2XServiceManager.getMoGoStatusManager().isSeekHelping()) {
             Logger.d(TAG, "关闭自车求助按钮!");
             V2XServiceManager.getMoGoStatusManager().setSeekHelping(TAG, false);
-            if (mV2XButton != null) {
-                mV2XButton.close();
+            if (getV2XButton() != null) {
+                getV2XButton().close();
                 SharedPrefsMgr.getInstance(V2XUtils.getApp()).putLong(V2XConst.SEEK_HELP_TIME, 0);
             }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
index a11dffc26d..e01dd87f44 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
@@ -6,11 +6,11 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.utils.ADASUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
@@ -76,59 +76,59 @@ public class V2XPushLiveCarScenario extends AbsV2XScenario<V2XPushMessageEntity>
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
+        if (getV2XWindow() != null) {
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height));
             V2XServiceManager
                     .getMogoTopViewManager()
-                    .addView(mV2XWindow.getView(), layoutParams, this);
-            mV2XWindow.show(mV2XMessageEntity.getContent());
+                    .addView(getV2XWindow().getView(), layoutParams, this);
+            getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager.getMoGoV2XStatusManager().setLiveCarWindowShow(TAG, true);
         }
     }
 
     @Override
     public void closeWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setLiveCarWindowShow(TAG, false);
     }
 
     @Override
     public void showButton() {
-        if (mV2XButton != null) {
-            mV2XButton.show();
+        if (getV2XButton() != null) {
+            getV2XButton().show();
         }
     }
 
     @Override
     public void closeButton() {
-        if (mV2XButton != null) {
-            mV2XButton.close();
+        if (getV2XButton() != null) {
+            getV2XButton().close();
         }
     }
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+        if (getV2XMarker() != null) {
+            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
         }
     }
 
     @Override
     public void clearPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
     }
 
     @Override
     public void onViewAdded(View view) {
         Logger.d(MODULE_NAME, "展示 Window 动画结束");
-        ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), mV2XMessageEntity.getContent());
+        ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), getV2XMessageEntity().getContent());
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
index ec0086f5bb..6c06102a66 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
@@ -1,17 +1,14 @@
 package com.mogo.module.v2x.scenario.scene.livecar;
 
 import android.view.View;
-import android.view.ViewGroup;
 
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XConst;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
 import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
-import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 
@@ -70,55 +67,55 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
 
     @Override
     public void show() {
-        if (mV2XMessageEntity != null && mV2XMessageEntity.getContent() != null) {
+        if (getV2XMessageEntity() != null && getV2XMessageEntity().getContent() != null) {
             showWindow();
         }
     }
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
+        if (getV2XWindow() != null) {
             V2XServiceManager
                     .getMogoTopViewManager()
-                    .addSubView(mV2XWindow.getView(), this);
-            mV2XWindow.show(mV2XMessageEntity.getContent());
+                    .addSubView(getV2XWindow().getView(), this);
+            getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, true);
         }
     }
 
     @Override
     public void closeWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, false);
     }
 
     @Override
     public void showButton() {
-        if (mV2XButton != null) {
-            mV2XButton.show();
+        if (getV2XButton() != null) {
+            getV2XButton().show();
         }
     }
 
     @Override
     public void closeButton() {
-        if (mV2XButton != null) {
-            mV2XButton.close();
+        if (getV2XButton() != null) {
+            getV2XButton().close();
         }
     }
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+        if (getV2XMarker() != null) {
+            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
         }
     }
 
     @Override
     public void clearPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
index 2e9c1b008b..2c8a11ddfc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkScenario.java
@@ -59,10 +59,10 @@ public class V2XIllegalParkScenario extends AbsV2XScenario<List<MarkerExploreWay
     @Override
     public void showWindow() {
         MarkerExploreWay markerExploreWay = null;
-        if (mV2XMessageEntity.getContent() != null) {
+        if (getV2XMessageEntity().getContent() != null) {
             markerExploreWay = V2XAlarmServer
                     .getIllegalParkAlarmEvent(
-                            (ArrayList<MarkerExploreWay>) mV2XMessageEntity.getContent(),
+                            (ArrayList<MarkerExploreWay>) getV2XMessageEntity().getContent(),
                             V2XStatusManager.getInstance().getLocation());
         }
         if (markerExploreWay != null) {
@@ -76,7 +76,7 @@ public class V2XIllegalParkScenario extends AbsV2XScenario<List<MarkerExploreWay
             v2XRoadEventEntity.setPoiType(V2XPoiTypeEnum.ALERT_ILLEGAL_PARK);
             if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
                 v2XRoadEventEntity.setTts(markerExploreWay.getAddr() + "可能被罚违章停车，您可以说，有用或没用来帮助其它车友。");
-                ((V2XIllegalParkWindow) mV2XWindow).show(markerExploreWay, true);
+                ((V2XIllegalParkWindow) getV2XWindow()).show(markerExploreWay, true);
                 TrackUtils.trackV2xRoadShow(markerExploreWay.getInfoId(), V2XPoiTypeEnum.ALERT_ILLEGAL_PARK, "1");
             } else {
                 v2XRoadEventEntity.setTts(markerExploreWay.getAddr() + "可能被罚违章停车");
@@ -88,7 +88,7 @@ public class V2XIllegalParkScenario extends AbsV2XScenario<List<MarkerExploreWay
 
     @Override
     public void closeWindow() {
-        V2XServiceManager.getMogoTopViewManager().removeView(mV2XWindow.getView());
+        V2XServiceManager.getMogoTopViewManager().removeView(getV2XWindow().getView());
     }
 
     @Override
@@ -101,8 +101,8 @@ public class V2XIllegalParkScenario extends AbsV2XScenario<List<MarkerExploreWay
 
     @Override
     public void drawPOI() {
-        if (mV2XMessageEntity != null) {
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+        if (getV2XMessageEntity() != null) {
+            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
index bc67065aeb..0f70e68b2d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java
@@ -70,7 +70,7 @@ public class V2XIllegalParkWindow extends RelativeLayout implements IV2XWindow<M
      * 初始化视图
      */
     private void initView(Context context) {
-        LayoutInflater.from(context).inflate(R.layout.window_road_event_detail, this);
+        LayoutInflater.from(context).inflate(R.layout.window_fault_help, this);
         // 详情列表
         mRecyclerView = findViewById(R.id.rvRoadEventList);
         mV2XRoadEventAdapter = new V2XRoadEventAdapter(mItemList);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
index b6f266d2d3..5fc836c2aa 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/push/V2XPushEventScenario.java
@@ -5,11 +5,11 @@ import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
 import com.mogo.module.v2x.utils.V2XUtils;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
@@ -62,8 +62,8 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
 
     @Override
     public void show() {
-        if (mV2XMessageEntity != null && mV2XMessageEntity.getContent() != null) {
-            speakTTSVoice(mV2XMessageEntity.getContent().getTts(), null);
+        if (getV2XMessageEntity() != null && getV2XMessageEntity().getContent() != null) {
+            speakTTSVoice(getV2XMessageEntity().getContent().getTts(), null);
             drawPOI();
             showWindow();
         }
@@ -71,15 +71,15 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
+        if (getV2XWindow() != null) {
             ViewGroup.LayoutParams layoutParams =
                     new ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height_ground));
             V2XServiceManager
                     .getMogoTopViewManager()
-                    .addView(mV2XWindow.getView(), layoutParams,this);
-            mV2XWindow.show(mV2XMessageEntity.getContent());
+                    .addView(getV2XWindow().getView(), layoutParams, this);
+            getV2XWindow().show(getV2XMessageEntity().getContent());
             V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, true);
         }
     }
@@ -87,37 +87,37 @@ public class V2XPushEventScenario extends AbsV2XScenario<V2XPushMessageEntity> i
     @Override
     public void closeWindow() {
         V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false);
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
     }
 
     @Override
     public void showButton() {
-        if (mV2XButton != null) {
-            mV2XButton.show();
+        if (getV2XButton() != null) {
+            getV2XButton().show();
         }
     }
 
     @Override
     public void closeButton() {
-        if (mV2XButton != null) {
-            mV2XButton.close();
+        if (getV2XButton() != null) {
+            getV2XButton().close();
         }
     }
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+        if (getV2XMarker() != null) {
+            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
             V2XServiceManager.getMoGoV2XStatusManager().setPushPOIShow(TAG, true);
         }
     }
 
     @Override
     public void clearPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setPushPOIShow(TAG, false);
     }
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 c24d513952..6afe84b5f9 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
@@ -78,22 +78,22 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
     @Override
     public void show() {
-        if (mV2XMessageEntity != null && mV2XMessageEntity.getContent() != null) {
+        if (getV2XMessageEntity() != null && getV2XMessageEntity().getContent() != null) {
             // 设置TTS
-            mV2XMessageEntity.getContent().getTts(false);
+            getV2XMessageEntity().getContent().getTts(false);
             // 广播给ADAS
             ADASUtils.broadcastToADAS(
                     V2XServiceManager.getContext(),
-                    mV2XMessageEntity.getContent());
+                    getV2XMessageEntity().getContent());
             if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
                 showWindow();
             }
 
             //  地图主动推送/触发消息 埋点
-            String poiType = mV2XMessageEntity.getContent().getPoiType();
-            String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
-            String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
-            String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
+            String poiType = getV2XMessageEntity().getContent().getPoiType();
+            String lat = String.valueOf(getV2XMessageEntity().getContent().getLocation().getLat());
+            String lon = String.valueOf(getV2XMessageEntity().getContent().getLocation().getLon());
+            String infoId = getV2XMessageEntity().getContent().getNoveltyInfo().getInfoId();
             String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
             Map<String, Object> properties = new HashMap<>();
             properties.put("dbid", infoId);
@@ -107,7 +107,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
     @Override
     public void showWindow() {
-        if (mV2XWindow != null) {
+        if (getV2XWindow() != null) {
             // 关闭直播弹窗
             try {
                 IV2XWindow v2XWindow = V2XRoadLiveCarScenario.getInstance().getV2XWindow();
@@ -122,7 +122,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
             // 关闭之前的事件弹窗
             boolean isShowEventWindow = V2XServiceManager.getMoGoV2XStatusManager().isRoadEventWindowShow();
             if (isShowEventWindow) {
-                ((V2XRoadEventWindow) mV2XWindow).updateTopWindowInfo(mV2XMessageEntity.getContent());
+                ((V2XRoadEventWindow) getV2XWindow()).updateTopWindowInfo(getV2XMessageEntity().getContent());
             } else {
                 ViewGroup.LayoutParams layoutParams =
                         new ViewGroup.LayoutParams(
@@ -130,8 +130,8 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
                                 (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_event_window_height));
                 V2XServiceManager
                         .getMogoTopViewManager()
-                        .addView(mV2XWindow.getView(), layoutParams, this);
-                mV2XWindow.show(mV2XMessageEntity.getContent());
+                        .addView(getV2XWindow().getView(), layoutParams, this);
+                getV2XWindow().show(getV2XMessageEntity().getContent());
             }
             V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, true);
         }
@@ -141,42 +141,42 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
 
     @Override
     public void closeWindow() {
-        if (mV2XWindow != null) {
-            mV2XWindow.close();
+        if (getV2XWindow() != null) {
+            getV2XWindow().close();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, false);
     }
 
     @Override
     public void showButton() {
-        if (mV2XButton != null) {
-            mV2XButton.setOnActionListener(this::showWindow);
-            mV2XButton.show();
+        if (getV2XButton() != null) {
+            getV2XButton().setOnActionListener(this::showWindow);
+            getV2XButton().show();
             V2XServiceManager.getMoGoV2XStatusManager().setRoadEventButtonShow(TAG, true);
         }
     }
 
     @Override
     public void closeButton() {
-        if (mV2XButton != null) {
-            mV2XButton.close();
+        if (getV2XButton() != null) {
+            getV2XButton().close();
         }
         V2XServiceManager.getMoGoV2XStatusManager().setRoadEventButtonShow(TAG, false);
     }
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null) {
+        if (getV2XMarker() != null) {
             // 重置告警信息
-            V2XServiceManager.getV2XStatusManager().setAlarmInfo(mV2XMessageEntity.getContent());
-            mV2XMarker.drawPOI(mV2XMessageEntity.getContent());
+            V2XServiceManager.getV2XStatusManager().setAlarmInfo(getV2XMessageEntity().getContent());
+            getV2XMarker() .drawPOI(getV2XMessageEntity().getContent());
         }
     }
 
     @Override
     public void clearPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
index ffdc49dcba..360e47f296 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java
@@ -1,6 +1,5 @@
 package com.mogo.module.v2x.scenario.scene.seek;
 
-import android.os.CountDownTimer;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -20,7 +19,6 @@ import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.logger.Logger;
 
 import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 
@@ -32,6 +30,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  * version: 1.0
  */
 public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> implements IMogoTopViewStatusListener {
+
     private volatile static V2XSeekHelpScenario mV2XSeekHelpScenario;
 
     private V2XSeekHelpScenario() {
@@ -42,6 +41,8 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
             synchronized (V2XSeekHelpScenario.class) {
                 if (mV2XSeekHelpScenario == null) {
                     mV2XSeekHelpScenario = new V2XSeekHelpScenario();
+                    mV2XSeekHelpScenario.setV2XWindow(new V2XSeekHelpWindow());
+                    mV2XSeekHelpScenario.setV2XMarker(new V2XSeekHelpMarker());
                 }
             }
         }
@@ -52,21 +53,8 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
 
     @Override
     public void init(@Nullable V2XMessageEntity<List<V2XMarkerEntity>> v2XMessageEntity) {
-        mV2XMessageEntity = v2XMessageEntity;
-        if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
-            if (mV2XMessageEntity != null) {
-                mMarkerEntity = mV2XMessageEntity.getContent();
-            }
-            if (!isShown) {
-                setV2XWindow(new V2XSeekHelpWindow());
-                setV2XMarker(new V2XSeekHelpMarker());
-            } else {
-                countDownFaultHelpWindowCancel();
-                closeWindow();
-                clearPOI();
-            }
-            show();
-        }
+        setV2XMessageEntity(v2XMessageEntity);
+
         AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("发现其他车主的求助信息");
         // 广播给ADAS和Launcher卡片
         V2XRoadEventEntity eventEntity = new V2XRoadEventEntity();
@@ -74,6 +62,14 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
         eventEntity.setExpireTime(30000);
         eventEntity.setAlarmContent("其他车主求助");
         ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), eventEntity);
+
+        if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
+            if (getV2XMessageEntity() != null &&
+                    !V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpWindowShow()) {
+                mMarkerEntity = getV2XMessageEntity().getContent();
+                show();
+            }
+        }
     }
 
     @Override
@@ -81,90 +77,31 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
         showWindow();
     }
 
-    @Override
-    public void close() {
-        countDownFaultHelpWindowCancel();
-        super.close();
-        mV2XWindow = null;
-        mV2XMarker = null;
-        mV2XButton = null;
-    }
-
-    private volatile boolean isShown = false;
-    private ArrayBlockingQueue<List<V2XMarkerEntity>> blockingQueue = new ArrayBlockingQueue<>(5);
-    private CountDownTimer faultHelpTimer;
-
-    private void countDownFaultHelpWindowCancel() {
-        if (faultHelpTimer != null) {
-            faultHelpTimer.cancel();
-            faultHelpTimer = null;
-        }
-        blockingQueue.clear();
-        isShown = false;
-    }
-
-    private void countDownFaultHelpWindowStart() {
-        if (faultHelpTimer == null) {
-            faultHelpTimer = new CountDownTimer(20_000, 20_000) {
-                @Override
-                public void onTick(long millisUntilFinished) {
-                    //   Logger.d(TAG, "故障求助倒计时: " + millisUntilFinished);
-                }
-
-                @Override
-                public void onFinish() {
-                    Logger.d(TAG, "故障求助倒计时: onFinish");
-                    isShown = false;
-                    List<V2XMarkerEntity> result = blockingQueue.poll();
-                    closeWindow();
-                    clearPOI();
-                    if (result != null) {
-                        mMarkerEntity = result;
-                        show();
-                    }
-                }
-
-            };
-        }
-        faultHelpTimer.start();
-    }
-
     @Override
     public void showWindow() {
-        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, true);
-        if (mV2XWindow != null && mMarkerEntity != null) {
-            if (!isShown) {
-                isShown = true;
-                countDownFaultHelpWindowStart();
-                View view = mV2XWindow.getView();
-                Logger.d(TAG, "添加window= " + view);
-                ViewGroup.LayoutParams layoutParams =
-                        new ViewGroup.LayoutParams(
-                                ViewGroup.LayoutParams.MATCH_PARENT,
-                                (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
-                V2XServiceManager
-                        .getMogoTopViewManager()
-                        .addView(mV2XWindow.getView(), layoutParams, this);
-                mV2XWindow.show(mMarkerEntity);
-            } else {
-                blockingQueue.offer(mMarkerEntity);
-            }
+        if (getV2XWindow() != null && mMarkerEntity != null) {
+            View view = getV2XWindow().getView();
+            Logger.d(MODULE_NAME, "添加window= " + view);
+            ViewGroup.LayoutParams layoutParams =
+                    new ViewGroup.LayoutParams(
+                            ViewGroup.LayoutParams.MATCH_PARENT,
+                            (int) V2XUtils.getApp().getResources().getDimension(R.dimen.module_v2x_fatigue_driving_window_height_ground));
+            V2XServiceManager
+                    .getMogoTopViewManager()
+                    .addView(getV2XWindow().getView(), layoutParams, this);
+            getV2XWindow().show(mMarkerEntity);
         }
-
     }
 
     @Override
     public void closeWindow() {
         if (V2XServiceManager.getMoGoV2XStatusManager().isOtherSeekHelpWindowShow()) {
-            Logger.d(TAG, "关闭求助车辆的Window!");
+            Logger.d(MODULE_NAME, "关闭求助车辆的Window!");
             V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false);
-            if (mV2XWindow != null) {
-                View view = mV2XWindow.getView();
-                Logger.d(TAG, "移除window= " + view);
-                V2XServiceManager
-                        .getMogoTopViewManager()
-                        .removeView(view);
-                mV2XWindow.close();
+            if (getV2XWindow() != null) {
+                View view = getV2XWindow().getView();
+                Logger.d(MODULE_NAME, "移除window= " + view);
+                getV2XWindow().close();
             }
         }
     }
@@ -181,21 +118,22 @@ public class V2XSeekHelpScenario extends AbsV2XScenario<List<V2XMarkerEntity>> i
 
     @Override
     public void drawPOI() {
-        if (mV2XMarker != null && mMarkerEntity != null) {
-            mV2XMarker.drawPOI(mMarkerEntity);
+        if (getV2XMarker() != null && mMarkerEntity != null) {
+            getV2XMarker().drawPOI(mMarkerEntity);
         }
     }
 
     @Override
     public void clearPOI() {
-        if (mV2XMarker != null) {
-            mV2XMarker.clearPOI();
+        if (getV2XMarker() != null) {
+            getV2XMarker().clearPOI();
         }
     }
 
     @Override
     public void onViewAdded(View view) {
         Logger.d(MODULE_NAME, "展示 Window 动画结束");
+        V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, true);
         drawPOI();
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpWindow.java
index 55cbc39080..7db43a223e 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpWindow.java
@@ -1,9 +1,8 @@
 package com.mogo.module.v2x.scenario.scene.seek;
 
 import android.content.Context;
-import android.content.Intent;
+import android.os.Handler;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -13,54 +12,50 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.PagerSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.map.MogoLatLng;
-import com.mogo.map.navi.IMogoNaviListener;
-import com.mogo.map.navi.MogoNaviInfo;
-import com.mogo.map.navi.MogoTraffic;
+import com.mogo.module.common.entity.V2XEventShowEntity;
+import com.mogo.module.common.entity.V2XPushMessageEntity;
+import com.mogo.module.common.entity.V2XWindowTypeEnum;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.adapter.V2XSeekHelpAdapter;
+import com.mogo.module.v2x.adapter.V2XRoadEventAdapter;
 import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity;
 import com.mogo.module.v2x.listener.V2XWindowStatusListener;
 import com.mogo.module.v2x.scenario.view.IV2XWindow;
-import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
-import com.mogo.module.v2x.voice.V2XVoiceConstants;
-import com.mogo.module.v2x.voice.V2XVoiceManager;
-import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.utils.logger.Logger;
-import com.zhidao.carchattingprovider.CallChattingProviderConstant;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 
 /**
- * @ProjectName: MoGoModulSafeDriving
- * @Package: com.mogo.module.v2x.window
- * @ClassName: V2XFaultHelpWindow
- * @Description: 故障求助window
- * @Author: fenghl
- * @CreateDate: 2020/4/13 15:24
- * @UpdateUser: 更新者：
- * @UpdateDate: 2020/4/13 15:24
- * @UpdateRemark: 更新说明：
- * @Version: 1.0
+ * author : donghongyu
+ * e-mail : 1358506549@qq.com
+ * date   : 2020/5/15 5:37 PM
+ * desc   : 他人发起的故障求助
+ * version: 1.0
  */
-public class V2XSeekHelpWindow extends ConstraintLayout implements V2XSeekHelpAdapter.OnViewClickListener, IMogoNaviListener, IV2XWindow<List<V2XMarkerEntity>> {
-    private static final String TAG = V2XSeekHelpWindow.class.getSimpleName();
+public class V2XSeekHelpWindow extends ConstraintLayout implements IV2XWindow<List<V2XMarkerEntity>> {
+    private static final String TAG = "V2XSeekHelpWindow";
+
+    // 展示列表
     private RecyclerView mRecyclerView;
-    private int mCurPosition;
-    private V2XSeekHelpAdapter mAdapter;
-    IMogoRegisterCenter mMogoRegisterCenter = null;
-    private V2XMarkerEntity mMarkerEntity;
-    // 弹窗状态监听
-    private V2XWindowStatusListener mV2XWindowStatusListener;
+    // 列表数据适配器
+    private V2XRoadEventAdapter mV2XRoadEventAdapter;
+    // 列表展示
+    private List<V2XEventShowEntity> mItemList = new ArrayList<>();
+
+    // 直播30秒自动关闭
+    private static Handler handlerV2XEvent = new Handler();
+    private static Runnable runnableV2XEvent;
+
+    // 推荐的停车场
+    private V2XPushMessageEntity mV2XPushMessageEntity;
 
     public V2XSeekHelpWindow() {
         this(V2XServiceManager.getContext(), null);
     }
+
     public V2XSeekHelpWindow(Context context) {
         this(context, null);
     }
@@ -71,197 +66,73 @@ public class V2XSeekHelpWindow extends ConstraintLayout implements V2XSeekHelpAd
 
     public V2XSeekHelpWindow(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init(context);
+        initView(context);
     }
 
-    private void init(Context context) {
+    private void initView(Context context) {
         Logger.w(MODULE_NAME, "初始化道路故障求助窗口View。。。。。");
         LayoutInflater.from(context).inflate(R.layout.window_fault_help, this);
-        initRecyclerView(context);
-        initVoice();
-        mMogoRegisterCenter = V2XServiceManager.getMogoRegisterCenter();
-    }
-
-    private void initRecyclerView(Context context) {
-        mRecyclerView = findViewById(R.id.rvFaultHelp);
-        LinearLayoutManager layoutManager = new LinearLayoutManager(context, RecyclerView.VERTICAL, false);
+        // 详情列表
+        mRecyclerView = findViewById(R.id.rvRoadEventList);
+        mV2XRoadEventAdapter = new V2XRoadEventAdapter(mItemList);
+        mRecyclerView.setAdapter(mV2XRoadEventAdapter);
+        // 设置切换样式
+        new PagerSnapHelper().attachToRecyclerView(mRecyclerView);
+        // 配置列表朝向
+        LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
         mRecyclerView.setLayoutManager(layoutManager);
-        mAdapter = new V2XSeekHelpAdapter(context);
-        mAdapter.setOnViewClickListener(this);
-        mRecyclerView.setAdapter(mAdapter);
-
         mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
             public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
                 super.onScrollStateChanged(recyclerView, newState);
-                if (recyclerView.getChildCount() > 0 && newState == RecyclerView.SCROLL_STATE_IDLE) {
-                    mCurPosition = layoutManager.findFirstCompletelyVisibleItemPosition();
-                    Logger.d(TAG, "v2x 故障求助 当前显示位置===" + mCurPosition);
+                if (recyclerView.getChildCount() > 0) {
+                    if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                        // 用户处于交互的时候延后隐藏时间
+                        countDownV2XEvent();
+                    }
                 }
             }
         });
-        new PagerSnapHelper().attachToRecyclerView(mRecyclerView);
     }
 
-    private V2XVoiceCallbackListener mChatCb = new V2XVoiceCallbackListener() {
-        @Override
-        public void onCallback(String command, Intent intent) {
-            if (mMarkerEntity != null) {
-                callChatting(mMarkerEntity);
-            }
-        }
-    };
-    private V2XVoiceCallbackListener mNaviCb = new V2XVoiceCallbackListener() {
-        @Override
-        public void onCallback(String command, Intent intent) {
-            if (mMarkerEntity != null) {
-                startNavi(mMarkerEntity.getLat(), mMarkerEntity.getLon());
-            }
-        }
-    };
-
-    /**
-     * 注册语音
-     */
-    private void initVoice() {
-        registerVoiceCmd();
-    }
-
-    private void registerVoiceCmd() {
-        V2XVoiceManager.INSTANCE.registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING, mChatCb);
-        V2XVoiceManager.INSTANCE.registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP, mChatCb);
-        V2XVoiceManager.INSTANCE.registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI, mNaviCb);
-        V2XVoiceManager.INSTANCE.registerUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP, mNaviCb);
-    }
-
-    private void unregisterVoiceCmd() {
-        V2XVoiceManager.INSTANCE.unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CALL_CHATTING);
-        V2XVoiceManager.INSTANCE.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_CHAT_MORE_UN_WAKEUP);
-        V2XVoiceManager.INSTANCE.unRegisterWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_NAVI);
-        V2XVoiceManager.INSTANCE.unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_V2X_TO_NAVI_UN_WAKEUP);
-    }
-
-
-    private void callChatting(V2XMarkerEntity entity) {
-        try {
-            Map<String, String> params = new HashMap<>(16);
-            params.put(CallChattingProviderConstant.CCPROVIDER_SN, entity.getSn());
-            V2XMarkerEntity.UserInfoBean infoBean = entity.getUserInfo();
-            if (infoBean != null) {
-                params.put(CallChattingProviderConstant.CCPROVIDER_USER_IMG, infoBean.getHeadImgUrl());
-
-                params.put(CallChattingProviderConstant.CCPROVIDER_USER_AGE, infoBean.getAge() + "");
-                params.put(CallChattingProviderConstant.CCPROVIDER_USER_SEX, infoBean.getSex() + "");
-                params.put(CallChattingProviderConstant.CCPROVIDER_NICK_NAME, infoBean.getDisplayName());
-            }
-//            params.put(CallChattingProviderConstant.CCPROVIDER_CAR_TYPE, );
-
-            //params.put(CallChattingProviderConstant.CCPROVIDER_ADDRESS, location.getAddress());
-            params.put(CallChattingProviderConstant.CCPROVIDER_LAT, entity.getLat() + "");
-            params.put(CallChattingProviderConstant.CCPROVIDER_LON, entity.getLon() + "");
-
-
-            Logger.d(TAG, "调用车聊聊传入参数==$params===" + params);
-            V2XServiceManager.getCarsChattingProvider().call(params);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void onViewChatClick(V2XMarkerEntity entity) {
-        Log.d(TAG, "点击:调用车聊聊通话!");
-        callChatting(entity);
-    }
-
-    @Override
-    public void onViewNaviClick(double lat, double lng) {
-        startNavi(lat, lng);
-    }
-
-    private void startNavi(double lat, double lng) {
-        Log.d(TAG, "去导航!");
-        MogoLatLng endPoint = new MogoLatLng(lat, lng);
-        V2XServiceManager.getNavi().naviTo(endPoint);
-        synchronized (V2XSeekHelpWindow.class) {
-            mMogoRegisterCenter.unregisterMogoNaviListener(MODULE_NAME);
-            mMogoRegisterCenter.registerMogoNaviListener(MODULE_NAME, this);
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        unregisterVoiceCmd();
-        mAdapter.clearData();
-        mAdapter.setOnViewClickListener(null);
-        synchronized (V2XSeekHelpWindow.class) {
-            mMogoRegisterCenter.unregisterMogoNaviListener(MODULE_NAME);
-        }
-        mMarkerEntity = null;
-
-    }
-
-    @Override
-    public void onInitNaviFailure() {
-
-    }
-
-    @Override
-    public void onInitNaviSuccess() {
-
-    }
-
-    @Override
-    public void onNaviInfoUpdate(MogoNaviInfo naviinfo) {
-
-    }
-
-    @Override
-    public void onStartNavi() {
-
-    }
-
-    @Override
-    public void onStopNavi() {
-
-    }
-
-    @Override
-    public void onCalculateSuccess() {
-        V2XServiceManager.getNavi().startNavi(true);
-    }
-
-    @Override
-    public void onoCalculateFailed() {
-
-    }
-
-    @Override
-    public void onUpdateTraffic(MogoTraffic traffic) {
-
-    }
-
-
     @Override
     public void show(List<V2XMarkerEntity> entityList) {
-        // TODO: 2020/4/13 根据需求仅展示一个，默认显示第一个
         if (entityList != null && !entityList.isEmpty()) {
-            V2XMarkerEntity entity = entityList.get(0);
-            mAdapter.addData(entityList.get(0));
-            mAdapter.notifyDataSetChanged();
-            mMarkerEntity = entity;
+            V2XMarkerEntity markerEntity = entityList.get(0);
+
+            mV2XPushMessageEntity = new V2XPushMessageEntity();
+            mV2XPushMessageEntity.setLon(markerEntity.getLon());
+            mV2XPushMessageEntity.setLat(markerEntity.getLat());
+            mV2XPushMessageEntity.setDisplayName(markerEntity.getUserInfo().getDisplayName());
+            mV2XPushMessageEntity.setHeadImgUrl(markerEntity.getUserInfo().getHeadImgUrl());
+            mV2XPushMessageEntity.setSex(markerEntity.getUserInfo().getSex());
+            mV2XPushMessageEntity.setSn(markerEntity.getUserInfo().getSn());
+            mV2XPushMessageEntity.setCreateTime(markerEntity.getCreateTime());
+            mV2XPushMessageEntity.setDistance(markerEntity.getDistance());
+            mV2XPushMessageEntity.setExpireTime(20000);
+
+            // 清空数据
+            mItemList.clear();
+
+            //Logger.d(MODULE_NAME, "V2X===推送消息：" + v2XRoadEventEntity);
+            V2XEventShowEntity v2XEventShowEntity = new V2XEventShowEntity();
+            v2XEventShowEntity.setV2XPushMessageEntity(mV2XPushMessageEntity);
+            v2XEventShowEntity.setViewType(V2XWindowTypeEnum.SEEK_HELP_WINDOW);
+            mItemList.add(v2XEventShowEntity);
+            // 刷新列表
+            mV2XRoadEventAdapter.notifyDataSetChanged();
+
+            countDownV2XEvent();
         }
-        //mAdapter.addDataList(entityList);
     }
 
     @Override
     public void close() {
-       /* Logger.d(TAG,"移除window= "+this);
+        Logger.d(TAG, "移除window= " + this);
+        //移除窗体
         V2XServiceManager
-                .getIMogoWindowManager()
-                .removeView(this);*/
+                .getMogoTopViewManager()
+                .removeView(this);
     }
 
     @Override
@@ -271,6 +142,26 @@ public class V2XSeekHelpWindow extends ConstraintLayout implements V2XSeekHelpAd
 
     @Override
     public void setWindowStatusListener(V2XWindowStatusListener listener) {
-        mV2XWindowStatusListener = listener;
+    }
+
+    /**
+     * 窗体倒计时
+     */
+    public void countDownV2XEvent() {
+        if (mV2XPushMessageEntity != null) {
+            // 倒计时
+            if (runnableV2XEvent == null) {
+                runnableV2XEvent = () -> {
+                    Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。");
+                    // 移出Window详细信息
+                    close();
+                };
+            } else {
+                handlerV2XEvent.removeCallbacks(runnableV2XEvent);
+            }
+            int expireTime = mV2XPushMessageEntity.getExpireTime();
+            Logger.d(MODULE_NAME, "V2X=== Window 展示开始倒计时：" + expireTime);
+            handlerV2XEvent.postDelayed(runnableV2XEvent, expireTime);
+        }
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png
index 6d53c27c8a..a49b3d9c54 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_illegal_parking.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png
index 0965428453..3d31d18906 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parking_p.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png
index 7b3907dca9..dba50d66d0 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_parting_icon.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_illegal_parking.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_illegal_parking.png
new file mode 100644
index 0000000000..7dcda74ee9
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_illegal_parking.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_p.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_p.png
index 6a642ee946..f3f8b82f3d 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_p.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parking_p.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png
index ad38331b25..80548d676f 100644
Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_parting_icon.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index 0cd149aba3..caf8d41175 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@drawable/v2x_fault_help_bg"
+    android:paddingStart="@dimen/dp_40"
     android:paddingEnd="@dimen/dp_40"
     app:roundLayoutRadius="@dimen/dp_40">
 
@@ -13,15 +14,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_13"
-        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_40"
         android:layout_marginEnd="@dimen/dp_7"
-        android:layout_marginBottom="@dimen/dp_6"
         android:background="@drawable/bg_v2x_event_type_orange"
         android:gravity="center_vertical"
-        android:paddingStart="@dimen/dp_13"
+        android:paddingStart="@dimen/dp_23"
         android:paddingTop="@dimen/dp_5"
-        android:paddingEnd="@dimen/dp_13"
+        android:paddingEnd="@dimen/dp_23"
         android:paddingBottom="@dimen/dp_5"
         android:text="求助信息"
         android:textColor="@android:color/white"
@@ -32,16 +32,15 @@
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivFaultHelpHead"
-        android:layout_width="@dimen/dp_108"
-        android:layout_height="@dimen/dp_108"
+        android:layout_width="@dimen/dp_75"
+        android:layout_height="@dimen/dp_75"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_21"
         android:layout_marginEnd="@dimen/dp_31"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
-        app:layout_constraintStart_toEndOf="@+id/tvImgTextContent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/tvImgTextContent"
+        app:layout_constraintTop_toBottomOf="@+id/tvImgTextContent"
         app:miv_borderColor="#4cffffff"
         app:miv_failureHolder="@drawable/icon_default_user_head"
         app:miv_overlayImageId="@drawable/icon_default_user_head"
@@ -53,10 +52,10 @@
         android:id="@+id/tvFaultHelpName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_22"
+        android:layout_marginStart="@dimen/dp_10"
         android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_34"
-        app:layout_constraintBottom_toTopOf="@id/tvFaultHelpEventTime"
+        android:textSize="@dimen/dp_28"
+        android:textStyle="bold"
         app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
         app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
         app:layout_constraintVertical_chainStyle="packed"
@@ -67,13 +66,10 @@
         android:id="@+id/tvFaultHelpEventTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_22"
-        android:layout_marginTop="@dimen/dp_20"
         android:alpha="0.59"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_26"
-        app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpHead"
-        app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
+        app:layout_constraintStart_toStartOf="@id/tvFaultHelpName"
         app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
         tools:text="15:30发布求助信息" />
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
index 23efbbf041..47500e63f7 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@color/live_video_background_color"
+    android:paddingStart="@dimen/dp_40"
     android:paddingEnd="@dimen/dp_40"
     app:roundLayoutRadius="@dimen/dp_40">
 
@@ -13,7 +14,6 @@
         android:id="@+id/ivIconP"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
         android:src="@drawable/icon_parking_p"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -23,7 +23,7 @@
         android:id="@+id/ivIconPIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginStart="@dimen/dp_30"
         android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/icon_parting_icon"
         app:layout_constraintBottom_toTopOf="@+id/tvAddress"
@@ -57,7 +57,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
         app:layout_constraintEnd_toStartOf="@+id/ivToNav"
         app:layout_constraintTop_toTopOf="@+id/ivToNav"
-        tools:text="300M" />
+        tools:text="300m" />
 
     <ImageView
         android:id="@+id/ivToNav"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
index 62e0c52bc8..e96d3e9056 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fault_help.xml
@@ -2,7 +2,7 @@
 <androidx.recyclerview.widget.RecyclerView 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/rvFaultHelp"
+    android:id="@+id/rvRoadEventList"
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:orientation="vertical"
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
index e547da75f3..60b86d3f77 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
@@ -14,11 +14,11 @@
   "zoom": true,
   "zoomScale": 15,
   "location": {
-    "lat": 39.951326,
-    "lon": 116.343487
+    "lat": 39.968678,
+    "lon": 116.405467
   },
-  "lat": 39.951326,
-  "lon": 116.343487,
+  "lat": 39.968678,
+  "lon": 116.405467,
   "userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
   "msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
 }
\ No newline at end of file
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 a63ecc25c4..a4d8454187 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
@@ -8,11 +8,11 @@
     <dimen name="module_v2x_event_window_height_ground">450px</dimen>
     <dimen name="module_v2x_push_img_height">390px</dimen>
 
-    <dimen name="module_v2x_fatigue_driving_window_height_ground">230px</dimen>
+    <dimen name="module_v2x_fatigue_driving_window_height_ground">220px</dimen>
 
-    <dimen name="module_v2x_event_icon_size">160px</dimen>
+    <dimen name="module_v2x_event_icon_size">147px</dimen>
 
-    <dimen name="module_v2x_event_button_size">118px</dimen>
+    <dimen name="module_v2x_event_button_size">98px</dimen>
     <dimen name="module_v2x_event_button_size_detail">130px</dimen>
 
     <dimen name="module_v2x_event_image_height">320px</dimen>
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
index 6f90c84d79..3d0c6ad1fc 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
@@ -226,4 +226,10 @@ public class MogoServicePaths {
      */
     @Deprecated
     public static final String  PATH_AGREEMENT = "/agreement/showFragment";
+
+    /**
+     * 日志上传
+     */
+    @Deprecated
+    public static final String PATH_LOG_LIB = "/loglib/api";
 }
diff --git a/settings.gradle b/settings.gradle
index b365b84754..355f8f4eab 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,13 +22,11 @@ include ':modules:mogo-module-share'
 include ':modules:mogo-module-service'
 include ':modules:mogo-module-back'
 include ':modules:mogo-module-authorize'
-//include ':modules:mogo-module-guide'
 include ':libraries:map-amap'
 include ':libraries:map-custom'
 include ':libraries:mogo-map-api'
 include ':modules:mogo-module-apps'
 include ':modules:mogo-module-extensions'
-//include ':foudations:mogo-connection'
 include ':modules:mogo-module-gps-simulator'
 include ':modules:mogo-module-gps-simulator-debug'
 include ':modules:mogo-module-gps-simulator-noop'
@@ -37,3 +35,7 @@ include ':modules:mogo-module-media'
 include ':modules:mogo-module-v2x'
 include ':main-extensions:mogo-module-main-independent'
 include ':main-extensions:mogo-module-main-launcher'
+
+include ':modules:mogo-module-push'
+include ':modules:mogo-module-push-base'
+include ':modules:mogo-module-push-noop'
diff --git a/upload.sh b/upload.sh
index e0652a5cec..025344b30a 100755
--- a/upload.sh
+++ b/upload.sh
@@ -64,4 +64,10 @@ if [ $? -ne 0 ]; then exit; fi
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :foudations:mogo-base-services-apk:clean  :foudations:mogo-base-services-apk:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
-./gradlew :foudations:mogo-base-services-sdk:clean  :foudations:mogo-base-services-sdk:uploadArchives
\ No newline at end of file
+./gradlew :foudations:mogo-base-services-sdk:clean  :foudations:mogo-base-services-sdk:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :modules:mogo-module-push-base:clean  :modules:mogo-module-push-base:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :modules:mogo-module-push-noop:clean  :modules:mogo-module-push-noop:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :modules:mogo-module-push:clean  :modules:mogo-module-push:uploadArchives
\ No newline at end of file