[Update]启动优化初版

2022-05-11 18:25:49 +08:00
parent c72d86c48f
commit 56f8c969b8
20 changed files with 771 additions and 473 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/ConnInfoAdapter.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/ConnInfoAdapter.java
@@ -0,0 +1,70 @@
+package com.mogo.eagle.core.function.main;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Color;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
+import com.mogo.eagle.core.function.hmi.R;
+
+import java.util.List;
+
+public class ConnInfoAdapter extends RecyclerView.Adapter<ConnInfoAdapter.ConnInfoViewHolder> {
+
+    private List<AutopilotStatusInfo> data;
+    private Context context;
+
+    public ConnInfoAdapter(Context context, List<AutopilotStatusInfo> data) {
+        this.data = data;
+        this.context = context;
+    }
+
+    public void updateData(AutopilotStatusInfo statusInfo) {
+        if (data.size() > 999) {
+            data.clear();
+        }
+        data.add(statusInfo);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public ConnInfoViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(context).inflate(R.layout.autopilot_connect_status_item, parent, false);
+        return new ConnInfoViewHolder(view);
+    }
+
+    @SuppressLint("ResourceAsColor")
+    @Override
+    public void onBindViewHolder(@NonNull ConnInfoViewHolder holder, int position) {
+        AutopilotStatusInfo statusInfo = data.get(position);
+        if (statusInfo.getConnectStatus()) {
+            holder.mContentView.setTextColor(Color.parseColor("#FFFFFF"));
+        } else {
+            holder.mContentView.setTextColor(Color.parseColor("#FF4040"));
+        }
+        holder.mContentView.setText(statusInfo.toString());
+    }
+
+    @Override
+    public int getItemCount() {
+        return data != null ? data.size() : 0;
+    }
+
+    public static class ConnInfoViewHolder extends RecyclerView.ViewHolder {
+
+        private TextView mContentView;
+
+        public ConnInfoViewHolder(@NonNull View itemView) {
+            super(itemView);
+            mContentView = itemView.findViewById(R.id.tvStatusInfo);
+        }
+    }
+}
--- 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
@@ -15,18 +15,26 @@ 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.mogo.cloud.commons.BuildConfig;
 import com.mogo.commons.context.ContextHolderUtil;
 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.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.map.MogoLocation;
+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.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.main.cards.MogoModulesManager;
 import com.mogo.eagle.core.function.main.service.MogoMainService;
+import com.mogo.eagle.core.function.main.stagetwo.APMStartup;
+import com.mogo.eagle.core.function.main.stagetwo.AutopilotStartup;
 import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper;
 import com.mogo.eagle.core.function.main.windowview.FloatingViewHandler;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
@@ -44,10 +52,18 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.fragmentmanager.FragmentStackTransactionListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.rousetime.android_startup.StartupManager;
+import com.rousetime.android_startup.model.LoggerLevel;
+import com.rousetime.android_startup.model.StartupConfig;

+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;
+
 /**
 * @author congtaowang
 * @since 2019-12-23
@@ -56,7 +72,8 @@ import java.util.Map;
 */
 public class MainActivity extends MvpActivity<MainView, MainPresenter> implements MainView,
        IMogoLocationListener,
-        FragmentStackTransactionListener {
+        FragmentStackTransactionListener,
+        IMoGoAutopilotStatusListener {

    protected static final String TAG = "MainActivity";
    private static final int REQUEST_CODE_DIALOG = 100;
@@ -71,6 +88,11 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement

    private boolean isFirst = false;

+    private RecyclerView mConnectInfoRV;
+    private ConnInfoAdapter mConnAdapter;
+    private List<AutopilotStatusInfo> dataList = new ArrayList<>();
+    private boolean isFloatingLayerHidden = false;
+
    @Override
    protected int getLayoutId() {
        return R.layout.module_main_activity_main;
@@ -89,10 +111,10 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        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);

-
        //申请悬浮窗权限
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
            // 检查是否有悬浮窗权限
@@ -118,6 +140,9 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        super.onCreate(savedInstanceState);
        calculateStartTime();
        ContextHolderUtil.holdContext(this);
+        // 监听工控机连接信息
+        CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, this);
+        startUpInStage2();
        // 加载模块
        mPresenter.postLoadModuleMsg();
        // 监听网络状态
@@ -171,6 +196,32 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        mMogoStatusManager.setMainPageLaunchedStatus(TAG, true);
    }

