diff --git a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
index 13272210f3..311f50e690 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
+++ b/core/function-impl/mogo-core-function-chat/src/main/res/layout/module_car_chatting_launcher_calling_hawk_eye_view.xml
@@ -13,7 +13,6 @@
         android:id="@+id/module_carchatting_call_head"
         android:layout_width="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
         android:layout_height="@dimen/module_call_chat_calling_iv_hawk_eye_width_height"
-        android:scaleType="centerInside"
         android:src="@mipmap/module_carchatting_hawk_eye_default_head_img"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -25,7 +24,6 @@
         android:layout_width="@dimen/module_call_chat_hawk_eye_circle_btn_size"
         android:layout_height="@dimen/module_call_chat_hawk_eye_circle_btn_size"
         android:layout_marginEnd="@dimen/module_call_chat_calling_iv_hawk_eye_margin_left_right"
-        android:scaleType="centerInside"
         android:src="@mipmap/module_carchatting_launcher_calling_hangup"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git 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
index dc08cb75f7..0bf5097f02 100644
--- 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
@@ -9,6 +9,7 @@ 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.MsgBoxCountDownBean
 import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
@@ -39,7 +40,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(
     var driverMsgBoxBubbleAdapter: DriverMsgBoxBubbleAdapter ?=null
 
     private val TAG =  "DriverMsgBoxBubbleView"
-    private val dataList :ArrayList<MsgBoxBean> = ArrayList()
+    private val dataList :ArrayList<MsgBoxCountDownBean> = ArrayList()
     private var isShowData = true
 
     private fun initView() {
@@ -92,7 +93,8 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(
                     //todo 过滤MAP系统异常报警
                 } else{
                     clMsgBubbleLayout.visibility = View.VISIBLE
-                    dataList.add(msgBoxBean)
+                    val msgBoxCountDownBean = MsgBoxCountDownBean(msgBoxBean)
+                    dataList.add(msgBoxCountDownBean)
                     driverMsgBoxBubbleAdapter?.setData(dataList)
                 }
             }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt
index 30ff6c7f23..17151d727e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxCountDownBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
@@ -25,7 +26,7 @@ class MBoxBubbleView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener {
 
     private val TAG =  "PassengerMsgBoxBubbleView"
-    private val dataList :ArrayList<MsgBoxBean> = ArrayList()
+    private val dataList :ArrayList<MsgBoxCountDownBean> = ArrayList()
     private var mBoxBubbleAdapter: MBoxBubbleAdapter?= null
     private var isShowData = true
 
@@ -58,7 +59,8 @@ class MBoxBubbleView @JvmOverloads constructor(
                     MsgBoxConfig.noticeList.add(msgBoxList)
                     if(isShowData){
                         CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
-                        dataList.add(msgBoxList)
+                        val msgBoxCountDownBean = MsgBoxCountDownBean(msgBoxList)
+                        dataList.add(msgBoxCountDownBean)
                         mBoxBubbleAdapter?.setData(dataList)
                     }
                 }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt
index 78f9002e4a..e382698b28 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MMsgBoxBubbleView.kt
@@ -6,10 +6,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
-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.data.msgbox.OperationMsg
+import com.mogo.eagle.core.data.msgbox.*
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager
@@ -26,7 +23,7 @@ class MMsgBoxBubbleView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener {
 
     private val TAG =  "MMsgBoxBubbleView"
-    private val dataList :ArrayList<MsgBoxBean> = ArrayList()
+    private val dataList :ArrayList<MsgBoxCountDownBean> = ArrayList()
     private var mMsgBoxBubbleAdapter: MMsgBoxBubbleAdapter?= null
     private var isShowData = true
 
@@ -56,27 +53,27 @@ class MMsgBoxBubbleView @JvmOverloads constructor(
             if(category == MsgCategory.NOTICE){
                 if(msgBoxList.type == MsgBoxType.NOTICE || msgBoxList.type == MsgBoxType.V2X
                     || msgBoxList.type == MsgBoxType.OBU){
-                    MsgBoxConfig.noticeList.add(msgBoxList)
-                    if(isShowData){
-                        CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
-                        dataList.add(msgBoxList)
-                        mMsgBoxBubbleAdapter?.setData(dataList)
-                    }
+                    update(msgBoxList)
                 }
                 if(msgBoxList.type == MsgBoxType.OPERATION){
                     if((msgBoxList.bean as OperationMsg).type == 2){
-                        MsgBoxConfig.noticeList.add(msgBoxList)
-                        if(isShowData){
-                            CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
-                            dataList.add(msgBoxList)
-                            mMsgBoxBubbleAdapter?.setData(dataList)
-                        }
+                        update(msgBoxList)
                     }
                 }
             }
         }
     }
 
+    private fun update(msgBoxList: MsgBoxBean){
+        MsgBoxConfig.noticeList.add(msgBoxList)
+        if(isShowData){
+            CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
+            val msgBoxCountDownBean = MsgBoxCountDownBean(msgBoxList)
+            dataList.add(msgBoxCountDownBean)
+            mMsgBoxBubbleAdapter?.setData(dataList)
+        }
+    }
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         CallerMsgBoxListenerManager.addListener(TAG,this)
diff --git 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
index 0112f09266..0ed1eb0622 100644
--- 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
@@ -7,6 +7,7 @@ import android.view.*
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxCountDownBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
@@ -30,7 +31,7 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor(
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMsgBoxListener {
 
     private val TAG =  "PassengerMsgBoxBubbleView"
-    private val dataList :ArrayList<MsgBoxBean> = ArrayList()
+    private val dataList :ArrayList<MsgBoxCountDownBean> = ArrayList()
     private var passengerMsgBoxBubbleAdapter: PassengerMsgBoxBubbleAdapter ?= null
     private var isShowData = true
 
@@ -63,7 +64,8 @@ class PassengerMsgBoxBubbleView @JvmOverloads constructor(
                     MsgBoxConfig.noticeList.add(msgBoxList)
                     if(isShowData){
                         CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
-                        dataList.add(msgBoxList)
+                        val msgBoxCountDownBean = MsgBoxCountDownBean(msgBoxList)
+                        dataList.add(msgBoxCountDownBean)
                         passengerMsgBoxBubbleAdapter?.setData(dataList)
                     }
                 }
diff --git 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
index 754c9a91a3..466e5bf5a6 100644
--- 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
@@ -30,7 +30,7 @@ import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
  */
 class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.Adapter<RecyclerView.ViewHolder>(){
 
-    private var data: ArrayList<MsgBoxBean> ?= null
+    private var data: ArrayList<MsgBoxCountDownBean> ?= null
 
     private val operation: Int = 1
     private val operationReturn: Int = 10
@@ -40,10 +40,9 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
     private val report: Int = 4
     private val summary: Int = 5
 
-    var countDownTimer: CountDownTimer?=null
     private var changeViewListener: ChangeViewListener?=null
 
-    fun setData(data: ArrayList<MsgBoxBean>){
+    fun setData(data: ArrayList<MsgBoxCountDownBean>){
         this.data = data
         if(data.size>4){
             data.removeAt(0)
@@ -90,9 +89,9 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
         when (holder) {
             is BubbleOperationHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position]
+                    val msgBoxBean = it[position].msgBoxBean
                     val operationMsg = msgBoxBean.bean as OperationMsg
-                    holder.tvBubbleOperationTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    holder.tvBubbleOperationTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvBubbleOperationContent.text = operationMsg.content
                     holder.clBubbleOperationLayout.setOnClickListener {
                         CallerMsgBoxEventListenerManager.invokeBubbleOperationListener(msgBoxBean)
@@ -102,7 +101,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
             //运营平台还车通知
             is BubbleOperationReturnHolder -> {
                 data?.let {
-                    val operationReturnMsg = it[position].bean as OperationMsg
+                    val operationReturnMsg = it[position].msgBoxBean.bean as OperationMsg
                     holder.tvOperationReturnContent.text = operationReturnMsg.content
                     holder.tvOperationReturnTime.text =
                         TimeUtils.millis2String(operationReturnMsg.timestamp, getHourMinFormat())
@@ -111,17 +110,17 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
             //运营平台靠边停车
             is BubbleOperationStopHolder -> {
                 data?.let {
-                    val operationStopMsg = it[position].bean as OperationMsg
+                    val operationStopMsg = it[position].msgBoxBean.bean as OperationMsg
                     holder.tvOperationStopTime.text =
                         TimeUtils.millis2String(operationStopMsg.timestamp, getHourMinFormat())
                 }
             }
             is BubbleReportHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position]
+                    val msgBoxBean = it[position].msgBoxBean
                     val reportEntity = msgBoxBean.bean as ReportEntity
-                    holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}"
-                    holder.tvBubbleReceiveTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    holder.tvBubbleReportTime.text = "时间：${TimeUtils.millis2String(it[position].msgBoxBean.timestamp)}"
+                    holder.tvBubbleReceiveTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     var resultStr = "类型："
                     for (result in reportEntity.resultList){
                         resultStr = "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}"
@@ -134,11 +133,11 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
             }
             is BubbleNoticeHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position].bean
+                    val msgBoxBean = it[position].msgBoxBean.bean
                     val noticeFrCloudMsg = msgBoxBean as NoticeFrCloudMsg
                     if(noticeFrCloudMsg.type == 0){
                         val noticeNormalData = noticeFrCloudMsg.noticeNormalData
-                        holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvNoticeContent.text = noticeNormalData?.content
                         GlideApp.with(activity).load(noticeNormalData?.imageUrl).optionalTransform(
                             GlideRoundedCornersTransform(
@@ -154,7 +153,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
                         }
                     }else if(noticeFrCloudMsg.type == 1){
                         val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData
-                        holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvNoticeContent.text = noticeTrafficStylePushData?.content
                         GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).optionalTransform(
                             GlideRoundedCornersTransform(
@@ -173,9 +172,9 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
             }
             is BubbleV2XHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position]
+                    val msgBoxBean = it[position].msgBoxBean
                     val v2XMsg = msgBoxBean.bean as V2XMsg
-                    holder.tvV2XTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    holder.tvV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvV2XContent.text = v2XMsg.content
                     holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable(
                         EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
@@ -186,15 +185,15 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
             }
             is BubbleSummaryHolder -> {
                 data?.let {
-                    val summaryMsg = it[position].bean as V2XMsg
-                    holder.tvSummaryTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    val summaryMsg = it[position].msgBoxBean.bean as V2XMsg
+                    holder.tvSummaryTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvSummaryContent.text = summaryMsg.content
                 }
             }
         }
 
-        val msgBoxBean: MsgBoxBean = data!![position]
-        countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
+        val msgBoxBean: MsgBoxCountDownBean = data!![position]
+        msgBoxBean.countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
             override fun onTick(p0: Long) {
 
             }
@@ -203,34 +202,32 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
                 data?.remove(msgBoxBean)
                 changeViewListener?.notifyView()
                 notifyDataSetChanged()
-//                    notifyItemRemoved(index)
-//                    notifyItemRangeChanged(index,recordTypeEntity.size-index)
             }
 
         }
-        countDownTimer?.start()
+        msgBoxBean.countDownTimer?.start()
 
     }
 
     override fun getItemCount() = data?.size ?: 0
 
     override fun getItemViewType(position: Int): Int {
-        return if(data!![position].type == MsgBoxType.OPERATION){
-            if((data!![position].bean as OperationMsg).type == 0){
+        return if(data!![position].msgBoxBean.type == MsgBoxType.OPERATION){
+            if((data!![position].msgBoxBean.bean as OperationMsg).type == 0){
                 //运营平台还车通知
                 operationReturn
-            }else if((data!![position].bean as OperationMsg).type == 1){
+            }else if((data!![position].msgBoxBean.bean as OperationMsg).type == 1){
                 //运营平台靠边停车
                 operationStop
             }else{
                 //普通运营平台
                 operation
             }
-        }else if(data!![position].type == MsgBoxType.REPORT){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.REPORT){
             report
-        }else if(data!![position].type == MsgBoxType.NOTICE){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.NOTICE){
             notice
-        }else if(data!![position].type == MsgBoxType.V2X && data!![position].sourceType == DataSourceType.SUMMARY){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.V2X && data!![position].msgBoxBean.sourceType == DataSourceType.SUMMARY){
             summary
         } else{
             v2x
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt
index 343289ebcd..c95913d7e7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MBoxBubbleAdapter.kt
@@ -17,14 +17,13 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils.getHourMinFormat
 
 class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<RecyclerView.ViewHolder>(){
 
-    private var data: ArrayList<MsgBoxBean> ?= null
+    private var data: ArrayList<MsgBoxCountDownBean> ?= null
 
     private val notice: Int = 1
     private val v2x: Int = 2
 
-    var countDownTimer: CountDownTimer?=null
 
-    fun setData(data: ArrayList<MsgBoxBean>){
+    fun setData(data: ArrayList<MsgBoxCountDownBean>){
         this.data = data
         if(data.size>3){
             data.removeAt(0)
@@ -49,14 +48,14 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<Re
         when (holder) {
             is BubbleNoticeHolder -> {
                 data?.let {
-                    val noticeFrCloudMsg = it[position].bean as NoticeFrCloudMsg
+                    val noticeFrCloudMsg = it[position].msgBoxBean.bean as NoticeFrCloudMsg
                     if(noticeFrCloudMsg.type == 0){
                         val noticeNormalData = noticeFrCloudMsg.noticeNormalData
-                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvMNoticeContent.text = noticeNormalData?.content
                     }else {
                         val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData
-                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvMNoticeContent.text = noticeTrafficStylePushData?.content
                     }
 
@@ -65,8 +64,8 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<Re
             is BubbleV2XHolder -> {
                 data?.let {
                     val msgBoxBean = it[position]
-                    val v2XMsg = msgBoxBean.bean as V2XMsg
-                    holder.tvMV2XTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    val v2XMsg = msgBoxBean.msgBoxBean.bean as V2XMsg
+                    holder.tvMV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvMV2XContent.text = v2XMsg.content
                     holder.ivMV2XImage.setImageDrawable(activity.resources.getDrawable(
                         EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
@@ -74,8 +73,8 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<Re
             }
         }
 
-        val msgBoxBean: MsgBoxBean = data!![position]
-        countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
+        val msgBoxBean: MsgBoxCountDownBean = data!![position]
+        msgBoxBean.countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
             override fun onTick(p0: Long) {
 
             }
@@ -88,13 +87,13 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<Re
             }
 
         }
-        countDownTimer?.start()
+        msgBoxBean.countDownTimer?.start()
     }
 
     override fun getItemCount() = data?.size ?: 0
 
     override fun getItemViewType(position: Int): Int {
-        return if(data!![position].type == MsgBoxType.NOTICE){
+        return if(data!![position].msgBoxBean.type == MsgBoxType.NOTICE){
             notice
         }else{
             v2x
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt
index a679403300..5ca1218f9e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxBubbleAdapter.kt
@@ -23,16 +23,15 @@ import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
 
 class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private var data: ArrayList<MsgBoxBean> ?= null
+    private var data: ArrayList<MsgBoxCountDownBean> ?= null
 
     private val notice: Int = 1
     private val v2x: Int = 2
     private val summary: Int = 3
     private val operation: Int = 4
 
-    var countDownTimer: CountDownTimer?=null
 
-    fun setData(data: ArrayList<MsgBoxBean>){
+    fun setData(data: ArrayList<MsgBoxCountDownBean>){
         this.data = data
         if(data.size>3){
             data.removeAt(0)
@@ -65,10 +64,10 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
         when (holder) {
             is BubbleNoticeHolder -> {
                 data?.let {
-                    val noticeFrCloudMsg = it[position].bean as NoticeFrCloudMsg
+                    val noticeFrCloudMsg = it[position].msgBoxBean.bean as NoticeFrCloudMsg
                     if(noticeFrCloudMsg.type == 0){
                         val noticeNormalData = noticeFrCloudMsg.noticeNormalData
-                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvMNoticeContent.text = noticeNormalData?.content
                         GlideApp.with(activity).load(noticeNormalData?.imageUrl).placeholder(R.drawable.icon_passenger_operation)
                             .optionalTransform(
@@ -83,7 +82,7 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
                         }
                     }else if(noticeFrCloudMsg.type == 1){
                         val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData
-                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvMNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvMNoticeContent.text = noticeTrafficStylePushData?.content
                         GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).placeholder(R.drawable.icon_passenger_operation)
                             .optionalTransform(
@@ -102,9 +101,9 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
             }
             is BubbleV2XHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position]
+                    val msgBoxBean = it[position].msgBoxBean
                     val v2XMsg = msgBoxBean.bean as V2XMsg
-                    holder.tvMV2XTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    holder.tvMV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvMV2XContent.text = v2XMsg.content
                     holder.ivMV2XImage.setImageDrawable(activity.resources.getDrawable(
                         EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
@@ -115,8 +114,8 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
             }
             is BubbleSummaryHolder -> {
                 data?.let {
-                    val summaryMsg= it[position].bean as V2XMsg
-                    holder.tvMSummaryTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    val summaryMsg= it[position].msgBoxBean.bean as V2XMsg
+                    holder.tvMSummaryTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvMSummaryContent.text = summaryMsg.content
                     holder.tvMSummaryCheck.setOnClickListener {
                         //跳转全览模式
@@ -127,15 +126,15 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
             }
             is BubbleOperationHolder ->{
                 data?.let {
-                    val operationMsg = it[position].bean as OperationMsg
-                    holder.tvMOperationTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    val operationMsg = it[position].msgBoxBean.bean as OperationMsg
+                    holder.tvMOperationTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvMOperationContent.text = operationMsg.content
                 }
             }
         }
 
-        val msgBoxBean: MsgBoxBean = data!![position]
-        countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
+        val msgBoxBean: MsgBoxCountDownBean = data!![position]
+        msgBoxBean.countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
             override fun onTick(p0: Long) {
 
             }
@@ -148,17 +147,17 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter
             }
 
         }
-        countDownTimer?.start()
+        msgBoxBean.countDownTimer?.start()
     }
 
     override fun getItemCount() = data?.size ?: 0
 
     override fun getItemViewType(position: Int): Int {
-        return if(data!![position].type == MsgBoxType.NOTICE){
+        return if(data!![position].msgBoxBean.type == MsgBoxType.NOTICE){
             notice
-        }else if(data!![position].type == MsgBoxType.V2X && data!![position].sourceType == DataSourceType.SUMMARY){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.V2X && data!![position].msgBoxBean.sourceType == DataSourceType.SUMMARY){
             summary
-        }else if(data!![position].type == MsgBoxType.OPERATION){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.OPERATION){
             operation
         } else{
             v2x
diff --git 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
index 01c8b24ae1..5b5aca0a98 100644
--- 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
@@ -28,15 +28,13 @@ import com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
  */
 class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private var data: ArrayList<MsgBoxBean> ?= null
+    private var data: ArrayList<MsgBoxCountDownBean> ?= null
 
     private val notice: Int = 1
     private val v2x: Int = 2
     private val summary: Int = 3
 
-    var countDownTimer: CountDownTimer?=null
-
-    fun setData(data: ArrayList<MsgBoxBean>){
+    fun setData(data: ArrayList<MsgBoxCountDownBean>){
         this.data = data
         if(data.size>3){
             data.removeAt(0)
@@ -65,10 +63,10 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
         when (holder) {
             is BubbleNoticeHolder -> {
                 data?.let {
-                    val noticeFrCloudMsg = it[position].bean as NoticeFrCloudMsg
+                    val noticeFrCloudMsg = it[position].msgBoxBean.bean as NoticeFrCloudMsg
                     if(noticeFrCloudMsg.type == 0){
                         val noticeNormalData = noticeFrCloudMsg.noticeNormalData
-                        holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvPassengerNoticeContent.text = noticeNormalData?.content
                         GlideApp.with(activity).load(noticeNormalData?.imageUrl).optionalTransform(
                             GlideRoundedCornersTransform(
@@ -82,7 +80,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
                         }
                     }else if(noticeFrCloudMsg.type == 1){
                         val noticeTrafficStylePushData = noticeFrCloudMsg.trafficPushData
-                        holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                        holder.tvPassengerNoticeTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                         holder.tvPassengerNoticeContent.text = noticeTrafficStylePushData?.content
                         GlideApp.with(activity).load(noticeTrafficStylePushData?.poiImgUrl).optionalTransform(
                             GlideRoundedCornersTransform(
@@ -100,9 +98,9 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
             }
             is BubbleV2XHolder -> {
                 data?.let {
-                    val msgBoxBean = it[position]
+                    val msgBoxBean = it[position].msgBoxBean
                     val v2XMsg = msgBoxBean.bean as V2XMsg
-                    holder.tvPassengerV2XTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    holder.tvPassengerV2XTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvPassengerV2XContent.text = v2XMsg.content
                     holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable(
                         EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)))
@@ -113,8 +111,8 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
             }
             is BubbleSummaryHolder -> {
                 data?.let {
-                    val summaryMsg= it[position].bean as V2XMsg
-                    holder.tvPassengerSummaryTime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+                    val summaryMsg= it[position].msgBoxBean.bean as V2XMsg
+                    holder.tvPassengerSummaryTime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
                     holder.tvPassengerSummaryContent.text = summaryMsg.content
                     holder.tvPassengerSummaryCheck.setOnClickListener {
                         //跳转全览模式
@@ -125,8 +123,8 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
             }
         }
 
-        val msgBoxBean: MsgBoxBean = data!![position]
-        countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
+        val msgBoxBean: MsgBoxCountDownBean = data!![position]
+        msgBoxBean.countDownTimer =object: CountDownTimer(CallerMsgBoxManager.getDismissTime(),1000){
             override fun onTick(p0: Long) {
 
             }
@@ -139,15 +137,15 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView
             }
 
         }
-        countDownTimer?.start()
+        msgBoxBean.countDownTimer?.start()
     }
 
     override fun getItemCount() = data?.size ?: 0
 
     override fun getItemViewType(position: Int): Int {
-        return if(data!![position].type == MsgBoxType.NOTICE){
+        return if(data!![position].msgBoxBean.type == MsgBoxType.NOTICE){
             notice
-        }else if(data!![position].type == MsgBoxType.V2X && data!![position].sourceType == DataSourceType.SUMMARY){
+        }else if(data!![position].msgBoxBean.type == MsgBoxType.V2X && data!![position].msgBoxBean.sourceType == DataSourceType.SUMMARY){
             summary
         } else{
             v2x
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
index c7d20aea1f..c0ace51269 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt
@@ -73,10 +73,10 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
     }
 
     override fun initViews() {
+        injectFloatView()
         injectStatusBar()
         window.setBackgroundDrawable(null)
         initConnectInfoRV()
-        FloatingViewHandler.init(module_main_id_floating_view)
         CallerHmiManager.init(this)
 
         //申请悬浮窗权限
@@ -90,23 +90,42 @@ open class MainActivity : MvpActivity<MainView?, MainPresenter?>(), MainView,
     }
 
     private fun injectStatusBar() {
-        val decorView = this.window.decorView as FrameLayout
+        val decorView = this.window.decorView as? FrameLayout ?: return
         val contentView =
-            (decorView.findViewById<View>(android.R.id.content) as ViewGroup).getChildAt(0)
+            (decorView.findViewById<View>(android.R.id.content) as? ViewGroup)?.getChildAt(0) ?: return
         contentView.fitsSystemWindows = false
         decorView.clipToPadding = false
         var statusBarView = decorView.findViewWithTag<View>("status_bar")
         if (statusBarView == null) {
             statusBarView = statusBar
-            statusBarView.setTag("status_bar")
+            statusBarView.tag = "status_bar"
+            val params = FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+            )
+            params.topMargin = 0
+            params.gravity = Gravity.TOP
+            decorView.addView(statusBarView, params)
+        }
+    }
+
+    private fun injectFloatView() {
+        val decorView = this.window.decorView as? FrameLayout ?: return
+        val contentView =
+            (decorView.findViewById<View>(android.R.id.content) as? ViewGroup)?.getChildAt(0) ?: return
+        contentView.fitsSystemWindows = false
+        decorView.clipToPadding = false
+        var floatContainer = decorView.findViewWithTag<View>("float_container")
+        if (floatContainer == null) {
+            floatContainer = FrameLayout(this)
+            floatContainer.tag = "float_container"
+            FloatingViewHandler.init(floatContainer)
+            val params = FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT,
+            )
+            decorView.addView(floatContainer, params)
         }
-        val statusBarLP = FrameLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT,
-        )
-        statusBarLP.topMargin = 0
-        statusBarLP.gravity = Gravity.TOP
-        decorView.addView(statusBarView, statusBarLP)
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_operation.xml
index d8d1747997..de8d8eae24 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_operation.xml
@@ -10,13 +10,12 @@
 
     <ImageView
         android:id="@+id/ivMOperationImage"
-        android:layout_width="@dimen/dp_83"
-        android:layout_height="@dimen/dp_83"
+        android:layout_width="@dimen/dp_110"
+        android:layout_height="@dimen/dp_110"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginStart="@dimen/dp_13"
-        android:src="@drawable/icon_msg_box_operation_stop"
+        android:src="@drawable/icon_passenger_operation"
         />
 
     <TextView
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_operation.xml
index d2a3127cbc..a064113ef4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_operation.xml
@@ -12,7 +12,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginStart="@dimen/dp_16"
-        android:src="@drawable/icon_msg_box_operation_stop"
+        android:src="@drawable/icon_passenger_operation"
         />
 
     <TextView
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
index 96184c4e54..0b1e1b60cd 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_main_activity_main.xml
@@ -6,23 +6,11 @@
     android:background="@drawable/main_splash_bg"
     android:orientation="vertical">
 
+    <!--网约车视图-->
     <FrameLayout
+        android:id="@+id/module_main_id_och_fragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <!-- 浮层-->
-        <FrameLayout
-            android:id="@+id/module_main_id_floating_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <!--网约车视图-->
-        <FrameLayout
-            android:id="@+id/module_main_id_och_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-    </FrameLayout>
+        android:layout_height="match_parent" />
 
     <!--冷启动过渡Logo-->
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 27d514d3b1..8ba6b14009 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -317,7 +317,7 @@
                 android:id="@+id/tbOpenMfView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="打开蘑方按键Toast"
+                android:text="蘑方按键Toast"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp"
                 android:visibility="gone"
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
index 13f0e013b1..b2400ffa9a 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
@@ -65,10 +65,10 @@ object TrackerSourceColorHelper {
 
         //僵尸车
         if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
-            color = "#AE7887FF"
+            color = "#AD7488FF"
             CallerMapUIServiceManager.getMapUIController()?.let {
                 if(it.isDayMode){
-                    color = "#AD7488FF"
+                    color = "#AE7887FF"
                 }
             }
         }
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
index 1c916ecbf7..1b8eb5302d 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt
@@ -22,9 +22,7 @@ object MarkerDrawerManager {
         fun onLocationChanged(planningPoints: List<LatLng>, locIndex: Int)
     }
 
-    private val routeWipeDisposable by lazy {
-        CompositeDisposable()
-    }
+    private var routeWipeDisposable: CompositeDisposable? = null
 
     // 自主画线的所有高德坐标系的轨迹点
     val planningPoints by lazy {
@@ -40,19 +38,22 @@ object MarkerDrawerManager {
     var callback: Callback? = null
 
     fun startLoopCalCarLocation() {
+        routeWipeDisposable = CompositeDisposable()
         getLoopCalCarObservable().delay(1000L, TimeUnit.MILLISECONDS, true)
             .subscribeOn(Schedulers.io())
             .repeat()
             .retry()
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe().let {
-                routeWipeDisposable.add(it)
+                routeWipeDisposable?.add(it)
             }
     }
 
     fun stopLoopCalCarLocation() {
-        if (!routeWipeDisposable.isDisposed) {
-            routeWipeDisposable.dispose()
+        routeWipeDisposable?.let {
+            if (!it.isDisposed) {
+                it.dispose()
+            }
         }
     }
 
@@ -103,7 +104,6 @@ object MarkerDrawerManager {
             var baseDiffDis = CoordinateUtils.calculateLineDistance(
                 realLon, realLat, baseLatLng.longitude, baseLatLng.latitude
             ) // lon,lat, prelon, prelat
-//            val lastIndex = if (lastArrivedIndex >= 1 && lastArrivedIndex <= routePoints.size - 1) lastArrivedIndex else 1
             for (i in 1 until routePoints.size) {
                 val latLng = routePoints[i]
                 val diff = CoordinateUtils.calculateLineDistance(
@@ -111,8 +111,8 @@ object MarkerDrawerManager {
                 )
                 if (baseDiffDis > diff) {
                     baseDiffDis = diff
-                    // 距离最近的时候判断是否走过
-                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(realLon, realLat, latLng.longitude, latLng.latitude, heading) >= 90) {
+                    // 距离最近的时候判断是否走过，且车行驶是线性连续的1s不会跳点过多
+                    if (DrivingDirectionUtils.getDegreeOfCar2Poi2(realLon, realLat, latLng.longitude, latLng.latitude, heading) >= 90 && i - lastArrivedIndex < 3) {
                         currentIndex = i
                     }
                 }
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index dd56a3045b..3cef39a6a1 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -36,6 +36,7 @@ import com.mogo.eagle.core.function.smp.MakerWithCount
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.callback
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.coordinateConverterWgsToGcj
+import com.mogo.eagle.core.function.smp.MarkerDrawerManager.lastArrivedIndex
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.lonLatHeading
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.planningPoints
 import com.mogo.eagle.core.function.smp.MarkerDrawerManager.startLoopCalCarLocation
@@ -236,6 +237,9 @@ class OverMapView @JvmOverloads constructor(
         }
         mStartMarker?.isVisible = false
         mEndMarker?.isVisible = false
+        MarkerDrawerManager.stopLoopCalCarLocation()
+        planningPoints.clear()
+        lastArrivedIndex = -1
     }
 
     @SuppressLint("UseCompatLoadingForDrawables")
diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
index 0bea51ed0d..584308b320 100644
--- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
+++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
@@ -124,6 +124,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         }
         //设置长链接的secretKey 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
         clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ"
+//        clientConfig.secretKey = "n48AlVufihvMDWgzwHX42yzSgiWaad6v"
 
         clientConfig.iHttpCurrentLocation = object : ICurrentLocation {
             override fun getCurrentLocation(): SimpleLocation {
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxCountDownBean.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxCountDownBean.kt
new file mode 100644
index 0000000000..a5fee017c9
--- /dev/null
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxCountDownBean.kt
@@ -0,0 +1,7 @@
+package com.mogo.eagle.core.data.msgbox
+
+import android.os.CountDownTimer
+
+class MsgBoxCountDownBean(val msgBoxBean: MsgBoxBean){
+    var countDownTimer: CountDownTimer ?= null
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index b754d9d8e9..c1d418f3b6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -145,4 +145,4 @@ ADAS_DATA_LIB_POM_ARTIFACT_ID=adas-data
 ADAS_DATA_LIB_CHILD_VERSION=.0
 
 # 线程优化版本
-THREAD_OPT_VERSION=4.0.0
+THREAD_OPT_VERSION=4.0.1
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt
index 12c3dbaa96..6edc26bd3c 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt
@@ -1,6 +1,8 @@
 package com.mogo.map.location
 
 import android.content.Context
+import android.os.Handler
+import android.os.HandlerThread
 import com.amap.api.location.AMapLocation
 import com.amap.api.location.AMapLocationClient
 import com.amap.api.location.AMapLocationClientOption
@@ -29,6 +31,12 @@ class GDLocationClient private constructor(context: Context) : AMapLocationListe
      */
     private var lastGaoDeLocation: MogoLocation = MogoLocation()
 
+    private val handler by lazy {
+        val thread = HandlerThread("GDLocationChange")
+        thread.start()
+        Handler(thread.looper)
+    }
+
     init {
         AMapLocationClient.updatePrivacyShow(context, true, true)
         AMapLocationClient.updatePrivacyAgree(context, true)
@@ -64,66 +72,68 @@ class GDLocationClient private constructor(context: Context) : AMapLocationListe
     }
 
     override fun onLocationChanged(aMapLocation: AMapLocation) {
-        // 更新GNSS 信息
-        lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
-
-        // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
-        mapLocation?.let {
-            // 转换 GCJ02-->WGS84 坐标
-            val wgs84Location =
-                CoordinateTransform.GCJ02ToWGS84(it.longitude, it.latitude)
-
-            lastGaoDeLocation.longitude = wgs84Location[0]
-            lastGaoDeLocation.latitude = wgs84Location[1]
-            lastGaoDeLocation.heading = it.bearing.toDouble()
-            lastGaoDeLocation.gnssSpeed = it.speed
-            lastGaoDeLocation.altitude = it.altitude
-            lastGaoDeLocation.satelliteTime = it.time
+        handler.post {
+            // 更新GNSS 信息
             lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
 
-            lastGaoDeLocation.locType = 1 // 定位类型为高德坐标(网路或者硬件定位)
-            lastGaoDeLocation.satellite = 4
+            // 将高德中的一些用于业务的数据进行融合，例如：CityCode、address等
+            mapLocation?.let {
+                // 转换 GCJ02-->WGS84 坐标
+                val wgs84Location =
+                    CoordinateTransform.GCJ02ToWGS84(it.longitude, it.latitude)
 
-            lastGaoDeLocation.cityName = it.city
-            lastGaoDeLocation.cityCode = it.cityCode
-            lastGaoDeLocation.provider = it.provider
-            lastGaoDeLocation.address = it.address
-            lastGaoDeLocation.district = it.district
-            lastGaoDeLocation.province = it.province
-            lastGaoDeLocation.adCode = it.adCode
-            lastGaoDeLocation.locationDetail = it.locationDetail
-            lastGaoDeLocation.poiName = it.poiName
-            lastGaoDeLocation.aoiName = it.aoiName
-            lastGaoDeLocation.street = it.street
-            lastGaoDeLocation.streetNum = it.streetNum
-            lastGaoDeLocation.description = it.description
-            lastGaoDeLocation.buildingId = it.buildingId
-            lastGaoDeLocation.floor = it.floor
-            lastGaoDeLocation.errorCode = it.errorCode
-            lastGaoDeLocation.errorInfo = it.errorInfo
-        }
+                lastGaoDeLocation.longitude = wgs84Location[0]
+                lastGaoDeLocation.latitude = wgs84Location[1]
+                lastGaoDeLocation.heading = it.bearing.toDouble()
+                lastGaoDeLocation.gnssSpeed = it.speed
+                lastGaoDeLocation.altitude = it.altitude
+                lastGaoDeLocation.satelliteTime = it.time
+                lastGaoDeLocation.lastReceiveTime = TimeUtils.getNowMills()
 
-        // 回掉给监听者
-        CallerGaoDeMapLocationListenerManager.invokeMoGoLocationChanged(lastGaoDeLocation)
+                lastGaoDeLocation.locType = 1 // 定位类型为高德坐标(网路或者硬件定位)
+                lastGaoDeLocation.satellite = 4
 
-        mapLocation = aMapLocation
-        // 本地SP缓存城市Code
-        val cityCode = aMapLocation.cityCode
-        if (cityCode != null && cityCode.isNotEmpty()) {
-            mCityCode = aMapLocation.cityCode
-            SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
-                .putString(SharedPrefsConstants.LOCATION_CITY_CODE, cityCode)
+                lastGaoDeLocation.cityName = it.city
+                lastGaoDeLocation.cityCode = it.cityCode
+                lastGaoDeLocation.provider = it.provider
+                lastGaoDeLocation.address = it.address
+                lastGaoDeLocation.district = it.district
+                lastGaoDeLocation.province = it.province
+                lastGaoDeLocation.adCode = it.adCode
+                lastGaoDeLocation.locationDetail = it.locationDetail
+                lastGaoDeLocation.poiName = it.poiName
+                lastGaoDeLocation.aoiName = it.aoiName
+                lastGaoDeLocation.street = it.street
+                lastGaoDeLocation.streetNum = it.streetNum
+                lastGaoDeLocation.description = it.description
+                lastGaoDeLocation.buildingId = it.buildingId
+                lastGaoDeLocation.floor = it.floor
+                lastGaoDeLocation.errorCode = it.errorCode
+                lastGaoDeLocation.errorInfo = it.errorInfo
+            }
 
-            SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
-                .putString(
-                    SharedPrefsConstants.LOCATION_LATITUDE,
-                    aMapLocation.latitude.toString()
-                )
-            SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
-                .putString(
-                    SharedPrefsConstants.LOCATION_LONGITUDE,
-                    aMapLocation.longitude.toString()
-                )
+            // 回掉给监听者
+            CallerGaoDeMapLocationListenerManager.invokeMoGoLocationChanged(lastGaoDeLocation)
+
+            mapLocation = aMapLocation
+            // 本地SP缓存城市Code
+            val cityCode = aMapLocation.cityCode
+            if (cityCode != null && cityCode.isNotEmpty()) {
+                mCityCode = aMapLocation.cityCode
+                SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
+                    .putString(SharedPrefsConstants.LOCATION_CITY_CODE, cityCode)
+
+                SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
+                    .putString(
+                        SharedPrefsConstants.LOCATION_LATITUDE,
+                        aMapLocation.latitude.toString()
+                    )
+                SharedPrefsMgr.getInstance(AbsMogoApplication.getApp())
+                    .putString(
+                        SharedPrefsConstants.LOCATION_LONGITUDE,
+                        aMapLocation.longitude.toString()
+                    )
+            }
         }
     }
 
diff --git a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
index f0752af30c..4dab0363b9 100644
--- a/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
+++ b/tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
@@ -68,8 +68,15 @@ class IFlyTekTts : IMogoTTS, InitListener {
     }
 
     override fun release() {
-        ttsEngine?.stopSpeaking()
-        ttsEngine?.destroy()
+        if (Thread.currentThread() != Looper.getMainLooper().thread) {
+            UiThreadHandler.post {
+                ttsEngine?.stopSpeaking()
+                ttsEngine?.destroy()
+            }
+        } else {
+            ttsEngine?.stopSpeaking()
+            ttsEngine?.destroy()
+        }
     }
 
     override fun flush() {
@@ -91,7 +98,16 @@ class IFlyTekTts : IMogoTTS, InitListener {
 
     override fun speakTTSVoiceWithLevel(tts: String?, level: Int, callBack: IMogoTTSCallback?) {
         if (tts.isNullOrEmpty()) return
-        speakMultiLangTTSWithLevel(MultiLangTtsEntity(listOf(LangTtsEntity(tts, LanguageType.CHINESE))), level, callBack)
+        speakMultiLangTTSWithLevel(
+            MultiLangTtsEntity(
+                listOf(
+                    LangTtsEntity(
+                        tts,
+                        LanguageType.CHINESE
+                    )
+                )
+            ), level, callBack
+        )
     }
 
     override fun speakMultiLangTTSWithLevel(
@@ -99,10 +115,19 @@ class IFlyTekTts : IMogoTTS, InitListener {
         level: Int,
         callBack: IMogoTTSCallback?
     ) {
-        if (callBack != null) {
-            speakVoiceMap[ttsEntity.toString()] = callBack
+        if (Thread.currentThread() != Looper.getMainLooper().thread) {
+            UiThreadHandler.post {
+                if (callBack != null) {
+                    speakVoiceMap[ttsEntity.toString()] = callBack
+                }
+                speakMultiLangTTSWithLevel(ttsEntity, level)
+            }
+        } else {
+            if (callBack != null) {
+                speakVoiceMap[ttsEntity.toString()] = callBack
+            }
+            speakMultiLangTTSWithLevel(ttsEntity, level)
         }
-        speakMultiLangTTSWithLevel(ttsEntity, level)
     }
 
     override fun stopSpeakTts(text: String?) {
@@ -110,6 +135,16 @@ class IFlyTekTts : IMogoTTS, InitListener {
     }
 
     override fun stopTts() {
+        if (Thread.currentThread() != Looper.getMainLooper().thread) {
+            UiThreadHandler.post {
+                realStop()
+            }
+        } else {
+            realStop()
+        }
+    }
+
+    private fun realStop() {
         curTtsEntity?.let {
             val string = it.toString()
             if (speakVoiceMap.containsKey(string)) {