[Update] 升级ARouter 版本，支持Fragment单利

[Change] 修改地图层、HMI层加载方式，采用ARouter方式获取Fragment实例进行加载；废弃MoGoWarningProvider使用MoGoHmiFragment接管IMoGoWaringProvider实现 Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-11-10 19:11:04 +08:00
parent 8580551598
commit cc7870fa9f
27 changed files with 233 additions and 540 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt
@@ -10,6 +10,7 @@ import com.mogo.service.IMogoServiceApis
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
 import com.mogo.utils.logger.Logger

@@ -23,14 +24,12 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() {
    companion object {
        private const val TAG = "NoticeNormalBroadcastReceiver"
        private var mMogoServiceApis: IMogoServiceApis? = null
-        private var mIMoGoWaringProvider: IMoGoWaringProvider? = null
    }

    override fun onReceive(context: Context, intent: Intent) {
        try {
            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
                    .navigation(context) as IMogoServiceApis
-            mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi

            // 分发场景
            dispatchShowWaring("11", "官方公告", "测试普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告哈哈哈哈哈哈好好",
@@ -60,6 +59,6 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() {
        data.videoUrl = videoUrl
        data.fileType = fileType

-        mIMoGoWaringProvider!!.showNoticeNormalData(data)
+        CallerHmiManager.showNoticeNormalData(data)
    }
 }
--- 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
@@ -4,10 +4,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.service.IMogoServiceApis
-import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.utils.logger.Logger

 /**
@@ -21,14 +21,12 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
    companion object {
        private const val TAG = "V2XLimitingVelocityBroadcastReceiver"
        private var mMogoServiceApis: IMogoServiceApis? = null
-        private var mIMoGoWaringProvider: IMoGoWaringProvider? = null
    }

    override fun onReceive(context: Context, intent: Intent) {
        try {
            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
                .navigation(context) as IMogoServiceApis
-            mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi
            mContext = context

            val limitingVelocityIsShow =
@@ -64,13 +62,13 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
     * @param limitingVelocitySpeed    限速速度
     */
    private fun dispatchShowWaring(limitingVelocitySpeed: Int) {
-        mIMoGoWaringProvider!!.showLimitingVelocity(limitingVelocitySpeed)
+        CallerHmiManager.showLimitingVelocity(limitingVelocitySpeed)
    }

    /**
     * 关闭限速标志
     */
    private fun dispatchCloseWaring() {
-        mIMoGoWaringProvider!!.disableLimitingVelocity()
+        CallerHmiManager.disableLimitingVelocity()
    }
 }
--- 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
@@ -4,10 +4,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.eagle.core.data.constants.MogoServicePaths
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.service.IMogoServiceApis
-import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.utils.logger.Logger

 /**
@@ -21,14 +21,12 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
    companion object {
        private const val TAG = "V2XTrafficLightBroadcastReceiver"
        private var mMogoServiceApis: IMogoServiceApis? = null
-        private var mIMoGoWaringProvider: IMoGoWaringProvider? = null
    }

    override fun onReceive(context: Context, intent: Intent) {
        try {
            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
                .navigation(context) as IMogoServiceApis
-            mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi
            mContext = context

            val trafficLightIsShow =
@@ -64,13 +62,13 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
     * @param trafficLightCheckType    选中的交通的灯 0-都是默认，1-红，2-黄，3-绿
     */
    private fun dispatchShowWaring(trafficLightCheckType: Int) {
-        mIMoGoWaringProvider!!.showWarningTrafficLight(trafficLightCheckType)
+        CallerHmiManager.showWarningTrafficLight(trafficLightCheckType)
    }

    /**
     * 关闭交通灯
     */
    private fun dispatchCloseWaring() {
-        mIMoGoWaringProvider!!.disableWarningTrafficLight()
+        CallerHmiManager.disableWarningTrafficLight()
    }
 }
--- 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
@@ -4,11 +4,11 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.module.common.enums.EventTypeEnum
-import com.mogo.eagle.core.function.hmi.WaringConst
-import com.mogo.service.IMogoServiceApis
 import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.hmi.WaringConst
+import com.mogo.module.common.enums.EventTypeEnum
+import com.mogo.service.IMogoServiceApis
 import com.mogo.utils.logger.Logger

 /**
@@ -22,14 +22,12 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
    companion object {
        private const val TAG = "V2XWarningBroadcastReceiver"
        private var mMogoServiceApis: IMogoServiceApis? = null
-        private var mIMoGoWaringProvider: IMoGoWaringProvider? = null
    }

    override fun onReceive(context: Context, intent: Intent) {
        try {
            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
                .navigation(context) as IMogoServiceApis
-            mIMoGoWaringProvider = mMogoServiceApis!!.waringProviderApi
            mContext = context
            val v2xIsShow =
                intent.getBooleanExtra(WaringConst.BROADCAST_V2X_IS_SHOW_EXTRA_KEY, false)
@@ -60,9 +58,7 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
     * 分发处理关闭场景
     */
    private fun dispatchCloseWaring(tag: String?) {
-        mIMoGoWaringProvider!!.disableWarningV2X(
-            tag
-        )
+        CallerHmiManager.disableWarningV2X(tag)
    }

    /**
@@ -80,9 +76,9 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
        tag: String?
    ) {
        if (EventTypeEnum.TYPE_USECASE_ID_IVP.poiType == v2xType.toString()) {
-            mIMoGoWaringProvider!!.showLimitingVelocity(1)
+            CallerHmiManager.showLimitingVelocity(1)
        }
-        mIMoGoWaringProvider!!.showWarningV2X(
+        CallerHmiManager.showWarningV2X(
            v2xType,
            alertContent,
            ttsContent,
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -1,18 +1,24 @@
 package com.mogo.eagle.core.function.hmi.ui

 import android.animation.Animator
+import android.content.Context
 import android.text.TextUtils
 import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
 import android.view.animation.OvershootInterpolator
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.camera.CameraEntity
+import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
 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.IMoGoWaringProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.hmi.R
@@ -33,20 +39,31 @@ import kotlinx.android.synthetic.main.fragment_hmi.*
 * @date 2021/8/3 2:40 下午
 * 预警图层
 */
+@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI)
 class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>(),
