Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0

# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt

@@ -7,7 +7,7 @@ import android.view.View
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 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
@@ -61,7 +61,7 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
      * @param limitingVelocitySpeed    限速速度
      */
     private fun dispatchShowWaring(limitingVelocitySpeed: Int) {
-        CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(limitingVelocitySpeed,DataSourceType.MAP)
+        CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(limitingVelocitySpeed,DataSourceType.MAP)
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 
 /**

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt

@@ -14,7 +14,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框
@@ -77,7 +77,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
         ttsContent: String?,
     ) {
         if (EventTypeEnumNew.TYPE_USECASE_ID_IVP_RED.poiType == v2xType.toString()) {
-            CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(1,DataSourceType.MAP)
+            CallerLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(1,DataSourceType.MAP)
         }
         if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
             Log.d("MsgBox-V2XWarningBR", "alertContent或ttsContent为空!")

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/HmiPresenter.kt

@@ -1,13 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui
-
-import com.mogo.commons.mvp.Presenter
-
-/**
- * @author xiaoyuzhou
- * @date 2021/8/3 3:55 下午
- */
-class HmiPresenter(view: MoGoHmiContract.View?) :
-    Presenter<MoGoHmiContract.View?>(view) {
-
-
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiContract.kt

@@ -1,19 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui
-
-import com.mogo.commons.mvp.IView
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum
-import com.mogo.eagle.core.data.notice.NoticeNormalData
-import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-
-
-/**
- *@author        xiaoyuzhou
- *@date          2021/8/4 3:38 下午
- */
-interface MoGoHmiContract {
-
-    interface View : IView {
-
-    }
-}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt

@@ -3,18 +3,14 @@ package com.mogo.eagle.core.function.hmi.ui
 import android.content.Context
 import android.text.TextUtils
 import android.view.ViewGroup
+import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.commons.context.ContextHolderUtil
-import com.mogo.commons.mvp.BaseFragment
-import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.AIAssist
 import com.mogo.commons.voice.IMogoVoiceCmdCallBack
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.data.config.HmiBuildConfig
-import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_FRAGMENT_HMI
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
 import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
@@ -26,10 +22,8 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.function.call.v2x.CallerV2XWarningListenerManager
 import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog
 import com.mogo.eagle.core.function.hmi.ui.notice.DispatchDialogManager
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeCheckDialog
@@ -42,15 +36,12 @@ import com.mogo.eagle.core.function.hmi.ui.tools.ModifyBindingCarDialog
 import com.mogo.eagle.core.function.hmi.ui.tools.ToBindingCarDialog
 import com.mogo.eagle.core.function.hmi.ui.tools.UpgradeAppDialog
 import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
-import com.mogo.eagle.core.function.main.DisplayEffectsHelper
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 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.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.zhjt.service_biz.BizConfig
-import kotlinx.android.synthetic.main.fragment_hmi.*
 import kotlinx.coroutines.*
 import java.util.concurrent.atomic.AtomicReference
 
@@ -59,36 +50,19 @@ import java.util.concurrent.atomic.AtomicReference
  * @date 2021/8/3 2:40 下午
  * 预警图层
  */
-@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI)
-class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
-    IMoGoHmiProvider,
-    MoGoHmiContract.View {
+@Route(path = PATH_FRAGMENT_HMI)
+class MoGoHmiProvider : IMoGoHmiProvider {
 
     companion object {
-        private const val TAG = "MoGoHmiFragment"
+        private const val TAG = "MoGoHmiProvider"
     }
 
     private val lastSpeakJob by lazy { AtomicReference<Job>() }
     private var lastShowV2XJob: Job? = null
+    private var context: Context? = null
 
-    override fun initViews() {
-    }
-
-    override fun showIPCReportWindow(
-        errorReportList: ArrayList<ReportEntity>,
-        warningReportList: ArrayList<ReportEntity>,
-        reportLevel: Int
-    ) {
-        ThreadUtils.runOnUiThread {
-            if (reportLevel == 1) {
-                IPCReportWindow.show(
-                    requireContext(),
-                    errorReportList,
-                    warningReportList,
-                    reportLevel
-                )
-            }
-        }
+    override fun init(context: Context?) {
+        this.context = context
     }
 
     override fun setStatusBarDarkOrLight(light: Boolean) {
@@ -97,28 +71,19 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
 
     override fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
         CallerHmiViewControlListenerManager.updateStatusBarRightView(
-            StatusBarView.TAG,
-            insert,
-            tag,
-            viewGroup
+            StatusBarView.TAG, insert, tag, viewGroup
         )
     }
 
     override fun updateStatusBarLeftView(insert: Boolean, tag: String, viewGroup: ViewGroup) {
         CallerHmiViewControlListenerManager.updateStatusBarLeftView(
-            StatusBarView.TAG,
-            insert,
-            tag,
-            viewGroup
+            StatusBarView.TAG, insert, tag, viewGroup
         )
     }
 
     override fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) {
         CallerHmiViewControlListenerManager.updateStatusBarDownloadView(
-            StatusBarView.TAG,
-            insert,
-            tag,
-            progress
+            StatusBarView.TAG, insert, tag, progress
         )
     }
 
@@ -126,23 +91,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         CallerHmiViewControlListenerManager.updateMfStatus(StatusBarView.TAG, tag, status)
     }
 
-    override fun getLayoutId(): Int {
-        return R.layout.fragment_hmi
-    }
-
-    override fun getTagName(): String {
-        return TAG
-    }
-
-    override fun createPresenter(): HmiPresenter {
-        return HmiPresenter(this)
-    }
-
-    override fun displayEffects() {
-        DisplayEffectsHelper.getInstance().display()
-    }
-
-    /** todo----------------------------------------------- **/
     /**
      * 不展示顶部弹窗，其它保留
      */
@@ -152,32 +100,31 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         alertContent: CharSequence?,
         ttsContent: String?,
         listener: IMoGoWarningStatusListener?,
-        playTts: Boolean,
+        direction: WarningDirectionEnum,
         expireTime: Long
     ) {
-        val playTTS =
-            playTts && !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
-        activity?.let {
-            val warningContent = alertContent
-                ?: EventTypeEnumNew.getWarningContent(v2xType)
-
+        val playTTS = !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
+        context?.let {
+            val warningContent = alertContent ?: EventTypeEnumNew.getWarningContent(v2xType)
             if (warningContent.isEmpty()) {
                 CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!")
                 return
             }
+
             listener?.onShow()
+            CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
             CallerLogger.d(
                 "$M_HMI$TAG",
                 "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
             )
             lastShowV2XJob?.safeCancel()
-            lifecycleScope.launch {
+            ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.Main) {
                 delay(expireTime)
             }.also { itx ->
                 lastShowV2XJob = itx
             }.invokeOnCompletion {
                 listener?.onDismiss()
-                dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL)
+                CallerV2XWarningListenerManager.dismiss()
             }
 
             if (ttsContent != null && !TextUtils.isEmpty(ttsContent) && playTTS) {
@@ -185,7 +132,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                 if (last != null && !last.isCompleted) {
                     return
                 }
-                lifecycleScope.launch(Dispatchers.Default) {
+                ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.Main) {
                     speak(it, ttsContent)
                 }.also { itx ->
                     lastSpeakJob.set(itx)
@@ -217,38 +164,35 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         }
     }
 
-    override fun showWarning(direction: WarningDirectionEnum) {
-        CallerLogger.d(TAG, "showWarning====")
-        flV2XWarningView?.showWarning(direction)
-    }
-
-    override fun showWarning(direction: WarningDirectionEnum, closeTime: Long) {
-        flV2XWarningView?.showWarning(direction, closeTime)
+    override fun showWarning(v2xType: String, direction: WarningDirectionEnum, expireTime: Long) {
+        CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
     }
 
     override fun dismissWarning(direction: WarningDirectionEnum) {
-        flV2XWarningView?.dismissWarning(direction)
+        CallerV2XWarningListenerManager.dismiss(direction)
     }
 
-    /** todo----------------------------------------------- **/
-
     override fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean) {
-        context?.let {
-            DispatchDialogManager.getInstance(it).showDialog(msgData)
+        ThreadUtils.runOnUiThread {
+            context?.let {
+                DispatchDialogManager.getInstance(it).showDialog(msgData)
+            }
         }
     }
 
     override fun dismissDispatchDialog() {
-        context?.let {
-            DispatchDialogManager.getInstance(it).releaseDialog()
+        ThreadUtils.runOnUiThread {
+            context?.let {
+                DispatchDialogManager.getInstance(it).releaseDialog()
+            }
         }
     }
 
-    override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData?) {
-        trafficStylePushData?.let {
+    override fun showNoticeForTrafficWithData(pushData: NoticeTrafficStylePushData?) {
+        pushData?.let {
             ThreadUtils.runOnUiThread {
                 context?.let { it ->
-                    NoticeTrafficDialog.show(it, trafficStylePushData)
+                    NoticeTrafficDialog.show(it, pushData)
                 }
             }
         }
@@ -289,15 +233,29 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         }
     }
 
-    override fun showToBindingcarDialog() {
-        if (ContextHolderUtil.getContext() != null) {
-            ToBindingCarDialog.show(ContextHolderUtil.getContext())
+    override fun showToBindingCarDialog() {
+        if (context != null) {
+            ToBindingCarDialog.show(context)
         }
     }
 
-    override fun showModifyBindingcarDialog() {
-        if (ContextHolderUtil.getContext() != null) {
-            ModifyBindingCarDialog.show(ContextHolderUtil.getContext())
+    override fun showModifyBindingCarDialog() {
+        if (context != null) {
+            ModifyBindingCarDialog.show(context)
+        }
+    }
+
+    override fun showIPCReportWindow(
+        errorReportList: ArrayList<ReportEntity>,
+        warningReportList: ArrayList<ReportEntity>,
+        reportLevel: Int
+    ) {
+        ThreadUtils.runOnUiThread {
+            context?.let {
+                if (reportLevel == 1) {
+                    IPCReportWindow.show(it, errorReportList, warningReportList, reportLevel)
+                }
+            }
         }
     }
 
@@ -308,18 +266,17 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         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)
             }
         }
     }
@@ -330,47 +287,4 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
         }
     }
 
-    override fun setSnBinding(isOpen: Boolean) {
-        HmiBuildConfig.isShowSnBindingView = isOpen
-    }
-
-    override fun setObuWeaknessTraffic(isOpen: Boolean) {
-        HmiBuildConfig.isShowObuWeaknessTrafficView = isOpen
-    }
-
-    override fun setCloudWeaknessTraffic(isOpen: Boolean) {
-        HmiBuildConfig.isShowCloudWeaknessTrafficView = isOpen
-    }
-
-    override fun showSmallFragment() {
-//        // 加载全览模式图层
-//        val fragmentOverview = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_OVERVIEW)
-//            .navigation() as BaseFragment
-//        activity?.supportFragmentManager?.beginTransaction()
-//            ?.setCustomAnimations(R.anim.slide_in, R.anim.fade_out)?.apply {
-//                if (!fragmentOverview.isAdded) {
-//                    add(
-//                        R.id.module_main_id_smp_fragment,
-//                        fragmentOverview,
-//                        fragmentOverview.tagName
-//                    )
-//                } else {
-//                    show(fragmentOverview)
-//                }.commitAllowingStateLoss()
-//            }
-//        CallerDevaToolsManager.hideStatusBar()
-    }
-
-    override fun hideSmallFragment() {
-//        val fragmentOverview = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_OVERVIEW)
-//            .navigation() as BaseFragment
-//        activity?.supportFragmentManager?.beginTransaction()
-//            ?.setCustomAnimations(R.anim.slide_in, R.anim.fade_out)?.apply {
-//                if (fragmentOverview.isVisible) {
-//                    hide(fragmentOverview)
-//                }
-//            }
-//            ?.commitAllowingStateLoss()
-    }
-
 }

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("点云大小颜色输入不正确")
                 }
@@ -1053,33 +1054,23 @@ internal class DebugSettingView @JvmOverloads constructor(
          * sn绑定控制
          */
         tbOpenSnBinding.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) {
-                CallerHmiManager.setSnBinding(true)
-            } else {
-                CallerHmiManager.setSnBinding(false)
-            }
+            HmiBuildConfig.isShowSnBindingView = !isChecked
         }
 
         /**
          * obu弱势交通控制
          */
         tbObuWeaknessTraffic.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) { //默认开启
-                CallerHmiManager.setObuWeaknessTraffic(true)
-            } else {
-                CallerHmiManager.setObuWeaknessTraffic(false)
-            }
+            // 默认开启
+            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
         }
 
         /**
          * 云端弱势交通控制
          */
         tbCloudWeaknessTraffic.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) { //默认关闭
-                CallerHmiManager.setCloudWeaknessTraffic(true)
-            } else {
-                CallerHmiManager.setCloudWeaknessTraffic(false)
-            }
+            // 默认关闭
+            HmiBuildConfig.isShowObuWeaknessTrafficView = isChecked
         }
 
         /**
@@ -1225,7 +1216,7 @@ internal class DebugSettingView @JvmOverloads constructor(
          * 设置是否输出高精地图日志 true-打印日志，false-不打印日志
          */
         tbHdMapLog.setOnCheckedChangeListener { _, isChecked ->
-            CallerHDMapManager.setDebugMode(isChecked)
+            CallerMapUIServiceManager.getMapUIController()?.setDebugMode(isChecked)
         }
 
         cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus()

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt

