wait to finish

2022-11-10 10:54:57 +08:00
parent 7868bf626f
commit a836c31728
189 changed files with 780 additions and 4887 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java
@@ -0,0 +1,56 @@
+package com.mogo.eagle.core.function.hmi.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Build;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.module.common.R;
+
+/**
+ * 浮在各种wm上面的dialog基类，调用了window.setType
+ *
+ * @author tongchenfei
+ */
+public class BaseFloatDialog extends Dialog {
+
+    private static final String TAG = "BaseFloatDialog";
+
+    public BaseFloatDialog(@NonNull Context context) {
+        this(context, R.style.BaseFloatDialogStyle);
+    }
+
+    public BaseFloatDialog(@NonNull Context context, int themeResId) {
+        super(context, themeResId);
+        if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
+            addFlag();
+        }
+    }
+
+    private void addFlag() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
+        } else {
+            getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        }
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
+                | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
+    }
+
+    @Override
+    public void show() {
+        CallerLogger.INSTANCE.d(TAG, "onShow====");
+        super.show();
+    }
+
+    @Override
+    public void dismiss() {
+        CallerLogger.INSTANCE.d( TAG, "onDismiss====");
+        super.dismiss();
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java
@@ -0,0 +1,140 @@
+package com.mogo.eagle.core.function.hmi.dialog;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.widget.TextView;
+
+import androidx.annotation.StringRes;
+
+import com.mogo.module.common.R;
+import com.mogo.module.common.wm.WindowManagerView;
+
+/**
+ * @author congtaowang
+ * @since 2020-04-24
+ * <p>
+ * 显示在最上层的对话框
+ */
+public class WMDialog implements DialogInterface {
+
+    private WMDialogParams mParams;
+    private WindowManagerView mWindowManagerView;
+
+    private WMDialog( WMDialogParams params ) {
+        this.mParams = params;
+        mWindowManagerView = new WindowManagerView.Builder( mParams.mContext ).contentView( R.layout.module_commons_layout_wm_dialog ).build();
+        initViews();
+    }
+
+    public void show() {
+        mWindowManagerView.show();
+    }
+
+    private void initViews() {
+        TextView ok = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_button_ok );
+        TextView cancel = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_button_cancel );
+        TextView content = mWindowManagerView.findViewById( R.id.module_commons_wm_dialog_content );
+
+        ok.setText( mParams.mOkButtonText );
+        if ( mParams.mOnOkButtonClickListener != null ) {
+            ok.setOnClickListener( view -> {
+                if ( mParams.mOnOkButtonClickListener != null ) {
+                    mParams.mOnOkButtonClickListener.onClick( WMDialog.this, DialogInterface.BUTTON_POSITIVE );
+                }
+            } );
+        }
+        cancel.setText( mParams.mCancelButtonText );
+        if ( mParams.mOnCancelButtonClickListener != null ) {
+            cancel.setOnClickListener( view -> {
+                if ( mParams.mOnCancelButtonClickListener != null ) {
+                    mParams.mOnCancelButtonClickListener.onClick( WMDialog.this, DialogInterface.BUTTON_NEGATIVE );
+                }
+            } );
+        }
+
+        content.setText( mParams.mContent );
+    }
+
+    @Override
+    public void cancel() {
+        dismiss();
+    }
+
+    @Override
+    public void dismiss() {
+        mWindowManagerView.dismiss();
+    }
+
+    public boolean isShowing() {
+        return mWindowManagerView.isShowing();
+    }
+
+    public static class Builder {
+
+        private Context mContext;
+        private WMDialogParams mParams;
+
+        public Builder( Activity activity ) {
+            this.mContext = activity;
+            mParams = new WMDialogParams();
+            mParams.mContext = activity;
+        }
+
+        public Builder setContent( CharSequence content ) {
+            mParams.mContent = content;
+            return this;
+        }
+
+        public Builder setContent( @StringRes int content ) {
+            mParams.mContent = mContext.getString( content );
+            return this;
+        }
+
+        public Builder setOkButton( CharSequence buttonText, OnClickListener listener ) {
+            mParams.mOkButtonText = buttonText;
+            mParams.mOnOkButtonClickListener = listener;
+            return this;
+        }
+
+        public Builder setOkButton( @StringRes int buttonText, OnClickListener listener ) {
+            mParams.mOkButtonText = mContext.getText( buttonText );
+            mParams.mOnOkButtonClickListener = listener;
+            return this;
+        }
+
+        public Builder setCancelButton( CharSequence buttonText, OnClickListener listener ) {
+            mParams.mCancelButtonText = buttonText;
+            mParams.mOnCancelButtonClickListener = listener;
+            return this;
+        }
+
+        public Builder setCancelButton( @StringRes int buttonText, OnClickListener listener ) {
+            mParams.mCancelButtonText = mContext.getText( buttonText );
+            mParams.mOnCancelButtonClickListener = listener;
+            return this;
+        }
+
+        public Builder setOnDialogDismissListener( OnDismissListener onDialogDismissListener ) {
+            mParams.mOnDialogDismissListener = onDialogDismissListener;
+            return this;
+        }
+
+        public WMDialog build() {
+            WMDialog dialog = new WMDialog( mParams );
+            return dialog;
+        }
+    }
+
+    public static class WMDialogParams {
+
+        //        public CharSequence mTitle;
+        public CharSequence mOkButtonText;
+        public CharSequence mCancelButtonText;
+        public CharSequence mContent;
+        public OnClickListener mOnOkButtonClickListener;
+        public OnClickListener mOnCancelButtonClickListener;
+        public OnDismissListener mOnDialogDismissListener;
+        public Context mContext;
+    }
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt
@@ -7,7 +7,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
-import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.eagle.core.data.enums.EventTypeEnum

 /**
 * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -23,7 +23,7 @@ import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
-import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.eagle.core.data.enums.EventTypeEnum
 import com.mogo.commons.mvp.BaseFragment
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.*
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ModifyBindingCarDialog.kt
@@ -1,49 +1,54 @@
 package com.mogo.eagle.core.function.hmi.ui.bindingcar

 import android.content.Context
-import android.util.Log
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
+import com.mogo.commons.module.status.IMogoStatusChangedListener
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
-import com.mogo.module.common.dialog.BaseFloatDialog
-import com.mogo.service.IMogoServiceApis
-import com.mogo.service.statusmanager.IMogoStatusChangedListener
-import com.mogo.service.statusmanager.StatusDescriptor
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog


 /**
 * @brief  修改车辆对话框
 * @author lixiaopeng
 */