-        MoGoWarningContract.View {
+    IMoGoWaringProvider,
+    MoGoWarningContract.View {
    private val TAG = "MoGoHmiFragment"

-
    private var mWarningFloat: WarningFloat.Builder? = null
    private var cameraListView: CameraListView? = null
    private var cameraViewFloat: WarningFloat.Builder? = null

+    override fun init(context: Context?) {
+        Log.d(TAG, "init")
+    }

    override fun vipIdentification(visible: Boolean) {
        flVipIdentificationView.visibility = if (visible) View.VISIBLE else View.GONE
    }

+    override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
+        return null
+    }
+
+    override val functionName: String
+        get() = TAG
+
    override fun initViews() {
        ivCameraIcon.setOnClickListener {
            if (cameraViewFloat == null) {
@@ -93,11 +110,11 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     */
    @Synchronized
    override fun showWarningV2X(
-            v2xType: Int,
-            alertContent: String?,
-            ttsContent: String?,
-            tag: String?,
-            listenerIMoGo: IMoGoWarningStatusListener?
+        v2xType: Int,
+        alertContent: String?,
+        ttsContent: String?,
+        tag: String?,
+        listenerIMoGo: IMoGoWarningStatusListener?
    ) {

        activity?.let {
@@ -106,9 +123,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
            notificationView.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType.toString()))

            notificationView.setWarningContent(
-                    alertContent ?: EventTypeEnum.getWarningContent(
-                            v2xType.toString()
-                    )
+                alertContent ?: EventTypeEnum.getWarningContent(
+                    v2xType.toString()
+                )
            )

            if (mWarningFloat != null && mWarningFloat!!.config.floatTag != tag) {
@@ -116,47 +133,47 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
            }

            mWarningFloat = WarningFloat.with(it)
-                    .setTag(tag)
-                    .setLayout(notificationView)
-                    .setSidePattern(SidePattern.RESULT_RIGHT)
-                    .setCountDownTime(5000)
-                    .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                    .setImmersionStatusBar(true)
-                    .addWarningStatusListener(listenerIMoGo)
-                    .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                        override fun onShow() {
-                            // 创建弹窗成功才进行TTS播报
-                            Logger.d(
-                                    "MoGoWarningFragment",
-                                    "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent"
-                            )
-                            if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent)) {
-                                Logger.d("MoGoWarningFragment", "---> ttsContent = $ttsContent")
-                                AIAssist.getInstance(activity)
-                                        .speakTTSVoice(ttsContent)
-                            }
+                .setTag(tag)
+                .setLayout(notificationView)
+                .setSidePattern(SidePattern.RESULT_TOP)
+                .setCountDownTime(5000)
+                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                .setImmersionStatusBar(true)
+                .addWarningStatusListener(listenerIMoGo)
+                .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                    override fun onShow() {
+                        // 创建弹窗成功才进行TTS播报
+                        Logger.d(
+                            "MoGoWarningFragment",
+                            "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent"
+                        )
+                        if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent)) {
+                            Logger.d("MoGoWarningFragment", "---> ttsContent = $ttsContent")
+                            AIAssist.getInstance(activity)
+                                .speakTTSVoice(ttsContent)
+                        }
+                    }
+                })
+                .setAnimator(object : DefaultAnimator() {
+                    override fun enterAnim(
+                        view: View,
+                        params: WindowManager.LayoutParams,
+                        windowManager: WindowManager,
+                        sidePattern: SidePattern
+                    ): Animator? =
+                        super.enterAnim(view, params, windowManager, sidePattern)?.apply {
+                            interpolator = OvershootInterpolator()
                        }
-                    })
-                    .setAnimator(object : DefaultAnimator() {
-                        override fun enterAnim(
-                                view: View,
-                                params: WindowManager.LayoutParams,
-                                windowManager: WindowManager,
-                                sidePattern: SidePattern
-                        ): Animator? =
-                                super.enterAnim(view, params, windowManager, sidePattern)?.apply {
-                                    interpolator = OvershootInterpolator()
-                                }

-                        override fun exitAnim(
-                                view: View,
-                                params: WindowManager.LayoutParams,
-                                windowManager: WindowManager,
-                                sidePattern: SidePattern
-                        ): Animator? =
-                                super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
-                    })
-                    .show()
+                    override fun exitAnim(
+                        view: View,
+                        params: WindowManager.LayoutParams,
+                        windowManager: WindowManager,
+                        sidePattern: SidePattern
+                    ): Animator? =
+                        super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200)
+                })
+                .show()

        }
    }
