[2.13.0-arch-opt] merge

2023-02-07 15:06:28 +08:00
parent a382fc36c1
commit 1548c607da
71 changed files with 1014 additions and 1337 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
@@ -6,7 +6,6 @@ import android.view.ViewGroup
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.mogo.commons.context.ContextHolderUtil
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
@@ -235,14 +234,14 @@ class MoGoHmiProvider : IMoGoHmiProvider {
    }

    override fun showToBindingCarDialog() {
-        if (ContextHolderUtil.getContext() != null) {
-            ToBindingCarDialog.show(ContextHolderUtil.getContext())
+        if (context != null) {
+            ToBindingCarDialog.show(context)
        }
    }

    override fun showModifyBindingCarDialog() {
-        if (ContextHolderUtil.getContext() != null) {
-            ModifyBindingCarDialog.show(ContextHolderUtil.getContext())
+        if (context != null) {
+            ModifyBindingCarDialog.show(context)
        }
    }

@@ -267,17 +266,17 @@ class MoGoHmiProvider : IMoGoHmiProvider {
        content: String,
        installType: String
    ) {
-        if (ContextHolderUtil.getContext() != null) {
+        if (context != null) {
            UpgradeAppDialog.show(
-                ContextHolderUtil.getContext(), name, url, title, content, installType
+                context, name, url, title, content, installType
            )
        }
    }

    override fun showAdUpgradeDialog(images: List<String>, padSn: String, releaseId: String) {
        ThreadUtils.runOnUiThread {
-            if (ContextHolderUtil.getContext() != null) {
-                AdUpgradeDialog.show(ContextHolderUtil.getContext(), images, padSn, releaseId)
+            if (context != null) {
+                AdUpgradeDialog.show(context, images, padSn, releaseId)
            }
        }
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -51,7 +51,6 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigList
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.map.CallerHDMapManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerSmpManager
 import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
@@ -524,10 +523,10 @@ internal class DebugSettingView @JvmOverloads constructor(
        tbChangeCurrentCarIcon.setOnCheckedChangeListener { _, isChecked ->
            if (!isChecked) {
                // 替换为出租车图标
-                CallerHDMapManager.changeCurrentIcon(R.raw.chuzuche)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche)
            } else {
                // 替换为小巴车图标
-                CallerHDMapManager.changeCurrentIcon(R.raw.xiaobache)
+                CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaobache)
            }
        }

@@ -741,7 +740,9 @@ internal class DebugSettingView @JvmOverloads constructor(
        tbDrawPointCloudData.isChecked = FunctionBuildConfig.isDrawPointCloudData
        //是否渲染点云数据
        tbDrawPointCloudData.setOnCheckedChangeListener { _, isChecked ->
-            CallerHDMapManager.setIsDrawPointCloud(isChecked)
+            CallerAutoPilotControlManager.setIsDrawPointCloud(isChecked)
+            FunctionBuildConfig.isDrawPointCloudData = isChecked
+            CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
        }

        //设置点云大小
@@ -752,7 +753,7 @@ internal class DebugSettingView @JvmOverloads constructor(
            } else {
                try {
                    val cloudSizeFloat = cloudSize.toFloat()
-                    CallerHDMapManager.setPointCloudSize(cloudSizeFloat)
+                    CallerMapUIServiceManager.getMapUIController()?.setPointCloudSize(cloudSizeFloat)
                } catch (e: Exception) {
                    ToastUtils.showShort("点云大小格式输入不正确")
                }
@@ -765,7 +766,7 @@ internal class DebugSettingView @JvmOverloads constructor(
                ToastUtils.showShort("请输入正确的点云颜色")
            } else {
                try {
-                    CallerHDMapManager.setPointCloudColor(cloudColor)
+                    CallerMapUIServiceManager.getMapUIController()?.setPointCloudColor(cloudColor)
                } catch (e: Exception) {
                    ToastUtils.showShort("点云大小颜色输入不正确")
                }
@@ -1215,7 +1216,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         * 设置是否输出高精地图日志 true-打印日志，false-不打印日志
         */
        tbHdMapLog.setOnCheckedChangeListener { _, isChecked ->
-            CallerHDMapManager.setDebugMode(isChecked)
+            CallerMapUIServiceManager.getMapUIController()?.setDebugMode(isChecked)
        }

        cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus()
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt
@@ -1,10 +1,13 @@
 package com.mogo.eagle.core.function.hmi.ui.widget

+import android.animation.Animator
+import android.animation.Animator.AnimatorListener
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
@@ -14,8 +17,8 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import kotlinx.android.synthetic.main.view_v2x_warning_fog.view.*

-class V2XFogEventView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
-    ConstraintLayout(context, attrs, defStyleAttr), IV2XEventListener {
+class V2XFogEventView(context: Context, attrs: AttributeSet) :
+    ConstraintLayout(context, attrs), IV2XEventListener {

    companion object {
        private const val TAG = "V2XFogEventView"
@@ -44,6 +47,24 @@ class V2XFogEventView(context: Context, attrs: AttributeSet?, defStyleAttr: Int)
            animator8
        )
        animatorSet.duration = 5000
+        animatorSet.addListener(object : AnimatorListener{
+            override fun onAnimationStart(animation: Animator?) {
+                visibility = View.VISIBLE
+            }
+
+            override fun onAnimationEnd(animation: Animator?) {
+                visibility = View.GONE
+            }
+
+            override fun onAnimationCancel(animation: Animator?) {
+                visibility = View.GONE
+            }
+
+            override fun onAnimationRepeat(animation: Animator?) {
+
+            }
+
+        })
    }

    override fun onAttachedToWindow() {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
@@ -1,481 +0,0 @@
-package com.mogo.eagle.core.function.main;
-
-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK;
-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LEAK;
-import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK;
-import static com.mogo.eagle.core.function.main.MainPresenter.MOGO_PERMISSION_REQUEST_CODE;
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
-
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.kwai.koom.base.MonitorManager;
-import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor;
-import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig;
-import com.kwai.koom.nativeoom.leakmonitor.LeakRecord;
-import com.mogo.commons.analytics.AnalyticsUtils;
-import com.mogo.commons.context.ContextHolderUtil;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.module.status.MogoStatusManager;
-import com.mogo.commons.mvp.BaseFragment;
-import com.mogo.commons.mvp.MvpActivity;
-import com.mogo.commons.mvp.MvpFragment;
-import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
-import com.mogo.eagle.core.data.config.HdMapBuildConfig;
-import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.startup.CallerStartUpManager;
-import com.mogo.eagle.core.function.hmi.R;
-import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView;
-import com.mogo.eagle.core.function.main.modules.MogoModulesManager;
-import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler;
-import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils;
-import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
-import com.mogo.eagle.core.utilcode.util.BarUtils;
-import com.mogo.eagle.core.utilcode.util.NetworkUtils;
-import com.mogo.eagle.core.utilcode.util.ProcessUtils;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
-import com.mogo.map.listener.IMogoMapListener;
-import com.mogo.map.listener.MogoMapListenerHandler;
-import com.mogo.map.uicontroller.EnumMapUI;
-import com.mogo.map.uicontroller.IMogoMapUIController;
-import com.rousetime.android_startup.StartupManager;
-import com.rousetime.android_startup.model.LoggerLevel;
-import com.rousetime.android_startup.model.StartupConfig;
-import com.zhjt.mogo_core_function_devatools.monitor.db.CpuInfo;
-import com.zhjt.mogo_core_function_devatools.monitor.db.MemInfo;
-import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb;
-import com.zhjt.service.chain.ChainLog;
-import com.zhjt.service.chain.TracingConstants;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import mogo.telematics.pad.MessagePad;
-import mogo_msg.MogoReportMsg;
-import system_master.SystemStatusInfo;
-
-/**
- * @author congtaowang
- * @since 2019-12-23
- * <p>
- * 描述：加载各个模块
- */
-public class MainActivity extends MvpActivity<MainView, MainPresenter> implements MainView,
-        IMoGoAutopilotStatusListener {
-
-    protected static final String TAG = "MainActivity";
-    private static final int REQUEST_CODE_DIALOG = 100;
-
-    protected FrameLayout mFloatingLayout;
-    protected View mCoverUpLayout;
-
-    protected ConstraintLayout clSpecialEffect;
-
-    private boolean isFirst = false;
-
-    private RecyclerView mConnectInfoRV;
-    private ConnInfoAdapter mConnAdapter;
-    private final List<AutopilotStatusInfo> dataList = new ArrayList<>();
-    private int mLastStatus = 0x00;
-    private boolean isFloatingLayerHidden = false;
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.module_main_activity_main;
-    }
-
-    @Override
-    protected void initViews() {
-        injectStatusBar();
-        getWindow().setBackgroundDrawable(null);
-
-        mFloatingLayout = findViewById(R.id.module_main_id_floating_view);
-        mCoverUpLayout = findViewById(R.id.module_main_id_cover_up);
-
-        clSpecialEffect = findViewById(R.id.cl_special_effect);
-        mConnectInfoRV = findViewById(R.id.rvConnectInfo);
-        initConnectInfoRV();
-        FloatingViewHandler.init(mFloatingLayout);
-        CallerHmiManager.INSTANCE.init(this);
-
-        //申请悬浮窗权限
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // 检查是否有悬浮窗权限
-            if (Settings.canDrawOverlays(this)) {
-                return;
-            }
-            PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG);
-        }
-    }
-
-    private void injectStatusBar() {
-        FrameLayout decorView = (FrameLayout) this.getWindow().getDecorView();
-        View contentView = ((ViewGroup) decorView.findViewById(android.R.id.content)).getChildAt(0);
-        contentView.setFitsSystemWindows(false);
-        decorView.setClipToPadding(false);
-
-        View statusBarView = decorView.findViewWithTag("status_bar");
-        if (statusBarView == null) {
-            statusBarView = getStatusBarView();
-            statusBarView.setTag("status_bar");
-        }
-        FrameLayout.LayoutParams statusBarLP =
-                new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, BarUtils.getStatusBarHeight());
-        statusBarLP.topMargin = 0;
-        statusBarLP.gravity = Gravity.TOP;
-        decorView.addView(statusBarView, statusBarLP);
-    }
-
-    /**
-     * 修改statusBar 重写实现，需要继承 StatusBarView，xml中基础系统控件不要修改其id，拿来即用
-     * @return StatusBarView
-     */
-    protected StatusBarView getStatusBarView(){
-        return new StatusBarView(this);
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        calculateStartTime();
-        ContextHolderUtil.holdContext(this);
-        // 监听工控机连接信息
-        CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
-        CallerStartUpManager.initStageTwo();
-        // 加载模块
-        mPresenter.postLoadModuleMsg();
-        // 监听网络状态
-        NetworkUtils.listenNetStrength(this);
-
-        mPresenter.checkPermission(this);
-
-        // 同步AppInfo Config信息
-        CallerDevaToolsManager.INSTANCE.syncConfig();
-    }
-
-    private void calculateStartTime() {
-        long coldStartTime = AppLaunchTimeUtils.getTimeCalculate(AppLaunchTimeUtils.COLD_START);
-        // 这里记录的TimeUtils.coldStartTime是指Application启动的时间，最终的冷启动时间等于Application启动时间+热启动时间
-        AppLaunchTimeUtils.sColdStartTime = coldStartTime > 0 ? coldStartTime : 0;
-        AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.HOT_START);
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        super.onWindowFocusChanged(hasFocus);
-        if (hasFocus) {
-            // 统计代码
-            final Map<String, Object> properties = new HashMap<>();
-            long hotStartTime = AppLaunchTimeUtils.getTimeCalculate(AppLaunchTimeUtils.HOT_START);
-            if (AppLaunchTimeUtils.sColdStartTime > 0 && hotStartTime > 0) {
-                // 真正的冷启动时间 = Application启动时间 + 热启动时间
-                long coldStartTime = AppLaunchTimeUtils.sColdStartTime + hotStartTime;
-                // 过滤掉异常启动时间
-                if (coldStartTime < 50000) {
-                    // 上传冷启动时间coldStartTime
-                    CallerLogger.INSTANCE.i(M_HMI + TAG, "coldStartTime:" + coldStartTime);
-                    properties.put("app_launch_coldStartTime", coldStartTime);
-                }
-            } else if (hotStartTime > 0) {
-                // 过滤掉异常启动时间
-                if (hotStartTime < 30000) {
-                    // 上传热启动时间hotStartTime
-                    CallerLogger.INSTANCE.i(M_HMI + TAG, "hotStartTime:" + hotStartTime);
-                    properties.put("app_launch_hotStartTime", hotStartTime);
-                }
-            }
-            AnalyticsUtils.track("app_launch_time", properties);
-        }
-    }
-
-    private void initConnectInfoRV() {
-        mConnAdapter = new ConnInfoAdapter(this, dataList);
-        mConnectInfoRV.setLayoutManager(new LinearLayoutManager(this));
-        mConnectInfoRV.setAdapter(mConnAdapter);
-    }
-
-    @Override
-    public void loadModules() {
-        final long start = System.currentTimeMillis();
-        MogoModulesManager.getInstance().init(this);
-        MogoMapListenerHandler.Companion.getMogoMapListenerHandler().registerHostMapListener(TAG, new IMogoMapListener() {
-            @Override
-            public void onMapLoaded() {
-                // 延时加载其他模块
-                getWindow().getDecorView().post(() -> {
-                    HdMapBuildConfig.isMapLoaded = true;
-                    loadOthersModules();
-                    loadFunctionFragment();
-
-                    // TODO 这里临时兼容进入VR模式，标记状态机。有些业务（OCH）会根据状态判断加载
-                    MogoStatusManager.getInstance().setVrMode(TAG, true);
-                    // 设置地图样式
-                    MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
-                });
-                CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
-
-            }
-        });
-        // 加载地图
-        loadFunctionMapView();
-    }
-
-    /**
-     * 加载其它模块
-     */
-    protected void loadOthersModules() {
-        // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
-        MogoModulesManager.getInstance().loadFunctionModules();
-        mPresenter.delayOperations();
-        MogoModulesManager.getInstance().loadFunctionModulesServer();
-        UiThreadHandler.postDelayed(() -> {
-            CallerLogger.INSTANCE.d(M_HMI + TAG, "5秒已过，启动基础服务……");
-            MogoModulesManager.getInstance().loadBaseModule();
-        }, 5_000L);
-        if (DebugConfig.isDebug()) {
-            // 启动Native内存泄漏监测
-            startLeakMonitor();
-        }
-        checkMonitorDb();
-    }
-
-    private void startLeakMonitor() {
-        LeakMonitorConfig leakMonitorConfig = new LeakMonitorConfig.Builder()
-                .setLoopInterval(50000)
-                .setMonitorThreshold(16)
-                .setNativeHeapAllocatedThreshold(0)
-                .setSelectedSoList(new String[]{"libhdmap", "libmap",
-                        "libAMapSDK_NAVI_v8_0_1", "libZegoExpressEngine",
-                        "libcntts"
-                })
-                .setEnableLocalSymbolic(DebugConfig.isDebug())
-                .setLeakListener(leaks -> {
-                    StringBuilder stringBuilder = new StringBuilder();
-                    if (!leaks.isEmpty()) {
-                        for (LeakRecord leakRecord : leaks) {
-                            stringBuilder.append(leakRecord.toString());
-                        }
-                        printLeakMsg(stringBuilder.toString());
-                    }
-                })
-                .build();
-        MonitorManager.addMonitorConfig(leakMonitorConfig);
-        LeakMonitor.INSTANCE.start();
-    }
-
-    private void checkMonitorDb() {
-        new Thread(() -> {
-            long limitId = 50001;
-            File file = this.getDatabasePath(MonitorDb.INTERNAL_DB_NAME);
-            try {
-                if (file != null && file.exists()) {
-                    List<CpuInfo> cpuList = MonitorDb.getDb(this).monitorDao().getAllCPUById(limitId);
-                    List<MemInfo> memList = MonitorDb.getDb(this).monitorDao().getAllMemById(limitId);
-                    // 大于5w条清除
-                    if (cpuList.size() > 0 || memList.size() > 0) {
-                        this.deleteDatabase(MonitorDb.INTERNAL_DB_NAME);
-                    }
-                }
-            } catch (Exception e) {
-                CallerLogger.INSTANCE.e(TAG, e.getMessage());
-            }
-        }).start();
-    }
-
-    @ChainLog(
-            linkChainLog = CHAIN_LINK_LOG_NATIVE_LEAK,
-            linkCode = CHAIN_LINK_LEAK,
-            endpoint = TracingConstants.Endpoint.PAD,
-            nodeAliasCode = CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK,
-            paramIndexes = {0},
-            clientPkFileName = "sn"
-    )
-    private void printLeakMsg(String leakRecord) {
-        CallerLogger.INSTANCE.d(M_HMI + TAG, "内存泄漏日志如下：\n" + leakRecord);
-    }
-
-    @Override
-    public void hideCoverUpLayout() {
-        mConnectInfoRV.setVisibility(View.GONE);
-        getWindow().setBackgroundDrawable(null);
-        mCoverUpLayout.setVisibility(View.GONE);
-        isFloatingLayerHidden = true;
-    }
-
-    @Override
-    public void loadFunctionFragment() {
-        CallerLogger.INSTANCE.d(M_HMI + TAG, "loadFunctionFragment……");
-        // 加载 小地图 图层
-        BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation();
-        addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment);
-    }
-
-    /**
-     * 加载地图视图
-     */
-    private void loadFunctionMapView() {
-        MvpFragment fragmentHdMap = (MvpFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_MAP).navigation();
-        if (fragmentHdMap != null) {
-            addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_map_fragment_container);
-        }
-    }
-
-    @NonNull
-    @Override
-    protected MainPresenter createPresenter() {
-        return new MainPresenter(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, true);
-        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, false);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, true);
-    }
-
-    @Override
-    public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
-        int status = autoPilotStatusInfo.getIpcConnStatus();
-        if (mLastStatus != status) {
-            AutopilotStatusInfo statusInfo = autoPilotStatusInfo.clone();
-            mConnectInfoRV.post(() -> updateConnectInfoView(statusInfo));
-            mLastStatus = status;
-        }
-    }
-
-    @Override
-    public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) {
-    }
-
-    @Override
-    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) {
-    }
-
-    @Override
-    public void onAutopilotIpcConnectStatusChanged(int status, @Nullable String reason) {
-    }
-
-    @Override
-    public void onAutopilotSNRequest() {
-    }
-
-    @Override
-    public void onAutopilotStatusRespByQuery(@NonNull SystemStatusInfo.StatusInfo status) {
-
-    }
-
-    private void updateConnectInfoView(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
-        if (!isFloatingLayerHidden) {// 遮罩层显示的时候
-            mConnAdapter.updateData(autoPilotStatusInfo);
-            mConnectInfoRV.scrollToPosition(mConnAdapter.getItemCount() - 1);
-            mLastStatus = autoPilotStatusInfo.getIpcConnStatus();
-        } else {// 遮罩层隐藏的时候
-            CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(TAG);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(TAG);
-        MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG);
-        IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController();
-        if (mapUIController != null) {
-            mapUIController.destroy();
-        }
-        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false);
-
-        CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy.");
-        ContextHolderUtil.releaseContext();
-        MogoModulesManager.getInstance().onDestroy();
-        FloatingViewHandler.clear();
-        ProcessUtils.killAllBackgroundProcesses();
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == MOGO_PERMISSION_REQUEST_CODE) {
-            boolean isAllGranted = true;
-            // 判断是否所有的权限都已经授予了
-            for (int grant : grantResults) {
-                if (grant != PackageManager.PERMISSION_GRANTED) {
-                    isAllGranted = false;
-                    break;
-                }
-            }
-
-            if (isAllGranted) {
-                isFirst = false;
-            } else {
-                // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮
-                if (!isFirst) {
-                    PermissionsDialogUtils.openAppDetails(this, null, REQUEST_CODE_DIALOG);
-                    isFirst = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * 由于应用是单页面的，所以采用Fragment将各模块的UI进行分割解耦合
-     *
-     * @param newFragment 功能UI
-     * @param tagName     UI绑定的Tag
-     * @param containerId 要加入的资源ID
-     */
-    private void addFragment(Fragment newFragment, String tagName, int containerId) {
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag(tagName);
-        if (fragment == null) {
-            fragment = newFragment;
-        }
-        if (fragment == null) {
-            CallerLogger.INSTANCE.e(M_HMI + TAG, "add fragment fail  cause fragment == null, container is " + ResourcesHelper.getResNameById(getApplicationContext(), containerId));
-            return;
-        }
-        getSupportFragmentManager().beginTransaction()
-                .replace(containerId, fragment, tagName)
-                .commitAllowingStateLoss();
-    }
-
-    @Override
-    public void onPointerCaptureChanged(boolean hasCapture) {
-        super.onPointerCaptureChanged(hasCapture);
-    }
-}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -0,0 +1,410 @@
+package com.mogo.eagle.core.function.main
+
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.alibaba.android.arouter.launcher.ARouter
+import com.kwai.koom.base.MonitorManager.addMonitorConfig
+import com.kwai.koom.nativeoom.leakmonitor.LeakListener
+import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor.start
+import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig
+import com.kwai.koom.nativeoom.leakmonitor.LeakRecord
+import com.mogo.commons.analytics.AnalyticsUtils
+import com.mogo.commons.context.ContextHolderUtil
+import com.mogo.commons.debug.DebugConfig
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.commons.mvp.BaseFragment
+import com.mogo.commons.mvp.MvpActivity
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
+import com.mogo.eagle.core.data.config.HdMapBuildConfig
+import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+import com.mogo.eagle.core.data.deva.chain.ChainConstant
+import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
+import com.mogo.eagle.core.function.call.startup.CallerStartUpManager.initStageTwo
+import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
+import com.mogo.eagle.core.function.main.modules.MogoModulesManager
+import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler
+import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils
+import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper
+import com.mogo.eagle.core.utilcode.util.BarUtils
+import com.mogo.eagle.core.utilcode.util.NetworkUtils
+import com.mogo.eagle.core.utilcode.util.ProcessUtils
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.map.listener.IMogoMapListener
+import com.mogo.map.listener.MogoMapListenerHandler.Companion.mogoMapListenerHandler
+import com.mogo.map.uicontroller.EnumMapUI
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb
+import com.zhjt.mogo_core_function_devatools.monitor.db.MonitorDb.Companion.getDb
+import com.zhjt.service.chain.ChainLog
+import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
+import kotlinx.android.synthetic.main.module_main_activity_main.*
+import mogo.telematics.pad.MessagePad
+import mogo_msg.MogoReportMsg
+import system_master.SystemStatusInfo
+
+/**
+ * @author congtaowang
+ * @since 2019-12-23
+ *
+ *
+ * 描述：加载各个模块
+ */
+open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
+    IMoGoAutopilotStatusListener {
+
+    companion object {
+        protected const val TAG = "MainActivity"
+        private const val REQUEST_CODE_DIALOG = 100
+    }
+
+    private var isFirst = false
+    private var mConnAdapter: ConnInfoAdapter? = null
+    private val dataList: List<AutopilotStatusInfo> = ArrayList()
+    private var mLastStatus = 0x00
+    private var isFloatingLayerHidden = false
+
+    override fun getLayoutId(): Int {
+        return R.layout.module_main_activity_main
+    }
+
+    override fun initViews() {
+        injectStatusBar()
+        window.setBackgroundDrawable(null)
+        initConnectInfoRV()
+        FloatingViewHandler.init(module_main_id_floating_view)
+        CallerHmiManager.init(this)
+
+        //申请悬浮窗权限
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // 检查是否有悬浮窗权限
+            if (Settings.canDrawOverlays(this)) {
+                return
+            }
+            PermissionsDialogUtils.openAppDetails(this, "显示悬浮窗", REQUEST_CODE_DIALOG)
+        }
+    }
+
+    private fun injectStatusBar() {
+        val decorView = this.window.decorView as FrameLayout
+        val contentView =
+            (decorView.findViewById<View>(android.R.id.content) as ViewGroup).getChildAt(0)
+        contentView.fitsSystemWindows = false
+        decorView.clipToPadding = false
+        var statusBarView = decorView.findViewWithTag<View>("status_bar")
+        if (statusBarView == null) {
+            statusBarView = StatusBarView(this)
+            statusBarView.setTag("status_bar")
+        }
+        val statusBarLP = FrameLayout.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            BarUtils.getStatusBarHeight()
+        )
+        statusBarLP.topMargin = 0
+        statusBarLP.gravity = Gravity.TOP
+        decorView.addView(statusBarView, statusBarLP)
+    }
+
+    /**
+     * 修改statusBar 重写实现，需要继承 StatusBarView，xml中基础系统控件不要修改其id，拿来即用
+     * @return StatusBarView
+     */
+    protected val statusBarView: StatusBarView
+        get() = StatusBarView(this)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        calculateStartTime()
+        ContextHolderUtil.holdContext(this)
+        // 监听工控机连接信息
+        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
+        initStageTwo()
+        // 加载模块
+        mPresenter!!.postLoadModuleMsg()
+        // 监听网络状态
+        NetworkUtils.listenNetStrength(this)
+        mPresenter!!.checkPermission(this)
+
+        // 同步AppInfo Config信息
+        CallerDevaToolsManager.syncConfig()
+    }
+
+    private fun calculateStartTime() {
+        val coldStartTime = AppLaunchTimeUtils.getTimeCalculate(AppLaunchTimeUtils.COLD_START)
+        // 这里记录的TimeUtils.coldStartTime是指Application启动的时间，最终的冷启动时间等于Application启动时间+热启动时间
+        AppLaunchTimeUtils.sColdStartTime = if (coldStartTime > 0) coldStartTime else 0
+        AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.HOT_START)
+    }
+
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            // 统计代码
+            val properties: MutableMap<String, Any> = HashMap()
+            val hotStartTime = AppLaunchTimeUtils.getTimeCalculate(AppLaunchTimeUtils.HOT_START)
+            if (AppLaunchTimeUtils.sColdStartTime > 0 && hotStartTime > 0) {
+                // 真正的冷启动时间 = Application启动时间 + 热启动时间
+                val coldStartTime = AppLaunchTimeUtils.sColdStartTime + hotStartTime
+                // 过滤掉异常启动时间
+                if (coldStartTime < 50000) {
+                    // 上传冷启动时间coldStartTime
+                    i(SceneConstant.M_HMI + TAG, "coldStartTime:$coldStartTime")
+                    properties["app_launch_coldStartTime"] = coldStartTime
+                }
+            } else if (hotStartTime > 0) {
+                // 过滤掉异常启动时间
+                if (hotStartTime < 30000) {
+                    // 上传热启动时间hotStartTime
+                    i(SceneConstant.M_HMI + TAG, "hotStartTime:$hotStartTime")
+                    properties["app_launch_hotStartTime"] = hotStartTime
+                }
+            }
+            AnalyticsUtils.track("app_launch_time", properties)
+        }
+    }
+
+    private fun initConnectInfoRV() {
+        mConnAdapter = ConnInfoAdapter(this, dataList)
+        rvConnectInfo.layoutManager = LinearLayoutManager(this)
+        rvConnectInfo.adapter = mConnAdapter
+    }
+
+    override fun loadModules() {
+        val start = System.currentTimeMillis()
+        MogoStatusManager.getInstance().setVrMode(TAG, true)
+        MogoModulesManager.getInstance().init(this)
+        loadOthersModules()
+        mogoMapListenerHandler.registerHostMapListener(TAG, object : IMogoMapListener {
+            override fun onMapLoaded() {
+                // 延时加载其他模块
+                window.decorView.post {
+                    HdMapBuildConfig.isMapLoaded = true
+                    mPresenter!!.delayOperations()
+                    loadFunctionFragment()
+                    // 设置地图样式
+                    mogoMapListenerHandler.onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR)
+                }
+                i(
+                    SceneConstant.M_HMI + TAG,
+                    "App launch timer cost " + (System.currentTimeMillis() - start) + "ms"
+                )
+            }
+        })
+    }
+
+    /**
+     * 加载其它模块
+     */
+    protected open fun loadOthersModules() {
+        // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
+        MogoModulesManager.getInstance().loadFunctionModules()
+        MogoModulesManager.getInstance().loadFunctionModulesServer()
+        UiThreadHandler.postDelayed({
+            d(SceneConstant.M_HMI + TAG, "5秒已过，启动基础服务……")
+            MogoModulesManager.getInstance().loadBaseModule()
+        }, 5000L)
+        if (DebugConfig.isDebug()) {
+            // 启动Native内存泄漏监测
+            startLeakMonitor()
+        }
+        checkMonitorDb()
+    }
+
+    private fun startLeakMonitor() {
+        val leakMonitorConfig: LeakMonitorConfig = LeakMonitorConfig.Builder()
+            .setLoopInterval(50000)
+            .setMonitorThreshold(16)
+            .setNativeHeapAllocatedThreshold(0)
+            .setSelectedSoList(
+                arrayOf(
+                    "libhdmap", "libmap",
+                    "libAMapSDK_NAVI_v8_0_1", "libZegoExpressEngine",
+                    "libcntts"
+                )
+            )
+            .setEnableLocalSymbolic(DebugConfig.isDebug())
+            .setLeakListener(object : LeakListener {
+                override fun onLeak(leaks: MutableCollection<LeakRecord>) {
+                    val stringBuilder = StringBuilder()
+                    if (!leaks.isEmpty()) {
+                        for (leakRecord in leaks) {
+                            stringBuilder.append(leakRecord.toString())
+                        }
+                        printLeakMsg(stringBuilder.toString())
+                    }
+                }
+            })
+            .build()
+        addMonitorConfig(leakMonitorConfig)
+        start()
+    }
+
+    private fun checkMonitorDb() {
+        Thread {
+            val limitId: Long = 50001
+            val file = getDatabasePath(MonitorDb.INTERNAL_DB_NAME)
+            try {
+                if (file != null && file.exists()) {
+                    val cpuList = getDb(this).monitorDao().getAllCPUById(limitId)
+                    val memList = getDb(this).monitorDao().getAllMemById(limitId)
+                    // 大于5w条清除
+                    if (cpuList.isNotEmpty() || memList.isNotEmpty()) {
+                        deleteDatabase(MonitorDb.INTERNAL_DB_NAME)
+                    }
+                }
+            } catch (e: Exception) {
+                e(TAG, e.message)
+            }
+        }.start()
+    }
+
+    @ChainLog(
+        linkChainLog = ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK,
+        linkCode = ChainConstant.CHAIN_LINK_LEAK,
+        endpoint = PAD,
+        nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK,
+        paramIndexes = [0],
+        clientPkFileName = "sn"
+    )
+    private fun printLeakMsg(leakRecord: String) {
+        d(SceneConstant.M_HMI + TAG, "内存泄漏日志如下：\n$leakRecord")
+    }
+
+    override fun hideCoverUpLayout() {
+        rvConnectInfo.visibility = View.GONE
+        window.setBackgroundDrawable(null)
+        module_main_id_cover_up!!.visibility = View.GONE
+        isFloatingLayerHidden = true
+    }
+
+    override fun loadFunctionFragment() {
+        d(SceneConstant.M_HMI + TAG, "loadFunctionFragment……")
+        // 加载 小地图 图层
+        val fragmentSmpMap = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP)
+            .navigation() as BaseFragment
+        addFragment(fragmentSmpMap, fragmentSmpMap.tagName, R.id.module_main_id_smp_fragment)
+    }
+
+    override fun createPresenter(): MainPresenter {
+        return MainPresenter(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, true)
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, false)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, true)
+    }
+
+    override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
+        val status = autoPilotStatusInfo.ipcConnStatus
+        if (mLastStatus != status) {
+            val statusInfo = autoPilotStatusInfo.clone()
+            rvConnectInfo.post { updateConnectInfoView(statusInfo) }
+            mLastStatus = status
+        }
+    }
+
+    private fun updateConnectInfoView(autoPilotStatusInfo: AutopilotStatusInfo) {
+        if (!isFloatingLayerHidden) { // 遮罩层显示的时候
+            mConnAdapter!!.updateData(autoPilotStatusInfo)
+            rvConnectInfo.scrollToPosition(mConnAdapter!!.itemCount - 1)
+            mLastStatus = autoPilotStatusInfo.ipcConnStatus
+        } else { // 遮罩层隐藏的时候
+            CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        mogoMapListenerHandler.unregisterHostMapListener(TAG)
+        val mapUIController = getMapUIController()
+        mapUIController?.destroy()
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false)
+        d(SceneConstant.M_HMI + TAG, "destroy.")
+        ContextHolderUtil.releaseContext()
+        MogoModulesManager.getInstance().onDestroy()
+        FloatingViewHandler.clear()
+        ProcessUtils.killAllBackgroundProcesses()
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        if (requestCode == MainPresenter.MOGO_PERMISSION_REQUEST_CODE) {
+            var isAllGranted = true
+            // 判断是否所有的权限都已经授予了
+            for (grant in grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
+                    isAllGranted = false
+                    break
+                }
+            }
+            if (isAllGranted) {
+                isFirst = false
+            } else {
+                // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮
+                if (!isFirst) {
+                    PermissionsDialogUtils.openAppDetails(this, null, REQUEST_CODE_DIALOG)
+                    isFirst = true
+                }
+            }
+        }
+    }
+
+    /**
+     * 由于应用是单页面的，所以采用Fragment将各模块的UI进行分割解耦合
+     *
+     * @param newFragment 功能UI
+     * @param tagName     UI绑定的Tag
+     * @param containerId 要加入的资源ID
+     */
+    private fun addFragment(newFragment: Fragment, tagName: String, containerId: Int) {
+        var fragment = supportFragmentManager.findFragmentByTag(tagName)
+        if (fragment == null) {
+            fragment = newFragment
+        }
+        if (fragment == null) {
+            e(
+                SceneConstant.M_HMI + TAG,
+                "add fragment fail  cause fragment == null, container is " + ResourcesHelper.getResNameById(
+                    applicationContext, containerId
+                )
+            )
+            return
+        }
+        supportFragmentManager.beginTransaction()
+            .replace(containerId, fragment, tagName)
+            .commitAllowingStateLoss()
+    }
+
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -5,6 +5,7 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT;
 import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_F;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN;

 import android.content.Intent;
 import android.os.Bundle;
