merge

2022-03-15 12:22:34 +08:00
parent 422000ab3c b6d8cd940d
commit d14565c72b
1568 changed files with 13876 additions and 72455 deletions
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/WaringConst.java
@@ -5,7 +5,6 @@ package com.mogo.eagle.core.function.hmi;
 * @date 2021/8/3 4:26 下午
 */
 public class WaringConst {
-    public static String MODULE_NAME = "MODULE_HMI_WARING";

    // V2X 弹窗预警
    // 是否展示：true-展示，false-关闭
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloat.kt
@@ -9,7 +9,9 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
 import com.mogo.eagle.core.function.hmi.notification.interfaces.OnFloatAnimator
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.reminder.Reminder
 import com.mogo.eagle.core.utilcode.reminder.api.impl.ViewReminder
 import com.mogo.eagle.core.utilcode.util.WindowUtils
@@ -175,7 +177,7 @@ class WarningFloat {
            when {
                // 未设置浮窗布局文件/布局视图，不予创建
                config.layoutId == null && config.layoutView == null ->
-                    Logger.e(TAG, "需要传入 layoutId 或 layoutView ")
+                    CallerLogger.e("$M_HMI$TAG", "需要传入 layoutId 或 layoutView ")
                // 申请浮窗权限
                else -> {
                    var content: View? = null
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/notification/WarningFloatWindowHelper.kt
@@ -7,7 +7,6 @@ import android.app.Service
 import android.content.Context
 import android.graphics.PixelFormat
 import android.graphics.Rect
-import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -15,7 +14,8 @@ import android.view.WindowManager
 import com.mogo.eagle.core.function.hmi.notification.anim.AnimatorManager
 import com.mogo.eagle.core.function.hmi.notification.enums.ShowPattern
 import com.mogo.eagle.core.function.hmi.notification.widget.ParentFrameLayout
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+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.WindowUtils

 /**
@@ -47,7 +47,7 @@ internal class WarningFloatWindowHelper(
            config.isShow = true
            true
        } else {
-            Logger.e(TAG, "activity 必须是 Activity 的实现")
+            CallerLogger.e("$M_HMI$TAG", "activity 必须是 Activity 的实现")
            false
        }
    }
@@ -125,7 +125,6 @@ internal class WarningFloatWindowHelper(
    fun resetDownTime() {
        // 设置倒计时指定秒数后自动关闭Window
        if (config.countDownTime > 0) {
-            Log.d(TAG, "重置弹窗时常")
            frameLayout?.removeCallbacks(closeWarningTask)
            frameLayout?.postDelayed(closeWarningTask, config.countDownTime)
        }
@@ -217,7 +216,7 @@ internal class WarningFloatWindowHelper(
        // removeView是异步删除，在Activity销毁的时候会导致窗口泄漏，所以使用removeViewImmediate直接删除view
        windowManager.run { if (force) removeViewImmediate(frameLayout) else removeView(frameLayout) }
    } catch (e: Exception) {
-        Logger.e(TAG, "浮窗关闭出现异常：$e")
+        CallerLogger.e("$M_HMI$TAG", "浮窗关闭出现异常：$e")
    }


@@ -259,7 +258,6 @@ internal class WarningFloatWindowHelper(
            // 上中
            Gravity.CENTER_HORIZONTAL, Gravity.TOP or Gravity.CENTER_HORIZONTAL -> {
                params.x = (parentRect.right - view.width).shr(1)
-                Log.d(TAG, "layoutParams:${params.x},${params.y}")
            }
            // 下中
            Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL -> {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt
@@ -3,8 +3,16 @@ package com.mogo.eagle.core.function.hmi.receiver
 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.data.notice.NoticeNormalData
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBrakeLight
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showTurnLight
+import com.mogo.eagle.core.function.hmi.WaringConst
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.util.SharedPrefs
+import com.mogo.service.IMogoServiceApis

 /**
 * 转向灯，刹车
--- 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
@@ -3,9 +3,13 @@ package com.mogo.eagle.core.function.hmi.receiver
 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.eagle.core.utilcode.mogo.logger.Logger
+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.service.IMogoServiceApis

 /**
 * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 控制限速标志
@@ -17,10 +21,13 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {

    companion object {
        private const val TAG = "V2XLimitingVelocityBroadcastReceiver"
+        private var mMogoServiceApis: IMogoServiceApis? = null
    }

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

            val limitingVelocityIsShow =
@@ -34,8 +41,8 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
                    0
                )

-            Logger.d(
-                TAG,
+            CallerLogger.d(
+                "$M_HMI$TAG",
                "limitingVelocityIsShow:$limitingVelocityIsShow limitingVelocitySpeed:$limitingVelocitySpeed"
            )
            if (limitingVelocityIsShow) {
--- 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
@@ -3,9 +3,11 @@ package com.mogo.eagle.core.function.hmi.receiver
 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.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.service.IMogoServiceApis

 /**
 * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 触发红绿灯场景
@@ -17,10 +19,13 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {

    companion object {
        private const val TAG = "V2XTrafficLightBroadcastReceiver"
+        private var mMogoServiceApis: IMogoServiceApis? = null
    }

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

            val trafficLightIsShow =
@@ -34,10 +39,6 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
                    0
                )

-            Logger.d(
-                TAG,
-                "trafficLightIsShow:$trafficLightIsShow trafficLightCheckType:$trafficLightCheckType"
-            )
            if (trafficLightIsShow) {
                // 分发场景
                dispatchShowWaring(trafficLightCheckType)
--- 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
@@ -5,7 +5,8 @@ import android.content.Context
 import android.content.Intent
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.module.common.enums.EventTypeEnum

 /**
@@ -33,8 +34,8 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
                intent.getStringExtra(WaringConst.BROADCAST_V2X_TTS_CONTENT_EXTRA_KEY)
            val tag =
                intent.getStringExtra(WaringConst.BROADCAST_V2X_TAG_EXTRA_KEY)
-            Logger.d(
-                TAG,
+            CallerLogger.d(
+                "$M_HMI$TAG",
                "v2xType:$v2xType alertContent:$alertContent ttsContent:$ttsContent tag:$tag"
            )
            if (v2xIsShow) {
--- 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
@@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.hmi.ui
 import android.animation.Animator
 import android.os.Bundle
 import android.text.TextUtils
-import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
@@ -13,10 +12,10 @@ 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.autopilot.AdUpgradeStateHelper
-import com.mogo.eagle.core.data.autopilot.AutoPilotRecordResult
 import com.mogo.eagle.core.data.camera.CameraEntity
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
+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.notice.NoticeNormalData
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
@@ -27,6 +26,7 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
 import com.mogo.eagle.core.function.call.check.CallerCheckManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.hmi.R
@@ -40,13 +40,13 @@ import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView
 import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
 import com.mogo.eagle.core.function.hmi.ui.tools.AutoPilotAndCheckView
 import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.mogo.module.common.enums.EventTypeEnum
 import kotlinx.android.synthetic.main.fragment_hmi.*
 import kotlinx.coroutines.*
+import record_cache.RecordPanelOuterClass
 import java.util.*

 /**
@@ -56,8 +56,8 @@ import java.util.*
 */
@Route(path = MoGoFragmentPaths.PATH_FRAGMENT_HMI)
 class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>(),
-        IMoGoWaringProvider,
-        MoGoWarningContract.View, IMoGoAutopilotIdentifyListener {
+    IMoGoWaringProvider,
+    MoGoWarningContract.View, IMoGoAutopilotIdentifyListener {
    private val TAG = "MoGoHmiFragment"

    // DebugSettingView
@@ -89,7 +89,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>

    override fun vipIdentification(visible: Boolean) {
        ThreadUtils.runOnUiThread {
-            Logger.d(TAG, "vipIdentification")
            if (visible) {
                flVipIdentificationView?.visibility = View.VISIBLE
            } else {
@@ -137,13 +136,13 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
    }

    @OptIn(ExperimentalCoroutinesApi::class)
-    override fun onAutopilotRecordResult(record: AutoPilotRecordResult?) {
+    override fun onAutopilotRecordResult(record: RecordPanelOuterClass.RecordPanel) {
        record ?: return
        if (HmiBuildConfig.isShowBadCaseView && record.type == 1 && record.stat == 100) {
            CallerDevaToolsManager.onReceiveBadCaseRecord(record)
        }
        if (record.type == 2 && (record.stat == 101 || record.stat == 100)) {
-            CallerMapDataCollectorManager.finish(record.id, record.stat, "", record.fileName
+            CallerMapDataCollectorManager.finish(record.id, record.stat, "", record.filename
                    ?: "", record.note ?: "")
        }
    }
@@ -186,7 +185,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
    }

    private fun showToolsFloat() {
-        Logger.d(TAG, "showToolsFloat")
        context?.let {
            if (toolsViewFloat == null) {
                if (toolsView == null) {
@@ -208,41 +206,41 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                    })
                }
                toolsViewFloat = WarningFloat.with(it)
-                        .setTag("ToolsViewFloat")
-                        .setLayout(toolsView!!)
-                        .setSidePattern(SidePattern.LEFT)
-                        .setGravity(Gravity.LEFT, offsetY = 72)
-                        .setImmersionStatusBar(true)
-                        .setWindowHeight(WindowManager.LayoutParams.MATCH_PARENT)
-                        .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("ToolsViewFloat")
+                    .setLayout(toolsView!!)
+                    .setSidePattern(SidePattern.LEFT)
+                    .setGravity(Gravity.LEFT, offsetY = 72)
+                    .setImmersionStatusBar(true)
+                    .setWindowHeight(WindowManager.LayoutParams.MATCH_PARENT)
+                    .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() {
-                                toolsViewFloat = null
-                                toolsView = null
-                                // TODO:("")
-                            }
-                        })
-                        .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() {
+                            toolsViewFloat = null
+                            toolsView = null
+                            // TODO:("")
+                        }
+                    })
+                    .show()
            } else {
                toolsViewFloat?.show()
            }
@@ -336,7 +334,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     * 开关DebugView
     */
    override fun toggleDebugView() {
-        Log.d(TAG, "长按显示状态工具栏")
+        CallerLogger.d("$M_HMI$TAG", "长按显示状态工具栏")
        context?.let {
            if (mDebugSettingViewFloat != null) {
                WarningFloat.dismiss(mDebugSettingViewFloat!!.config.floatTag, false)
@@ -347,33 +345,33 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                    mDebugSettingView = DebugSettingView(it)
                }
                mDebugSettingViewFloat = WarningFloat.with(it)
-                        .setTag("DebugSettingView")
-                        .setLayout(mDebugSettingView!!)
-                        .setSidePattern(SidePattern.RIGHT)
-                        .setGravity(Gravity.RIGHT, offsetY = 70)
-                        .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("DebugSettingView")
+                    .setLayout(mDebugSettingView!!)
+                    .setSidePattern(SidePattern.RIGHT)
+                    .setGravity(Gravity.RIGHT, offsetY = 70)
+                    .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)
-                        })
-                        .show()
+                        override fun exitAnim(
+                            view: View,
+                            params: WindowManager.LayoutParams,
+                            windowManager: WindowManager,
+                            sidePattern: SidePattern
+                        ): Animator? =
+                            super.exitAnim(view, params, windowManager, sidePattern)
+                                ?.setDuration(200)
+                    })
+                    .show()
            }
        }
    }