@@ -165,7 +182,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     * 关闭指定floatTag 的 VR下V2X预警弹窗
     * @param tag 弹窗标识
     */
-    override fun disableWarningV2X(tag: String) {
+    override fun disableWarningV2X(tag: String?) {
        activity?.let {
            WarningFloat.dismiss(tag)
        }
@@ -252,7 +269,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     * 展示云公告顶部弹窗
     * @param trafficStylePushData
     */
-    override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) {
+    override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData?) {
        ThreadUtils.runOnUiThread {
            activity.let {
                val noticeBannerView = this.context?.let { it1 -> NoticeBannerView(it1) }
@@ -260,58 +277,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                mWarningFloat = it?.let { it1 ->
                    noticeBannerView?.let { it2 ->
                        WarningFloat.with(it1)
-                                .setTag(tag)
-                                .setLayout(it2)
-                                .setSidePattern(SidePattern.TOP)
-                                .setCountDownTime(60 * 1000 * 3)
-                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                                .setImmersionStatusBar(true)
-                                .addWarningStatusListener(null)
-                                .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                    override fun onShow() {
-                                        // 创建弹窗成功才进行TTS播报
-//                                    AIAssist.getInstance(activity)
-//                                            .speakTTSVoice("")
-                                    }
-                                })
-                                .setAnimator(object : DefaultAnimator() {
-                                    override fun enterAnim(
-                                            view: View,
-                                            params: WindowManager.LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.enterAnim(view, params, windowManager, sidePattern)?.apply {
-                                                interpolator = OvershootInterpolator()
-                                            }
-
-                                    override fun exitAnim(
-                                            view: View,
-                                            params: WindowManager.LayoutParams,
-                                            windowManager: WindowManager,
-                                            sidePattern: SidePattern
-                                    ): Animator? =
-                                            super.exitAnim(view, params, windowManager, sidePattern)
-                                                    ?.setDuration(200)
-                                })
-                                .show()
-                    }
-                }
-            }
-        }
-    }
-
-    override fun showNoticeNormalData(normalData: NoticeNormalData) {
-        activity.let {
-            val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) }
-            noticeBannerView?.setPushData(normalData)
-            mWarningFloat = it?.let { it1 ->
-                noticeBannerView?.let { it2 ->
-                    WarningFloat.with(it1)
                            .setTag(tag)
                            .setLayout(it2)
                            .setSidePattern(SidePattern.TOP)
-                            .setCountDownTime(10000)
+                            .setCountDownTime(60 * 1000 * 3)
                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
                            .setImmersionStatusBar(true)
                            .addWarningStatusListener(null)
@@ -324,25 +293,74 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                            })
                            .setAnimator(object : DefaultAnimator() {
                                override fun enterAnim(
-                                        view: View,
-                                        params: WindowManager.LayoutParams,
-                                        windowManager: WindowManager,
-                                        sidePattern: SidePattern
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
                                ): Animator? =
-                                        super.enterAnim(view, params, windowManager, sidePattern)?.apply {
+                                    super.enterAnim(view, params, windowManager, sidePattern)
+                                        ?.apply {
                                            interpolator = OvershootInterpolator()
                                        }

                                override fun exitAnim(
-                                        view: View,
-                                        params: WindowManager.LayoutParams,
-                                        windowManager: WindowManager,
-                                        sidePattern: SidePattern
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
                                ): Animator? =
-                                        super.exitAnim(view, params, windowManager, sidePattern)
-                                                ?.setDuration(200)
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                        ?.setDuration(200)
                            })
                            .show()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun showNoticeNormalData(normalData: NoticeNormalData?) {
+        activity.let {
+            val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) }
+            noticeBannerView?.setPushData(normalData)
+            mWarningFloat = it?.let { it1 ->
+                noticeBannerView?.let { it2 ->
+                    WarningFloat.with(it1)
+                        .setTag(tag)
+                        .setLayout(it2)
+                        .setSidePattern(SidePattern.TOP)
+                        .setCountDownTime(10000)
+                        .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                        .setImmersionStatusBar(true)
+                        .addWarningStatusListener(null)
+                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                            override fun onShow() {
+                                // 创建弹窗成功才进行TTS播报
+//                                    AIAssist.getInstance(activity)
+//                                            .speakTTSVoice("")
+                            }
+                        })
+                        .setAnimator(object : DefaultAnimator() {
+                            override fun enterAnim(
+                                view: View,
+                                params: WindowManager.LayoutParams,
+                                windowManager: WindowManager,
+                                sidePattern: SidePattern
+                            ): Animator? =
+                                super.enterAnim(view, params, windowManager, sidePattern)?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }
+
+                            override fun exitAnim(
+                                view: View,
+                                params: WindowManager.LayoutParams,
+                                windowManager: WindowManager,
+                                sidePattern: SidePattern
+                            ): Animator? =
+                                super.exitAnim(view, params, windowManager, sidePattern)
+                                    ?.setDuration(200)
+                        })
+                        .show()
                }
            }
        }