@@ -20,7 +20,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
@@ -81,11 +81,8 @@ internal class SOPSettingView @JvmOverloads constructor(
          */
         tbObuWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowObuWeaknessTrafficView
         tbObuWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            if (!isChecked) { //默认开启
-                CallerHmiManager.setObuWeaknessTraffic(true)
-            } else {
-                CallerHmiManager.setObuWeaknessTraffic(false)
-            }
+            // 默认开启
+            HmiBuildConfig.isShowObuWeaknessTrafficView = !isChecked
         }
 
         /**
@@ -93,18 +90,15 @@ internal class SOPSettingView @JvmOverloads constructor(
          */
         tbCloudWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowCloudWeaknessTrafficView
         tbCloudWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) { //默认关闭
-                CallerHmiManager.setCloudWeaknessTraffic(true)
-            } else {
-                CallerHmiManager.setCloudWeaknessTraffic(false)
-            }
+            // 默认关闭
+            HmiBuildConfig.isShowCloudWeaknessTrafficView = isChecked
         }
 
         /**
          * 限速数据来源开关
          */
         tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
-            //默认关闭
+            // 默认关闭
             HmiBuildConfig.isShowObuLimitSpeedView = isChecked
         }
 
@@ -112,7 +106,7 @@ internal class SOPSettingView @JvmOverloads constructor(
          * obu V2V开关
          */
         tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
-            //默认关闭
+            // 默认关闭
             HmiBuildConfig.isShowObuV2vView = isChecked
         }
 
