From 96bc3ba8a4bd9de3ba66927cbd3bfe26f54ae1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Jul 2020 16:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86UI=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module_event_panel_fragment_event_panel.xml      | 12 ++++++------
 .../src/main/res/layout/item_v2x_event_detail.xml    |  4 ++--
 .../res/layout/item_v2x_event_detail_stub_live.xml   |  2 +-
 .../src/main/res/layout/item_v2x_fault_help.xml      |  4 ++--
 .../src/main/res/layout/item_v2x_live_video.xml      |  2 +-
 .../main/res/layout/item_v2x_push_event_detail.xml   |  2 +-
 .../src/main/res/layout/view_heart_like.xml          |  1 -
 .../src/main/res/layout/view_heart_unlike.xml        |  1 -
 .../src/main/res/layout/view_video_layout_normal.xml |  2 +-
 .../src/main/res/layout/window_animation.xml         |  2 +-
 .../src/main/res/layout/window_fatigue_driving.xml   |  4 +++-
 .../src/main/res/layout/window_illegal_parking.xml   |  2 +-
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml   |  2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
index 67437cda97..3536c79096 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
@@ -9,17 +9,17 @@
         android:id="@+id/vpEventPanel"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <Button
+        android:id="@+id/btnShowOrHidePanels"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/btnShowOrHidePanels"
+        android:layout_marginTop="200dp"
+        android:layout_marginEnd="10dp"
         android:text="显示面板"
-        android:textSize="20sp"
         android:textColor="#000"
+        android:textSize="20sp"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="10dp"/>
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
index f7c6793422..cac876ff3f 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
@@ -8,7 +8,7 @@
     android:paddingStart="@dimen/dp_15"
     android:paddingTop="@dimen/dp_15"
     android:paddingBottom="@dimen/dp_15"
-    app:roundLayoutRadius="@dimen/dp_30">
+    app:roundLayoutRadius="@dimen/dp_40">
 
     <com.mogo.module.v2x.view.RoundLayout
         android:id="@+id/rlRoadEventImg"
@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30">
+        app:roundLayoutRadius="@dimen/dp_40">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivEventImg"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
index 3a17f60632..e7411814d7 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="#3D4053"
     android:gravity="center"
-    app:roundLayoutRadius="@dimen/dp_30"
+    app:roundLayoutRadius="@dimen/dp_40"
     tools:layout_height="@dimen/dp_382">
 
     <ImageView
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
index a87e825882..f8a664ecf6 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
@@ -6,7 +6,7 @@
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@drawable/v2x_fault_help_bg"
     android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_30">
+    app:roundLayoutRadius="@dimen/dp_40">
 
     <TextView
         android:id="@+id/tvImgTextContent"
@@ -85,7 +85,7 @@
         android:fontFamily="sans-serif-condensed-medium"
         android:gravity="center_vertical"
         android:textColor="#FFF"
-        android:textSize="@dimen/dp_70"
+        android:textSize="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
index 93db1915b9..62dcccdbe0 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30" />
+        app:roundLayoutRadius="@dimen/dp_40" />
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivReportHead"
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 1025bec9d4..877029708d 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
@@ -12,7 +12,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundLayoutRadius="@dimen/dp_30">
+        app:roundLayoutRadius="@dimen/dp_40">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivImg"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml
index fe3ec7ff14..8080b8a457 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml
@@ -10,6 +10,5 @@
         android:id="@+id/ivIllegalParkingLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
         android:src="@drawable/icon_heart_like" />
 </LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
index 027401f76f..3f1ffbd440 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
@@ -10,7 +10,6 @@
         android:id="@+id/ivIllegalParkingUnLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
         android:src="@drawable/icon_heart_unlike" />
 </LinearLayout>
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
index c933ac0ead..77c61a79a2 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_video_layout_normal.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/module_v2x_event_window_height"
     android:background="@color/live_video_background_color"
-    app:roundLayoutRadius="@dimen/dp_30">
+    app:roundLayoutRadius="@dimen/dp_40">
 
     <com.tencent.rtmp.ui.TXCloudVideoView
         android:id="@+id/txcVideoView"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml b/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
index 396374e36e..a4b31bedf9 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_animation.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/dp_30"
-        app:roundLayoutRadius="@dimen/dp_30">
+        app:roundLayoutRadius="@dimen/dp_40">
 
         <com.mogo.module.v2x.view.TextureVideoView
             android:id="@+id/vvCarAnimation"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
index a03b1bfd5a..8c230a983c 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
@@ -7,12 +7,13 @@
     android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
     android:background="@color/live_video_background_color"
     android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_30">
+    app:roundLayoutRadius="@dimen/dp_40">
 
     <ImageView
         android:id="@+id/ivIconP"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_20"
         android:src="@drawable/icon_parking_p"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -20,6 +21,7 @@
 
     <ImageView
         android:id="@+id/ivIconPIcon"
+        android:layout_marginStart="@dimen/dp_20"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/icon_parting_icon"
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
index 9d55aabd0c..d6a8abbf4e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
@@ -8,7 +8,7 @@
     android:background="@color/live_video_background_color"
     android:paddingStart="@dimen/dp_40"
     android:paddingEnd="@dimen/dp_40"
-    app:roundLayoutRadius="@dimen/dp_30">
+    app:roundLayoutRadius="@dimen/dp_40">
 
     <ImageView
         android:id="@+id/ivIconP"
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 936ab7c995..b8069b67c7 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -10,7 +10,7 @@
 
     <dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
 
-    <dimen name="module_v2x_event_icon_size">180px</dimen>
+    <dimen name="module_v2x_event_icon_size">160px</dimen>
 
     <dimen name="module_v2x_event_button_size">110px</dimen>
     <dimen name="module_v2x_event_button_size_detail">100px</dimen>