@@ -368,40 +386,40 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                    }
                })
                cameraViewFloat = WarningFloat.with(it)
-                        .setTag("CameraListFloat")
-                        .setLayout(cameraListView!!)
-                        .setSidePattern(SidePattern.RIGHT)
-                        .setLocation(1742, 280)
-                        .setImmersionStatusBar(true)
-                        .setAnimator(object : DefaultAnimator() {
-                            override fun enterAnim(
-                                    view: View,
-                                    params: WindowManager.LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.enterAnim(view, params, windowManager, sidePattern)
-                                            ?.apply {
-                                                interpolator = OvershootInterpolator()
-                                            }
+                    .setTag("CameraListFloat")
+                    .setLayout(cameraListView!!)
+                    .setSidePattern(SidePattern.RIGHT)
+                    .setLocation(1742, 280)
+                    .setImmersionStatusBar(true)
+                    .setAnimator(object : DefaultAnimator() {
+                        override fun enterAnim(
+                            view: View,
+                            params: WindowManager.LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.enterAnim(view, params, windowManager, sidePattern)
+                                ?.apply {
+                                    interpolator = OvershootInterpolator()
+                                }

-                            override fun exitAnim(
-                                    view: View,
-                                    params: WindowManager.LayoutParams,
-                                    windowManager: WindowManager,
-                                    sidePattern: SidePattern
-                            ): Animator? =
-                                    super.exitAnim(view, params, windowManager, sidePattern)
-                                            ?.setDuration(200)
-                        })
-                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                            override fun onDismiss() {
-                                cameraViewFloat = null
-                                cameraListView = null
-                                ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor)
-                            }
-                        })
-                        .show()
+                        override fun exitAnim(
+                            view: View,
+                            params: WindowManager.LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                        override fun onDismiss() {
+                            cameraViewFloat = null
+                            cameraListView = null
+                            ivCameraIcon.setBackgroundResource(R.drawable.icon_camera_nor)
+                        }
+                    })
+                    .show()
            } else {
                cameraViewFloat?.show()
            }