-class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver{
+class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver {

    private val TAG = "BindingCarDialog"
    private var confirmTv: TextView? = null
-    private var cancleTv: TextView? = null
+    private var cancelTv: TextView? = null

-    private var mServiceApis: IMogoServiceApis? = null
-    private val statusChangedListenerForCheckNotice = IMogoStatusChangedListener { descriptor, isTrue ->
-        if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
-            dismiss()
+    private val statusChangedListenerForCheckNotice =
+        IMogoStatusChangedListener { descriptor, isTrue ->
+            if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
+                dismiss()
+            }
        }
-    }

    init {
        setContentView(R.layout.dialog_modify_bindingcar)
        setCanceledOnTouchOutside(true)

        confirmTv = findViewById(R.id.tv_bindingcar_confirm)
-        cancleTv = findViewById(R.id.tv_bindingcar_cancel)
+        cancelTv = findViewById(R.id.tv_bindingcar_cancel)

        confirmTv?.setOnClickListener {
            modifyBindingcar()
        }

-        cancleTv?.setOnClickListener {
+        cancelTv?.setOnClickListener {
            dismiss()
        }
+
+        MogoStatusManager.getInstance().registerStatusChangedListener(
+            TAG,
+            StatusDescriptor.MAIN_PAGE_IS_BACKGROUND,
+            statusChangedListenerForCheckNotice
+        )
    }

    /**
@@ -62,6 +67,11 @@ class ModifyBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifec

    override fun dismiss() {
        super.dismiss()
+        MogoStatusManager.getInstance().unregisterStatusChangedListener(
+            TAG,
+            StatusDescriptor.MAIN_PAGE_IS_BACKGROUND,
+            statusChangedListenerForCheckNotice
+        )
    }

    fun showModifyBindingcarDialog() {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/ToBindingCarDialog.kt
@@ -3,13 +3,13 @@ package com.mogo.eagle.core.function.hmi.ui.bindingcar
 import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
+import com.mogo.commons.module.status.IMogoStatusChangedListener
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
-import com.mogo.module.common.dialog.BaseFloatDialog
-import com.mogo.service.IMogoServiceApis
-import com.mogo.service.statusmanager.IMogoStatusChangedListener
-import com.mogo.service.statusmanager.StatusDescriptor
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog


 /**
@@ -20,9 +20,8 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle

    private val TAG = "ToBindingCarDialog"
    private var confirmTv: TextView? = null
-    private var cancleTv: TextView? = null
+    private var cancelTv: TextView? = null

-    private var mServiceApis: IMogoServiceApis? = null
    private val statusChangedListenerForCheckNotice = IMogoStatusChangedListener { descriptor, isTrue ->
        if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
            dismiss()
@@ -34,15 +33,21 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle
        setCanceledOnTouchOutside(true)

        confirmTv = findViewById(R.id.tv_to_bindingcar_confirm)
-        cancleTv = findViewById(R.id.tv_to_bindingcar_cancel)
+        cancelTv = findViewById(R.id.tv_to_bindingcar_cancel)

        confirmTv?.setOnClickListener {
            toBindingcar()
        }

-        cancleTv?.setOnClickListener {
+        cancelTv?.setOnClickListener {
            dismiss()
        }
+
+        MogoStatusManager.getInstance().registerStatusChangedListener(
+            TAG,
+            StatusDescriptor.MAIN_PAGE_IS_BACKGROUND,
+            statusChangedListenerForCheckNotice
+        )
    }

    /**
@@ -61,6 +66,11 @@ class ToBindingCarDialog(context: Context) : BaseFloatDialog(context), Lifecycle

    override fun dismiss() {
        super.dismiss()
+        MogoStatusManager.getInstance().unregisterStatusChangedListener(
+            TAG,
+            StatusDescriptor.MAIN_PAGE_IS_BACKGROUND,
+            statusChangedListenerForCheckNotice
+        )
    }

    fun showToBindingcarDialog() {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bindingcar/UpgradeAppDialog.kt
@@ -1,24 +1,19 @@
 package com.mogo.eagle.core.function.hmi.ui.bindingcar

 import android.content.Context
-import android.opengl.Visibility
-import android.util.Log
 import android.view.View
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.module.common.dialog.BaseFloatDialog
-import com.mogo.service.IMogoServiceApis
-import com.mogo.service.statusmanager.IMogoStatusChangedListener
-import com.mogo.service.statusmanager.StatusDescriptor
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog

 /**
 * @brief  APP升级提示弹框
 * @author lixiaopeng
 */
-class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver{
+class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver {

    private val TAG = "UpgradeAppDialog"
    private var confirmTv: TextView? = null
@@ -70,7 +65,13 @@ class UpgradeAppDialog(context: Context) : BaseFloatDialog(context), LifecycleOb
    }

    // 升级类型 1:提示升级 2:静默升级 3:强制升级
-    fun showUpgradeAppDialog(name: String, url: String, title: String, content: String, installType: String) {
+    fun showUpgradeAppDialog(
+        name: String,
+        url: String,
+        title: String,
+        content: String,
+        installType: String
+    ) {
        if (isShowing) {
            return
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt
@@ -13,7 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
-import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.model.VideoOptionModel
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt
@@ -7,6 +7,9 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
+import com.mogo.commons.module.status.IMogoStatusChangedListener
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -15,11 +18,8 @@ import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp
 import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform
 import com.mogo.eagle.core.utilcode.util.BitmapHelper
 import com.mogo.eagle.core.widget.media.video.NoticeSimpleVideoPlayer
-import com.mogo.module.common.MogoApisHandler
-import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
 import com.mogo.service.IMogoServiceApis
-import com.mogo.service.statusmanager.IMogoStatusChangedListener
-import com.mogo.service.statusmanager.StatusDescriptor
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
@@ -94,13 +94,13 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO
            playVideo(mVideoUrl)
        }

-        mServiceApis = MogoApisHandler.getInstance().apis
-        mServiceApis?.statusManagerApi?.registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForCheckNotice)
+        MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForCheckNotice)
    }


    override fun dismiss() {
        super.dismiss()
+        MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForCheckNotice)
        stopLive()
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
@@ -15,27 +15,25 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager;

 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.module.status.IMogoStatusChangedListener;
+import com.mogo.commons.module.status.MogoStatusManager;
+import com.mogo.commons.module.status.StatusDescriptor;
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters;
 import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
 import com.mogo.eagle.core.data.notice.NoticeValue;
-import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
 import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform;
+import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.BitmapHelper;
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
 import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.module.common.dialog.BaseFloatDialog;
-import com.mogo.service.IMogoServiceApis;
-import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView;
-import com.mogo.service.statusmanager.IMogoStatusChangedListener;
-import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog;
 import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder;
 import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;
@@ -64,9 +62,8 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    private TextView refuse;//拒绝
    private TextView connect;//连接
    private NoticeTrafficAdapter adapter;
-    private final ArrayList dataArrayList = new ArrayList();
+    private final ArrayList<NoticeValue> dataArrayList = new ArrayList<>();
    private NoticeTrafficStyleInfo.NoticeTrafficAccountInfo mTrafficStyleInfo;
-    private IMogoServiceApis mServiceApis;

    public NoticeTrafficDialog(@NonNull Context context, NoticeTrafficStylePushData pushData) {
        super(context);
@@ -84,8 +81,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
        setCanceledOnTouchOutside(true);
        playerShow();//视频播放器及接操作按钮
        recyclerVie();//详情信息列表
-        mServiceApis = MogoApisHandler.getInstance().getApis();
-        mServiceApis.getStatusManagerApi().registerStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice);
+        MogoStatusManager.getInstance().registerStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice);
    }

    /**
@@ -169,7 +165,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
     * 开启自动驾驶
     */
    private void startAutoPilot() {
-        if (mTrafficStyleInfo != null){
+        if (mTrafficStyleInfo != null) {
            AutopilotControlParameters parameters = new AutopilotControlParameters();
            parameters.isSpeakVoice = false;
            parameters.vehicleType = 10;
@@ -356,13 +352,10 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
     */
    private void requestTrafficInfo() {
        CallerLogger.INSTANCE.d(M_HMI + TAG, "requestTrafficInfo");
-        CallerNoticeManager.getNoticeProvider().requestAccidentInfo(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), new NoticeNetCallBack() {
-            @Override
-            public void callBackWithResult(NoticeTrafficStyleInfo trafficInfo) {
-                CallerLogger.INSTANCE.d(M_HMI + TAG, "交通事故详情::" + trafficInfo);
-                mTrafficStyleInfo = trafficInfo.getResult().getAccidentInfo();
-                infoRefresh(mTrafficStyleInfo);
-            }
+        CallerNoticeManager.getNoticeProvider().requestAccidentInfo(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), trafficInfo -> {
+            CallerLogger.INSTANCE.d(M_HMI + TAG, "交通事故详情::" + trafficInfo);
+            mTrafficStyleInfo = trafficInfo.getResult().getAccidentInfo();
+            infoRefresh(mTrafficStyleInfo);
        });
    }

@@ -445,6 +438,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    public void dismiss() {
        super.dismiss();
        CallerLogger.INSTANCE.d(M_HMI + TAG, "trafficDialog dismiss");
+        MogoStatusManager.getInstance().unregisterStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice);
        releasePlayer();
    }

--- 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
@@ -74,7 +74,7 @@ import com.mogo.map.MogoMap
 import com.mogo.map.MogoMapUIController
 import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.map.uicontroller.VisualAngleMode.*
-import com.mogo.module.service.routeoverlay.*
+import com.mogo.eagle.core.function.business.routeoverlay.*
 import com.zhidao.easysocket.utils.L
 import com.zhidao.support.adas.high.other.permission.BackgrounderPermission
 import com.zhjt.mogo_core_function_devatools.env.*
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -16,8 +16,7 @@ import com.mogo.eagle.core.function.call.obu.CallerOBUManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.module.service.routeoverlay.RouteStrategy
-import kotlinx.android.synthetic.main.view_debug_setting.view.*
+import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
 import kotlinx.android.synthetic.main.view_sop_setting.view.tbRouteDynamicEffect

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog

 /**
 * @author XuXinChao
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog

 /**
 * @author XuXinChao
--- 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
@@ -31,6 +31,7 @@ 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;
@@ -61,7 +62,6 @@ import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
-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;
@@ -91,7 +91,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
    private static final int REQUEST_CODE_DIALOG = 100;

    protected IMogoServiceApis mServiceApis;
-    protected IMogoStatusManager mMogoStatusManager;

    protected FrameLayout mFloatingLayout;
    protected View mCoverUpLayout;
@@ -102,7 +101,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement

    private RecyclerView mConnectInfoRV;
    private ConnInfoAdapter mConnAdapter;
-    private List<AutopilotStatusInfo> dataList = new ArrayList<>();
+    private final List<AutopilotStatusInfo> dataList = new ArrayList<>();
    private int mLastStatus = 0x00;
    private boolean isFloatingLayerHidden = false;

@@ -225,8 +224,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        if (mServiceApis == null) {
            mServiceApis = MogoApisHandler.getInstance().getApis();
        }
-        mMogoStatusManager = mServiceApis.getStatusManagerApi();
-        mMogoStatusManager.setMainPageLaunchedStatus(TAG, true);
+        MogoStatusManager.getInstance().setMainPageLaunchedStatus(TAG, true);
    }

    private void initConnectInfoRV() {
@@ -274,7 +272,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
                loadFunctionFragment();

                // TODO 这里临时兼容进入VR模式，标记状态机。有些业务（OCH）会根据状态判断加载
-                MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
+                MogoStatusManager.getInstance().setVrMode(TAG, true);
                // 设置地图样式
                MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
            });
@@ -394,23 +392,20 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
    @Override
    protected void onResume() {
        super.onResume();
-        mMogoStatusManager.setMainPageResumeStatus(TAG, true);
-        mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false);
+        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, true);
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, true);
    }

    @Override
    protected void onPause() {
        super.onPause();
-        mMogoStatusManager.setMainPageResumeStatus(TAG, false);
+        MogoStatusManager.getInstance().setMainPageResumeStatus(TAG, false);
    }

-
    @Override
    protected void onStop() {
        super.onStop();
-        if (mMogoStatusManager != null) {
-            mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, true);
-        }
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, true);
    }

    @Override
@@ -481,13 +476,13 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
            listenerRegister.unregisterMarkerClickListener();
            listenerRegister.unregisterHostMapListener();
        }
-        mMogoStatusManager.setMainPageLaunchedStatus(TAG, false);
-        mMogoStatusManager.setMainPageIsBackgroundStatus(TAG, false);
-
        IMogoMapUIController mapUIController = CallerMapUIServiceManager.INSTANCE.getMapUIController();
        if (mapUIController != null) {
            mapUIController.destroy();
        }
+        MogoStatusManager.getInstance().setMainPageLaunchedStatus(TAG, false);
+        MogoStatusManager.getInstance().setMainPageIsBackgroundStatus(TAG, false);
+
        CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy.");
        ContextHolderUtil.releaseContext();
        MogoModulesManager.getInstance().onDestroy();
--- 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
@@ -26,7 +26,6 @@ import com.mogo.eagle.core.utilcode.util.ProcessUtils;
 import com.mogo.map.MapApiPath;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
-import com.mogo.module.service.ServiceConst;
 import com.zhidao.support.obu.ami.AmiClientManager;
 import com.zhjt.mogo_core_function_devatools.monitor.db.CpuInfo;
 import com.zhjt.mogo_core_function_devatools.monitor.db.MemInfo;