diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 4c54205202..5473f300af 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -82,7 +82,6 @@ android:layout_width="650dp" android:layout_height="wrap_content" android:layout_marginBottom="20dp" - android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/viewPassengerMsgBoxButton" app:layout_constraintLeft_toLeftOf="@id/viewPassengerMsgBoxButton" app:layout_constraintRight_toRightOf="@id/viewPassengerMsgBoxButton" /> 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 42ff1b43d0..42f7fa8178 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 @@ -19,6 +19,9 @@ import com.mogo.eagle.core.function.msgbox.MsgBoxConfig import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_m_box_bubble.view.* +/** + * M2气泡态消息盒子 + */ class MBoxBubbleView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt index a64c894066..196baac151 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/BusPassengerMsgBoxBubbleAdapter.kt @@ -80,6 +80,7 @@ class BusPassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerV holder.tvBusPV2XContent.text = v2XMsg.content holder.ivBusPV2XImage.setImageDrawable(activity.resources.getDrawable( EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) + holder.tvBusPV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } } @@ -125,6 +126,7 @@ class BusPassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerV var ivBusPV2XImage: ImageView = itemView.findViewById(R.id.ivBusPV2XImage) var tvBusPV2XTime: TextView = itemView.findViewById(R.id.tvBusPV2XTime) var tvBusPV2XContent: TextView = itemView.findViewById(R.id.tvBusPV2XContent) + var tvBusPV2XTitle: TextView = itemView.findViewById(R.id.tvBusPV2XTitle) } //运营消息 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 466e5bf5a6..408fb9fcf3 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 @@ -181,6 +181,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A holder.clV2XLayout.setOnClickListener { CallerMsgBoxEventListenerManager.invokeBubbleV2XListener(msgBoxBean) } + holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } is BubbleSummaryHolder -> { @@ -275,6 +276,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A var tvV2XTime: TextView = itemView.findViewById(R.id.tvV2XTime) var tvV2XContent: TextView = itemView.findViewById(R.id.tvV2XContent) var clV2XLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clV2XLayout) + var tvV2XTitle: TextView = itemView.findViewById(R.id.tvV2XTitle) } //汇总消息 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 6c27709cbf..a31166ff14 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -369,6 +369,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.ivV2XImage.setImageDrawable(activity.resources.getDrawable( EventTypeEnumNew.getUpdateIconRes(v2XMsg.type)) ) + holder.tvV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } is MsgBoxSummary -> { @@ -472,6 +473,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : 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 tvV2XTitle: TextView = itemView.findViewById(R.id.tvV2XTitle) } //汇总消息 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 83842d19e9..ef6669cb99 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 @@ -82,6 +82,7 @@ class MBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter { @@ -179,6 +180,7 @@ class MMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView.Adapter var tvMV2XTime: TextView = itemView.findViewById(R.id.tvMV2XTime) var tvMV2XContent: TextView = itemView.findViewById(R.id.tvMV2XContent) var clMVeXLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clMVeXLayout) + var tvMV2XTitle: TextView = itemView.findViewById(R.id.tvMV2XTitle) } //汇总消息 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt index 62172a1ff6..aa1ef8a854 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MMsgBoxListAdapter.kt @@ -100,6 +100,7 @@ class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter { @@ -155,6 +156,7 @@ class MMsgBoxListAdapter(private val activity: Activity): RecyclerView.Adapter { @@ -167,6 +168,7 @@ class PassengerMsgBoxBubbleAdapter(private val activity: Activity): RecyclerView var tvPassengerV2XTime: TextView = itemView.findViewById(R.id.tvPassengerV2XTime) var tvPassengerV2XContent: TextView = itemView.findViewById(R.id.tvPassengerV2XContent) var clPassengerVeXLayout: RoundCanClickConstraintLayout = itemView.findViewById(R.id.clPassengerVeXLayout) + var tvPassengerV2XTitle: TextView = itemView.findViewById(R.id.tvPassengerV2XTitle) } //汇总消息 diff --git 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 index 3db034d364..21ae03bffc 100644 --- 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 @@ -97,6 +97,7 @@ class PassengerMsgBoxListAdapter(private val activity: Activity): RecyclerView.A holder.tvPassengerV2XContent.text = v2XMsg.content holder.ivPassengerV2XImage.setImageDrawable(activity.resources.getDrawable( EventTypeEnumNew.getUpdateIconRes(v2XMsg.type))) + holder.tvPassengerV2XTitle.text = EventTypeEnumNew.getEventTitle(v2XMsg.type) } } is ListSummaryHolder -> { @@ -140,6 +141,7 @@ class PassengerMsgBoxListAdapter(private val activity: Activity): RecyclerView.A 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 tvPassengerV2XTitle: TextView = itemView.findViewById(R.id.tvPassengerV2XTitle) } //汇总消息 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_v2x.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_v2x.png new file mode 100644 index 0000000000..d41c75bc33 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_v2x.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bus_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bus_box_v2x.xml index 1c4c09f901..d787ce3fb9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bus_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bus_box_v2x.xml @@ -19,14 +19,26 @@ android:layout_marginStart="@dimen/dp_26" /> + + @@ -35,16 +47,14 @@ android:id="@+id/tvBusPV2XContent" android:layout_width="0dp" android:layout_height="wrap_content" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintLeft_toLeftOf="@id/tvBusPV2XTitle" + app:layout_constraintRight_toRightOf="@id/tvBusPV2XTime" + app:layout_constraintTop_toBottomOf="@id/tvBusPV2XTitle" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toRightOf="@id/ivBusPV2XImage" - app:layout_constraintRight_toLeftOf="@id/tvBusPV2XTime" - android:layout_marginStart="@dimen/dp_26" - android:layout_marginEnd="@dimen/dp_16" - android:textColor="#FF203555" - android:textSize="@dimen/dp_36" + android:textColor="#CC203555" + android:textSize="@dimen/dp_28" android:gravity="start" - android:maxLines="1" + android:maxLines="2" android:ellipsize="end" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml index 4f6a9e0465..75d41bf8bf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml @@ -1,6 +1,6 @@ + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml index 27ae52a175..6f5eb37a39 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_box_v2x.xml @@ -19,12 +19,25 @@ android:layout_marginStart="@dimen/dp_13" /> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_v2x.xml index deddc8f6e2..37f11a7689 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_msg_list_v2x.xml @@ -14,12 +14,25 @@ android:layout_marginStart="@dimen/dp_16" /> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml index ef36f539a0..394a6676bb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml @@ -3,8 +3,7 @@ android:layout_width="804dp" android:layout_height="160dp" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="#53000000" - app:roundLayoutRadius="24dp" + android:background="@drawable/bg_msg_box_v2x" android:layout_gravity="center_horizontal" android:layout_marginStart="30dp" android:layout_marginEnd="30dp" @@ -20,11 +19,24 @@ app:layout_constraintLeft_toLeftOf="parent" android:layout_margin="25dp"/> + + diff --git 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 index 9888e42f87..80adf656b8 100644 --- 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,14 +1,14 @@ + android:layout_marginBottom="7dp" + > + + diff --git 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 index fbe95e1a36..3aae086477 100644 --- 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 @@ -20,32 +20,42 @@ /> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml index a323fe7515..227d4c0f8d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_list_v2x.xml @@ -14,31 +14,41 @@ /> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml index f70a509ba8..7bfd821501 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml @@ -1,7 +1,7 @@ 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 aea8bbfd7e..fa74444d2d 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 @@ -108,24 +108,24 @@ enum class EventTypeEnumNew( //接管 TAKE_OVER_EVENT( - "20000", "注意周围、立即接管", "注意周围、立即接管", R.drawable.icon_warning_take_over, + "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over, "注意周围、立即接管", "自动驾驶退出请立即接管" ), // 前方静止or慢速车辆报警 - ALERT_FRONT_CAR("99999"), + ALERT_FRONT_CAR("99999","前方预警"), // 限行管理 ALERT_TRAFFIC_CONTROL("99998"), // 红绿灯事件、是建议以多少速度驶过 - ALERT_TRAFFIC_LIGHT_SUGGEST("99997"), + ALERT_TRAFFIC_LIGHT_SUGGEST("99997","红绿灯"), // 红绿灯事件、一种是绿灯不足3秒 - ALERT_TRAFFIC_LIGHT_WARNING("99996"), + ALERT_TRAFFIC_LIGHT_WARNING("99996","红绿灯"), // 故障车辆 - ALERT_CAR_TROUBLE_WARNING("20007"), + ALERT_CAR_TROUBLE_WARNING("20007","故障车辆"), // 疲劳驾驶 ALERT_FATIGUE_DRIVING("99993"), @@ -219,28 +219,28 @@ enum class EventTypeEnumNew( //---------弱势交通参与者 obu and cloud start ------> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES( 1001.toString(), - "弱势交通参与者碰撞预警", + "碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_motorcycle_collision, content = "注意摩托车", tts = "注意摩托车" ), TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES( 1002.toString(), - "弱势交通参与者碰撞预警", + "碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_motobike, content = "注意非机动车", tts = "注意非机动车" ), TYPE_USECASE_ID_VRUCW_PERSON( 1003.toString(), - "弱势交通参与者碰撞预警", + "碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_pedestrian_crossing, content = "注意行人", tts = "注意行人" ), TYPE_ERROR_WEAKNESS( 1006.toString(), - "未知/错误/异常", + "未知障碍物", poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, content = "前方有未知障碍物", tts = "前方有未知障碍物" @@ -397,7 +397,7 @@ enum class EventTypeEnumNew( ), TYPE_NO_PASSING( 51.toString(), - "不通", + "道路不通", poiTypeSrcVr = R.drawable.v2x_icon_fenglu_vr, content = "前方%s米不通", tts = "前方%s米不通" @@ -470,7 +470,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_JINGZHI( "100251", - "前方%s米静止障碍物占道", + "静止障碍物占道", poiTypeSrcVr = R.drawable.v2x_icon_jingzhi_zhangai, content = "前方%s米静止障碍物占道", tts = "前方%s米静止障碍物占道" @@ -478,7 +478,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_SHIGU( "100321", - "前方%s米道路事故", + "道路事故", poiTypeSrcVr = R.drawable.v2x_icon_shigu_sanjiaopai, content = "前方%s米道路事故", tts = "前方%s米道路事故" @@ -486,7 +486,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_SHIGONG( "100061", - "前方%s米道路施工", + "道路施工", poiTypeSrcVr = R.drawable.v2x_icon_shigong_zhandao, content = "前方%s米道路施工", tts = "前方%s米道路施工" @@ -500,10 +500,10 @@ enum class EventTypeEnumNew( tts = "" ), - TYPE_VIP_IDENTIFICATION_PASS("20022", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行,已为您变为绿灯", "VIP车辆优先通行,已为您变为绿灯"), - TYPE_VIP_IDENTIFICATION_EXTEND("20023", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行,已为您延长绿灯", "VIP车辆优先通行,已为您延长绿灯"), - TYPE_VIP_ERROR_IDENTIFICATION("20024", "", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败,", "请求失败,稍后重试"), - TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"); + TYPE_VIP_IDENTIFICATION_PASS("20022", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行,已为您变为绿灯", "VIP车辆优先通行,已为您变为绿灯"), + TYPE_VIP_IDENTIFICATION_EXTEND("20023", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "VIP车辆优先通行,已为您延长绿灯", "VIP车辆优先通行,已为您延长绿灯"), + TYPE_VIP_ERROR_IDENTIFICATION("20024", "VIP通行", "", R.drawable.icon_warning_v2x_vip_turn_light, "请求失败,", "请求失败,稍后重试"), + TYPE_OPTIMAL_ROUTE_RECOMMEND("2000", "路线推荐", "", R.drawable.icon_warning_v2x_optimal_route, "为您推荐最优路线", "已为您选择最优路线"); companion object { @@ -706,6 +706,307 @@ enum class EventTypeEnumNew( } } + @JvmStatic + fun getEventTitle(poiType: String?): String{ + return when(poiType){ + //交通检查 + TRAFFIC_CHECK.poiType ->{ + TRAFFIC_CHECK.poiTypeStr + } + //封路 + ROAD_CLOSED.poiType ->{ + ROAD_CLOSED.poiTypeStr + } + //施工 + FOURS_ROAD_WORK.poiType ->{ + FOURS_ROAD_WORK.poiTypeStr + } + //道路施工 + TYPE_SOCKET_ROAD_SHIGONG.poiType ->{ + TYPE_SOCKET_ROAD_SHIGONG.poiTypeStr + } + //静止障碍物占道 + TYPE_SOCKET_ROAD_JINGZHI.poiType ->{ + TYPE_SOCKET_ROAD_JINGZHI.poiTypeStr + } + //道路事故 + TYPE_SOCKET_ROAD_SHIGU.poiType ->{ + TYPE_SOCKET_ROAD_SHIGU.poiTypeStr + } + //交通拥堵 + TYPE_SOCKET_ROAD_CONGESTION.poiType ->{ + TYPE_SOCKET_ROAD_CONGESTION.poiTypeStr + } + //道路拥堵 + FOURS_BLOCK_UP.poiType ->{ + FOURS_BLOCK_UP.poiTypeStr + } + //道路积水 + FOURS_PONDING.poiType ->{ + FOURS_PONDING.poiTypeStr + } + //浓雾 + FOURS_FOG.poiType ->{ + FOURS_FOG.poiTypeStr + } + //结冰 + FOURS_ICE.poiType ->{ + FOURS_ICE.poiTypeStr + } + //事故 + FOURS_ACCIDENT.poiType ->{ + FOURS_ACCIDENT.poiTypeStr + } + //重大事故 + FOURS_ACCIDENT_01.poiType ->{ + FOURS_ACCIDENT_01.poiTypeStr + } + //特大事故 + FOURS_ACCIDENT_02.poiType ->{ + FOURS_ACCIDENT_02.poiTypeStr + } + //较大事故 + FOURS_ACCIDENT_03.poiType ->{ + FOURS_ACCIDENT_03.poiTypeStr + } + //一般事故 + FOURS_ACCIDENT_04.poiType ->{ + FOURS_ACCIDENT_04.poiTypeStr + } + //轻微事故 + FOURS_ACCIDENT_05.poiType ->{ + FOURS_ACCIDENT_05.poiTypeStr + } + //事故 + FOURS_LIVING.poiType ->{ + FOURS_LIVING.poiTypeStr + } + //红绿灯数据 + ALERT_TRAFFIC_LIGHT_SUGGEST.poiType ->{ + ALERT_TRAFFIC_LIGHT_SUGGEST.poiTypeStr + } + //红绿灯数据 + ALERT_TRAFFIC_LIGHT_WARNING.poiType ->{ + ALERT_TRAFFIC_LIGHT_WARNING.poiTypeStr + } + //前方静止or慢速车辆报警 + ALERT_FRONT_CAR.poiType ->{ + ALERT_FRONT_CAR.poiTypeStr + } + // 故障车辆 + ALERT_CAR_TROUBLE_WARNING.poiType ->{ + ALERT_CAR_TROUBLE_WARNING.poiTypeStr + } + //VIP车辆优先通行,已为您变为绿灯 + TYPE_VIP_IDENTIFICATION_PASS.poiType ->{ + TYPE_VIP_IDENTIFICATION_PASS.poiTypeStr + } + //VIP车辆优先通行,已为您延长绿灯 + TYPE_VIP_IDENTIFICATION_EXTEND.poiType ->{ + TYPE_VIP_IDENTIFICATION_EXTEND.poiTypeStr + } + //VIP变灯请求失败 + TYPE_VIP_ERROR_IDENTIFICATION.poiType ->{ + TYPE_VIP_ERROR_IDENTIFICATION.poiTypeStr + } + //最优路线 + TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType ->{ + TYPE_OPTIMAL_ROUTE_RECOMMEND.poiTypeStr + } + //绿波通行 + TYPE_USECASE_ID_IVP_GREEN.poiType ->{ + TYPE_USECASE_ID_IVP_GREEN.poiTypeStr + } + //闯红灯预警 + TYPE_USECASE_ID_IVP_RED.poiType ->{ + TYPE_USECASE_ID_IVP_RED.poiTypeStr + } + //鬼探头类型 + GHOST_PROBE.poiType ->{ + GHOST_PROBE.poiTypeStr + } + //接管 + TAKE_OVER_EVENT.poiType ->{ + TAKE_OVER_EVENT.poiTypeStr + } + //机动车 + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType ->{ + TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiTypeStr + } + //碰撞预警 + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType ->{ + TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiTypeStr + } + //碰撞预警 + TYPE_USECASE_ID_VRUCW_PERSON.poiType ->{ + TYPE_USECASE_ID_VRUCW_PERSON.poiTypeStr + } + //未知障碍物 + TYPE_ERROR_WEAKNESS.poiType ->{ + TYPE_ERROR_WEAKNESS.poiTypeStr + } + //学校 + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType ->{ + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeStr + } + //禁止停车 + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType ->{ + TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeStr + } + //超速行驶 + TYPE_USECASE_ID_SLW.poiType ->{ + TYPE_USECASE_ID_SLW.poiTypeStr + } + //拥堵 + TYPE_USECASE_ID_TJW.poiType ->{ + TYPE_USECASE_ID_TJW.poiTypeStr + } + //车辆故障 + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType ->{ + TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeStr + } + //道路积水 + FOURS_PONDING.poiType ->{ + FOURS_PONDING.poiTypeStr + } + //异常停车 + TYPE_USECASE_ID_ROAD_PARKING.poiType ->{ + TYPE_USECASE_ID_ROAD_PARKING.poiTypeStr + } + //逆行车辆 + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType ->{ + TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiTypeStr + } + //急转弯 + TYPE_ID_SHAPR_TURNS.poiType ->{ + TYPE_ID_SHAPR_TURNS.poiTypeStr + } + //桥梁 + TYPE_ID_BRIDGE.poiType ->{ + TYPE_ID_BRIDGE.poiTypeStr + } + //行人 + TYPE_ID_PEDESTRIAN.poiType ->{ + TYPE_ID_PEDESTRIAN.poiTypeStr + } + //路滑 + TYPE_ID_SLIPPERY_ROAD.poiType ->{ + TYPE_ID_SLIPPERY_ROAD.poiTypeStr + } + //隧道 + TYPE_ID_TUNNEL.poiType ->{ + TYPE_ID_TUNNEL.poiTypeStr + } + //渡轮 + TYPE_ID_FERRY.poiType ->{ + TYPE_ID_FERRY.poiTypeStr + } + //路面不平 + TYPE_ID_UNEVEN_ROAD.poiType ->{ + TYPE_ID_UNEVEN_ROAD.poiTypeStr + } + //非机动车 + TYPE_ID_NON_MOTOR_VEHICLE.poiType ->{ + TYPE_ID_NON_MOTOR_VEHICLE.poiTypeStr + } + //障碍 + TYPE_ID_OBSTACLE.poiType ->{ + TYPE_ID_OBSTACLE.poiTypeStr + } + //施工 + TYPE_FOURS_ROAD_WORK.poiType ->{ + TYPE_FOURS_ROAD_WORK.poiTypeStr + } + //车队 + TYPE_VEHICLE_QUEUE.poiType ->{ + TYPE_VEHICLE_QUEUE.poiTypeStr + } + //道路不通 + TYPE_NO_PASSING.poiType ->{ + TYPE_NO_PASSING.poiTypeStr + } + //禁止掉头 + TYPE_NO_TURNING_AROUND.poiType ->{ + TYPE_NO_TURNING_AROUND.poiTypeStr + } + //禁止停车 + TYPE_USECASE_ID_ROAD_NO_PARKING.poiType ->{ + TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeStr + } + //禁止鸣笛 + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType ->{ + TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeStr + } + //超速 + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType ->{ + TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeStr + } + //公交提醒 + TYPE_USECASE_ID_BUS_WARNING.poiType ->{ + TYPE_USECASE_ID_BUS_WARNING.poiTypeStr + } + //右侧变窄/车道数减少 + TYPE_USECASE_ID_NARROW_RIGHT.poiType ->{ + TYPE_USECASE_ID_NARROW_RIGHT.poiTypeStr + } + //加油站 + TYPE_USECASE_ID_GAS_STATION.poiType ->{ + TYPE_USECASE_ID_GAS_STATION.poiTypeStr + } + //学校 + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType ->{ + TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeStr + } + //交通事故 + TYPE_USECASE_ID_ACCIDENT.poiType ->{ + TYPE_USECASE_ID_ACCIDENT.poiTypeStr + } + //紧急制动预警 + TYPE_USECASE_ID_EBW.poiType ->{ + TYPE_USECASE_ID_EBW.poiTypeStr + } + //前向碰撞预警 + TYPE_USECASE_ID_FCW.poiType ->{ + TYPE_USECASE_ID_FCW.poiTypeStr + } + //交叉路口碰撞预警 + TYPE_USECASE_ID_ICW.poiType ->{ + TYPE_USECASE_ID_ICW.poiTypeStr + } + //车辆失控预警 + TYPE_USECASE_ID_CLW.poiType ->{ + TYPE_USECASE_ID_CLW.poiTypeStr + } + //逆向超车预警 + TYPE_USECASE_ID_DNPW.poiType ->{ + TYPE_USECASE_ID_DNPW.poiTypeStr + } + //异常车辆提醒 + TYPE_USECASE_ID_AVW.poiType ->{ + TYPE_USECASE_ID_AVW.poiTypeStr + } + //盲区预警 + TYPE_USECASE_ID_BSW.poiType ->{ + TYPE_USECASE_ID_BSW.poiTypeStr + } + //变道预警 + TYPE_USECASE_ID_LCW.poiType ->{ + TYPE_USECASE_ID_LCW.poiTypeStr + } + //紧急车辆提醒 + TYPE_USECASE_ID_EVW.poiType ->{ + TYPE_USECASE_ID_EVW.poiTypeStr + } + //左转辅助 + TYPE_USECASE_ID_LTA.poiType ->{ + TYPE_USECASE_ID_LTA.poiTypeStr + } + else ->{ + "事件通知" + } + } + } + @JvmStatic fun getUpdateIconRes(poiType: String?): Int { return when (poiType) {