@@ -421,4 +439,5 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
        Log.d(TAG, "onDestroy")
    }

+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt
@@ -15,128 +15,5 @@ interface MoGoWarningContract {

    interface View : IView {

-        /**
-         * 隐藏 脉速表
-         * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-         */
-        fun setSpeedChartViewVisibility(visibility: Int)
-
-        /**
-         * 隐藏 自动驾驶触发 按钮
-         *  @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-         */
-        fun setAutopilotStatusViewVisibility(visibility: Int)
-
-        /**
-         * 隐藏 切换视角 按钮
-         * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-         */
-        fun setPerspectiveSwitchViewVisibility(visibility: Int)
-
-        /**
-         * 隐藏 检测状态 按钮
-         * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-         */
-        fun setCheckStatusViewVisibility(visibility: Int)
-
-        /**
-         * 展示VR下V2X预警
-         *
-         * @param v2xType      V2X类型
-         * @param alertContent 提醒文本
-         * @param ttsContent   tts语音播报消息
-         * @param tag          tag绑定弹窗的标志
-         */
-        fun showWarningV2X(
-            v2xType: Int,
-            alertContent: String?,
-            ttsContent: String?,
-            tag: String?,
-            listenerIMoGo: IMoGoWarningStatusListener?
-        )
-
-        /**
-         * 关闭指定floatTag 的 VR下V2X预警弹窗
-         * @param tag 弹窗标识
-         */
-        fun disableWarningV2X(tag: String)
-
-        /**
-         * 展示红绿灯预警
-         *
-         * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
-         */
-        fun showWarningTrafficLight(checkLightId: Int)
-
-        /**
-         * 关闭红绿灯预警
-         */
-        fun disableWarningTrafficLight()
-
-        /**
-         * 修改红灯倒计时
-         */
-        fun changeCountdownRed(redNum: Int)
-
-        /**
-         * 修改黄灯倒计时
-         */
-        fun changeCountdownYellow(yellowNum: Int)
-
-        /**
-         * 修改绿灯倒计时
-         */
-        fun changeCountdownGreen(greenNum: Int)
-
-        /**
-         * @param readNum 红灯倒计时
-         * @param yellowNum 黄灯倒计时
-         * @param greenNum 绿灯倒计时
-         */
-        fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int)
-
-        /**
-         * 展示限速预警
-         *
-         * @param limitingSpeed 限速速度
-         */
-        fun showLimitingVelocity(limitingSpeed: Int)
-
-        /**
-         * 关闭限速预警
-         */
-        fun disableLimitingVelocity()
-
-        /**
-         * 展示指定方位上的红框预警
-         * @param direction
-         * @see WarningDirectionEnum
-         */
-        fun showWarning(direction: WarningDirectionEnum)
-
-        /**
-         * 展示指定方位上的红框预警
-         * @param direction
-         * @see WarningDirectionEnum
-         * @param closeTime 倒计时
-         */
-        fun showWarning(direction: WarningDirectionEnum, closeTime: Long)
-
-        /**
-         * 展示云公告顶部弹窗
-         * @param trafficStylePushData
-         */
-        fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData)
-
-        /**
-         * 展示普通云公告
-         * @param normalData
-         */
-        fun showNoticeNormalData(normalData: NoticeNormalData)
-
-        /**
-         * 展示VIP标识
-         */
-        fun vipIdentification(visible: Boolean)
    }
 }