@@ -387,7 +385,15 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     * @param tag          tag绑定弹窗的标志
     */
    @Synchronized
-    override fun showWarningV2X(v2xType: Int, alertContent: CharSequence?, ttsContent: String?, tag: String?, listenerIMoGo: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long) {
+    override fun showWarningV2X(
+        v2xType: Int,
+        alertContent: CharSequence?,
+        ttsContent: String?,
+        tag: String?,
+        listenerIMoGo: IMoGoWarningStatusListener?,
+        playTts: Boolean,
+        expireTime: Long
+    ) {
        lifecycleScope.launchWhenResumed {
            activity?.let {
                val floatWindow = mWarningFloat
@@ -396,9 +402,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                    val notificationView = V2XNotificationView(it)
                    notificationView.setWarningIcon(EventTypeEnum.getWarningIcon(v2xType.toString()))
                    val warningContent = alertContent
-                            ?: EventTypeEnum.getWarningContent(v2xType.toString())
+                        ?: EventTypeEnum.getWarningContent(v2xType.toString())
                    if (warningContent.isEmpty()) {
-                        Logger.e(TAG, "Show warningContent is null or empty!")
+                        CallerLogger.e("$M_HMI$TAG", "Show warningContent is null or empty!")
                        return@launchWhenResumed
                    } else {
                        notificationView.setWarningContent(warningContent)
@@ -407,48 +413,49 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                        WarningFloat.dismiss(floatWindow.config.floatTag, true)
                    }
                    mWarningFloat = WarningFloat.with(it)
-                            .setTag(tag)
-                            .setLayout(notificationView)
-                            .setSidePattern(SidePattern.RESULT_TOP)
-                            .setCountDownTime(expireTime)
-                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                            .setImmersionStatusBar(true)
-                            .isEnqueue(true)
-                            .addWarningStatusListener(listenerIMoGo)
-                            .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                override fun onShow() {
-                                    // 创建弹窗成功才进行TTS播报
-                                    Logger.d(
-                                            "MoGoWarningFragment",
-                                            "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent"
-                                    )
-                                    if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent) && playTts) {
-                                        Logger.d("MoGoWarningFragment", "---> ttsContent = $ttsContent")
-                                        AIAssist.getInstance(activity)
-                                                .speakTTSVoice(ttsContent)
-                                    }
+                        .setTag(tag)
+                        .setLayout(notificationView)
+                        .setSidePattern(SidePattern.RESULT_TOP)
+                        .setCountDownTime(expireTime)
+                        .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                        .setImmersionStatusBar(true)
+                        .isEnqueue(true)
+                        .addWarningStatusListener(listenerIMoGo)
+                        .addWarningStatusListener(object : IMoGoWarningStatusListener {
+                            override fun onShow() {
+                                // 创建弹窗成功才进行TTS播报
+                                CallerLogger.d(
+                                    "$M_HMI$TAG",
+                                    "mWarningFloat = $mWarningFloat---ttsContent = $ttsContent"
+                                )
+                                if (mWarningFloat != null && !TextUtils.isEmpty(ttsContent) && playTts) {
+                                    CallerLogger.d("$M_HMI$TAG", "---> 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()
                } else {
                    val notification = floatWindow.config.layoutView as? V2XNotificationView
                    if (alertContent?.isNotEmpty() == true) {
@@ -567,42 +574,42 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                mNoticeFloat = it?.let { it1 ->
                    noticeBannerView?.let { it2 ->
                        WarningFloat.with(it1)
-                                .setTag(WaringConst.NOTICE_FOR_TRAFFIC_KEY)
-                                .setLayout(it2)
-                                .setSidePattern(SidePattern.TOP)
-                                .setCountDownTime(60 * 1000 * 3)
-                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                                .setImmersionStatusBar(true)
-                                .addWarningStatusListener(object : IMoGoWarningStatusListener {
-                                    override fun onShow() {
-                                        // 创建弹窗成功才进行TTS播报
+                            .setTag(WaringConst.NOTICE_FOR_TRAFFIC_KEY)
+                            .setLayout(it2)
+                            .setSidePattern(SidePattern.TOP)
+                            .setCountDownTime(60 * 1000 * 3)
+                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                            .setImmersionStatusBar(true)
+                            .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()
-                                                    }
+                            })
+                            .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()
                    }
                }
            }
@@ -617,41 +624,41 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                mNoticeFloat = it.let { it1 ->
                    noticeBannerView?.let { it2 ->
                        WarningFloat.with(it1)
-                                .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
-                                .setLayout(it2)
-                                .setSidePattern(SidePattern.TOP)
-                                .setCountDownTime(10000)
-                                .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
-                                .setImmersionStatusBar(true)
-                                .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()
-                                                    }
+                            .setTag(WaringConst.NOTICE_FOR_NORMAL_KEY)
+                            .setLayout(it2)
+                            .setSidePattern(SidePattern.TOP)
+                            .setCountDownTime(10000)
+                            .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110)
+                            .setImmersionStatusBar(true)
+                            .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 exitAnim(
+                                    view: View,
+                                    params: WindowManager.LayoutParams,
+                                    windowManager: WindowManager,
+                                    sidePattern: SidePattern
+                                ): Animator? =
+                                    super.exitAnim(view, params, windowManager, sidePattern)
+                                        ?.setDuration(200)
+                            })
+                            .show()
                    }
                }
            }
@@ -706,40 +713,40 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                    }
                })
                cameraViewFloat = WarningFloat.with(it)
-                        .setTag("CameraListFloat")
-                        .setLayout(cameraListView!!)
-                        .setSidePattern(SidePattern.RIGHT)
-                        .setGravity(Gravity.RIGHT, -40, 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)
+                    .setGravity(Gravity.RIGHT, -40, 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()
            }
@@ -767,7 +774,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     */
    override fun showTurnLight(light: Int) {
        if (HmiBuildConfig.isShowTurnLightView) {
-            //Log.d("liyz", "showTurnLight  light = $light")
            turnLightView.setTurnLight(light)
        }
    }
@@ -777,7 +783,6 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     */
    override fun showBrakeLight(light: Int) {
        if (HmiBuildConfig.isShowBrakeLightView) {
-//            Log.d("liyz", "showBrakeLight  light = $light")
            brakeView.setBrakeLight(light)
        }
    }
@@ -800,12 +805,12 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     * @param upgradeStatus 升级状态
     */
    override fun showAdUpgradeStatus(
-            upgradeMode: Int,
-            downloadStatus: Int,
-            currentProgress: Int,
-            totalProgress: Int,
-            downloadVersion: String,
-            upgradeStatus: Int
+        upgradeMode: Int,
+        downloadStatus: Int,
+        currentProgress: Int,
+        totalProgress: Int,
+        downloadVersion: String,
+        upgradeStatus: Int
    ) {
        ThreadUtils.runOnUiThread {
            val tipsView = upgradeTipsView?.invoke()
@@ -825,7 +830,14 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
                }
            }
            //将状态同步到工具箱
-            toolsView?.showAdUpgradeStatus(upgradeMode, downloadStatus, currentProgress, totalProgress, downloadVersion, upgradeStatus)
+            toolsView?.showAdUpgradeStatus(
+                upgradeMode,
+                downloadStatus,
+                currentProgress,
+                totalProgress,
+                downloadVersion,
+                upgradeStatus
+            )
        }

    }
@@ -877,7 +889,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>

    override fun onDestroy() {
        super.onDestroy()
-        Log.d(TAG, "onDestroy")
+        CallerLogger.d("$M_HMI$TAG", "onDestroy")
    }


--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt
@@ -23,7 +23,8 @@ import com.mogo.cloud.trafficlive.api.MoGoAiCloudTrafficLive
 import com.mogo.eagle.core.data.camera.CameraEntity
 import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+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.widget.media.video.SimpleVideoPlayer
 import com.shuyu.gsyvideoplayer.GSYVideoManager
 import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
