From b4bc2675378a234811b26668b924d7b6d56c9c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 5 Aug 2020 11:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E4=BC=98=E5=8C=96=E3=80=8D=20=20=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/seek/V2XSeekHelpDialog.java         |  2 +-
 ...2x_common.xml => dialog_v2x_seek_help.xml} |  0
 .../main/res/layout/item_v2x_event_detail.xml | 78 ++++++++++++++++--
 .../res/layout/item_v2x_push_event_detail.xml | 65 ++++++++++++++-
 .../res/layout/merge_view_bottom_button.xml   | 64 ---------------
 .../res/layout/merge_view_event_button.xml    | 82 -------------------
 6 files changed, 135 insertions(+), 156 deletions(-)
 rename modules/mogo-module-v2x/src/main/res/layout/{dialog_v2x_common.xml => dialog_v2x_seek_help.xml} (100%)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/merge_view_bottom_button.xml
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
index ccab292a65..f75ff027e4 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpDialog.java
@@ -55,7 +55,7 @@ public class V2XSeekHelpDialog extends ConstraintLayout implements View.OnClickL
 
     private void init(Context context) {
         mContext = context;
-        LayoutInflater.from(context).inflate(R.layout.dialog_v2x_common, this);
+        LayoutInflater.from(context).inflate(R.layout.dialog_v2x_seek_help, this);
         tvContent = findViewById(R.id.tvDialogContent);
         tvLeft = findViewById(R.id.tvDialogLeft);
         tvRight = findViewById(R.id.tvDialogRight);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_common.xml
rename to modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
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 cce3e0668c..8845ab2f25 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
@@ -121,9 +121,77 @@
         app:miv_shape="circle"
         app:miv_shapeBorderWidth="@dimen/dp_4" />
 
-    <include
-        android:id="@+id/event_button"
-        layout="@layout/merge_view_event_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <ImageView
+        android:id="@+id/ivEventLive"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:padding="@dimen/dp_10"
+        android:src="@drawable/selector_live_btn"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
+        app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/ivEventReportTrue"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:padding="@dimen/dp_10"
+        android:scaleType="fitXY"
+        android:src="@drawable/icon_report_true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+        app:layout_constraintStart_toEndOf="@id/ivEventLive"
+        app:layout_goneMarginLeft="@dimen/dp_10"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/ivEventReportErr"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:padding="@dimen/dp_10"
+        android:src="@drawable/icon_report_err"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+        app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
+        app:layout_goneMarginLeft="@dimen/dp_10"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/ivEventCallChart"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:padding="@dimen/dp_10"
+        android:src="@drawable/selector_talk_btn"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+        app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
+        app:layout_goneMarginLeft="@dimen/dp_10"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/ivEventEventNav"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:padding="@dimen/dp_10"
+        android:src="@drawable/selector_nav_btn"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+        app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
+        app:layout_goneMarginLeft="@dimen/dp_10"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/ivEventZan"
+        android:layout_width="@dimen/module_v2x_event_button_size_detail"
+        android:layout_height="@dimen/module_v2x_event_button_size_detail"
+        android:padding="@dimen/dp_10"
+        android:src="@drawable/v2x_event_icon_zan"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
+        app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
+        app:layout_goneMarginLeft="@dimen/dp_10"
+        tools:visibility="visible" />
 </com.mogo.module.v2x.view.RoundConstraintLayout>
\ No newline at end of file
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 b35fcaa60f..9c0ae5ec22 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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -51,13 +52,69 @@
         app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
         app:layout_constraintStart_toStartOf="@+id/rlRoadEventList" />
 
-    <include
-        android:id="@+id/bottomButton"
-        layout="@layout/merge_view_bottom_button"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_25"
         app:layout_constraintBottom_toBottomOf="@+id/guideline1"
         app:layout_constraintStart_toStartOf="@+id/guideline1"
-        app:layout_constraintTop_toTopOf="@+id/guideline1" />
+        app:layout_constraintTop_toTopOf="@+id/guideline1">
+
+        <ImageView
+            android:id="@+id/ivRoadReportTrue"
+            android:layout_width="@dimen/dp_123"
+            android:layout_height="@dimen/dp_123"
+            android:layout_marginStart="@dimen/dp_25"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/icon_report_true"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivRoadReportErr"
+            android:layout_width="@dimen/dp_123"
+            android:layout_height="@dimen/dp_123"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/icon_report_err"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/ivRoadReportTrue"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivRoadCallChart"
+            android:layout_width="@dimen/dp_123"
+            android:layout_height="@dimen/dp_123"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/selector_talk_btn"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/ivRoadReportErr"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivRoadEventNav"
+            android:layout_width="@dimen/dp_123"
+            android:layout_height="@dimen/dp_123"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/selector_nav_btn"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/ivRoadCallChart"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/ivRoadEventLike"
+            android:layout_width="@dimen/dp_123"
+            android:layout_height="@dimen/dp_123"
+            android:padding="@dimen/dp_10"
+            android:src="@drawable/v2x_event_icon_zan"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/ivRoadEventNav"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/merge_view_bottom_button.xml b/modules/mogo-module-v2x/src/main/res/layout/merge_view_bottom_button.xml
deleted file mode 100644
index cd3f4816a1..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/merge_view_bottom_button.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/dp_25">
-
-    <ImageView
-        android:id="@+id/ivRoadReportTrue"
-        android:layout_width="@dimen/dp_123"
-        android:layout_height="@dimen/dp_123"
-        android:layout_marginStart="@dimen/dp_25"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/icon_report_true"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivRoadReportErr"
-        android:layout_width="@dimen/dp_123"
-        android:layout_height="@dimen/dp_123"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/icon_report_err"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@+id/ivRoadReportTrue"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivRoadCallChart"
-        android:layout_width="@dimen/dp_123"
-        android:layout_height="@dimen/dp_123"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_talk_btn"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@+id/ivRoadReportErr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivRoadEventNav"
-        android:layout_width="@dimen/dp_123"
-        android:layout_height="@dimen/dp_123"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_nav_btn"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@+id/ivRoadCallChart"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivRoadEventLike"
-        android:layout_width="@dimen/dp_123"
-        android:layout_height="@dimen/dp_123"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/v2x_event_icon_zan"
-        android:visibility="gone"
-        app:layout_constraintStart_toEndOf="@+id/ivRoadEventNav"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml b/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
deleted file mode 100644
index 345e9ebc81..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/merge_view_event_button.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <ImageView
-        android:id="@+id/ivEventLive"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/dp_10"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_live_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/rlRoadEventImg"
-        app:layout_constraintStart_toEndOf="@+id/rlRoadEventImg"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivEventReportTrue"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:scaleType="fitXY"
-        android:src="@drawable/icon_report_true"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventLive"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivEventReportErr"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/icon_report_err"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventReportTrue"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivEventCallChart"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_talk_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventReportErr"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivEventEventNav"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/selector_nav_btn"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventCallChart"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/ivEventZan"
-        android:layout_width="@dimen/module_v2x_event_button_size_detail"
-        android:layout_height="@dimen/module_v2x_event_button_size_detail"
-        android:padding="@dimen/dp_10"
-        android:src="@drawable/v2x_event_icon_zan"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
-        app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
-        app:layout_goneMarginLeft="@dimen/dp_10"
-        tools:visibility="visible" />
-</merge>
\ No newline at end of file