Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0

2023-02-01 16:52:31 +08:00
parent 52bc276157 f9eeef8cb9
commit 2df96d3dac
73 changed files with 1853 additions and 433 deletions
--- 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
@@ -98,16 +98,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),

    }

-    // todo 新超
-    override fun updateDriverMsgBoxTipView(show: Boolean) {
-
-    }
-
-    // todo 新超
-    override fun updatePassengerMsgBoxTipView(show: Boolean) {
-
-    }
-
    /** todo ----------------------------------------------**/
    /**
     * 设置 红绿灯 代理View
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxBubbleAdapter
@@ -83,7 +84,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(
                }
            }
            if(isShowData){
-                CallerHmiManager.updateDriverMsgBoxTipView(true)
+                CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
                if(category == MsgCategory.RECORD_BAG){
                    //弹出被动录包弹窗
                    CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true)
@@ -98,16 +99,12 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.addListener(TAG,this)
-        }
+        CallerMsgBoxListenerManager.addListener(TAG,this)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.removeListener(TAG)
-        }
+        CallerMsgBoxListenerManager.removeListener(TAG)
    }

 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt
@@ -3,8 +3,13 @@ package com.mogo.eagle.core.function.hmi.ui.msgbox
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import kotlinx.android.synthetic.main.view_driver_msg_box_button.view.*

 /**
 * @author XuXinChao
@@ -15,19 +20,71 @@ class DriverMsgBoxButtonView @JvmOverloads constructor(
    context: Context,
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
-):ConstraintLayout(context, attrs, defStyleAttr) {
+):ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxEventListener {

    companion object {
        const val TAG = "DriverMsgBoxButtonView"
    }

+    private var clickListener: ClickListener? = null
+
    init{
        LayoutInflater.from(context).inflate(R.layout.view_driver_msg_box_button, this, true)
        initView()
    }

    private fun initView(){
+        cbMsgBoxDriver.setOnCheckedChangeListener { _, isChecked ->
+            clickListener?.showMsgBoxList(isChecked)
+            msgBoxTipView.visibility = View.GONE
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerMsgBoxEventListenerManager.addListener(TAG,this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerMsgBoxEventListenerManager.removeListener(TAG)
+    }
+
+    override fun onSummaryClickEvent() {

    }

+    /**
+     * 更新新消息提醒红点
+     * @param isShow true:展示；false:不展示
+     */
+    override fun onUpdateTipEvent(isShow: Boolean) {
+        if(isShow){
+            msgBoxTipView.visibility = View.VISIBLE
+        }else{
+            msgBoxTipView.visibility = View.GONE
+        }
+    }
+
+    override fun onBubbleOperationClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxDriver.performClick()
+    }
+
+    override fun onBubbleV2XClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxDriver.performClick()
+    }
+
+    override fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxDriver.performClick()
+    }
+
+    fun setClickListener(clickListener: ClickListener) {
+        this.clickListener = clickListener
+    }
+
+    interface ClickListener{
+        fun showMsgBoxList(show: Boolean)
+    }
+
+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
@@ -7,16 +7,16 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgCategory
+import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener
 import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxListAdapter
 import com.mogo.eagle.core.function.msgbox.MsgBoxConfig
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.layout_driver_msg_box_list.view.*
 import org.greenrobot.eventbus.EventBus
