diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle
index 271fc0660b..ef409600d8 100644
--- a/core/function-impl/mogo-core-function-main/build.gradle
+++ b/core/function-impl/mogo-core-function-main/build.gradle
@@ -72,8 +72,6 @@ dependencies {
         api rootProject.ext.dependencies.moduleextensions
         api rootProject.ext.dependencies.modulemap
         api rootProject.ext.dependencies.moduleADAS
-        api rootProject.ext.dependencies.modulepushbase
-        api rootProject.ext.dependencies.modulepush
         api rootProject.ext.dependencies.callchat
         api rootProject.ext.dependencies.callchatprovider
         api rootProject.ext.dependencies.mapcustom
@@ -104,8 +102,6 @@ dependencies {
         api project(':modules:mogo-module-extensions')
         api project(':modules:mogo-module-map')
         api project(':modules:mogo-module-adas')
-        api project(":modules:mogo-module-push-base")
-        api project(":modules:mogo-module-push")
         api project(':modules:mogo-module-carchatting')
         api project(':modules:mogo-module-carchattingprovider')
         api project(':libraries:map-custom')
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java
index f71973af53..1d2f2ecba7 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java
@@ -1,11 +1,15 @@
 package com.mogo.eagle.core.function.v2x.events.scenario.impl;
 
+import static com.mogo.eagle.core.function.v2x.events.consts.V2XConst.MODULE_NAME;
+import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING;
+
 import android.content.Intent;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
 import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
 import com.mogo.eagle.core.function.v2x.events.scenario.IV2XScenarioManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.scene.animation.V2XAnimationScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.fatigue.V2XFatigueDrivingScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.help.V2XCarForHelpScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.livecar.V2XPushLiveCarScenario;
@@ -17,19 +21,16 @@ import com.mogo.eagle.core.function.v2x.events.scenario.scene.route.V2XOptimalRo
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.seek.V2XSeekHelpScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.ugc.V2XEventUgcScenario;
 import com.mogo.eagle.core.function.v2x.events.scenario.scene.warning.V2XFrontWarningScenario;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.ThreadUtils;
 import com.mogo.eagle.core.utilcode.util.Utils;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.v2x.scenario.scene.destination.V2XRecommendRouteScenario;
-import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
-
-import static com.mogo.eagle.core.function.v2x.events.consts.V2XConst.MODULE_NAME;
-import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_RECOMMEND_PARKING;
 
 /**
  * author : donghongyu
@@ -89,9 +90,6 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                             case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING:
                                 mV2XScenario = new V2XPushLiveCarScenario();
                                 break;
-                            case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING:
-                                mV2XScenario = new V2XAnimationScenario();
-                                break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP:
                                 mV2XScenario = new V2XCarForHelpScenario();
                                 break;
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationScenario.java
deleted file mode 100644
index 9037ed1130..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationScenario.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.animation;
-
-import androidx.annotation.Nullable;
-
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
-import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
-import com.mogo.eagle.core.function.v2x.events.listener.V2XWindowStatusListener;
-import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XStatusManager;
-import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario;
-import com.mogo.eagle.core.function.v2x.events.utils.ADASUtils;
-import com.mogo.module.common.entity.V2XMessageEntity;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
-import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.service.windowview.IMogoWindowManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/5/15 5:37 PM
- * desc   : 场景动画的场景展示，目前这里仅在演示DEMO中使用
- * version: 1.0
- */
-public class V2XAnimationScenario extends AbsV2XScenario<V2XPushMessageEntity> {
-
-    public V2XAnimationScenario() {
-        setV2XWindow(new V2XAnimationWindow());
-    }
-
-    @Override
-    public void init(@Nullable V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity) {
-        boolean isMainPageOnResume = false;
-        IMogoStatusManager statusManager = BridgeApi.INSTANCE.statusManager();
-        if (statusManager != null) {
-            isMainPageOnResume = statusManager.isMainPageOnResume();
-        }
-        if (!isSameScenario(v2XMessageEntity)
-                && isMainPageOnResume) {
-            boolean isV2XAnimationShow = false;
-            IMoGoV2XStatusManager v2xStatus = BridgeApi.INSTANCE.v2xStatus();
-            if (v2xStatus != null) {
-                isV2XAnimationShow = v2xStatus.isV2XAnimationShow();
-            }
-            if (isV2XAnimationShow) {
-                close();
-            }
-            setV2XMessageEntity(v2XMessageEntity);
-            show();
-        } else {
-            setV2XMessageEntity(v2XMessageEntity);
-            Logger.w(V2XConst.MODULE_NAME, "要处理的场景已经存在，丢弃这次初始化");
-        }
-    }
-
-    @Override
-    public void show() {
-        showWindow();
-    }
-
-    @Override
-    public void showWindow() {
-        if (getV2XWindow() != null) {
-            getV2XWindow().setWindowStatusListener(new V2XWindowStatusListener() {
-                @Override
-                public void onViewShow() {
-                    ADASUtils.broadcastToADAS(BridgeApi.INSTANCE.context(), getV2XMessageEntity().getContent());
-                }
-
-                @Override
-                public void onViewClose() {
-                    closeWindow();
-                    clearPOI();
-                }
-            });
-            getV2XWindow().show(getV2XMessageEntity().getContent());
-
-            IMogoWindowManager windowManager = BridgeApi.INSTANCE.windowManager();
-            if (windowManager != null) {
-                windowManager.addView(getV2XWindow().getView(), 0, 0, false);
-            }
-            IMoGoV2XStatusManager v2xStatus = BridgeApi.INSTANCE.v2xStatus();
-            if (v2xStatus != null) {
-                v2xStatus.setV2XAnimationWindowShow(TAG, true);
-            }
-        }
-    }
-
-    @Override
-    public void closeWindow() {
-        if (getV2XWindow() != null) {
-            getV2XWindow().close();
-        }
-        IMoGoV2XStatusManager v2xStatus = BridgeApi.INSTANCE.v2xStatus();
-        if (v2xStatus != null) {
-            v2xStatus.setV2XAnimationWindowShow(TAG, false);
-        }
-    }
-
-    @Override
-    public void showButton() {
-        if (getV2XButton() != null) {
-            getV2XButton().show();
-        }
-    }
-
-    @Override
-    public void closeButton() {
-        if (getV2XButton() != null) {
-            getV2XButton().close();
-        }
-    }
-
-    @Override
-    public void drawPOI() {
-        if (getV2XMarker() != null) {
-            getV2XMarker().drawPOI(getV2XMessageEntity().getContent());
-        }
-    }
-
-    @Override
-    public void clearPOI() {
-        setV2XMessageEntity(null);
-        if (getV2XMarker() != null) {
-            getV2XMarker().clearPOI();
-        }
-    }
-}
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationWindow.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationWindow.java
deleted file mode 100644
index 443c1bdd17..0000000000
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/animation/V2XAnimationWindow.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.mogo.eagle.core.function.v2x.events.scenario.scene.animation;
-
-import static com.mogo.eagle.core.function.v2x.events.consts.V2XConst.MODULE_NAME;
-
-import android.content.Context;
-import android.net.Uri;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-
-import com.mogo.commons.voice.AIAssist;
-import com.mogo.eagle.core.function.v2x.R;
-import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
-import com.mogo.eagle.core.function.v2x.events.listener.V2XWindowStatusListener;
-import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XWindow;
-import com.mogo.module.common.entity.V2XPushMessageEntity;
-import com.mogo.eagle.core.widget.TextureVideoView;
-import com.mogo.service.windowview.IMogoTopViewManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
-
-/**
- * author : donghongyu
- * e-mail : 1358506549@qq.com
- * date   : 2020/4/24 11:34 AM
- * desc   : TODO 前瞻演示功能场景动画
- * version: 1.0
- */
-public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow<V2XPushMessageEntity> {
-    // 弹窗状态监听
-    private V2XWindowStatusListener mV2XWindowStatusListener;
-    private TextureVideoView vvCarAnimation;
-
-    public V2XAnimationWindow() {
-        this(BridgeApi.INSTANCE.context(), null);
-    }
-
-    public V2XAnimationWindow(Context context) {
-        this(context, null);
-    }
-
-    public V2XAnimationWindow(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public V2XAnimationWindow(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context);
-    }
-
-    public void initView(Context context) {
-        Logger.w(MODULE_NAME, "初始化场景动画View。。。。。");
-        LayoutInflater.from(context).inflate(R.layout.window_animation, this);
-        vvCarAnimation = findViewById(R.id.vvCarAnimation);
-    }
-
-    /**
-     * 展示道路事件详情Windows
-     */
-    @Override
-    public void show(V2XPushMessageEntity entity) {
-        Uri videoUri = null;
-        String tts = null;
-        switch (entity.getSceneId()) {
-            // 前车紧急制动告警
-            case "100005":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_emergency_braking);
-                break;
-            // 十字路口碰撞预警
-            case "100006":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_left_right_car);
-                tts = "注意路口车辆";
-                break;
-            // 岔路口碰撞预警
-            case "100007":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_cut_in_line);
-                break;
-            // 禁行车道预警
-            case "100008":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_current_row_closed);
-                break;
-            // 应急车辆优先通行
-            case "100012":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_emergency_lane);
-                break;
-            // 闯红灯预警
-            case "100013":
-                videoUri = Uri.parse("android.resource://" + getContext().getPackageName() + "/raw/" + R.raw.video_traffic_light_speed_cut);
-                break;
-            default:
-                Logger.e(MODULE_NAME, "未定义的类型：" + entity.getSceneId());
-        }
-        String path = "https://v.youku.com/v_show/id_XNjAzNzI3MDA0.html";
-
-        if (videoUri != null) {
-//            vvCarAnimation.setVideoPath(path);
-            vvCarAnimation.setVideoURI(videoUri);
-            vvCarAnimation.setOnPreparedListener(mediaPlayer -> {
-                Logger.w(MODULE_NAME, "场景动画准备。。。。。");
-            });
-            vvCarAnimation.setOnCompletionListener(mediaPlayer -> {
-                Logger.w(MODULE_NAME, "动画播放结束...");
-                if (mV2XWindowStatusListener != null) {
-                    mV2XWindowStatusListener.onViewClose();
-                }
-            });
-            vvCarAnimation.start();
-            Logger.w(MODULE_NAME, "开始播放动画。。。。。");
-            if (mV2XWindowStatusListener != null) {
-                mV2XWindowStatusListener.onViewShow();
-            }
-        }
-        if (tts != null) {
-            AIAssist.getInstance(BridgeApi.INSTANCE.context()).speakTTSVoice(tts);
-        }
-    }
-
-    @Override
-    public void close() {
-        //移除窗体
-        IMogoTopViewManager topViewManager = BridgeApi.INSTANCE.topViewManager();
-        if (topViewManager != null) {
-            topViewManager.removeView(this);
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (vvCarAnimation != null) {
-            vvCarAnimation.stopPlayback();
-        }
-    }
-
-    @Override
-    public View getView() {
-        return this;
-    }
-
-    @Override
-    public void setWindowStatusListener(V2XWindowStatusListener listener) {
-        this.mV2XWindowStatusListener = listener;
-    }
-}
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_current_row_closed.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_current_row_closed.mp4
deleted file mode 100644
index 18216441ff..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_current_row_closed.mp4 and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_cut_in_line.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_cut_in_line.mp4
deleted file mode 100644
index 2595d5cb3b..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_cut_in_line.mp4 and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_braking.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_braking.mp4
deleted file mode 100644
index 2dab1ef3d6..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_braking.mp4 and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_lane.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_lane.mp4
deleted file mode 100644
index 0a202201d1..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_emergency_lane.mp4 and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_left_right_car.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_left_right_car.mp4
deleted file mode 100755
index bc66e55a2c..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_left_right_car.mp4 and /dev/null differ
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_traffic_light_speed_cut.mp4 b/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_traffic_light_speed_cut.mp4
deleted file mode 100755
index b6d84516d4..0000000000
Binary files a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/video_traffic_light_speed_cut.mp4 and /dev/null differ
diff --git a/modules.txt b/modules.txt
index ba44a97da5..83a4cf333e 100644
--- a/modules.txt
+++ b/modules.txt
@@ -36,8 +36,6 @@
 :modules:mogo-module-share
 :modules:mogo-module-extensions
 :modules:mogo-module-main