+    private void initConnectInfoRV() {
+        mConnAdapter = new ConnInfoAdapter(this, dataList);
+        mConnectInfoRV.setLayoutManager(new LinearLayoutManager(this));
+        mConnectInfoRV.setAdapter(mConnAdapter);
+    }
+
+    /**
+     * 第二阶段初始化，第一阶段初始化可查看：{@link com.mogo.launcher.stageone}
+     */
+    public void startUpInStage2() {
+        StartupConfig config = null;
+        if (BuildConfig.DEBUG) {
+            config = new StartupConfig.Builder()
+                    .setLoggerLevel(LoggerLevel.DEBUG)
+                    .setOpenStatistics(true)
+                    .build();
+        }
+        new StartupManager.Builder()
+                .addStartup(new AutopilotStartup())
+                .addStartup(new APMStartup())
+                .setConfig(config)
+                .build(this)
+                .start()
+                .await();
+    }
+
    @Override
    public void loadModules() {
        final long start = System.currentTimeMillis();
@@ -186,7 +237,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        EventDispatchCenter.getInstance().setMapLoadedCallback(() -> {
            CallerLogger.INSTANCE.d(M_HMI + TAG, "map loaded." + Thread.currentThread().getName());
            // 延时加载其他模块
-            getWindow().getDecorView().postDelayed(() -> {
+            getWindow().getDecorView().post(() -> {
                loadOthersModules();
                loadFunctionFragment();

@@ -194,7 +245,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
                // 设置地图样式
                MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
-            }, 1000);
+            });
            CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
        });

@@ -239,8 +290,10 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement

    @Override
    public void hideCoverUpLayout() {
+        mConnectInfoRV.setVisibility(View.GONE);
        getWindow().setBackgroundDrawable(null);
        mCoverUpLayout.setVisibility(View.GONE);
+        isFloatingLayerHidden = true;
    }

    @Override
@@ -317,9 +370,33 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        return mServiceApis;
    }

