From 77e2f29037add8a8e8759fb17beb35d16bf9f9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 7 Aug 2020 19:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E8=A1=8C=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E5=B1=95=E7=A4=BA=C2=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/module/v2x/SpacesItemDecoration.java | 32 +++++++++++++++++++
 .../v2x/fragment/V2XEventPanelFragment.kt     |  1 +
 .../fragment/V2XScenarioHistoryFragment.java  |  2 ++
 .../res/layout/head_v2x_scennario_history.xml | 13 ++++++++
 ...e_v2x_event_panel_fragment_event_panel.xml | 15 ++++++++-
 ..._event_panel_fragment_scenario_history.xml | 28 +++++++++++++---
 6 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
 create mode 100644 modules/mogo-module-v2x/src/main/res/layout/head_v2x_scennario_history.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
new file mode 100644
index 0000000000..005984f991
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java
@@ -0,0 +1,32 @@
+package com.mogo.module.v2x;
+
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 这是LinearLayoutManager设置Item间距的的一个辅助类
+ *
+ * @author donghongyu
+ */
+public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
+    private int space;
+
+    public SpacesItemDecoration(int space) {
+        this.space = space;
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view,
+                               RecyclerView parent, RecyclerView.State state) {
+        outRect.left = space;
+        outRect.right = space;
+        outRect.bottom = space;
+
+        // Add top margin only for the first item to avoid double space between items
+        if (parent.getChildPosition(view) == 0) {
+            outRect.top = space;
+        }
+    }
+}
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 4a844b9927..0c5dea786f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -85,6 +85,7 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
             val colorStateList = ColorStateList(states, colors)
             tabView.text = tabsTitle[position]
             tabView.textSize = normalSize.toFloat()
+            tabView.typeface = Typeface.DEFAULT_BOLD
             tabView.setTextColor(colorStateList)
             tab.customView = tabView
         })
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 692625187a..60d9a9c89b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
 import com.mogo.module.v2x.R;
+import com.mogo.module.v2x.SpacesItemDecoration;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.adapter.V2XScenarioHistoryAdapter;
 import com.mogo.module.v2x.manager.IMoGoV2XStatusChangedListener;
@@ -45,6 +46,7 @@ public class V2XScenarioHistoryFragment
         mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         mV2XScenarioHistoryAdapter = new V2XScenarioHistoryAdapter(mV2XHistoryScenarioData);
         mRecyclerView.setAdapter(mV2XScenarioHistoryAdapter);
+        mRecyclerView.addItemDecoration(new SpacesItemDecoration(14));
         // 配置列表朝向
         LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
         mRecyclerView.setLayoutManager(layoutManager);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/head_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/head_v2x_scennario_history.xml
new file mode 100644
index 0000000000..549100d267
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/head_v2x_scennario_history.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tvMessage"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/dp_60"
+    android:paddingTop="@dimen/dp_30"
+    android:paddingEnd="@dimen/dp_60"
+    android:paddingBottom="@dimen/dp_30"
+    android:text="今日出行遇到的交通事件"
+    android:textColor="#FFFFFF"
+    android:textSize="@dimen/dp_36"
+    android:textStyle="bold" />
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 38eab3dec5..ffea487a85 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -17,7 +17,7 @@
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_150"
+            android:layout_height="@dimen/dp_130"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,6 +38,19 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
 
+
+        <ImageView
+            android:id="@+id/btnHidePanels"
+            android:layout_width="@dimen/dp_88"
+            android:layout_height="@dimen/dp_88"
+            android:layout_marginEnd="@dimen/dp_40"
+            android:background="@drawable/v2x_icon_event_live_close"
+            android:textColor="#000"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="@+id/tabLayout"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tabLayout" />
+
     </com.mogo.module.v2x.view.RoundConstraintLayout>
 
     <Button
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 b8fab665b7..5aae8f5efb 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
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/recyclerView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFF"
-    tools:listitem="@layout/module_v2x_event_share_item" />
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tvMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="@dimen/dp_60"
+        android:paddingTop="@dimen/dp_30"
+        android:paddingEnd="@dimen/dp_60"
+        android:paddingBottom="@dimen/dp_30"
+        android:text="今日出行遇到的交通事件"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/dp_36"
+        android:textStyle="bold" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/dp_40"
+        android:paddingEnd="@dimen/dp_40"
+        tools:listitem="@layout/item_v2x_illegal_parking" />
+</LinearLayout>