-:modules:mogo-module-push-base
-:modules:mogo-module-push
 :core:function-impl:mogo-core-function-autopilot
 :core:function-impl:mogo-core-function-hmi
 :core:function-impl:mogo-core-function-map
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/CarModelType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/CarModelType.java
deleted file mode 100644
index 875e875ffd..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/CarModelType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mogo.module.common.constants;
-
-public
-/**
- * @author congtaowang
- * @since 2020/10/29
- *
- * 车模型类型
- */
-enum CarModelType {
-
-    Other( "other" ),
-    OtherLeft( "other_left" ),
-    OtherRight( "other_right" ),
-
-    OtherLeftReverse( "other_left_reverse" ),
-    OtherRightReverse( "other_right_reverse" ),
-    OtherReverse( "other_reverse" ),
-
-    Self( "self" ),
-    SelfLeft( "self_left" ),
-    SelfRight( "self_right" );
-
-    private String res;
-
-    CarModelType( String res ) {
-        this.res = res;
-    }
-
-    public String getRes() {
-        return res;
-    }
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/SafeType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/SafeType.java
deleted file mode 100644
index 38a0625a2f..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/SafeType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mogo.module.common.constants;
-
-public
-/**
- * @author congtaowang
- * @since 2020/10/29
- *
- * 描述
- */
-enum SafeType {
-    Normal( "normal", "安全" ),
-    SpeedWarm( "warm", "注意/超速" ),
-    DistanceWarm( "warm", "注意/保持车距" ),
-    SpeedDangerous( "dangerous", "危险/严重超速" ),
-    DistanceDangerous( "dangerous", "危险/距离过近" );
-
-    private String msg;
-    private String res;
-
-    SafeType( String res, String msg ) {
-        this.msg = msg;
-        this.res = res;
-    }
-
-    public String getRes() {
-        return res;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/TrafficLightConst.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/TrafficLightConst.java
deleted file mode 100644
index f543e4b242..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/TrafficLightConst.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mogo.module.common.constants;
-
-/**
- * 用于内部标识红绿灯颜色
- *
- * @author  tongchenfei
- */
-public class TrafficLightConst {
-    public static final int TRAFFIC_LIGHT_COLOR_GRAY = 0;
-    public static final int TRAFFIC_LIGHT_COLOR_RED = 1;
-    public static final int TRAFFIC_LIGHT_COLOR_YELLOW = 2;
-    public static final int TRAFFIC_LIGHT_COLOR_GREEN = 3;
-
-    public static final int TRAFFIC_LIGHT_DIRECTION_TURN_AROUND = 0;
-    public static final int TRAFFIC_LIGHT_DIRECTION_TURN_LEFT = 1;
-    public static final int TRAFFIC_LIGHT_DIRECTION_STRAIGHT = 2;
-    public static final int TRAFFIC_LIGHT_DIRECTION_TURN_RIGHT = 3;
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/VisionMode.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/VisionMode.java
deleted file mode 100644
index bb15f594cd..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/VisionMode.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mogo.module.common.constants;
-
-public
-/**
- * @author congtaowang
- * @since 2020/10/29
- *
- * 描述
- */
-enum VisionMode {
-
-    Machine( "machine" ),
-    User( "user" );
-
-    private String res;
-
-    VisionMode( String res ) {
-        this.res = res;
-    }
-
-    public String getRes() {
-        return res;
-    }
-}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/SpeedData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/SpeedData.java
deleted file mode 100644
index 71d1cdfa10..0000000000
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/bean/SpeedData.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.mogo.module.common.drawer.bean;
-
-import com.mogo.map.marker.IMogoMarker;
-
-/**
- * 速度显示对象
- */
-public class SpeedData {
-
-    public IMogoMarker marker;
-    public double speed;
-    public String uuid;
-    public int type;
-    public double heading;
-    public boolean isVrMode;
-
-    public SpeedData(IMogoMarker marker, double speed, String uuid, int type, double heading, boolean isVrMode) {
-        this.marker = marker;
-        this.speed = speed;
-        this.uuid = uuid;
-        this.type = type;
-        this.heading = heading;
-        this.isVrMode = isVrMode;
-    }
-
-    public IMogoMarker getMarker() {
-        return marker;
-    }
-
-    public void setMarker(IMogoMarker marker) {
-        this.marker = marker;
-    }
-
-    public double getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(double speed) {
-        this.speed = speed;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public double getHeading() {
-        return heading;
-    }
-
-    public void setHeading(double heading) {
-        this.heading = heading;
-    }
-
-    public boolean getIsVrMode() {
-        return isVrMode;
-    }
-
-    public void setIsVrMode(boolean isVrMode) {
-        this.isVrMode = isVrMode;
-    }
-}
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java
index d87fcb9e0f..8ce7638f14 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/CameraWindow3DAdapter.java
@@ -6,11 +6,7 @@ import android.view.View;
 import com.mogo.map.marker.IMogoInfoWindowAdapter;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.drawer.marker.IMarkerView;
 import com.mogo.module.common.drawer.marker.MapCameraInfoView;
-import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
-import com.mogo.module.common.drawer.marker.MapMarkerView;
-import com.mogo.module.common.entity.MarkerShowEntity;
 
 /**
  * @author lixiaopeng
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
index 1afec48929..ad2221dfee 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
@@ -1,9 +1,5 @@
 package com.mogo.module.main.cards;
 
-import com.mogo.service.module.IMogoModuleProvider;
-
-import java.util.List;
-
 /**
  * @author congtaowang
  * @since 2019-12-24
diff --git a/modules/mogo-module-push-base/.gitignore b/modules/mogo-module-push-base/.gitignore
deleted file mode 100644
index 426a199cc8..0000000000
--- a/modules/mogo-module-push-base/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
\ No newline at end of file
diff --git a/modules/mogo-module-push-base/build.gradle b/modules/mogo-module-push-base/build.gradle
deleted file mode 100644
index e6a23cb457..0000000000
--- a/modules/mogo-module-push-base/build.gradle
+++ /dev/null
@@ -1,50 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-android-extensions'
-    id 'kotlin-kapt'
-    id 'com.alibaba.arouter'
-}
-
-android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode Integer.valueOf(VERSION_CODE)
-        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-        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
deleted file mode 100644
index c5f03b7a42..0000000000
--- a/modules/mogo-module-push-base/consumer-rules.pro
+++ /dev/null
@@ -1 +0,0 @@
--keep class com.mogo.module.push.base.PushUIConstants{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-push-base/gradle.properties b/modules/mogo-module-push-base/gradle.properties
deleted file mode 100644
index 653f4713ca..0000000000
--- a/modules/mogo-module-push-base/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f1b424510d..0000000000
--- a/modules/mogo-module-push-base/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
deleted file mode 100644
index 9a8574da7b..0000000000
--- a/modules/mogo-module-push-base/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?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
deleted file mode 100644
index 4cfde10760..0000000000
--- a/modules/mogo-module-push-base/src/main/java/com/mogo/module/push/base/PushUIConstants.java
+++ /dev/null
@@ -1,7 +0,0 @@
-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/.gitignore b/modules/mogo-module-push/.gitignore
deleted file mode 100644
index 426a199cc8..0000000000
--- a/modules/mogo-module-push/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
\ No newline at end of file
diff --git a/modules/mogo-module-push/README.md b/modules/mogo-module-push/README.md
deleted file mode 100644
index e262a8de52..0000000000
--- a/modules/mogo-module-push/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# 基于 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
deleted file mode 100644
index e262837470..0000000000
--- a/modules/mogo-module-push/build.gradle
+++ /dev/null
@@ -1,86 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlin-android-extensions'
-    id 'kotlin-kapt'
-    id 'com.alibaba.arouter'
-}
-
-android {
-    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    buildToolsVersion rootProject.ext.android.buildToolsVersion
-
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.android.minSdkVersion
-        targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode Integer.valueOf(VERSION_CODE)
-        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
-        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'])
-    // 小智语音，免唤醒词等服务
-    implementation rootProject.ext.dependencies.androidxconstraintlayout
-    implementation rootProject.ext.dependencies.aiassist
-
-    implementation rootProject.ext.dependencies.arouter
-    kapt rootProject.ext.dependencies.aroutercompiler
-
-    implementation 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(USE_MAVEN_PACKAGE) ){
-        implementation rootProject.ext.dependencies.modulepushbase
-        implementation rootProject.ext.dependencies.mogo_core_utils
-        implementation rootProject.ext.dependencies.mogocommons
-        implementation rootProject.ext.dependencies.modulecommon
-        implementation rootProject.ext.dependencies.mogoserviceapi
-
-        implementation rootProject.ext.dependencies.mogo_core_utils
-        implementation rootProject.ext.dependencies.mogo_core_data
-    } else {
-        implementation project(":modules:mogo-module-push-base")
-        implementation project(':core:mogo-core-utils')
-        implementation project(':foudations:mogo-commons')
-        implementation project(':modules:mogo-module-common')
-        implementation project(':services:mogo-service-api')
-
-        implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-data')
-    }
-}
-
-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
deleted file mode 100644
index 063385d531..0000000000
--- a/modules/mogo-module-push/consumer-rules.pro
+++ /dev/null
@@ -1,4 +0,0 @@
--keep class com.mogo.module.push.dao.*{*;}
--keep class com.mogo.module.push.model.Button{*;}
--keep class com.mogo.module.push.model.PushBean{*;}
--keep class com.mogo.module.push.view.**{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-push/gradle.properties b/modules/mogo-module-push/gradle.properties
deleted file mode 100644
index cf466ecef3..0000000000
--- a/modules/mogo-module-push/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f1b424510d..0000000000
--- a/modules/mogo-module-push/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
deleted file mode 100644
index 6a39ac26a4..0000000000
--- a/modules/mogo-module-push/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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" />
-
-</manifest>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 2d9d6f9f71..63f6748352 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -64,8 +64,6 @@ include ':modules:mogo-module-main'
 include ':modules:mogo-module-share'
 include ':modules:mogo-module-service'
 include ':modules:mogo-module-extensions'
-include ':modules:mogo-module-push'
-include ':modules:mogo-module-push-base'
 include ':modules:mogo-module-carchatting'
 include ':modules:mogo-module-carchattingprovider'
 include ':modules:mogo-module-chat'