+    @Override
+    public void onAutopilotStatusResponse(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
+        mConnectInfoRV.post(() -> updateConnectInfoView(autoPilotStatusInfo));
+    }
+
+    @Override
+    public void onAutopilotArriveAtStation(@Nullable MessagePad.ArrivalNotification arrivalNotification) {}
+
+    @Override
+    public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) {}
+
+    @Override
+    public void onAutopilotSNRequest() {}
+
+    private void updateConnectInfoView(@NonNull AutopilotStatusInfo autoPilotStatusInfo) {
+        if (!isFloatingLayerHidden) {// 遮罩层显示的时候
+            mConnAdapter.updateData(autoPilotStatusInfo);
+            mConnectInfoRV.scrollToPosition(mConnAdapter.getItemCount() - 1);
+        } else {// 遮罩层隐藏的时候
+            CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(TAG);
+        }
+    }
+
    @Override
    protected void onDestroy() {
        super.onDestroy();
+        CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(TAG);
        IMogoHosListenerRegister listenerRegister = CallerMapUIServiceManager.INSTANCE.getHostListenerRegister();
        if (listenerRegister != null) {
            listenerRegister.unregisterMarkerClickListener();
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -6,25 +6,14 @@ import android.content.Context;
 import android.os.Process;

 import com.bytedance.boost_multidex.BoostMultiDex;
-import com.mogo.aicloud.services.locationinfo.MogoLocationInfoServices;
-import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
-import com.mogo.cloud.httpdns.MogoHttpDnsConfig;
-import com.mogo.cloud.httpdns.bean.HttpDnsSimpleLocation;
-import com.mogo.cloud.passport.IMoGoTokenCallback;
-import com.mogo.cloud.passport.MoGoAiCloudClient;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.cloud.socket.SocketBuildConfig;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.constants.SharedPrefsConstants;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.commons.network.Utils;
 import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.constants.MoGoConfig;
 import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.chat.biz.ChatConsts;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.notice.PushUIConstants;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
@@ -32,16 +21,10 @@ 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.ProcessUtils;
 import com.mogo.map.MapApiPath;
-import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
-import com.mogo.module.common.constants.HostConst;
 import com.mogo.module.service.ServiceConst;
-import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
-import com.mogo.test.crashreport.CrashReportConstants;
-import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
 import com.zhidao.support.obu.ami.AmiClientManager;
-import com.zhjt.mogo_core_function_devatools.DevaToolsProvider;

 import java.lang.reflect.Field;

@@ -57,19 +40,17 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {

    @Override
    public void onCreate() {
-        initBuildConfig();
-        initConfigWithSP();
        super.onCreate();
        if (!shouldInit()) {
            return;
        }
        start = System.currentTimeMillis();
+        connectAmiIp();
        // Crash 日志收集
        initCrashConfig();
        initLogConfig();
        initTipToast();
        initModules();
-        initCloudClientConfig();
    }

    @Override
@@ -78,26 +59,11 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
        return ProcessUtils.isMainProcess(this);
    }

-    /**
-     * BuildConfig中渠道配置赋值
-     */
-    protected abstract void initBuildConfig();
-
-    /**
-     * 从SP本地设置中恢复数据
-     */
-    protected abstract void initConfigWithSP();
-
    /**
     * 初始化异常采集配置
     */
    protected abstract void initCrashConfig();

-    /**
-     * 初始化异常采集配置
-     */
-    protected abstract void initAnalyticsConfig();
-
    /**
     * 初始化日志
     */
@@ -115,149 +81,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
        CallerDevaToolsManager.INSTANCE.init(this);
    }

-
-    /**
-     * 初始化 MoGoAiCloudClientConfig
-     */
-    protected abstract void initCloudClientConfig();
-
-
-    @Override
-    protected void asyncInitImpl() {
-        super.asyncInitImpl();
-        initAnalyticsConfig();
-    }
-
-    @Override
-    protected void initHttpDns() {
-        super.initHttpDns();
-        prepareBaseService();
-    }
-
-    /**
-     * 基础服务：passport、location、socket
-     */
-    private void prepareBaseService() {
-        // 第三方平台的sn是由AI云SDK中服务调用通过服务端生成的
-        preparePassportEnvironment();
-    }
-
-    private void preparePassportEnvironment() {
-
-        // 设置网络环境：HTTP_DNS_ENV_QA、HTTP_DNS_ENV_RELEASE、HTTP_DNS_ENV_DEV
-        switch (DebugConfig.getNetMode()) {
-            case DebugConfig.NET_MODE_DEV:
-                clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_DEV);
-                break;
-            case DebugConfig.NET_MODE_QA:
-                clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA);
-                break;
-            case DebugConfig.NET_MODE_DEMO:
-                clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO);
-                break;
-            default:
-                clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_RELEASE);
-        }
-        // 设置是否是第三APP登录
-        clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE);
-        // 设置是否输出日志
-        clientConfig.setShowDebugLog(true);
-        // 设置是否输出网络日志
-        clientConfig.setShowNetDebugLog(false);
-        // 设置是否是直播推流的主播
-        clientConfig.setAnchor(true);
-        // 设置从蘑菇AI开放平台获取的APPKey
-        switch (DebugConfig.getCarMachineType()) {
-            // 比亚迪
-            case DebugConfig.CAR_MACHINE_TYPE_BYD:
-                clientConfig.setThirdPartyAppKey("bydauto");
-                break;
-            // 衡阳-鹰眼项目
-            case DebugConfig.CAR_MACHINE_TYPE_LENOVO:
-                clientConfig.setThirdPartyAppKey("pfieouqg");
-                break;
-            // 自研车机
-            default:
-                clientConfig.setThirdPartyAppKey("wbvpzgar");
-                break;
-        }
-        // 设置应用服务AppId  长链、鉴权
-        if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE) {
-            clientConfig.setServiceAppId("com_mogo_launcher");
-        } else {
-            clientConfig.setServiceAppId("com.mogo.launcher");
-        }
-        // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
-        // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备）
-        clientConfig.setThirdPartyDeviceId(Utils.getDevicesId());
-        // 设置循环检测间隔时间（每隔2小时loop一次httpDnsConfig）
-        clientConfig.setLoopCheckDelay(60 * 60 * 2 * 1000);
-        //设置长链接的secretKey  //todo 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
-        clientConfig.setSecretKey("YMj2VFDFxJ3Q4gNoZceJ");
-        //连接ami
-        connectAmiIp();
-
-//        todo 使用旧链路
-//        clientConfig.setUseOriginSocket(true);
-
-        clientConfig.setIHttpDnsCurrentLocation(() -> {
-            MogoLocation mogoLocation = null;
-            IMogoLocationClient locationClient = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApp());
-            if (locationClient != null) {
-                mogoLocation = locationClient.getLastKnowLocation();
-            }
-            HttpDnsSimpleLocation httpDnsSimpleLocation;
-            if (mogoLocation != null
-                    && mogoLocation.getLatitude() != 0
-                    && mogoLocation.getLongitude() != 0) {
-                httpDnsSimpleLocation = new HttpDnsSimpleLocation(
-                        mogoLocation.getCityCode(),
-                        mogoLocation.getLatitude(),
-                        mogoLocation.getLongitude());
-            } else {
-                String ciyCode = SharedPrefsMgr.getInstance(getApp())
-                        .getString(SharedPrefsConstants.LOCATION_CITY_CODE);
-                String latitude = SharedPrefsMgr.getInstance(getApp())
-                        .getString(SharedPrefsConstants.LOCATION_LATITUDE);
-                String longitude = SharedPrefsMgr.getInstance(getApp())
-                        .getString(SharedPrefsConstants.LOCATION_LONGITUDE);
-                try {
-                    httpDnsSimpleLocation = new HttpDnsSimpleLocation(
-                            ciyCode,
-                            Double.parseDouble(latitude),
-                            Double.parseDouble(longitude));
-                } catch (NumberFormatException e) {
-                    // e.printStackTrace();
-                    httpDnsSimpleLocation = new HttpDnsSimpleLocation("010", 1, 1);
-                }
-                //CallerLogger.INSTANCE.d(M_HMI + TAG, "使用缓存GPS信息：" + httpDnsSimpleLocation);
-            }
-            return httpDnsSimpleLocation;
-        });
-
-        // 初始化SDK，可以设置状态回调来监听
-        MoGoAiCloudClient.getInstance().init(this, clientConfig).addTokenCallbacks(
-                new IMoGoTokenCallback() {
-                    @Override
-                    public void onTokenGot(String token, String sn) {
-                        CallerLogger.INSTANCE.d(M_HMI + TAG, "onTokenGot ");
-                        clientConfig.setToken(token);
-                        // 异步初始化NetConfig
-                        asyncInit();
-                        // HttpDns ttl回调 --- socketTTL
-                        registerSocketHttpDnsTTL(HostConst.SOCKET_CENTER_DOMAIN);
-                        // 开启每5s/次定位上报
-                        uploadLocPerFiveSecond();
-                    }
-
-                    @Override
-                    public void onError(int code, String msg) {
-                        CallerLogger.INSTANCE.d(M_HMI + TAG, "初始化MogoAiCloudSdk failed ,reason : " + msg + " , 未能开启长链服务和初始化Modules服务");
-                    }
-                }
-        );
-    }
-
    /**
     * 连接ami
     */