@@ -32,7 +32,7 @@ class DriverMsgBoxListView @JvmOverloads constructor(
    context: Context,
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) , IMsgBoxListener {
+) : ConstraintLayout(context, attrs, defStyleAttr) , IMsgBoxListener, IMsgBoxEventListener {

    init {
        LayoutInflater.from(context).inflate(R.layout.layout_driver_msg_box_list, this, true)
@@ -43,11 +43,13 @@ class DriverMsgBoxListView @JvmOverloads constructor(
    private var ipcReportList: ArrayList<MsgBoxBean> ?= null
    private var badCaseList: ArrayList<MsgBoxBean> ?= null
    private var driverMsgBoxListAdapter: DriverMsgBoxListAdapter ?=null
+    private var linearLayoutManager: LinearLayoutManager ?= null

    private fun initView() {
        driverMsgBoxListAdapter= DriverMsgBoxListAdapter(context as Activity)
        rvMsgBoxList.adapter = driverMsgBoxListAdapter
-        rvMsgBoxList.layoutManager = LinearLayoutManager(context)
+        linearLayoutManager = LinearLayoutManager(context)
+        rvMsgBoxList.layoutManager = linearLayoutManager

        //获取通知消息列表
        noticeList= CallerMsgBoxManager.getCachedNotifyData() as ArrayList<MsgBoxBean>?
@@ -193,18 +195,16 @@ class DriverMsgBoxListView @JvmOverloads constructor(

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.addListener(TAG,this)
-            EventBus.getDefault().register(this)
-        }
+        CallerMsgBoxListenerManager.addListener(TAG,this)
+        CallerMsgBoxEventListenerManager.addListener(TAG,this)
+        EventBus.getDefault().register(this)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.removeListener(TAG)
-            EventBus.getDefault().unregister(this)
-        }
+        CallerMsgBoxListenerManager.removeListener(TAG)
+        CallerMsgBoxEventListenerManager.removeListener(TAG)
+        EventBus.getDefault().unregister(this)
    }

    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -214,4 +214,36 @@ class DriverMsgBoxListView @JvmOverloads constructor(
            it.remove(msgBoxList)
        }
    }
+
+    override fun onSummaryClickEvent() {
+
+    }
+
+    override fun onUpdateTipEvent(isShow: Boolean) {
+
+    }
+
+    override fun onBubbleOperationClickEvent(msgBoxBean: MsgBoxBean) {
+        MsgBoxConfig.setUserRecord(0)
+        notifyData()
+        noticeList?.let {
+            rvMsgBoxList?.scrollToPosition(it.indexOf(msgBoxBean))
+        }
+    }
+
+    override fun onBubbleV2XClickEvent(msgBoxBean: MsgBoxBean) {
+        MsgBoxConfig.setUserRecord(0)
+        notifyData()
+        noticeList?.let {
+            rvMsgBoxList?.scrollToPosition(it.indexOf(msgBoxBean))
+        }
+    }
+
+    override fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean) {
+        MsgBoxConfig.setUserRecord(1)
+        notifyData()
+        ipcReportList?.let {
+            linearLayoutManager?.scrollToPositionWithOffset(it.indexOf(msgBoxBean),0)
+        }
+    }
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt
@@ -12,6 +12,7 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxBubbleAdapter
@@ -64,7 +65,7 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor(
                    || msgBoxList.type == MsgBoxType.OBU){
                    MsgBoxConfig.noticeList.add(msgBoxList)
                    if(isShowData){
-                        CallerHmiManager.updatePassengerMsgBoxTipView(true)
+                        CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
                        dataList.add(msgBoxList)
                        passengerMsgBoxBubbleAdapter?.setData(dataList)
                    }
@@ -75,18 +76,12 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor(

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
-        if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.addListener(TAG,this)
-        }
+        CallerMsgBoxListenerManager.addListener(TAG,this)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
-        if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.removeListener(TAG)
-        }
+        CallerMsgBoxListenerManager.removeListener(TAG)
    }

 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt
