From d00003b8371023cbc03ea6ab94b1216f54a9d7b9 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 19 Nov 2020 13:52:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/item_v2x_scennario_history.xml | 90 +++++++++----------
 ..._event_panel_fragment_scenario_history.xml |  4 +-
 2 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index a119d15ca1..5cef5e4fdc 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -7,12 +7,51 @@
     android:layout_height="wrap_content"
     android:background="@drawable/bg_v2x_event_list_item">
 
+    <ImageView
+        android:id="@+id/ivIconP"
+        android:layout_width="0px"
+        android:layout_height="0px"
+        android:src="@drawable/icon_illegal_parking"
+        app:layout_constraintRight_toLeftOf="@+id/tvAddress"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvAddress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginRight="@dimen/dp_30"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/v2x_FFF_333"
+        android:textSize="@dimen/dp_32"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
+        app:layout_constraintStart_toStartOf="@id/tagEventType"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
+
+    <TextView
+        android:id="@+id/tvIllegalNum"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:alpha="0.6"
+        android:gravity="center_vertical"
+        android:textColor="@color/v2x_FFF_666"
+        android:textSize="@dimen/dp_26"
+        app:layout_constraintEnd_toEndOf="@+id/tvAddress"
+        app:layout_constraintStart_toStartOf="@+id/tvAddress"
+        app:layout_constraintTop_toBottomOf="@+id/tvAddress"
+        tools:text="违章人数：10人" />
+
     <TextView
         android:id="@+id/tagEventType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_36"
-        android:layout_marginTop="@dimen/dp_24"
+        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginBottom="@dimen/dp_36"
         android:background="@drawable/bg_v2x_event_type_read"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
@@ -22,8 +61,9 @@
         android:text="违章停车"
         android:textColor="#ffffff"
         android:textSize="@dimen/panel_list_item_title_size"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvIllegalNum" />
 
     <TextView
         android:id="@+id/tagEventEvaluate"
@@ -41,49 +81,7 @@
         android:textSize="@dimen/panel_list_item_title_size"
         app:layout_constraintBottom_toBottomOf="@+id/tagEventType"
         app:layout_constraintStart_toEndOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tagEventType" />
-
-    <ImageView
-        android:id="@+id/ivIconP"
-        android:layout_width="@dimen/module_v2x_history_event_icon_size"
-        android:layout_height="@dimen/module_v2x_history_event_icon_size"
-        android:layout_marginEnd="@dimen/dp_26"
-        android:src="@drawable/icon_illegal_parking"
-        app:layout_constraintRight_toLeftOf="@+id/tvAddress"
-        app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        app:layout_constraintTop_toTopOf="@+id/tvAddress" />
-
-    <TextView
-        android:id="@+id/tvAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_24"
-        android:layout_marginRight="@dimen/dp_30"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_32"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
-        app:layout_constraintStart_toEndOf="@+id/ivIconP"
-        app:layout_constraintTop_toBottomOf="@+id/tagEventType"
-        tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" />
-
-    <TextView
-        android:id="@+id/tvIllegalNum"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_24"
-        android:alpha="0.6"
-        android:gravity="center_vertical"
-        android:textColor="@color/v2x_FFF_666"
-        android:textSize="@dimen/dp_26"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/tvAddress"
-        app:layout_constraintStart_toStartOf="@+id/tvAddress"
-        app:layout_constraintTop_toBottomOf="@+id/tvAddress"
-        tools:text="违章人数：10人" />
+        app:layout_constraintTop_toTopOf="@+id/tagEventType" />¬
 
     <com.mogo.module.v2x.view.HeartLikeView
         android:id="@+id/llIllegalParkingLike"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
index 0857b59d79..0de9913f11 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
@@ -26,8 +26,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="今日出行遇到的交通事件"
-            android:textColor="@color/v2x_FFF_333"
-            android:textSize="@dimen/dp_36"
+            android:textColor="@color/v2x_FFF_666"
+            android:textSize="@dimen/dp_30"
             app:layout_scrollFlags="scroll|enterAlways" />
 
         <androidx.recyclerview.widget.RecyclerView

From 4ac675ebffffadcdbeafa1957ca00f45192f9ee8 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 19 Nov 2020 13:56:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=87=BA=E8=A1=8C=E5=8A=A8=E6=80=81title?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/item_v2x_scennario_history.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
index 5cef5e4fdc..c61b839713 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
@@ -25,7 +25,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/v2x_FFF_333"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_item_address"
         android:textStyle="bold"
         app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
         app:layout_constraintStart_toStartOf="@id/tagEventType"

From 249fc6b29c7586750eb8b4e2aea054a6f644e5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 19 Nov 2020 14:56:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=96=B9?=
 =?UTF-8?q?=E5=90=91=E8=A7=92=E6=AF=94=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
index f70296cb17..29ac85eb49 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/alarm/V2XAlarmServer.java
@@ -86,8 +86,7 @@ public class V2XAlarmServer {
                     //                "\n事件角度：" + markerNoveltyInfo.getLocation().getAngle() +
                     //                "\n车头角度：" + currentLocation.getAngle() +
                     //                "\n角度差值：" + Math.abs(currentLocation.getAngle() - markerNoveltyInfo.getLocation().getAngle()));
-                    if (v2XRoadEventEntity.getLocation().getAngle() >= 0 &&
-                            Math.abs(currentLocation.getBearing() - v2XRoadEventEntity.getLocation().getAngle()) <= 10) {
+                    if (v2XRoadEventEntity.getLocation().getAngle() >= 0) {
                         // 计算车辆距离指定气泡的距离
                         MarkerLocation eventLocation = v2XRoadEventEntity.getLocation();