@@ -33,7 +34,6 @@ import com.shuyu.gsyvideoplayer.player.PlayerFactory
 import com.shuyu.gsyvideoplayer.utils.GSYVideoType
 import kotlinx.android.synthetic.main.view_camera_list.view.*
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
-import java.lang.Exception

 /**
 * @author ChenFufeng
@@ -100,16 +100,16 @@ class CameraListView : FrameLayout {
                    when {
                        !cameraEntity.isCarLive() -> {
                            if (!cameraEntity.flvUrl.isNullOrEmpty()) {
-                                Logger.d(
-                                    TAG,
+                                CallerLogger.d(
+                                    "$M_HMI$TAG",
                                    "播放地址为：${cameraEntity.flvUrl!!}，ip为：${cameraEntity.ip}"
                                )
                                gsyVideoPlay(cameraEntity.flvUrl!!)
                            } else if (!cameraEntity.ip.isNullOrEmpty()) {
-                                Logger.d(TAG, "打开推流的摄像头ip为：${cameraEntity.ip}")
+                                CallerLogger.d("$M_HMI$TAG", "打开推流的摄像头ip为：${cameraEntity.ip}")
                                CallerMonitorManager.openCameraStream(cameraEntity.ip!!)
                            } else {
-                                Logger.e(TAG, "摄像头视频播放地址和ip均为空")
+                                CallerLogger.e("$M_HMI$TAG", "摄像头视频播放地址和ip均为空")
                            }
                        }
                        else -> {
@@ -145,7 +145,7 @@ class CameraListView : FrameLayout {
        PlayerFactory.setPlayManager(IjkPlayerManager::class.java)
        svpPlayer.setPlayListener(object : SimpleVideoPlayer.PlayListener {
            override fun onPlayEvent(event: Int) {
-                Logger.d(TAG, "onPlayEvent: event is:$event")
+                CallerLogger.d("$M_HMI$TAG", "onPlayEvent: event is:$event")
                when (event) {
                    SimpleVideoPlayer.PLAY_EVT_PLAY_LOADING -> {
                        // 会出现临时中断后又可以继续播放，需要停掉倒计时
@@ -162,7 +162,7 @@ class CameraListView : FrameLayout {
                        }
                    }
                    else -> {
-                        Logger.w(TAG, "播放视频异常,event is:$event")
+                        CallerLogger.w("$M_HMI$TAG", "播放视频异常,event is:$event")
                        showNoSignalView()
                        if (!valueAnimator.isStarted && !valueAnimator.isRunning) {
                            valueAnimator.start()
@@ -217,8 +217,8 @@ class CameraListView : FrameLayout {
        liveStreamManager.setLiveStatusChangeCallback {
            textureView
                .post {
-                handleSnLiveStatus(it)
-            }
+                    handleSnLiveStatus(it)
+                }
        }
    }

@@ -250,11 +250,14 @@ class CameraListView : FrameLayout {

    private val trafficCarLiveCallBack = object : ITrafficCarLiveCallBack {
        override fun onLive(liveSn: String?) {
-            Logger.d(TAG, "onLive")
+            CallerLogger.d("$M_HMI$TAG", "onLive")
        }

        override fun onFirstFrame() {
-            Logger.d(TAG, "onFirstFrame:isFirstPage is:$isFirstPage,isCarLive is:${isCarLive()}")
+            CallerLogger.d(
+                "$M_HMI$TAG",
+                "onFirstFrame:isFirstPage is:$isFirstPage,isCarLive is:${isCarLive()}"
+            )
            if (!isFirstPage && isCarLive()) {
                clickListener?.onShowLive(true)
                // 会出现临时中断后又可以继续播放，需要停掉倒计时
@@ -269,7 +272,7 @@ class CameraListView : FrameLayout {
        }

        override fun onDisConnect() {
-            Logger.e(TAG, "onDisConnect")
+            CallerLogger.e("$M_HMI$TAG", "onDisConnect")
            if (!isFirstPage && isCarLive()) {
                showNoSignalView()
                if (!valueAnimator.isStarted && !valueAnimator.isRunning) {
@@ -279,7 +282,7 @@ class CameraListView : FrameLayout {
        }

        override fun onError(errorMsg: String?) {
-            Logger.e(TAG, "onError msg is:${errorMsg}")
+            CallerLogger.e("$M_HMI$TAG", "onError msg is:${errorMsg}")
            if (!isFirstPage && isCarLive()) {
                // 发生错误
                showNoSignalView()
@@ -299,7 +302,7 @@ class CameraListView : FrameLayout {

    @SuppressLint("NotifyDataSetChanged")
    fun refreshCameraList(cameraInfoList: List<CameraEntity>?) {
-        Logger.d(TAG, "refreshCameraList")
+        CallerLogger.d("$M_HMI$TAG", "refreshCameraList")
        this.cameraInfoList.clear()
        cameraInfoList?.let {
            this.cameraInfoList.addAll(it)
@@ -338,13 +341,16 @@ class CameraListView : FrameLayout {
    }

    private fun stopLive() {
-        Logger.d(TAG, "stopLive")
+        CallerLogger.d("$M_HMI$TAG", "stopLive")
        when {
            !isCarLive() -> {
                try {
                    GSYVideoManager.releaseAllVideos()
                } catch (e: Exception) {
-                    Logger.e(TAG, "stopLive exception msg is:${e.message},cause is:${e.cause}")
+                    CallerLogger.e(
+                        "$M_HMI$TAG",
+                        "stopLive exception msg is:${e.message},cause is:${e.cause}"
+                    )
                    e.printStackTrace()
                }
            }
@@ -352,7 +358,7 @@ class CameraListView : FrameLayout {
                if (!liveSn.isNullOrEmpty()) {
                    MoGoAiCloudTrafficLive.stopCarLive(liveSn)
                } else {
-                    Logger.d(TAG, "StopCarLive sn is null or empty!")
+                    CallerLogger.d("$M_HMI$TAG", "StopCarLive sn is null or empty!")
                }
            }
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/carcorder/CarcorderPreviewView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/carcorder/CarcorderPreviewView.kt
@@ -5,17 +5,17 @@ import android.app.Activity
 import android.content.Context
 import android.hardware.usb.UsbDevice
 import android.os.Looper
-import android.util.Log
 import android.view.*
 import android.view.animation.OvershootInterpolator
 import com.mogo.cloud.live.manager.ILiveStreamManager
 import com.mogo.cloud.live.manager.LiveStreamManagerImpl
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
 import com.mogo.eagle.core.function.hmi.notification.anim.DefaultAnimator
 import com.mogo.eagle.core.function.hmi.notification.enums.SidePattern
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.usbcamera.UVCCameraHelper
 import com.serenegiant.usb.ParentPreviewConstraintLayout
 import com.serenegiant.usb.widget.CameraViewInterface
@@ -116,7 +116,7 @@ class CarcorderPreviewView private constructor(

    private val listener: UVCCameraHelper.OnMyDevConnectListener = object : UVCCameraHelper.OnMyDevConnectListener {
        override fun onAttachDev(device: UsbDevice?) {
-            Log.d(TAG, "onAttachDev")
+             CallerLogger.d("$M_HMI$TAG", "onAttachDev")
            // request open permission
            if (!isRequest) {
                isRequest = true
@@ -125,7 +125,7 @@ class CarcorderPreviewView private constructor(
        }

        override fun onDettachDev(device: UsbDevice) {
-            Log.d(TAG, "onDettachDev")
+             CallerLogger.d("$M_HMI$TAG", "onDettachDev")
            // close camera
            if (isRequest) {
                isRequest = false
@@ -135,7 +135,7 @@ class CarcorderPreviewView private constructor(
        }

        override fun onConnectDev(device: UsbDevice?, isConnected: Boolean) {
-            Log.d(TAG, "onConnectDev:isConnected=$isConnected")
+             CallerLogger.d("$M_HMI$TAG", "onConnectDev:isConnected=$isConnected")
            if (!isConnected) {
                showShortMsg("fail to connect,please check resolution params")
                isPreview = false
@@ -152,8 +152,8 @@ class CarcorderPreviewView private constructor(
                    }
                    Looper.prepare()
                    if (mCameraHelper != null && mCameraHelper!!.isCameraOpened) {
-                        Logger.d(TAG, "亮度(brightness):${mCameraHelper!!.getModelValue(UVCCameraHelper.MODE_BRIGHTNESS)}")
-                        Logger.d(TAG, "对比度(contrast):${mCameraHelper!!.getModelValue(UVCCameraHelper.MODE_CONTRAST)}")
+                        CallerLogger.d("$M_HMI$TAG", "亮度(brightness):${mCameraHelper!!.getModelValue(UVCCameraHelper.MODE_BRIGHTNESS)}")
+                        CallerLogger.d("$M_HMI$TAG", "对比度(contrast):${mCameraHelper!!.getModelValue(UVCCameraHelper.MODE_CONTRAST)}")
                    }
                    Looper.loop()
                }.start()
@@ -161,12 +161,12 @@ class CarcorderPreviewView private constructor(
        }

        override fun onDisConnectDev(device: UsbDevice?) {
-            Log.d(TAG, "onDisConnectDev")
+             CallerLogger.d("$M_HMI$TAG", "onDisConnectDev")
            showShortMsg("相机断开连接")
        }

        override fun onCancelDev(device: UsbDevice?) {
-            Log.d(TAG, "onCancelDev：" + device?.deviceName)
+             CallerLogger.d("$M_HMI$TAG", "onCancelDev：" + device?.deviceName)
        }
    }

@@ -183,8 +183,7 @@ class CarcorderPreviewView private constructor(
        mCameraHelper?.initUSBMonitor(context as Activity, carcorderPreview, listener)

        mCameraHelper?.setOnPreviewFrameListener { nv21Yuv ->
-            Log.d(TAG, "onPreviewResult: " + nv21Yuv.size)
-            //Log.i(TAG, "onVideoFrame byte length: " + bytesLength);
+             CallerLogger.d("$M_HMI$TAG", "onPreviewResult: " + nv21Yuv.size)
            if (liveStreamManager != null) {
                // 将摄像头采集的YUV数据推送到ZEGO
                liveStreamManager!!.notifyYUVData(nv21Yuv, 640, 480, 2)
@@ -208,9 +207,9 @@ class CarcorderPreviewView private constructor(
        // 设置状态回调
        liveStreamManager!!.setLiveStatusChangeCallback { status ->
            if (status == 0) {
-                Logger.d(TAG, "直播中……")
+                CallerLogger.d("$M_HMI$TAG", "直播中……")
            } else {
-                Logger.d(TAG, "直播结束……")
+                CallerLogger.d("$M_HMI$TAG", "直播结束……")
            }
        }
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt
@@ -3,12 +3,13 @@ package com.mogo.eagle.core.function.hmi.ui.notice
 import android.content.Context
 import android.graphics.Bitmap
 import android.text.TextUtils
-import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.data.notice.NoticeNormalData
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideRoundedCornersTransform
@@ -209,15 +210,15 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO
                }

                override fun onClickStop(url: String, vararg objects: Any) {
-                    Log.d(TAG, "onClickStop")
+                     CallerLogger.d(M_HMI + TAG, "onClickStop")
                }

                override fun onStartPrepared(url: String, vararg objects: Any) {
-                    Log.d(TAG, "onStartPrepared")
+                     CallerLogger.d(M_HMI + TAG, "onStartPrepared")
                }

                override fun onPlayError(url: String, vararg objects: Any) {
-                    Log.d(TAG, "onPlayError")
+                     CallerLogger.d(M_HMI + TAG, "onPlayError")
                    pushImageView?.visibility = View.GONE
                    pushVideo?.visibility = View.GONE
                    playImageView!!.visibility = View.GONE
@@ -244,7 +245,7 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO
                override fun onClickStartThumb(url: String, vararg objects: Any) {}
                override fun onClickBlank(url: String, vararg objects: Any) {}
                override fun onClickBlankFullscreen(url: String, vararg objects: Any) {
-                    Log.d(TAG, "onClickBlankFullscreen")
+                     CallerLogger.d(M_HMI + TAG, "onClickBlankFullscreen")
                }
            })
        }).start()
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficAdapter.java
@@ -1,7 +1,6 @@
 package com.mogo.eagle.core.function.hmi.ui.notice;

 import android.content.Context;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +9,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo;
 import com.mogo.eagle.core.data.notice.NoticeValue;
 import com.mogo.eagle.core.function.hmi.R;

@@ -23,7 +21,6 @@ import java.util.List;
 * @since: 10/26/21
 */
 class NoticeTrafficAdapter extends RecyclerView.Adapter {
-    private String TAG = "AINotice";
    LayoutInflater mLayoutInflater;
    private List<NoticeValue> data = new ArrayList();

@@ -41,8 +38,7 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter {
    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
        View v = mLayoutInflater.inflate(R.layout.notice_traffice_info_list_adapter, parent,
                false);
-        TrafficInfoHolder holder = new TrafficInfoHolder(v);
-        return holder;
+        return new TrafficInfoHolder(v);
    }

    @Override
@@ -61,13 +57,12 @@ class NoticeTrafficAdapter extends RecyclerView.Adapter {

    @Override
    public int getItemCount() {
-        Log.d(TAG, "getItemCount++" + String.valueOf(data.size()));
        return data.size();
    }

-    public class TrafficInfoHolder extends RecyclerView.ViewHolder {
-        private TextView keyText;
-        private TextView valueText;
+    private static class TrafficInfoHolder extends RecyclerView.ViewHolder {
+        private final TextView keyText;
+        private final TextView valueText;

        public TrafficInfoHolder(@NonNull View itemView) {
            super(itemView);
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java
@@ -1,8 +1,9 @@
 package com.mogo.eagle.core.function.hmi.ui.notice;

+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
+
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -20,6 +21,7 @@ import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData;
 import com.mogo.eagle.core.data.notice.NoticeValue;
 import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
 import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
@@ -56,12 +58,12 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    private ImageView close;
    private ImageView playImageView;
    private MogoImageView thumbnailImage;
-    private GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
+    private final GSYVideoOptionBuilder gsyVideoOptionBuilder = new GSYVideoOptionBuilder();
    private TextView accept;//接受
    private TextView refuse;//拒绝
    private TextView connect;//连接
    private NoticeTrafficAdapter adapter;
-    private ArrayList dataArrayList = new ArrayList();
+    private final ArrayList dataArrayList = new ArrayList();
    private NoticeTrafficStyleInfo.NoticeTrafficAccountInfo mTrafficStyleInfo;
    private IMogoServiceApis mServiceApis;

@@ -82,7 +84,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
        playerShow();//视频播放器及接操作按钮
        recyclerVie();//详情信息列表
        mServiceApis = MogoApisHandler.getInstance().getApis();
-        mServiceApis.getStatusManagerApi().registerStatusChangedListener(TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice);
+        mServiceApis.getStatusManagerApi().registerStatusChangedListener(M_HMI + TAG, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListenerForNotice);
    }

    /**
@@ -93,9 +95,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
        mVideoPlayer = findViewById(R.id.video_player);
        thumbnailImage = findViewById(R.id.thumbnail_image);
        playImageView = this.findViewById(R.id.start_for_traffic);
-        playImageView.setOnClickListener(v -> {
-            startLive();
-        });
+        playImageView.setOnClickListener(v -> startLive());
        close = findViewById(R.id.notice_traffic_dialog_close);
        close.setOnClickListener(v -> {
            releasePlayer();
@@ -104,12 +104,8 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
        accept = findViewById(R.id.accept_traffic);
        refuse = findViewById(R.id.refuse_traffic);
        connect = findViewById(R.id.notice_connect);
-        accept.setOnClickListener(v -> {
-            feedBackTraffic(1);
-        });
-        refuse.setOnClickListener(v -> {
-            feedBackTraffic(0);
-        });
+        accept.setOnClickListener(v -> feedBackTraffic(1));
+        refuse.setOnClickListener(v -> feedBackTraffic(0));
        //重新连接
        connect.setOnClickListener(v -> {
            netWorkStatus();
@@ -127,14 +123,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
            playImageView.setVisibility(View.INVISIBLE);
            thumbnailImage.setVisibility(View.VISIBLE);
        }
-        mVideoPlayer.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/
-                    resume();
-                } else {
-                    pause();
-                }
+        mVideoPlayer.setOnClickListener(v -> {
+            if (mVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/
+                resume();
+            } else {
+                pause();
            }
        });

@@ -179,13 +172,13 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
        parameters.isSpeakVoice = false;
        parameters.vehicleType = 10;
        //云平台使用的是火星坐标,自动驾驶需要wgs84
-        double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(),mTrafficStyleInfo.getLon());
+        double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon());
        AutopilotControlParameters.AutoPilotLonLat startLocation = new AutopilotControlParameters.AutoPilotLonLat
                (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(),
                        MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat());
        parameters.startLatLon = startLocation;
        AutopilotControlParameters.AutoPilotLonLat endLocation = new AutopilotControlParameters.AutoPilotLonLat
-                (gcj02[0],gcj02[1]);
+                (gcj02[0], gcj02[1]);
        parameters.endLatLon = endLocation;
        CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters);
    }
@@ -196,12 +189,8 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    private void pause() {
        playImageView.setVisibility(View.VISIBLE);
        thumbnailImage.setVisibility(View.GONE);
-        playImageView.setOnClickListener(v -> {
-            mVideoPlayer.onVideoResume();
-        });
-        thumbnailImage.setOnClickListener(v -> {
-            mVideoPlayer.onVideoResume();
-        });
+        playImageView.setOnClickListener(v -> mVideoPlayer.onVideoResume());
+        thumbnailImage.setOnClickListener(v -> mVideoPlayer.onVideoResume());
    }

    /**
@@ -223,12 +212,8 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
                (20f, GlideRoundedCornersTransform.CornerType.ALL)).into(thumbnailImage);
        playImageView.setImageResource(R.drawable.notice_video_play);
        playImageView.setVisibility(View.VISIBLE);
-        playImageView.setOnClickListener(v -> {
-            startLive();
-        });
-        thumbnailImage.setOnClickListener(v -> {
-            startLive();
-        });
+        playImageView.setOnClickListener(v -> startLive());
+        thumbnailImage.setOnClickListener(v -> startLive());
    }

    /**
@@ -237,7 +222,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    private void startLive() {
        if (mPushData != null) {
            try {
-                Log.d(TAG, "交警事故开始播放视频startLive");
+                CallerLogger.INSTANCE.d(M_HMI + TAG, "交警事故开始播放视频startLive");
                String videoUrl = mPushData.getPoiImgUrl();
                gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag("NoticeTrafficDialog")
                        .build(mVideoPlayer);
@@ -253,118 +238,115 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    }

    private void liveCallBack() {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(mPushData.getPoiImgUrl());/*获取第一帧图*/
-                mVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
-                    @Override
-                    public void onAutoComplete(String url, Object... objects) {
-                        complete(firstBitmap);
-                    }
+        new Thread(() -> {
+            Bitmap firstBitmap = BitmapHelper.getVideoThumbnail(mPushData.getPoiImgUrl());/*获取第一帧图*/
+            mVideoPlayer.setVideoAllCallBack(new VideoAllCallBack() {
+                @Override
+                public void onAutoComplete(String url, Object... objects) {
+                    complete(firstBitmap);
+                }

-                    @Override
-                    public void onClickResume(String url, Object... objects) {
-                        thumbnailImage.setVisibility(View.GONE);
-                        playImageView.setVisibility(View.GONE);
-                    }
+                @Override
+                public void onClickResume(String url, Object... objects) {
+                    thumbnailImage.setVisibility(View.GONE);
+                    playImageView.setVisibility(View.GONE);
+                }

-                    @Override
-                    public void onClickStop(String url, Object... objects) {
-                        Log.d(TAG, "onClickStop");
-                    }
+                @Override
+                public void onClickStop(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStop");
+                }

-                    @Override
-                    public void onStartPrepared(String url, Object... objects) {
-                        Log.d(TAG, "onStartPrepared");
-                    }
+                @Override
+                public void onStartPrepared(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onStartPrepared");
+                }

-                    @Override
-                    public void onPrepared(String url, Object... objects) {
-                        Log.d(TAG, "onPrepared");
-                        thumbnailImage.setVisibility(View.GONE);
-                        playImageView.setVisibility(View.GONE);
-                        connect.setVisibility(View.GONE);
-                    }
+                @Override
+                public void onPrepared(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onPrepared");
+                    thumbnailImage.setVisibility(View.GONE);
+                    playImageView.setVisibility(View.GONE);
+                    connect.setVisibility(View.GONE);
+                }

-                    @Override
-                    public void onClickStartIcon(String url, Object... objects) {
-                        Log.d(TAG, "onClickStartIcon");
-                    }
+                @Override
+                public void onClickStartIcon(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStartIcon");
+                }

-                    @Override
-                    public void onClickStartError(String url, Object... objects) {
-                        Log.e(TAG, "onClickStartError");
-                    }
+                @Override
+                public void onClickStartError(String url, Object... objects) {
+                    CallerLogger.INSTANCE.e(M_HMI + TAG, "onClickStartError");
+                }

-                    @Override
-                    public void onClickStopFullscreen(String url, Object... objects) {
-                        Log.d(TAG, "onClickStopFullscreen");
-                    }
+                @Override
+                public void onClickStopFullscreen(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStopFullscreen");
+                }

-                    @Override
-                    public void onClickResumeFullscreen(String url, Object... objects) {
-                    }
+                @Override
+                public void onClickResumeFullscreen(String url, Object... objects) {
+                }

-                    @Override
-                    public void onClickSeekbar(String url, Object... objects) {
-                    }
+                @Override
+                public void onClickSeekbar(String url, Object... objects) {
+                }

-                    @Override
-                    public void onClickSeekbarFullscreen(String url, Object... objects) {
-                    }
+                @Override
+                public void onClickSeekbarFullscreen(String url, Object... objects) {
+                }

-                    @Override
-                    public void onEnterFullscreen(String url, Object... objects) {
-                    }
+                @Override
+                public void onEnterFullscreen(String url, Object... objects) {
+                }

-                    @Override
-                    public void onQuitFullscreen(String url, Object... objects) {
-                    }
+                @Override
+                public void onQuitFullscreen(String url, Object... objects) {
+                }

-                    @Override
-                    public void onQuitSmallWidget(String url, Object... objects) {
-                    }
+                @Override
+                public void onQuitSmallWidget(String url, Object... objects) {
+                }

-                    @Override
-                    public void onEnterSmallWidget(String url, Object... objects) {
-                    }
+                @Override
+                public void onEnterSmallWidget(String url, Object... objects) {
+                }

-                    @Override
-                    public void onTouchScreenSeekVolume(String url, Object... objects) {
-                    }
+                @Override
+                public void onTouchScreenSeekVolume(String url, Object... objects) {
+                }

-                    @Override
-                    public void onTouchScreenSeekPosition(String url, Object... objects) {
-                    }
+                @Override
+                public void onTouchScreenSeekPosition(String url, Object... objects) {
+                }

-                    @Override
-                    public void onTouchScreenSeekLight(String url, Object... objects) {
-                    }
+                @Override
+                public void onTouchScreenSeekLight(String url, Object... objects) {
+                }

-                    @Override
-                    public void onPlayError(String url, Object... objects) {
-                        thumbnailImage.setVisibility(View.VISIBLE);
-                        connect.setVisibility(View.VISIBLE);
-                        Log.d(TAG, "onPlayError");
-                    }
+                @Override
+                public void onPlayError(String url, Object... objects) {
+                    thumbnailImage.setVisibility(View.VISIBLE);
+                    connect.setVisibility(View.VISIBLE);
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onPlayError");
+                }

-                    @Override
-                    public void onClickStartThumb(String url, Object... objects) {
-                        Log.d(TAG, "onClickStartThumb");
-                    }
+                @Override
+                public void onClickStartThumb(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickStartThumb");
+                }

-                    @Override
-                    public void onClickBlank(String url, Object... objects) {
-                    }
+                @Override
+                public void onClickBlank(String url, Object... objects) {
+                }

-                    @Override
-                    public void onClickBlankFullscreen(String url, Object... objects) {
-                        Log.d(TAG, "onClickBlankFullscreen");
+                @Override
+                public void onClickBlankFullscreen(String url, Object... objects) {
+                    CallerLogger.INSTANCE.d(M_HMI + TAG, "onClickBlankFullscreen");

-                    }
-                });
-            }
+                }
+            });
        }).start();
    }