@@ -3,8 +3,13 @@ package com.mogo.eagle.core.function.hmi.ui.msgbox
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import kotlinx.android.synthetic.main.view_passenger_msg_box_button.view.*

 /**
 * @author XuXinChao
@@ -15,19 +20,70 @@ class PassengerMsgBoxButtonView @JvmOverloads constructor(
    context: Context,
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
-): ConstraintLayout(context, attrs, defStyleAttr) {
+): ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxEventListener {

    companion object {
        const val TAG = "PassengerMsgBoxButtonView"
    }

+    private var clickListener: ClickListener? = null
+
    init{
        LayoutInflater.from(context).inflate(R.layout.view_passenger_msg_box_button, this, true)
        initView()
    }

    private fun initView(){
+        cbMsgBoxPassenger.setOnCheckedChangeListener { _, isChecked ->
+            clickListener?.showMsgBoxList(isChecked)
+            msgBoxPTipView.visibility = View.GONE
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerMsgBoxEventListenerManager.addListener(TAG,this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerMsgBoxEventListenerManager.removeListener(TAG)
+    }
+
+    override fun onSummaryClickEvent() {

    }

+    /**
+     * 更新新消息提醒红点
+     * @param isShow true:展示；false:不展示
+     */
+    override fun onUpdateTipEvent(isShow: Boolean) {
+        if(isShow){
+            msgBoxPTipView.visibility = View.VISIBLE
+        }else{
+            msgBoxPTipView.visibility = View.GONE
+        }
+    }
+
+    override fun onBubbleOperationClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxPassenger.performClick()
+    }
+
+    override fun onBubbleV2XClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxPassenger.performClick()
+    }
+
+    override fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean) {
+        cbMsgBoxPassenger.performClick()
+    }
+
+    fun setClickListener(clickListener: ClickListener) {
+        this.clickListener = clickListener
+    }
+
+    interface ClickListener{
+        fun showMsgBoxList(show: Boolean)
+    }
+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt
@@ -11,7 +11,9 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
+import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener
 import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.hmi.R
@@ -30,7 +32,7 @@ class PassengerMsgBoxListView @JvmOverloads constructor(
    context: Context,
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener {
+) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener, IMsgBoxEventListener {

    private val TAG = "PassengerMsgBoxListView"
    var passengerMsgBoxListAdapter: PassengerMsgBoxListAdapter ?= null
@@ -75,18 +77,36 @@ class PassengerMsgBoxListView @JvmOverloads constructor(

    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
-        if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.addListener(TAG,this)
-        }
+        CallerMsgBoxListenerManager.addListener(TAG,this)
+        CallerMsgBoxEventListenerManager.addListener(TAG,this)
    }

    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
-        if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) &&
-            AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){
-            CallerMsgBoxListenerManager.removeListener(TAG)
+        CallerMsgBoxListenerManager.removeListener(TAG)
+        CallerMsgBoxEventListenerManager.removeListener(TAG)
+    }
+
+    override fun onSummaryClickEvent() {
+
+    }
+
+    override fun onUpdateTipEvent(isShow: Boolean) {
+
+    }
+
+    override fun onBubbleOperationClickEvent(msgBoxBean: MsgBoxBean) {
+
+    }
+
+    override fun onBubbleV2XClickEvent(msgBoxBean: MsgBoxBean) {
+        noticeList?.let {
+            rvPassengerList.scrollToPosition(it.indexOf(msgBoxBean))
        }
    }

+    override fun onBubbleReportClickEvent(msgBoxBean: MsgBoxBean) {
+
+    }
+
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
@@ -14,12 +14,14 @@ import com.mogo.eagle.core.data.msgbox.*
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp
 import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat
+import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout

 /**
 * @author XuXinChao
@@ -76,14 +78,19 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
        when (holder) {
            is BubbleOperationHolder -> {
                data?.let {
-                    val operationMsg = it[position].bean as OperationMsg
+                    val msgBoxBean = it[position]
+                    val operationMsg = msgBoxBean.bean as OperationMsg
                    holder.tvBubbleOperationTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
                    holder.tvBubbleOperationContent.text = operationMsg.content
+                    holder.clBubbleOperationLayout.setOnClickListener {
+                        CallerMsgBoxEventListenerManager.invokeBubbleOperationListener(msgBoxBean)
+                    }
                }
            }
            is BubbleReportHolder -> {
                data?.let {
-                    val reportEntity = it[position].bean as ReportEntity
+                    val msgBoxBean = it[position]
+                    val reportEntity = msgBoxBean.bean as ReportEntity
                    holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}"
                    holder.tvBubbleReceiveTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
                    var resultStr = "类型："
@@ -91,6 +98,9 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
                        resultStr = "${resultStr}${CallerAutoPilotManager.getReportResultDesc(result)}"
                    }
                    holder.tvBubbleReportType.text = resultStr
+                    holder.clReportLayout.setOnClickListener {
+                        CallerMsgBoxEventListenerManager.invokeBubbleReportListener(msgBoxBean)
+                    }
                }
            }
            is BubbleNoticeHolder -> {
@@ -140,6 +150,9 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
                    holder.tvV2XContent.text = v2XMsg.content
                    holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable(
                        EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
+                    holder.clV2XLayout.setOnClickListener {
+                        CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean)
+                    }
                }
            }
            is BubbleSummaryHolder -> {
@@ -191,12 +204,14 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
        var tvBubbleReportTime: TextView = itemView.findViewById(R.id.tvBubbleReportTime)
        var tvBubbleReportType: TextView = itemView.findViewById(R.id.tvBubbleReportType)
        var tvBubbleReceiveTime: TextView = itemView.findViewById(R.id.tvBubbleReceiveTime)
+        var clReportLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clReportLayout)
    }

    //运营平台
    class BubbleOperationHolder(itemView: View): RecyclerView.ViewHolder(itemView){
        var tvBubbleOperationTime: TextView = itemView.findViewById(R.id.tvBubbleOperationTime)
        var tvBubbleOperationContent: TextView = itemView.findViewById(R.id.tvBubbleOperationContent)
+        var clBubbleOperationLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clBubbleOperationLayout)
    }

    //Notice
@@ -213,6 +228,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
        var ivV2XImage: ImageView = itemView.findViewById(R.id.ivV2XImage)
        var tvV2XTime: TextView = itemView.findViewById(R.id.tvV2XTime)
        var tvV2XContent: TextView = itemView.findViewById(R.id.tvV2XContent)
+        var clV2XLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clV2XLayout)
    }

    //汇总消息
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxBubbleAdapter.kt
@@ -19,6 +19,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat
+import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout

 /**
 * @author XuXinChao
@@ -105,6 +106,9 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
                    holder.tvPassengerV2XContent.text = v2XMsg.content
                    holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable(
                        EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
+                    holder.clPassengerVeXLayout.setOnClickListener {
+                        CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean)
+                    }
                }
            }
            is BubbleSummaryHolder -> {
@@ -115,7 +119,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
                    holder.tvPassengerSummaryCheck.setOnClickListener {
                        //跳转全览模式
 //                        CallerHmiManager.showSmallFragment()
-                        CallerMsgBoxEventListenerManager.invokeListener()
+                        CallerMsgBoxEventListenerManager.invokeSummaryListener()
                    }
                }
            }
@@ -164,6 +168,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
        var ivPassengerV2XImage: ImageView = itemView.findViewById(R.id.ivPassengerV2XImage)
        var tvPassengerV2XTime: TextView = itemView.findViewById(R.id.tvPassengerV2XTime)
        var tvPassengerV2XContent: TextView = itemView.findViewById(R.id.tvPassengerV2XContent)
+        var clPassengerVeXLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clPassengerVeXLayout)
    }

    //汇总消息
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/PassengerMsgBoxListAdapter.kt
@@ -107,7 +107,7 @@ class PassengerMsgBoxListAdapter(private val activity: Activity): RecyclerView.A
                    holder.tvPassengerSummaryCheck.setOnClickListener {
                        //跳转全览模式
 //                        CallerHmiManager.showSmallFragment()
-                        CallerMsgBoxEventListenerManager.invokeListener()
+                        CallerMsgBoxEventListenerManager.invokeSummaryListener()
                    }
                }
            }
--- 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
@@ -38,14 +38,12 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant
 import com.mogo.eagle.core.data.deva.scene.SceneModule
 import com.mogo.eagle.core.data.enums.TrafficTypeEnum
 import com.mogo.eagle.core.data.gnss.AccelerationEntity
-import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.data.obu.ObuStatusInfo
 import com.mogo.eagle.core.data.report.ReportEntity
 import com.mogo.eagle.core.function.api.autopilot.*
 import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener
 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
+import com.mogo.eagle.core.function.api.obu.IMoGoObuConnectListener
 import com.mogo.eagle.core.function.business.routeoverlay.*
 import com.mogo.eagle.core.function.call.autopilot.*
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
@@ -55,8 +53,8 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerHDMapManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerSmpManager
-import com.mogo.eagle.core.function.call.obu.CallerOBUManager
-import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
+import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.function.hmi.R
@@ -100,22 +98,21 @@ internal class DebugSettingView @JvmOverloads constructor(
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr),
-        IMoGoObuStatusListener,
-        IMoGoAutopilotStatusListener,
-        IMoGoChassisLocationWGS84Listener,
-        IMoGoMapLocationListener,
-        IMoGoAutopilotIdentifyListener,
-        IMoGoPlanningRottingListener,
-        IMoGoPlanningTrajectoryListener,
-        IMoGoDevaToolsFuncConfigListener,
-        IMoGoChassisLamplightListener,
-        IMoGoDevaToolsListener,
-        IMoGoChassisAccStateListener,
-        IMoGoChassisSteeringStateListener,
-        IMoGoChassisGearStateListener,
-        IMoGoChassisBrakeStateListener,
-        IMoGoChassisThrottleStateListener,
-        IMoGoSweeperFutianCleanSystemListener{
+    IMoGoObuConnectListener,
+    IMoGoAutopilotStatusListener,
+    IMoGoChassisLocationWGS84Listener,
+    IMoGoAutopilotIdentifyListener,
+    IMoGoPlanningRottingListener,
+    IMoGoPlanningTrajectoryListener,
+    IMoGoDevaToolsFuncConfigListener,
+    IMoGoChassisLamplightListener,
+    IMoGoDevaToolsListener,
+    IMoGoChassisAccStateListener,
+    IMoGoChassisSteeringStateListener,
+    IMoGoChassisGearStateListener,
+    IMoGoChassisBrakeStateListener,
+    IMoGoChassisThrottleStateListener,
+    IMoGoSweeperFutianCleanSystemListener {

    private val TAG = "DebugSettingView"

@@ -189,7 +186,7 @@ internal class DebugSettingView @JvmOverloads constructor(
    override fun onAttachedToWindow() {
        super.onAttachedToWindow()
        // 添加 OBU状态 监听
-        CallerObuListenerManager.addListener(TAG, this)
+        CallerObuConnectListenerManager.addListener(TAG, this)
        // 添加 ADAS状态 监听
        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
        // 添加 ADAS车辆状态&定位 监听
@@ -230,7 +227,7 @@ internal class DebugSettingView @JvmOverloads constructor(
    override fun onDetachedFromWindow() {
        super.onDetachedFromWindow()
        // 移除 OBU状态 监听
-        CallerObuListenerManager.removeListener(TAG)
+        CallerObuConnectListenerManager.removeListener(TAG)
        // 移除 ADAS状态 监听
        CallerAutoPilotStatusListenerManager.removeListener(TAG)
        // 移除 ADAS车辆状态&定位 监听
@@ -254,7 +251,10 @@ internal class DebugSettingView @JvmOverloads constructor(
        CallerChassisLamplightListenerManager.removeListener(TAG)

        // 移除 业务配置监听
-        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, TAG)
+        CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(
+            FuncBizConfig.FOUNDATION,
+            TAG
+        )

        if (logInfoView != null) {
            logInfoView!!.onEnterBackground()
@@ -552,7 +552,7 @@ internal class DebugSettingView @JvmOverloads constructor(
        setLogCheckedChangeListener()

        //OBU配置信息
-        tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
+        tvObuInfo.text = CallerObuConnectListenerManager.getObuStatusInfoJsonString()

        //工控机配置信息
        tvAutopilotInfo.text =
@@ -572,14 +572,14 @@ internal class DebugSettingView @JvmOverloads constructor(
        btnSetObuIP.setOnClickListener {
            val obuIP = etObuIP.text.toString()
            if (StringUtils.isValidIPAddress(obuIP)) {
-                CallerOBUManager.resetObuIpAddress(obuIP)
+                CallerObuApiManager.resetObuIpAddress(obuIP)
            } else {
                ToastUtils.showShort("请输入正确的IP地址")
            }
        }

        btnDrawFusion.isChecked = FunctionBuildConfig.isFusionColor
-        btnDrawFusion.setOnCheckedChangeListener{_, isChecked ->
+        btnDrawFusion.setOnCheckedChangeListener { _, isChecked ->
            FunctionBuildConfig.isFusionColor = isChecked
        }

@@ -589,7 +589,11 @@ internal class DebugSettingView @JvmOverloads constructor(
        // 演示模式
        tbIsDemoMode.setOnCheckedChangeListener { _, _ ->
            FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
-            CallerHmiManager.updateStatusBarLeftView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(context))
+            CallerHmiManager.updateStatusBarLeftView(
+                FunctionBuildConfig.isDemoMode,
+                "demoMode",
+                DemoModeView(context)
+            )
            CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
            if (!FunctionBuildConfig.isDemoMode) {
                //关闭美化模式时，通知工控机
@@ -1691,9 +1695,9 @@ internal class DebugSettingView @JvmOverloads constructor(
        mTrajectoryInfoSize = 0
        mRouteInfoSize = 0

-        if(FunctionBuildConfig.isDemoMode){
+        if (FunctionBuildConfig.isDemoMode) {
            tbIsDemoMode.text = "关闭美化模式"
-        }else{
+        } else {
            tbIsDemoMode.text = "开启美化模式"
        }

@@ -1702,7 +1706,7 @@ internal class DebugSettingView @JvmOverloads constructor(
    /**
     * OBU状态回调
     */
