[2.13.0-arhc-opt] merge

2023-02-07 15:00:25 +08:00
parent ed71827687
commit a382fc36c1
66 changed files with 1116 additions and 1182 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt
+++ b/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)
    }

    /**
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt
+++ b/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

 /**
--- 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
@@ -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为空!")
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/HmiPresenter.kt
+++ b/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) {
-
-
-}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiContract.kt
+++ b/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 {
-
-    }
-}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
@@ -3,18 +3,15 @@ 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 +23,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 +37,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 +51,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 +72,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 +92,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 +101,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 +133,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 +165,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,18 +234,32 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
        }
    }

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

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

+    override fun showIPCReportWindow(
+        errorReportList: ArrayList<ReportEntity>,
+        warningReportList: ArrayList<ReportEntity>,
+        reportLevel: Int
+    ) {
+        ThreadUtils.runOnUiThread {
+            context?.let {
+                if (reportLevel == 1) {
+                    IPCReportWindow.show(it, errorReportList, warningReportList, reportLevel)
+                }
+            }
+        }
+    }
+
    override fun showUpgradeDialog(
        name: String,
        url: String,
@@ -310,8 +269,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
    ) {
        if (ContextHolderUtil.getContext() != null) {
            UpgradeAppDialog.show(
-                ContextHolderUtil.getContext(),
-                name, url, title, content, installType
+                ContextHolderUtil.getContext(), name, url, title, content, installType
            )
        }
    }
@@ -330,47 +288,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()
-    }
-
 }
--- 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
@@ -1053,33 +1053,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
        }

        /**
--- 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
@@ -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)
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt
+++ b/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
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt
+++ b/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)
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt
+++ b/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
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XFogEventView.kt
@@ -0,0 +1,71 @@
+package com.mogo.eagle.core.function.hmi.ui.widget
+
+import android.animation.AnimatorSet
+import android.animation.ObjectAnimator
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+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?, defStyleAttr: Int) :
+    ConstraintLayout(context, attrs, defStyleAttr), 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
+    }
+
+    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)
+    }
+
+}
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt
+++ b/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)
+    }
+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VipIdentificationView.kt
+++ b/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

--- 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
@@ -40,6 +40,7 @@ import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.call.startup.CallerStartUpManager;
 import com.mogo.eagle.core.function.hmi.R;
@@ -119,6 +120,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        mConnectInfoRV = findViewById(R.id.rvConnectInfo);
        initConnectInfoRV();
        FloatingViewHandler.init(mFloatingLayout);
+        CallerHmiManager.INSTANCE.init(this);

        //申请悬浮窗权限
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -168,8 +170,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
        mPresenter.postLoadModuleMsg();
        // 监听网络状态
        NetworkUtils.listenNetStrength(this);
-        // 浓雾预警
-        DisplayEffectsHelper.getInstance().init(clSpecialEffect);

        mPresenter.checkPermission(this);

@@ -329,9 +329,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
    @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);
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/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>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -37,12 +37,6 @@
            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">
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_hmi_warning_v2x.xml
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning_fog.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning_fog.xml
@@ -0,0 +1,27 @@
+<?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">
+
+    <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>