@@ -266,69 +89,15 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
        AmiClientManager.getInstance().setObuIp(ipAddress);
    }

-    /**
-     * 上传自车位置信息到云端
-     */
-    private void uploadLocPerFiveSecond() {
-        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
-            MogoLocationInfoServices.getInstance().init(getApplicationContext());
-            MogoLocationInfoServices.getInstance().start();
-            IMogoLocationClient locationClient = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApplicationContext());
-            if (locationClient != null) {
-                locationClient.addLocationListener(location -> MogoLocationInfoServices.getInstance().provideLocation(location));
-            }
-        }
-    }
-
-    private void startSocketService() {
-        CallerLogger.INSTANCE.d(M_HMI + TAG, "startSocketService");
-        MogoLocation location = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApp()).getLastKnowLocation();
-        // 关闭长链服务
-        MogoAiCloudSocketManager.getInstance(getApplicationContext()).destroy();
-        MogoAiCloudSocketManager.getInstance(getApplicationContext()).registerLifecycleListener(10020, new IMogoLifecycleListener() {
-            @Override
-            public void onConnectFailure() {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "socket-onConnectFailure");
-                DebugConfig.setDownloadSnapshot(false);
-            }
-
-            @Override
-            public void onConnectSuccess() {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "socket-onConnectSuccess");
-                DebugConfig.setDownloadSnapshot(true);
-            }
-
-            @Override
-            public void onConnectLost() {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "socket-onConnectLost");
-                DebugConfig.setDownloadSnapshot(false);
-            }
-        });
-        // 开启Socket长链服务
-        double lat = location.getLatitude();
-        double lon = location.getLongitude();
-        MogoAiCloudSocketManager.getInstance(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(), lat, lon);
-    }
-
-    @Override
-    protected void socketTTL() {
-        // 鉴权成功后开启socket长链服务
-        startSocketService();
-    }
-
    private void initModules() {
        CallerLogger.INSTANCE.d(M_HMI + TAG, "initModules");
-        // 初始化 bugly 升级
-        MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME));
-        // 初始化 apm 日志采集
-        MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME));
+        //och模块
+        MogoModulePaths.addModuleFunction(new MogoModule("/och/api", "IMoGoFunctionProvider"));

        MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder"));
        MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY));
        // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME));

