From 22c03de59caf9102ecd9fb90a18ee75c7a0e69c3 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 10 Apr 2023 00:03:34 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Frobobus-d=5F230322=5F3.0.0]=E6=8E=A5?= =?UTF-8?q?=E7=AE=A1=E6=8F=90=E7=A4=BA=E5=8A=A0=E5=85=A5=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9B=92=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/vehicle/TakeOverView.kt | 15 +++++++++++++++ .../eagle/core/data/enums/EventTypeEnumNew.kt | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index ceb0ec8cce..36185d7cd5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -7,10 +7,15 @@ import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.enums.EventTypeEnumNew +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.zhjt.mogo.adas.data.bean.MogoReport @@ -71,6 +76,16 @@ class TakeOverView @JvmOverloads constructor( } } ) + //加入消息盒子 + saveMsgBox( + MsgBoxBean( + MsgBoxType.V2X, V2XMsg( + EventTypeEnumNew.TAKE_OVER_EVENT.poiType, + EventTypeEnumNew.TAKE_OVER_EVENT.poiTypeStrVr, "" + ) + ) + ) + } } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index fa74444d2d..024af8f69a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -107,9 +107,14 @@ enum class EventTypeEnumNew( "前方盲区行人通行，请注意", "前方盲区即将有行人通过，请减速慢行"), //接管 +// TAKE_OVER_EVENT( +// "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over, +// "注意周围、立即接管", "自动驾驶退出请立即接管" +// ), + TAKE_OVER_EVENT( "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over, - "注意周围、立即接管", "自动驾驶退出请立即接管" + "注意周围、立即接管", "平行驾驶遇弱网已退出，注意随时接管" ), // 前方静止or慢速车辆报警