From 9af784400d0db770afbb9a7eac937cc3909b600d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 3 Aug 2020 16:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=86=E5=8F=B2V2X?=
 =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/ScenarioHistoryAdapter.java      | 16 ++++++++++++++++
 .../holder/ScenarioHistoryRoadEventVH.java       |  2 +-
 .../res/layout/item_v2x_push_event_detail.xml    |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java
index fe62859808..7f14e357b2 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java
@@ -37,6 +37,22 @@ public class ScenarioHistoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
             case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING:
                 holder = new ScenarioHistoryRoadEventVH(parent);
                 break;
+            //违章停车
+            case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING:
+                holder = new ScenarioHistoryIllegalParkVH(parent);
+                break;
+            //推送展示
+            case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING:
+                holder = new ScenarioHistoryPushEventVH(parent);
+                break;
+            //疲劳驾驶
+            case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING:
+                holder = new ScenarioHistoryFatigueDrivingVH(parent);
+                break;
+            //他人故障求助
+            case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING:
+                holder = new ScenarioHistoryOtherSeekHelpVH(parent);
+                break;
             default:
                 holder = new ScenarioHistoryRoadEventVH(parent);
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java
index fffad1fb6c..2392692fbc 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java
@@ -14,7 +14,7 @@ import com.mogo.module.v2x.R;
 public class ScenarioHistoryRoadEventVH extends V2XBaseViewHolder<V2XHistoryScenarioData> {
     public ScenarioHistoryRoadEventVH(@NonNull ViewGroup viewGroup) {
         super(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.module_v2x_event_share_item, viewGroup, false));
+                .inflate(R.layout.item_v2x_event_detail, viewGroup, false));
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
index 8bff4cd905..b35fcaa60f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_event_detail.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_window_height_ground">
+    android:layout_height="wrap_content">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:id="@+id/rlRoadEventList"