@@ -93,13 +94,6 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
    @Override
    protected void initViews() {
        super.initViews();
-        // 这里在初始化完GUI后，做一些个性化的定制
-        // 小巴车的乘客屏幕
-        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) &&
-                AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-            FrameLayout frameLayout = findViewById(R.id.module_main_id_map_fragment_container);
-            frameLayout.setPadding(0, 0, AutoSizeUtils.dp2px(getContext(), 700), 0);
-        }
    }

    @Override
@@ -134,7 +128,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
    @Override
    protected void loadOthersModules() {
        super.loadOthersModules();
-        CallerLogger.INSTANCE.d(M_HMI + TAG, "loadOthersModules");
+        CallerLogger.INSTANCE.d(M_MAIN + TAG, "loadOthersModules");
        loadOCHModule();
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java
@@ -15,14 +15,12 @@ import android.os.Process;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.widget.FrameLayout;

 import androidx.annotation.Nullable;

 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.module.intent.IMogoIntentListener;
 import com.mogo.commons.module.intent.IntentManager;
-import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
 import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager;
@@ -30,7 +28,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.main.moujie.BluetoothMonitorReceiver;
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
@@ -47,8 +44,6 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;

-import me.jessyan.autosize.utils.AutoSizeUtils;
-
 /**
 * 针对作为Launcher的情况，做个性化操作
 *
@@ -91,13 +86,6 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte
    @Override
    protected void initViews() {
        super.initViews();
-        // 这里在初始化完GUI后，做一些个性化的定制
-        // 小巴车的乘客屏幕
-        if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) &&
-                AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-            FrameLayout frameLayout = findViewById(R.id.module_main_id_map_fragment_container);
-            frameLayout.setPadding(0, 0, AutoSizeUtils.dp2px(getContext(),700), 0);
-        }
    }

    @Override
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/modules/MogoModulesManager.java
@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.main.modules;

 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN;

 import android.app.Application;
 import android.content.Context;
@@ -82,7 +83,7 @@ public class MogoModulesManager implements MogoModulesHandler {
        final List<MogoModule> modules = MogoModulePaths.getModuleFunctions();
        if (modules != null && !modules.isEmpty()) {
            for (MogoModule module : modules) {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "module.getPath():" + module.getPath() + "     name: " + module.getName());
+                CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + "     name: " + module.getName());
                IMoGoFunctionProvider provider = loadFunction(module.getPath());
                if (provider != null) {
                    mModuleFunctionProviders.put(module, provider);
@@ -97,7 +98,7 @@ public class MogoModulesManager implements MogoModulesHandler {
        final List<MogoModule> modules = MogoModulePaths.getModuleFunctionServers();
        if (modules != null && !modules.isEmpty()) {
            for (MogoModule module : modules) {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "module.getPath():" + module.getPath() + "     name: " + module.getName());
+                CallerLogger.INSTANCE.d(M_MAIN + TAG, "module.getPath():" + module.getPath() + "     name: " + module.getName());
                IMoGoFunctionServerProvider provider = loadFunctionServer(module.getPath());
                if (provider != null) {
                    mModuleFunctionServerProviders.put(module, provider);
@@ -114,7 +115,7 @@ public class MogoModulesManager implements MogoModulesHandler {
            if (baseModule == null) {
                continue;
            }
-            CallerLogger.INSTANCE.d(M_HMI + TAG, "加载基本模块 : " + baseModule.getPath());
+            CallerLogger.INSTANCE.d(M_MAIN + TAG, "加载基本模块 : " + baseModule.getPath());
            loadBaseProvider(baseModule.getPath());
        }
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -1,42 +1,11 @@
 <?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="match_parent"
    android:layout_height="match_parent"
    android:background="@drawable/main_splash_bg"
    android:orientation="vertical">

-    <!-- 地图 -->
-    <FrameLayout
-        android:id="@+id/module_main_id_map_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <!--浓雾预警动画-->
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_special_effect"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/iv_wu1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:alpha="0"
-            android:src="@drawable/wu1"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_wu2"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:alpha="0"
-            android:src="@drawable/wu2"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent">
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning_fog.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning_fog.xml
@@ -3,7 +3,8 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:visibility="gone">

    <ImageView
        android:id="@+id/iv_wu1"