-    override fun onObuStatusResponse(obuStatusInfo: ObuStatusInfo) {
+    override fun onConnectStatus(obuStatusInfo: ObuStatusInfo) {
        lifecycleOwner.lifecycleScope.launch {
            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)

@@ -1782,7 +1786,7 @@ internal class DebugSettingView @JvmOverloads constructor(
        when (type) {
            BIZ_BEAUTY_MODE -> {
                tbIsDemoMode.isClickable = !lock
-                val (left,top,right,bottom) = tbIsDemoMode.currentPadding()
+                val (left, top, right, bottom) = tbIsDemoMode.currentPadding()
                if (lock) {
                    tbIsDemoMode.background =
                        resources.getDrawable(R.drawable.radio_button_lock_background)
@@ -1790,11 +1794,11 @@ internal class DebugSettingView @JvmOverloads constructor(
                    tbIsDemoMode.background =
                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
                }
-                tbIsDemoMode.setPadding(left,top,right,bottom)
+                tbIsDemoMode.setPadding(left, top, right, bottom)
            }
            BIZ_RAIN_MODE -> {
                tbIsRainMode.isClickable = !lock
-                val (left,top,right,bottom) = tbIsRainMode.currentPadding()
+                val (left, top, right, bottom) = tbIsRainMode.currentPadding()
                if (lock) {
                    tbIsRainMode.background =
                        resources.getDrawable(R.drawable.radio_button_lock_background)
@@ -1802,21 +1806,21 @@ internal class DebugSettingView @JvmOverloads constructor(
                    tbIsRainMode.background =
                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
                }
-                tbIsRainMode.setPadding(left,top,right,bottom)
+                tbIsRainMode.setPadding(left, top, right, bottom)
            }
            BIZ_WARNING_UPLOAD -> {
                tbReportWarning.isClickable = !lock
-                val (left,top,right,bottom) = tbReportWarning.currentPadding()
+                val (left, top, right, bottom) = tbReportWarning.currentPadding()
                if (lock) {
                    tbReportWarning.background =
                        resources.getDrawable(R.drawable.radio_button_lock_background)
                } else {
                    tbReportWarning.background = null
                }
-                tbReportWarning.setPadding(left,top,right,bottom)
+                tbReportWarning.setPadding(left, top, right, bottom)
            }
            BIZ_BAG_RECORD -> {
-                val (left,top,right,bottom) = btnRecordBag.currentPadding()
+                val (left, top, right, bottom) = btnRecordBag.currentPadding()
                if (lock) {
                    btnRecordBag.isClickable = false
                    btnRecordBag.background =
@@ -1826,10 +1830,10 @@ internal class DebugSettingView @JvmOverloads constructor(
                    btnRecordBag.requestFocus()
                    btnRecordBag.background = null
                }
-                btnRecordBag.setPadding(left,top,right,bottom)
+                btnRecordBag.setPadding(left, top, right, bottom)
            }
            BIZ_FULL_LOG -> {
-                val (left,top,right,bottom) = tbLogCatch.currentPadding()
+                val (left, top, right, bottom) = tbLogCatch.currentPadding()
                if (lock) {
                    tbLogCatch.isClickable = false
                    tbLogCatch.background =
@@ -1839,7 +1843,7 @@ internal class DebugSettingView @JvmOverloads constructor(
                    tbLogCatch.requestFocus()
                    tbLogCatch.background = null
                }
-                tbLogCatch.setPadding(left,top,right,bottom)
+                tbLogCatch.setPadding(left, top, right, bottom)
            }
        }
    }
@@ -1954,15 +1958,6 @@ internal class DebugSettingView @JvmOverloads constructor(
        }
    }

-    override fun onLocationChanged(location: MogoLocation?, from: Int, isGps: Boolean) {
-    }
-
-    /**
-     * 时延显示
-     */
-    override fun onObuV2iDelayTime(delayTime: Long) {
-
-    }

    /**
     * 车辆转向灯 数据
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.setting

 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -14,7 +13,7 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.obu.CallerOBUManager
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.kotlin.currentPadding
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -23,7 +22,6 @@ import com.mogo.eagle.core.function.business.routeoverlay.RouteStrategy
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
 import kotlinx.android.synthetic.main.view_sop_setting.view.tbRouteDynamicEffect
 import java.util.*
@@ -187,17 +185,17 @@ internal class SOPSettingView @JvmOverloads constructor(
        }

        //OBU控制总开关
-        tbObu.isChecked = CallerOBUManager.isConnected()
+        tbObu.isChecked = CallerObuApiManager.isConnected()
        tbObu.setOnCheckedChangeListener { _, isChecked ->
            if (!isChecked) {
                if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
-                    CallerOBUManager.resetObuIpAddress("192.168.1.199")
+                    CallerObuApiManager.resetObuIpAddress("192.168.1.199")
                } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
-                    CallerOBUManager.resetObuIpAddress("192.168.8.199")
+                    CallerObuApiManager.resetObuIpAddress("192.168.8.199")
                }
            } else {
                //断开链接
-                CallerOBUManager.disConnectObu()
+                CallerObuApiManager.disConnectObu()
            }
        }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -27,7 +27,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListene
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager;
 import com.mogo.eagle.core.function.msgbox.db.MsgBoxDb;
-import com.mogo.eagle.core.function.overview.OverviewDb;
+import com.mogo.eagle.core.function.overview.db.OverviewDb;
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -21,99 +21,6 @@
        android:layout_height="match_parent"
        android:paddingTop="72dp">

-        <!--消息盒子司机端选择入口-->
-        <CheckBox
-            android:id="@+id/cbMsgBoxDriver"
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_marginTop="15dp"
-            android:layout_marginEnd="25dp"
-            android:background="@drawable/selector_msg_box"
-            android:button="@null"
-            android:visibility="gone"
-            app:layout_constraintRight_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-<!--   todo 需要放入使用方 , view先gone掉方便重组    -->
-<!--             app:layout_constraintRight_toLeftOf="@id/viewLimitingVelocity"-->
-<!--            app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"  />-->
-
-        <!--司机端消息提示-->
-        <View
-            android:id="@+id/MsgBoxTipView"
-            android:layout_width="8dp"
-            android:layout_height="8dp"
-            android:background="@drawable/version_upgrade_tips_background"
-            android:translationZ="30dp"
-            android:visibility="gone"
-            app:layout_constraintCircle="@id/cbMsgBoxDriver"
-            app:layout_constraintCircleAngle="40"
-            app:layout_constraintCircleRadius="32dp"
-            tools:ignore="MissingConstraints" />
-
-        <!--消息盒子乘客端选择入口-->
-        <CheckBox
-            android:id="@+id/cbMsgBoxPassenger"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_marginStart="320dp"
-            android:layout_marginBottom="50dp"
-            android:background="@drawable/selector_msg_box_p"
-            android:button="@null"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent" />
-
-        <!--乘客端消息提示-->
-        <View
-            android:id="@+id/MsgBoxPTipView"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:background="@drawable/version_upgrade_tips_background"
-            android:translationZ="30dp"
-            android:visibility="gone"
-            app:layout_constraintCircle="@id/cbMsgBoxPassenger"
-            app:layout_constraintCircleAngle="40"
-            app:layout_constraintCircleRadius="50dp"
-            tools:ignore="MissingConstraints" />
-
-        <com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView
-            android:id="@+id/viewDriverMsgBoxList"
-            android:layout_width="864px"
-            android:layout_height="746px"
-            android:layout_marginEnd="40dp"
-            android:visibility="gone"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbMsgBoxDriver" />
-
-        <com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView
-            android:id="@+id/viewDriverMsgBoxBubble"
-            android:layout_width="864px"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="40dp"
-            android:visibility="visible"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cbMsgBoxDriver" />
-
-        <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView
-            android:id="@+id/viewPassengerMsgBoxBubble"
-            android:layout_width="650px"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/cbMsgBoxPassenger"
-            app:layout_constraintLeft_toLeftOf="@id/cbMsgBoxPassenger"
-            app:layout_constraintRight_toRightOf="@id/cbMsgBoxPassenger" />
-
-        <com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxListView
-            android:id="@+id/viewPassengerMsgBoxList"
-            android:layout_width="650px"
-            android:layout_height="750px"
-            android:layout_marginBottom="20dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/cbMsgBoxPassenger"
-            app:layout_constraintLeft_toLeftOf="@id/cbMsgBoxPassenger"
-            app:layout_constraintRight_toRightOf="@id/cbMsgBoxPassenger" />
-
        <!--左右转向灯-->
        <com.mogo.eagle.core.function.hmi.ui.turnlight.TurnLightViewStatus
            android:id="@+id/turnLightView"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.widget.RoundCanClickConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clBubbleOperationLayout"
    android:layout_width="804dp"
    android:layout_height="160dp"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -7,7 +8,8 @@
    app:roundLayoutRadius="24dp"
    android:layout_gravity="center_horizontal"
    android:layout_marginTop="7dp"
-    android:layout_marginBottom="7dp">
+    android:layout_marginBottom="7dp"
+    >

    <ImageView
        android:id="@+id/ivBubbleOperationImage"
@@ -61,4 +63,4 @@
        android:lineSpacingMultiplier="1.2"
        />

-</com.mogo.eagle.core.widget.RoundConstraintLayout>
+</com.mogo.eagle.core.widget.RoundCanClickConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.widget.RoundCanClickConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clReportLayout"
    android:layout_width="804dp"
    android:layout_height="160dp"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -72,4 +73,4 @@
        android:textSize="24dp"
        />

-</com.mogo.eagle.core.widget.RoundConstraintLayout>
+</com.mogo.eagle.core.widget.RoundCanClickConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_v2x.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.widget.RoundCanClickConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clV2XLayout"
    android:layout_width="804dp"
    android:layout_height="160dp"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -44,4 +45,4 @@
        android:ellipsize="end"
        />

-</com.mogo.eagle.core.widget.RoundConstraintLayout>
+</com.mogo.eagle.core.widget.RoundCanClickConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.mogo.eagle.core.widget.RoundCanClickConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clPassengerVeXLayout"
    android:layout_width="650dp"
    android:layout_height="160dp"
    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -47,4 +48,4 @@
        android:layout_marginEnd="25dp"
        />

-</com.mogo.eagle.core.widget.RoundConstraintLayout>
+</com.mogo.eagle.core.widget.RoundCanClickConstraintLayout>
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_driver_msg_box_button.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_driver_msg_box_button.xml
@@ -20,7 +20,7 @@

    <!--司机端消息提示-->
    <View
-        android:id="@+id/MsgBoxTipView"
+        android:id="@+id/msgBoxTipView"
        android:layout_width="8dp"
        android:layout_height="8dp"
        android:background="@drawable/version_upgrade_tips_background"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_passenger_msg_box_button.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_passenger_msg_box_button.xml
@@ -17,7 +17,7 @@

    <!--乘客端消息提示-->
    <View
-        android:id="@+id/MsgBoxPTipView"
+        android:id="@+id/msgBoxPTipView"
        android:layout_width="15dp"
        android:layout_height="15dp"
        android:background="@drawable/version_upgrade_tips_background"