-        // 域控制器模块（新）
-        MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AUTO_PILOT, "IMoGoAutoPilotProvider"));
        // OBU 模块
        MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider"));
        // 超视距，路测、行车记录仪监控
@@ -365,5 +134,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
            AppLaunchTimeUtils.beginTimeCalculate(AppLaunchTimeUtils.COLD_START);
        }
        BoostMultiDex.install(base);
+        AbsMogoApplication.sApp = this;
    }
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainPresenter.java
@@ -22,13 +22,13 @@ import com.mogo.eagle.core.function.main.constants.MainConstants;
 * <p>
 * 描述
 */
-public class MainPresenter extends Presenter< MainView > {
+public class MainPresenter extends Presenter<MainView> {

-    private Handler mMsgHandler = new Handler( Looper.getMainLooper() ) {
+    private Handler mMsgHandler = new Handler(Looper.getMainLooper()) {
        @Override
-        public void handleMessage( Message msg ) {
-            super.handleMessage( msg );
-            switch ( msg.what ) {
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
                case MainConstants.MSG_HIDE_MAP_COVER_FRAME:
                    mView.hideCoverUpLayout();
                    break;
@@ -41,14 +41,14 @@ public class MainPresenter extends Presenter< MainView > {

    public static final int MOGO_PERMISSION_REQUEST_CODE = 10000;

-    public MainPresenter( MainView view ) {
-        super( view );
-        SchemeIntent.getInstance().init( getContext(), mView.getApis() );
+    public MainPresenter(MainView view) {
+        super(view);
+        SchemeIntent.getInstance().init(getContext(), mView.getApis());
    }

    @Override
-    public void onCreate( @NonNull LifecycleOwner owner ) {
-        super.onCreate( owner );
+    public void onCreate(@NonNull LifecycleOwner owner) {
+        super.onCreate(owner);
    }

    public void checkPermission(Activity activity) {
@@ -96,25 +96,20 @@ public class MainPresenter extends Presenter< MainView > {
        return true;
    }

-
    /**
     * 延时操作
     */
    public void delayOperations() {
-        mMsgHandler.sendEmptyMessageDelayed( MainConstants.MSG_HIDE_MAP_COVER_FRAME, 150L );
+        mMsgHandler.sendEmptyMessage(MainConstants.MSG_HIDE_MAP_COVER_FRAME);
    }

    public void postLoadModuleMsg() {
        Message msg = Message.obtain();
        msg.what = MainConstants.MSG_LOAD_MODULES;
-        mMsgHandler.sendMessageDelayed( msg, 500 );
+        mMsgHandler.sendMessage(msg);
    }

-    public void handleSchemeIntent( Intent intent, boolean isOnNewIntent ) {
-        SchemeIntent.getInstance().handle( intent, isOnNewIntent );
-    }
-
-    public void initADAS(){
-
+    public void handleSchemeIntent(Intent intent, boolean isOnNewIntent) {
+        SchemeIntent.getInstance().handle(intent, isOnNewIntent);
    }
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/APMStartup.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/APMStartup.java
@@ -0,0 +1,33 @@
+package com.mogo.eagle.core.function.main.stagetwo;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.test.crashreport.CrashReportConstants;
+import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
+import com.rousetime.android_startup.AndroidStartup;
+
+public class APMStartup extends AndroidStartup<Boolean> {
+    @Nullable
+    @Override
+    public Boolean create(@NonNull Context context) {
+        // bugly
+        ARouter.getInstance().build(UpgradeReportConstants.PATH).navigation();
+        // apm
+        ARouter.getInstance().build(CrashReportConstants.PATH).navigation();
+        return true;
+    }
+
+    @Override
+    public boolean callCreateOnMainThread() {
+        return true;
+    }
+
+    @Override
+    public boolean waitOnMainThread() {
+        return false;
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/AutopilotStartup.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/AutopilotStartup.java
@@ -0,0 +1,40 @@
+package com.mogo.eagle.core.function.main.stagetwo;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.eagle.core.data.constants.MogoServicePaths;
+import com.rousetime.android_startup.AndroidStartup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AutopilotStartup extends AndroidStartup<Boolean> {
+    @Nullable
+    @Override
+    public Boolean create(@NonNull Context context) {
+        ARouter.getInstance().build(MogoServicePaths.PATH_AUTO_PILOT).navigation();
+        return true;
+    }
+
+    @Override
+    public boolean callCreateOnMainThread() {
+        return true;
+    }
+
+    @Override
+    public boolean waitOnMainThread() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public List<String> dependenciesByName() {
+        List<String> deps = new ArrayList<>();
+        deps.add("com.mogo.eagle.core.function.main.stagetwo.APMStartup");
+        return deps;
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/MapStartup.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/stagetwo/MapStartup.java
@@ -0,0 +1,38 @@
+package com.mogo.eagle.core.function.main.stagetwo;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.rousetime.android_startup.AndroidStartup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MapStartup extends AndroidStartup<Boolean> {
+    @Nullable
+    @Override
+    public Boolean create(@NonNull Context context) {
+        // TODO:暂不支持分步加载
+        return true;
+    }
+
+    @Override
+    public boolean callCreateOnMainThread() {
+        return true;
+    }
+
+    @Override
+    public boolean waitOnMainThread() {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public List<String> dependenciesByName() {
+        List<String> deps = new ArrayList<>();
+        deps.add("com.mogo.eagle.core.function.main.stagetwo.APMStartup");
+        return deps;
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/autopilot_connect_status_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48px"
+    android:padding="12px">
+
+    <TextView
+        android:id="@+id/tvStatusInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textSize="24px"
+        tools:text="测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下测试数据看一下"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- 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
@@ -87,4 +87,10 @@
            app:layout_constraintTop_toTopOf="parent" />
    </androidx.constraintlayout.widget.ConstraintLayout>

+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvConnectInfo"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
 </FrameLayout>