@@ -372,11 +354,11 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
     * 获取交通事故详情
     */
    private void requestTrafficInfo() {
-        Log.d(TAG, "requestTrafficInfo");
+        CallerLogger.INSTANCE.d(M_HMI + TAG, "requestTrafficInfo");
        CallerNoticeManager.getNoticeProvider().requestAccidentInfo(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), new NoticeNetCallBack() {
            @Override
            public void callBackWithResult(NoticeTrafficStyleInfo trafficInfo) {
-                Log.d(TAG, "交通事故详情::" + trafficInfo);
+                CallerLogger.INSTANCE.d(M_HMI + TAG, "交通事故详情::" + trafficInfo);
                mTrafficStyleInfo = trafficInfo.getResult().getAccidentInfo();
                infoRefresh(mTrafficStyleInfo);
            }
@@ -435,7 +417,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
     */
    private void netWorkStatus() {
        if (NetworkUtils.isAvailable(getContext())) {
-            Log.d(TAG, "网络可用");
+            CallerLogger.INSTANCE.d(M_HMI + TAG, "网络可用");
            thumbnailImage.setVisibility(View.GONE);
            connect.setVisibility(View.GONE);
            thumbnailImage.setBackgroundResource(R.drawable.notice_traffic_placeholder);
@@ -461,17 +443,14 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs
    @Override
    public void dismiss() {
        super.dismiss();
-        Log.d(TAG, "trafficdialog dismiss");
+        CallerLogger.INSTANCE.d(M_HMI + TAG, "trafficDialog dismiss");
        releasePlayer();
    }

-    private IMogoStatusChangedListener statusChangedListenerForNotice = new IMogoStatusChangedListener() {
-        @Override
-        public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-            if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
-                Log.d("AINotice", "onStatusChanged==MAIN_PAGE_IS_BACKGROUND");
-                dismiss();
-            }
+    private final IMogoStatusChangedListener statusChangedListenerForNotice = (descriptor, isTrue) -> {
+        if (descriptor == StatusDescriptor.MAIN_PAGE_IS_BACKGROUND) {
+            CallerLogger.INSTANCE.d(M_HMI + TAG, "onStatusChanged==MAIN_PAGE_IS_BACKGROUND");
+            dismiss();
        }
    };
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedDrawable.java
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/roundimage/RoundedImageView.java
@@ -16,6 +16,8 @@

 package com.mogo.eagle.core.function.hmi.ui.notice.roundimage;

+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -28,13 +30,13 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.util.AttributeSet;
-import android.util.Log;

 import androidx.annotation.ColorInt;
 import androidx.annotation.DimenRes;
 import androidx.annotation.DrawableRes;
 import androidx.appcompat.widget.AppCompatImageView;

+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.hmi.R;


@@ -271,7 +273,7 @@ public class RoundedImageView extends AppCompatImageView {
      try {
        d = rsrc.getDrawable(mResource);
      } catch (Exception e) {
-        Log.w(TAG, "Unable to find resource: " + mResource, e);
+        CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mResource + " exception : " +  e);
        // Don't try again.
        mResource = 0;
      }
@@ -309,7 +311,7 @@ public class RoundedImageView extends AppCompatImageView {
      try {
        d = rsrc.getDrawable(mBackgroundResource);
      } catch (Exception e) {
-        Log.w(TAG, "Unable to find resource: " + mBackgroundResource, e);
+        CallerLogger.INSTANCE.w(M_HMI + TAG, "Unable to find resource : " + mBackgroundResource +  " exception : " +  e);
        // Don't try again.
        mBackgroundResource = 0;
      }
--- 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
@@ -11,17 +11,13 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.autopilot.*
-import com.mogo.eagle.core.data.deva.chain.ChainConstant
+import com.mogo.eagle.core.data.chain.ChainConstant
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
-import com.mogo.eagle.core.data.traffic.TrafficData
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
+import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener
 import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener
 import com.mogo.eagle.core.function.api.obu.IMoGoObuStatusListener
@@ -53,6 +49,8 @@ import com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT
 import com.mogo.map.uicontroller.VisualAngleMode.*
 import com.mogo.module.common.MogoApisHandler
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
+import mogo.telematics.pad.MessagePad
+import mogo_msg.MogoReportMsg
 import java.util.*

 /**
@@ -62,13 +60,13 @@ import java.util.*
 * 展示 本机、网络、工控机、OBU等状态信息，支持设置IP，等参数进行调试
 */
 class DebugSettingView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
-        IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
-        IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
-        IMoGoAutopilotPlanningListener {
+    IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
+    IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
+    IMoGoAutopilotPlanningListener, IMoGoAutopilotCarConfigListener {

    private val TAG = "DebugSettingView"

@@ -76,7 +74,7 @@ class DebugSettingView @JvmOverloads constructor(
    private var logViewAttach = false

    private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null
-    private var mAutoPilotCarStateInfo: AutopilotCarStateInfo? = null
+    private var mGnssInfo: MessagePad.GnssInfo? = null

    // 感知识别「已知类型」数据个数
    private var mIdentifyDataSize = 0
@@ -127,6 +125,8 @@ class DebugSettingView @JvmOverloads constructor(
        CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
        // 添加 规划路径相关回调 监听
        CallerAutopilotPlanningListenerManager.addListener(TAG, this)
+        // 添加 工控机基础信息回调 监听
+        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
        if (logInfoView != null) {
            logInfoView!!.onEnterForeground()
        }
@@ -251,14 +251,14 @@ class DebugSettingView @JvmOverloads constructor(

        tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
        tvAutopilotInfo.text =
-                CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()
+            CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfoJsonString()

        // 绘制应用基本信息
        drawAppInfo()

        // 初始化OBU IP信息
        val ipAddress =
-                SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")
+            SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199")

        etObuIP.setText(ipAddress)
        etObuIP.text?.let { etObuIP.setSelection(it.length) }
@@ -274,8 +274,8 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化工控机 IP信息
        val autoPilotIpAddress =
-                SharedPrefsMgr.getInstance(context)
-                        .getString(MoGoConfig.AUTOPILOT_IP, FunctionBuildConfig.adasConnectIP)
+            SharedPrefsMgr.getInstance(context)
+                .getString(MoGoConfig.AUTOPILOT_IP, FunctionBuildConfig.adasConnectIP)

        etAutopilotIP.setText(autoPilotIpAddress)
        etAutopilotIP.text?.let { etAutopilotIP.setSelection(it.length) }
@@ -296,18 +296,18 @@ class DebugSettingView @JvmOverloads constructor(

        // 初始化 GSP数据源 数据
        rgGpsProvider.check(
-                when (FunctionBuildConfig.gpsProvider) {
-                    0 -> {
-                        R.id.rbGpsProviderAndroid
-                    }
-                    1 -> {
-                        R.id.rbGpsProviderRTK
-                    }
-                    2 -> {
-                        R.id.rbGpsProviderOBU
-                    }
-                    else -> R.id.rbGpsProviderAndroid
+            when (FunctionBuildConfig.gpsProvider) {
+                0 -> {
+                    R.id.rbGpsProviderAndroid
                }
+                1 -> {
+                    R.id.rbGpsProviderRTK
+                }
+                2 -> {
+                    R.id.rbGpsProviderOBU
+                }
+                else -> R.id.rbGpsProviderAndroid
+            }
        )
        rgGpsProvider.setOnCheckedChangeListener { group, checkedId ->
            when (checkedId) {
@@ -368,11 +368,9 @@ class DebugSettingView @JvmOverloads constructor(

        tbSelfLog.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
-                LogUtils.getConfig().isLogSwitch = false
                Logger.init(LogLevel.OFF)
                MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false
            } else {
-                LogUtils.getConfig().isLogSwitch = true
                Logger.init(LogLevel.DEBUG)
                MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = true
            }
@@ -380,10 +378,8 @@ class DebugSettingView @JvmOverloads constructor(
        tbADASLog.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                CallerAutoPilotManager.setEnableLog(true)
-                CallerAutoPilotManager.setIsWriteLog(true)
            } else {
                CallerAutoPilotManager.setEnableLog(false)
-                CallerAutoPilotManager.setIsWriteLog(false)
            }
        }
        tbControlView.setOnCheckedChangeListener { _, isChecked ->
@@ -395,11 +391,11 @@ class DebugSettingView @JvmOverloads constructor(
        }

        tbLogCatch.isChecked =
-                SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
+            SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
        tbLogCatch.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                var logTimeStr = etLogCatch.text?.toString()
-                if(logTimeStr.isNullOrEmpty()){
+                if (logTimeStr.isNullOrEmpty()) {
                    logTimeStr = "10"
                }
                val logCatchTime = logTimeStr.toInt()
@@ -414,20 +410,20 @@ class DebugSettingView @JvmOverloads constructor(
            }
        }
        CallerDevaToolsListenerManager.registerDevaToolsLogCatchListener(TAG,
-                object : IMoGoDevaToolsListener {
-                    override fun onLogCatchClose() {
-                        super.onLogCatchClose()
-                        tbLogCatch.isChecked = false
-                    }
+            object : IMoGoDevaToolsListener {
+                override fun onLogCatchClose() {
+                    super.onLogCatchClose()
+                    tbLogCatch.isChecked = false
+                }

-                    override fun onLogCatch(lineLog: String) {
-                        logInfoView?.let {
-                            if (logViewAttach) {
-                                it.onLogCatch(lineLog)
-                            }
+                override fun onLogCatch(lineLog: String) {
+                    logInfoView?.let {
+                        if (logViewAttach) {
+                            it.onLogCatch(lineLog)
                        }
                    }
-                })
+                }
+            })
        tbLogDebugView.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                logInfoView = LogInfoView()
@@ -486,7 +482,8 @@ class DebugSettingView @JvmOverloads constructor(
            AppConfigInfo.uniqueDeviceId = DeviceIdUtils.getDeviceId(AbsMogoApplication.getApp())
        }
        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
-            AppConfigInfo.widevineIDMd5 = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
+            AppConfigInfo.widevineIDMd5 =
+                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
        }
        AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
        AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
@@ -495,7 +492,7 @@ class DebugSettingView @JvmOverloads constructor(
        AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
        AppConfigInfo.isConnectSocket = DebugConfig.isDownloadSnapshot()

-         when (FunctionBuildConfig.appIdentityMode) {
+        when (FunctionBuildConfig.appIdentityMode) {
            0x00 -> {// 司机端
                AppConfigInfo.isDriver = true
                AppConfigInfo.isConnectedNetty = CallerTelematicManager.getServerStarted()
@@ -513,16 +510,16 @@ class DebugSettingView @JvmOverloads constructor(
        tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)

        tvCarInfo.text =
-                "GPS时间：${mAutoPilotCarStateInfo?.values?.satelliteTime}\n" +
-                        "自车经纬度：\n${mAutoPilotCarStateInfo?.values?.lon}\n${mAutoPilotCarStateInfo?.values?.lat}\n"
+            "GPS时间：${mGnssInfo?.satelliteTime}\n" +
+                    "自车经纬度：\n${mGnssInfo?.longitude}\n${mGnssInfo?.latitude}\n"

        tvIdentifyInfo.text =
-                "「有效类型」感知数据个数：${mIdentifyDataSize}\n" +
-                        "「未知类型」感知数据个数：${mUnknownIdentifyDataSize}\n"
+            "「有效类型」感知数据个数：${mIdentifyDataSize}\n" +
+                    "「未知类型」感知数据个数：${mUnknownIdentifyDataSize}\n"
        tvTrajectoryInfoSize.text =
-                "引导线点个数：${mTrajectoryInfoSize}"
+            "引导线点个数：${mTrajectoryInfoSize}"
        tvRouteInfoSize.text =
-                "全局路径规划点个数：${mRouteInfoSize}"
+            "全局路径规划点个数：${mRouteInfoSize}"

        // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况
        mIdentifyDataSize = 0
@@ -551,34 +548,17 @@ class DebugSettingView @JvmOverloads constructor(
        AppConfigInfo.isConnectAutopilot = autoPilotStatusInfo.connectStatus
    }

-    override fun onAutopilotArriveAtStation(autopilotWayArrive: AutopilotStationInfo?) {
-
+    override fun onAutopilotCarStateData(gnssInfo: MessagePad.GnssInfo?) {
+        mGnssInfo = gnssInfo
    }

-    override fun onAutopilotCarStateData(autoPilotCarStateInfo: AutopilotCarStateInfo?) {
-        //Logger.d(TAG, "autoPilotCarStateInfo:$autoPilotCarStateInfo")
-        mAutoPilotCarStateInfo = autoPilotCarStateInfo
-    }
-
-    override fun onAutopilotSNRequest() {
-
-    }
-
-    override fun onAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) {
-
-    }
-
-    override fun onLocationChanged(location: MogoLocation?) {
-        //Logger.d(TAG, "location:$location")
-    }
-
-    override fun onAutopilotIdentifyDataUpdate(trafficData: ArrayList<TrafficData>?) {
+    override fun onAutopilotIdentifyDataUpdate(trafficData: List<MessagePad.TrackedObject>?) {
        // 重制数据
        mIdentifyDataSize = 0
        mUnknownIdentifyDataSize = 0
        // 遍历计数
        trafficData?.forEach {
-            if (it.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI) {
+            if (it.type == TrafficTypeEnum.TYPE_TRAFFIC_ID_WEI_ZHI.type) {
                mUnknownIdentifyDataSize++
            } else {
                mIdentifyDataSize++
@@ -586,19 +566,26 @@ class DebugSettingView @JvmOverloads constructor(
        }
    }

-    override fun onAutopilotWarnMessage(autopilotWarnMessage: AutopilotWarnMessage?) {
-
-    }
-
-    override fun onAutopilotRecordResult(record: AutoPilotRecordResult?) {
-
-    }
-
    override fun onAutopilotTrajectory(trajectoryInfos: ArrayList<ADASTrajectoryInfo>) {
        mTrajectoryInfoSize = trajectoryInfos.size
    }

-    override fun onAutopilotRotting(routeList: AutopilotRouteInfo?) {
-        mRouteInfoSize = routeList?.models?.size ?: 0
+    override fun onAutopilotRotting(globalPathResp: MessagePad.GlobalPathResp?) {
+        mRouteInfoSize = globalPathResp?.wayPointsList?.size ?: 0
    }
+
+    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
+        //todo pb : 工控机基础信息回调 详见 message CarConfigResp proto
+
+    }
+
+    override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
+        //todo pb : 工控机异常信息回调
+
+    }
+
+    override fun onLocationChanged(location: MogoLocation?) {
+
+    }
+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AdUpgradeDialog.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.module.common.dialog.BaseFloatDialog

 /**
@@ -14,10 +13,6 @@ import com.mogo.module.common.dialog.BaseFloatDialog
 */
 class AdUpgradeDialog(context: Context) : BaseFloatDialog(context), LifecycleObserver {

-    companion object {
-        const val TAG = "AdUpgradeDialog"
-    }
-
    private var upgradeConfirm : TextView? = null
    private var upgradeCancel : TextView? = null

@@ -30,12 +25,10 @@ class AdUpgradeDialog(context: Context) : BaseFloatDialog(context), LifecycleObs
        upgradeCancel=findViewById(R.id.tv_upgrade_cancel)

        upgradeConfirm?.setOnClickListener{
-            Logger.i(TAG,"upgradeConfirm click")
            clickListener?.confirm()
            dismiss()
        }
        upgradeCancel?.setOnClickListener {
-            Logger.i(TAG,"upgradeCancel click")
            clickListener?.cancel()
            dismiss()
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -6,7 +6,6 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
-import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
@@ -140,9 +139,22 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
     * @param downloadVersion 下载版本
     * @param upgradeStatus 升级状态
     */
-    fun showAdUpgradeStatus(upgradeMode: Int,downloadStatus : Int,currentProgress : Int,totalProgress : Int
-                            ,downloadVersion : String,upgradeStatus : Int){
-        systemVersionView?.showAdUpgradeStatus(upgradeMode,downloadStatus,currentProgress, totalProgress, downloadVersion, upgradeStatus)
+    fun showAdUpgradeStatus(
+        upgradeMode: Int,
+        downloadStatus: Int,
+        currentProgress: Int,
+        totalProgress: Int,
+        downloadVersion: String,
+        upgradeStatus: Int
+    ) {
+        systemVersionView?.showAdUpgradeStatus(
+            upgradeMode,
+            downloadStatus,
+            currentProgress,
+            totalProgress,
+            downloadVersion,
+            upgradeStatus
+        )
        checkSystemView?.setAdUpgradeStatus(downloadStatus, upgradeStatus)
    }

@@ -160,10 +172,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
        connectStatus = autoPilotStatusInfo.connectStatus
    }

-    override fun onAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) {
-
-    }
-
    interface ClickListener {
        fun go2CheckPage()
        fun onClose(v: View)
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/DockerRebootDialog.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.widget.TextView
 import androidx.lifecycle.LifecycleObserver
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.module.common.dialog.BaseFloatDialog

 /**
@@ -14,10 +13,6 @@ import com.mogo.module.common.dialog.BaseFloatDialog
 */
 class DockerRebootDialog(context: Context): BaseFloatDialog(context), LifecycleObserver {

-    companion object {
-        const val TAG = "DockerRebootDialog"
-    }
-
    private var rebootConfirm : TextView? = null
    private var rebootCancel : TextView? = null

@@ -30,12 +25,10 @@ class DockerRebootDialog(context: Context): BaseFloatDialog(context), LifecycleO
        rebootCancel=findViewById(R.id.tv_reboot_cancel)

        rebootConfirm?.setOnClickListener{
-            Logger.i(TAG,"rebootConfirm click")
            clickListener?.confirm()
            dismiss()
        }
        rebootCancel?.setOnClickListener {
-            Logger.i(TAG,"rebootCancel click")
            clickListener?.cancel()
            dismiss()
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/BrakeViewStatus.kt
@@ -3,9 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui.turnlight
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.content.Context
-import android.os.Looper
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AlphaAnimation
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/turnlight/TurnLightViewStatus.kt
@@ -2,17 +2,14 @@ package com.mogo.eagle.core.function.hmi.ui.turnlight

 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.function.hmi.R
-import kotlinx.android.synthetic.main.view_brake_light_status.view.*
 import kotlinx.android.synthetic.main.view_turn_light_status.view.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
@@ -6,14 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters
-import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.util.LogUtils
+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.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.module.common.MogoApisHandler
@@ -51,14 +51,14 @@ class AutoPilotStatusView @JvmOverloads constructor(
        // 自动驾驶状态监听
        CallerAutoPilotStatusListenerManager.addListener(TAG, this)

-        LogUtils.dTag(TAG, "autopilotStatus: $mAutopilotStatus")
+        CallerLogger.d("$M_HMI$TAG", "autopilotStatus: $mAutopilotStatus")
        setAutoPilotStatus(mAutopilotStatus)
    }

    override fun onClick(v: View?) {
        when (mAutopilotStatus) {
            0 -> {// 不可自动驾驶，adas与工控机没有链接，或工控机异常
-                LogUtils.eTag(TAG, "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
+                CallerLogger.e("$M_HMI$TAG", "不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
                ToastUtils.showShort("不可自动驾驶，adas与工控机没有链接，或工控机异常，请检查")
                // TODO 这里临时触发自动驾驶能力,测试功过这里删除
                //CallerHmiListenerManager.invokeCheckAutoPilotBtnListener(true)
@@ -128,9 +128,4 @@ class AutoPilotStatusView @JvmOverloads constructor(
        setAutoPilotStatus(autoPilotStatusInfo.state)
    }

-    override fun onAutopilotGuardian(guardianInfo: AutopilotGuardianStatusInfo?) {
-
-    }
-
-
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckStatusView.kt
@@ -8,7 +8,6 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.function.api.check.IMogoCheckListener
 import com.mogo.eagle.core.function.call.check.CallerCheckManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import kotlinx.android.synthetic.main.view_check_status.view.*

 /**
@@ -35,7 +34,6 @@ class CheckStatusView @JvmOverloads constructor(
    }

    override fun updateMonitoringStatus(state: Int?) {
-        Logger.d(TAG, "updateCheckStatus")
        if (state == 1) {
            dismissErrorIcon()
        } else {
@@ -46,14 +44,12 @@ class CheckStatusView @JvmOverloads constructor(

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
-        Logger.d(TAG, "onAttachedToWindow")
        //车辆监控
        CallerCheckManager.registerVehicleMonitoringListener(TAG, this)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
-        Logger.d(TAG, "onDetachedFromWindow")
        //车辆监控
        CallerCheckManager.unregisterListener(TAG)
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CheckSystemView.kt
@@ -8,13 +8,14 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.notification.WarningFloat
 import com.mogo.eagle.core.function.hmi.ui.tools.DockerRebootDialog
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import kotlinx.android.synthetic.main.view_check_system.view.*

@@ -29,11 +30,11 @@ class CheckSystemView @JvmOverloads constructor(
    }

    private var connectStatus = false //是否连接工控机
-    private var autopilotStatus:Int ?=null   //自动驾驶状态   0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中
+    private var autopilotStatus: Int? = null   //自动驾驶状态   0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中
    private var dockerRebootDialog: DockerRebootDialog? = null

-    private var downloadStatus: Int=-1 //下载状态
-    private var upgradeStatus: Int=-1 //升级状态
+    private var downloadStatus: Int = -1 //下载状态
+    private var upgradeStatus: Int = -1 //升级状态

    init {
        LayoutInflater.from(context).inflate(R.layout.view_check_system, this, true)
@@ -47,26 +48,30 @@ class CheckSystemView @JvmOverloads constructor(
        }
        viewCheckReboot.setOnClickListener {
            //dialog
-            if(dockerRebootDialog == null){
+            if (dockerRebootDialog == null) {
                dockerRebootDialog = DockerRebootDialog(context)
-                dockerRebootDialog?.setClickListener(object : DockerRebootDialog.ClickListener{
+                dockerRebootDialog?.setClickListener(object : DockerRebootDialog.ClickListener {
                    override fun confirm() {
-                        if(autopilotStatus==2){
+                        if (autopilotStatus == 2) {
                            //当前处于自动驾驶状态，不可进行重启，Toast提示
                            ToastUtils.showShort("请先退出自动驾驶状态")
-                        }else if(AdUpgradeStateHelper.showCannotReboot(downloadStatus, upgradeStatus)){
+                        } else if (AdUpgradeStateHelper.showCannotReboot(
+                                downloadStatus,
+                                upgradeStatus
+                            )
+                        ) {
                            //当工控机处于下载或者升级状态，需要先进行升级
                            ToastUtils.showShort("请先完成新自动驾驶系统的下载/升级")
-                        } else{
+                        } else {
                            //确认重启
-                            Logger.i(TAG,"reboot confirm")
+                            CallerLogger.d("$M_HMI$TAG", "reboot confirm")
                            CallerAutoPilotManager.setIPCReboot()
                        }
                    }

                    override fun cancel() {
                        //取消重启
-                        Logger.i(TAG,"reboot cancel")
+                        CallerLogger.d("$M_HMI$TAG", "reboot cancel")
                    }

                })
@@ -75,9 +80,9 @@ class CheckSystemView @JvmOverloads constructor(
        }
    }

-    fun setAdUpgradeStatus(downloadStatus : Int,upgradeStatus : Int){
-        this.downloadStatus=downloadStatus
-        this.upgradeStatus=upgradeStatus
+    fun setAdUpgradeStatus(downloadStatus: Int, upgradeStatus: Int) {
+        this.downloadStatus = downloadStatus
+        this.upgradeStatus = upgradeStatus
    }

    private fun showSystemOperationWindow(view: View) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt
@@ -10,7 +10,6 @@ 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.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.service.IMogoServiceApis
@@ -37,6 +36,7 @@ class SpeedPanelView @JvmOverloads constructor(
    var mLatLng: Location? = null

    var mSpeedLimmit = 60;
+
    init {
        initEvent(context)

@@ -55,7 +55,6 @@ class SpeedPanelView @JvmOverloads constructor(

    private fun initEvent(context: Context) {
        setOnLongClickListener {
-            Logger.d(TAG, "长按显示状态工具栏")
            CallerHmiManager.toggleDebugView()
            false
        }
@@ -65,7 +64,11 @@ class SpeedPanelView @JvmOverloads constructor(
        override fun run() {
            if (mLatLng != null) {
                if (mMogoServiceApis.mapServiceApi != null && mMogoServiceApis.mapServiceApi.mapUIController != null) {
-                    mSpeedLimmit = mMogoServiceApis.mapServiceApi.mapUIController.getSpeedLimmit(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing)
+                    mSpeedLimmit = mMogoServiceApis.mapServiceApi.mapUIController.getSpeedLimmit(
+                        mLatLng!!.longitude,
+                        mLatLng!!.latitude,
+                        mLatLng!!.bearing
+                    )
                    UiThreadHandler.post {
                        val speed = (mLatLng!!.speed * 3.6f).toInt()
                        mSpeedChartView.setArcColor(Color.parseColor(if (speed > mSpeedLimmit) "#DB3137" else "#3E77F6"))
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt
@@ -7,12 +7,13 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.autopilot.AdUpgradeStateHelper
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -37,58 +38,70 @@ class SystemVersionView @JvmOverloads constructor(
    }

    private var connectStatus = false
-    private var dockerVersion :String ?=null //工控机版本
-    private var autopilotStatus:Int ?=null   //自动驾驶状态   0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中
-    private var adUpgradeDialog : AdUpgradeDialog? = null
+    private var dockerVersion: String? = null //工控机版本
+    private var autopilotStatus: Int? = null   //自动驾驶状态   0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中
+    private var adUpgradeDialog: AdUpgradeDialog? = null

-    private var upgradeMode: Int=-1 //升级模式
-    private var downloadStatus: Int=-1 //下载状态
-    private var currentProgress: Int=-1 //当前已下载包体大小
-    private var previousProgress: Int=-1 //前一秒的下载进度，用于计算下载剩余时间
-    private var totalProgress: Int=-1 //包体总大小
-    private var downloadVersion: String?=null //工控机docker版本
-    private var upgradeStatus: Int=-1 //升级状态
+    private var upgradeMode: Int = -1 //升级模式
+    private var downloadStatus: Int = -1 //下载状态
+    private var currentProgress: Int = -1 //当前已下载包体大小
+    private var previousProgress: Int = -1 //前一秒的下载进度，用于计算下载剩余时间
+    private var totalProgress: Int = -1 //包体总大小
+    private var downloadVersion: String? = null //工控机docker版本
+    private var upgradeStatus: Int = -1 //升级状态

    init {
        LayoutInflater.from(context).inflate(R.layout.view_system_version, this, true)
        initView()
    }

-    private fun initView(){
+    private fun initView() {
        showCurrentPadVersion()
        showCurrentAdVersion()


-
        //鹰眼版本视图点击事件
        ivPadVersion.setOnClickListener {
-            Logger.i(TAG,"pad version view clicked")
-       }
+            CallerLogger.i("$M_HMI$$TAG", "pad version view clicked")
+        }
        //工控机版本视图点击事件
        ivAdVersion.setOnClickListener {
-            Logger.i(TAG,"ad version view clicked")
-            Logger.i(TAG,"upgradeMode="+upgradeMode+" downloadStatus="+downloadStatus+" upgradeStatus="+upgradeStatus)
-            if(AdUpgradeStateHelper.isDownloading(downloadStatus)){
+            CallerLogger.i("$M_HMI$$TAG", "ad version view clicked")
+            CallerLogger.i(
+                "$M_HMI$$TAG",
+                "upgradeMode=$upgradeMode , downloadStatus=$downloadStatus , upgradeStatus=$upgradeStatus"
+            )
+            if (AdUpgradeStateHelper.isDownloading(downloadStatus)) {
                //点击Toast提示：下载剩余时间
-                ToastUtils.showShort("预计"+AdUpgradeStateHelper.getRemainingTime(totalProgress,previousProgress,currentProgress)+"下载完成")
-            }else if(AdUpgradeStateHelper.getUpgradeStatus()){
+                ToastUtils.showShort(
+                    "预计" + AdUpgradeStateHelper.getRemainingTime(
+                        totalProgress,
+                        previousProgress,
+                        currentProgress
+                    ) + "下载完成"
+                )
+            } else if (AdUpgradeStateHelper.getUpgradeStatus()) {
                //工控机状态为“升级中”
                ToastUtils.showShort("新版本升级中，预计5分钟升级完成")
-            }else if(AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)){
+            } else if (AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)) {
                //如果升级失败，则Toast提示：升级失败，请联系运维人员
                ToastUtils.showShort("升级失败，请联系运维人员")
-            }else if(AdUpgradeStateHelper.isHintUpgradeMode(upgradeMode) && AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){
+            } else if (AdUpgradeStateHelper.isHintUpgradeMode(upgradeMode) && AdUpgradeStateHelper.isDownloadFinish(
+                    downloadStatus,
+                    upgradeStatus
+                )
+            ) {
                //如果升级模式为“提示升级”，并且下载状态为已经下载完成，点击弹出升级确认弹窗
-                if(adUpgradeDialog == null){
+                if (adUpgradeDialog == null) {
                    adUpgradeDialog = AdUpgradeDialog(context)
-                    adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener{
+                    adUpgradeDialog?.setClickListener(object : AdUpgradeDialog.ClickListener {
                        override fun confirm() {
-                            if(autopilotStatus==2){
+                            if (autopilotStatus == 2) {
                                //当前处于自动驾驶状态，不可进行升级，Toast提示
                                ToastUtils.showShort("升级前请先退出自动驾驶模式")
-                            }else{
+                            } else {
                                //确认升级
-                                Logger.i(TAG,"upgrade confirm")
+                                CallerLogger.i("$M_HMI$$TAG", "upgrade confirm")
                                //设置当前状态为“升级中”
                                AdUpgradeStateHelper.setUpgradeStatus(true)
                                CallerAutoPilotManager.setIPCUpgradeAffirm()
@@ -101,7 +114,7 @@ class SystemVersionView @JvmOverloads constructor(

                        override fun cancel() {
                            //取消升级
-                            Logger.i(TAG,"upgrade cancel")
+                            CallerLogger.i("$M_HMI$$TAG", "upgrade cancel")
                            //取消升级命令不下发
 //                            CallerAutoPilotManager.setIPCUpgradeCancel()
                        }
@@ -124,15 +137,17 @@ class SystemVersionView @JvmOverloads constructor(
     * @param downloadVersion 下载版本
     * @param upgradeStatus 升级状态
     */
-    fun setAdUpgradeInfo(upgradeMode: Int,downloadStatus: Int,currentProgress: Int,totalProgress: Int,
-                         downloadVersion: String,upgradeStatus: Int){
-        this.upgradeMode=upgradeMode
-        this.downloadStatus=downloadStatus
-        this.previousProgress=this.currentProgress
-        this.currentProgress=currentProgress
-        this.totalProgress=totalProgress
-        this.downloadVersion=downloadVersion
-        this.upgradeStatus=upgradeStatus
+    fun setAdUpgradeInfo(
+        upgradeMode: Int, downloadStatus: Int, currentProgress: Int, totalProgress: Int,
+        downloadVersion: String, upgradeStatus: Int
+    ) {
+        this.upgradeMode = upgradeMode
+        this.downloadStatus = downloadStatus
+        this.previousProgress = this.currentProgress
+        this.currentProgress = currentProgress
+        this.totalProgress = totalProgress
+        this.downloadVersion = downloadVersion
+        this.upgradeStatus = upgradeStatus
    }

    /**
@@ -144,53 +159,77 @@ class SystemVersionView @JvmOverloads constructor(
     * @param downloadVersion 下载版本
     * @param upgradeStatus 升级状态
     */
-    fun showAdUpgradeStatus(upgradeMode: Int,downloadStatus: Int,currentProgress: Int,totalProgress: Int
-                            ,downloadVersion: String,upgradeStatus: Int){
+    fun showAdUpgradeStatus(
+        upgradeMode: Int,
+        downloadStatus: Int,
+        currentProgress: Int,
+        totalProgress: Int,
+        downloadVersion: String,
+        upgradeStatus: Int
+    ) {

-        GlobalScope.launch(Dispatchers.Main){
+        GlobalScope.launch(Dispatchers.Main) {
            //设置工控机下载、升级状态信息
-            setAdUpgradeInfo(upgradeMode, downloadStatus, currentProgress, totalProgress, downloadVersion, upgradeStatus)
+            setAdUpgradeInfo(
+                upgradeMode,
+                downloadStatus,
+                currentProgress,
+                totalProgress,
+                downloadVersion,
+                upgradeStatus
+            )

-            if(AdUpgradeStateHelper.isDownloading(downloadStatus)){
+            if (AdUpgradeStateHelper.isDownloading(downloadStatus)) {
                //正在下载，展示“下载中”角标，展示进度条，并设置当前下载进度
                ivAdStatus?.setImageResource(R.drawable.icon_downloading)
                adCircularProgressView?.let {
                    it.visibility = View.VISIBLE
-                    Logger.i(TAG,"下载中="+"currentProgress="+currentProgress+" totalProgress="+totalProgress+" downloadProgress="+AdUpgradeStateHelper.downloadProgress(currentProgress,totalProgress))
+                    CallerLogger.i(
+                        "$M_HMI$$TAG",
+                        "下载中=currentProgress=$currentProgress , totalProgress=$totalProgress ,  downloadProgress=" + AdUpgradeStateHelper.downloadProgress(
+                            currentProgress,
+                            totalProgress
+                        )
+                    )

-                    it.setProgress(AdUpgradeStateHelper.downloadProgress(currentProgress,totalProgress))
+                    it.setProgress(
+                        AdUpgradeStateHelper.downloadProgress(
+                            currentProgress,
+                            totalProgress
+                        )
+                    )
                }
-            }else if(AdUpgradeStateHelper.isDownloadFinish(downloadStatus,upgradeStatus)){
+            } else if (AdUpgradeStateHelper.isDownloadFinish(downloadStatus, upgradeStatus)) {
                //下载完成，处于可升级状态，展示“可升级”角标，将AD背景变为蓝色，并隐藏下载进度条(当状态为“升级中”时，不进行设置（存在升级命令已下发，但工控机未立即升级现象）)
-                if(!AdUpgradeStateHelper.getUpgradeStatus()){
+                if (!AdUpgradeStateHelper.getUpgradeStatus()) {
                    ivAdStatus?.setImageResource(R.drawable.icon_upgradeable)
                    ivAdVersion?.setBackgroundResource(R.drawable.version_upgradeable_background)
                    adCircularProgressView?.visibility = View.GONE
-                    if(AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)){
+                    if (AdUpgradeStateHelper.isQuietUpgradeMode(upgradeMode)) {
                        //如果升级模式为“静默升级”，则下载完成后，调用升级命令进行升级
                        CallerAutoPilotManager.setIPCUpgradeAffirm()
                        AdUpgradeStateHelper.setUpgradeStatus(true)
                    }
                }

-            }else if(AdUpgradeStateHelper.isDownloadFailed(downloadStatus)){
+            } else if (AdUpgradeStateHelper.isDownloadFailed(downloadStatus)) {
                //下载失败，将状态设为“最新版”角标，并隐藏进度条
                ivAdStatus?.setImageResource(R.drawable.icon_latest_version)
                adCircularProgressView?.visibility = View.GONE
                ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background)
-            } else if(AdUpgradeStateHelper.isUpgradeSuccess(upgradeStatus)){
+            } else if (AdUpgradeStateHelper.isUpgradeSuccess(upgradeStatus)) {
                //升级成功，将状态设为“最新版”角标，并隐藏进度条
                ivAdStatus?.setImageResource(R.drawable.icon_latest_version)
                adCircularProgressView?.visibility = View.GONE
                AdUpgradeStateHelper.setUpgradeStatus(false)
                ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background)
-            }else if(AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)){
+            } else if (AdUpgradeStateHelper.isUpgradeFailed(upgradeStatus)) {
                //升级失败，将状态设为“升级失败”角标，并隐藏进度条
                ivAdStatus?.setImageResource(R.drawable.icon_upgrade_failed)
                adCircularProgressView?.visibility = View.GONE
                AdUpgradeStateHelper.setUpgradeStatus(false)
                ivAdVersion?.setBackgroundResource(R.drawable.version_latest_background)
-            }else{
+            } else {
                //其他状态，均显示“最新版”，并隐藏进度条
                ivAdStatus?.setImageResource(R.drawable.icon_latest_version)
                adCircularProgressView?.visibility = View.GONE
@@ -205,7 +244,7 @@ class SystemVersionView @JvmOverloads constructor(
    /**
     * 展示当前鹰眼版本
     */
-    private fun showCurrentPadVersion(){
+    private fun showCurrentPadVersion() {
        tvPadVersionContent?.let {
            it.text = AppUtils.getAppVersionName()
        }
@@ -214,11 +253,11 @@ class SystemVersionView @JvmOverloads constructor(
    /**
     * 展示当前工控机版本
     */
-    private fun showCurrentAdVersion(){
+    private fun showCurrentAdVersion() {
        UiThreadHandler.post {
            tvAdVersionContent?.let {
 //            it.text = AdasManager.getInstance().getAdasConfig().getDockVersion())
-                if(!dockerVersion.isNullOrEmpty()){
+                if (!dockerVersion.isNullOrEmpty()) {
                    it.text = dockerVersion
                }
            }
@@ -239,11 +278,14 @@ class SystemVersionView @JvmOverloads constructor(
        connectStatus = autoPilotStatusInfo.connectStatus
        dockerVersion = autoPilotStatusInfo.dockVersion
        autopilotStatus = autoPilotStatusInfo.state
-        Logger.i(TAG,"onAutopilotStatusResponse connectStatus="+connectStatus+" dockerVersion="+dockerVersion+" autopilotStatus="+autopilotStatus)
+        CallerLogger.i(
+            "$M_HMI$TAG",
+            "onAutopilotStatusResponse connectStatus=$connectStatus , dockerVersion=$dockerVersion , autopilotStatus=$autopilotStatus"
+        )
        setViewStatus()
    }

-    private fun setViewStatus(){
+    private fun setViewStatus() {
        showCurrentAdVersion()
    }

--- 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
@@ -2,23 +2,14 @@ package com.mogo.eagle.core.function.hmi.ui.widget

 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 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.ALERT_WARNING_ALL
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_BOTTOM
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_BOTTOM_RIGHT
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_LEFT
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_NON
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_RIGHT
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP_LEFT
-import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP_RIGHT
+import com.mogo.eagle.core.data.enums.WarningDirectionEnum.*
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.module_hmi_warning_v2x.view.*

@@ -32,10 +23,12 @@ class V2XWarningView @JvmOverloads constructor(
    defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {

-    private val ALL_CLOSE_TIMER = 10000L
+    companion object {
+        private const val ALL_CLOSE_TIMER = 10000L
+        private const val TAG = "V2XWarningView"
+    }

    private val closeWarningTask: Runnable = Runnable {
-        Logger.d("V2XWarningView", "预警红边：倒计时结束")
        showWarning(ALERT_WARNING_NON)
    }

@@ -59,7 +52,7 @@ class V2XWarningView @JvmOverloads constructor(
     * @param closeTime 倒计时
     */
    fun showWarning(direction: WarningDirectionEnum, closeTime: Long) {
-        Logger.d("V2XWarningView", "预警红边：预警方向->$direction 预警倒计时->$closeTime")
+        CallerLogger.d("$M_HMI$TAG", "预警红边：预警方向->$direction 预警倒计时->$closeTime")
        UiThreadHandler.post {

            // 如果传入的不是关闭显示，则设置倒计时，定时关闭红框警示
@@ -174,7 +167,7 @@ class V2XWarningView @JvmOverloads constructor(
                hmiWarningLeftImg.visibility = View.GONE
            }
            else -> {
-                Log.d("XXX", "Not Support Direction")
+                CallerLogger.d("$M_HMI$TAG", "Not Support Direction")
            }
        }
    }