@@ -120,7 +114,7 @@ internal class SOPSettingView @JvmOverloads constructor(
          * obu V2i开关
          */
         tbObuV2iView.setOnCheckedChangeListener { _, isChecked ->
-            //默认关闭
+            // 默认关闭
             HmiBuildConfig.isShowObuV2iView = isChecked
         }
 
@@ -128,7 +122,7 @@ internal class SOPSettingView @JvmOverloads constructor(
          * obu 数据通过dc 传输V2i事件 开关 TODO pm确定下开关功能 HmiBuildConfig.isShowObuToDcV2iView
          */
         tbObuToDcView.setOnCheckedChangeListener { _, isChecked ->
-            //默认开启
+            // 默认开启
             HmiBuildConfig.isShowObuToDcV2iView = !isChecked
 //            Log.d("liyz", "HmiBuildConfig.isShowObuToDcV2iView = " + HmiBuildConfig.isShowObuToDcV2iView)
         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt

@@ -15,10 +15,10 @@ import com.mogo.eagle.core.data.trafficlight.isRed
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.service_biz.BizConfig

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt

@@ -10,7 +10,7 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG
 import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import kotlinx.android.synthetic.main.view_limiting_speed_vr.view.*
 
@@ -32,7 +32,7 @@ class LimitingVelocityView constructor(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        CallerViewLimitingVelocityListenerManager.addListener(TAG, this)
+        CallerLimitingVelocityListenerManager.addListener(TAG, this)
         CallerHmiViewControlListenerManager.addListener(LimitingVelocityView_TAG, this)
     }
 
@@ -54,7 +54,7 @@ class LimitingVelocityView constructor(
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        CallerViewLimitingVelocityListenerManager.removeListener(TAG)
+        CallerLimitingVelocityListenerManager.removeListener(TAG)
         CallerHmiViewControlListenerManager.removeListener(LimitingVelocityView_TAG)
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt

@@ -13,9 +13,9 @@ import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.TrafficLightView_TAG
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt

@@ -0,0 +1,92 @@
+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
+import com.mogo.eagle.core.function.api.v2x.IV2XEventListener
+import com.mogo.eagle.core.function.call.v2x.CallerV2XWarningListenerManager
+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) :
+    ConstraintLayout(context, attrs), IV2XEventListener {
+
+    companion object {
+        private const val TAG = "V2XFogEventView"
+    }
+
+    private val animatorSet = AnimatorSet()
+
+    init {
+        LayoutInflater.from(context).inflate(R.layout.view_v2x_warning_fog, this, true)
+        val animator1 = ObjectAnimator.ofFloat(iv_wu1, "alpha", 0f, 1f, 0f)
+        val animator2 = ObjectAnimator.ofFloat(iv_wu1, "translationX", -500f, 100f, 300f)
+        val animator3 = ObjectAnimator.ofFloat(iv_wu1, "scaleX", 1f, 1.5f, 2f)
+        val animator4 = ObjectAnimator.ofFloat(iv_wu1, "scaleY", 1f, 1.5f, 2f)
+        val animator5 = ObjectAnimator.ofFloat(iv_wu2, "alpha", 0f, 1f, 0f)
+        val animator6 = ObjectAnimator.ofFloat(iv_wu2, "translationX", 500f, -100f, -300f)
+        val animator7 = ObjectAnimator.ofFloat(iv_wu2, "scaleX", 1f, 1.5f, 2f)
+        val animator8 = ObjectAnimator.ofFloat(iv_wu2, "scaleY", 1f, 1.5f, 2f)
+        animatorSet.playTogether(
+            animator1,
+            animator2,
+            animator3,
+            animator4,
+            animator5,
+            animator6,
+            animator7,
+            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() {
+        super.onAttachedToWindow()
+        CallerV2XWarningListenerManager.addListener(TAG, this)
+    }
+
+    override fun show(v2xType: String, direction: WarningDirectionEnum, time: Long) {
+        ThreadUtils.runOnUiThread {
+            if(v2xType == EventTypeEnumNew.FOURS_FOG.poiType){
+                animatorSet.start()
+            }
+        }
+    }
+
+    override fun dismiss(direction: WarningDirectionEnum) {
+
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerV2XWarningListenerManager.removeListener(TAG)
+    }
+
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt

@@ -8,26 +8,26 @@ import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
 import android.widget.RelativeLayout
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum.*
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.function.api.v2x.IV2XEventListener
+import com.mogo.eagle.core.function.call.v2x.CallerV2XWarningListenerManager
 import com.mogo.eagle.core.function.hmi.R
+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.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import kotlinx.android.synthetic.main.module_hmi_warning_v2x.view.*
+import kotlinx.android.synthetic.main.view_v2x_warning.view.*
+
 
-/**
- *@author        xiaoyuzhou
- *@date          2021/9/10 7:44 下午
- */
 class V2XWarningView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
-) : RelativeLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : RelativeLayout(context, attrs, defStyleAttr), IV2XEventListener {
 
     companion object {
-        private const val ALL_CLOSE_TIMER = 10000L
+        private const val ALL_CLOSE_TIMER = 5000L
         private const val TAG = "V2XWarningView"
     }
 
@@ -36,24 +36,43 @@ class V2XWarningView @JvmOverloads constructor(
     }
 
     init {
-        LayoutInflater.from(context).inflate(R.layout.module_hmi_warning_v2x, this, true)
+        LayoutInflater.from(context).inflate(R.layout.view_v2x_warning, this, true)
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerV2XWarningListenerManager.addListener(TAG, this)
+    }
+
+    override fun show(v2xType: String, direction: WarningDirectionEnum, time: Long) {
+        ThreadUtils.runOnUiThread {
+            if (direction != ALERT_WARNING_NON) {
+                showWarning(direction)
+            }
+        }
+
+    }
+
+    override fun dismiss(direction: WarningDirectionEnum) {
+        ThreadUtils.runOnUiThread {
+            dismissWarning(direction)
+        }
     }
 
     /**
      * 展示指定方位上的红框预警
      * @param direction
      * @see WarningDirectionEnum
-     * @param closeTime 倒计时
      */
-    fun showWarning(direction: WarningDirectionEnum, closeTime: Long = ALL_CLOSE_TIMER) {
+    private fun showWarning(direction: WarningDirectionEnum, time: Long = ALL_CLOSE_TIMER) {
         UiThreadHandler.post {
             // 如果传入的不是关闭显示，则设置倒计时，定时关闭红框警示
             if (direction != ALERT_WARNING_NON) {
                 removeCallbacks(closeWarningTask)
-                postDelayed(closeWarningTask, closeTime)
+                postDelayed(closeWarningTask, time)
             }
             when (direction) {
-                ALERT_WARNING_NON ->{
+                ALERT_WARNING_NON -> {
                     // nothing
                 }
                 ALERT_WARNING_TOP -> {
@@ -156,7 +175,7 @@ class V2XWarningView @JvmOverloads constructor(
         }
     }
 
-    fun dismissWarning(direction: WarningDirectionEnum) {
+    private fun dismissWarning(direction: WarningDirectionEnum) {
         if (direction == ALERT_WARNING_NON) {
             return
         }
@@ -202,4 +221,10 @@ class V2XWarningView @JvmOverloads constructor(
         }
         clearAnimation()
     }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerV2XWarningListenerManager.removeListener(TAG)
+    }
+
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt

@@ -5,8 +5,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
-import com.mogo.eagle.core.function.api.vip.IMoGoVipSetListener
-import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
+import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener
+import com.mogo.eagle.core.function.call.v2x.CallVipSetListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java

@@ -1,484 +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.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);
-
-        //申请悬浮窗权限
-        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);
-        // 浓雾预警
-        DisplayEffectsHelper.getInstance().init(clSpecialEffect);
-
-        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……");
-        // 加载 HMI 图层
-        BaseFragment fragmentHdMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation();
-        addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_waring_fragment);
-        // 加载 小地图 图层
-        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);
-    }
-}

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()
+    }
+
+}

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();
     }
 

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

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());
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/clHmiContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <!--V2X预警红色边框-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.V2XWarningView
-        android:id="@+id/flV2XWarningView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml

@@ -1,48 +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>
-
-    <!--HMI 预警视图 OBU、云端下发、自车感知、自车策略-->
-    <FrameLayout
-        android:id="@+id/module_main_id_waring_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning_fog.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone">
+
+    <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_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <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"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:ignore="ContentDescription" />
+</androidx.constraintlayout.widget.ConstraintLayout>