From 08df93bb6dbec0b4eda2e153236317b847ab6d17 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 29 Sep 2020 14:24:09 +0800
Subject: [PATCH] opt surrding ui

---
 .idea/misc.xml                                       |  2 +-
 .../module/v2x/fragment/V2XSurroundingFragment.java  |  6 ++++--
 .../module/v2x/view/SurroundingMarginDecoration.java | 12 ++++++++----
 .../module_event_panel_fragment_surrounding.xml      |  2 +-
 .../module_fragment_surrounding_event_item.xml       |  9 +++++----
 .../src/main/res/values-ldpi/dimens.xml              |  1 +
 .../src/main/res/values-mdpi/dimens.xml              |  1 +
 .../src/main/res/values-xhdpi-1920x1000/dimens.xml   |  2 ++
 .../src/main/res/values-xhdpi/dimens.xml             |  1 +
 .../mogo-module-v2x/src/main/res/values/dimens.xml   |  2 ++
 10 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
index 2e26569889..ede7aaa93c 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
@@ -40,6 +40,7 @@ import com.mogo.module.v2x.listener.SurroundingItemClickListener;
 import com.mogo.module.v2x.presenter.SurroundingEventPresenter;
 import com.mogo.module.v2x.view.SurroundingEventView;
 import com.mogo.module.common.view.NetworkLoadingView;
+import com.mogo.module.v2x.view.SurroundingMarginDecoration;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.utils.WorkThreadHandler;
@@ -105,8 +106,9 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
 //        mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setOverScrollMode(OVER_SCROLL_NEVER);
         GridLayoutManager layoutManage = new GridLayoutManager(getContext(), 2);
-//        int spacingInPixels = getContext().getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_bottom_right_textsize);
-//        mRecyclerView.addItemDecoration(new SurroundingMarginDecoration(spacingInPixels));
+        int spacingInPixels = getContext().getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_bottom_right_textsize);
+        int spacingInPixelsLeft = getContext().getResources().getDimensionPixelSize(R.dimen.module_v2x_surrounding_item_maigin_left);
+        mRecyclerView.addItemDecoration(new SurroundingMarginDecoration(spacingInPixels, spacingInPixelsLeft));
         mRecyclerView.setLayoutManager(layoutManage);
 
         mAdapter = new V2XSurroundingAdapter(getActivity(), poiInfosList, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java
index 214a12be31..c99c88f0bd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SurroundingMarginDecoration.java
@@ -12,20 +12,24 @@ import androidx.recyclerview.widget.RecyclerView;
  */
 public class SurroundingMarginDecoration extends RecyclerView.ItemDecoration {
     private int margin ;
+    private int marginLeft ;
 
-    public SurroundingMarginDecoration(int space) {
+    public SurroundingMarginDecoration(int space, int left) {
         margin = space;
+        marginLeft = left;
     }
 
     @Override
     public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
         outRect.bottom = margin;
-        outRect.right = 0;
-        //由于每行都只有2个，所以第一个都是2的倍数，把左边距设为0
+
+        //由于每行都只有2个，所以第一个都是2的倍数
         if (parent.getChildLayoutPosition(view) % 2 == 0) {
-            outRect.left = 0;
+            outRect.left = marginLeft;
+            outRect.right = 0;
         } else {
             outRect.left = margin;
+            outRect.right = marginLeft;
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index d6c90ada38..220d67496e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -52,9 +52,9 @@
                 android:id="@+id/surrounding_recycleview"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/module_v2x_surrounding_list_margin_left"
                 android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
                 android:visibility="visible" />
+<!--            android:layout_marginLeft="@dimen/module_v2x_surrounding_list_margin_left"-->
 
             <!--空数据显示-->
             <RelativeLayout
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
index a272f55c9a..0467c01569 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
@@ -2,14 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_root"
     android:layout_width="wrap_content"
-    android:layout_marginBottom="@dimen/module_v2x_surrounding_item_margin_left"
-    android:layout_marginLeft="@dimen/module_v2x_surrounding_item_margin_left"
     android:layout_height="@dimen/module_v2x_surrounding_item_height">
+<!--    android:layout_marginBottom="@dimen/module_v2x_surrounding_item_margin_left"-->
+
+<!--    android:layout_marginLeft="@dimen/module_v2x_surrounding_item_margin_left"-->
 
     <RelativeLayout
-        android:layout_width="@dimen/module_v2x_surrounding_item_width"
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
-
+<!--        @dimen/module_v2x_surrounding_item_width-->
         <ImageView
             android:id="@+id/iv_event_bg"
             android:layout_width="match_parent"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index e0a9f57de8..63f2dac657 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -61,6 +61,7 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
 
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 9554c7c3cf..7afc5f5e14 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -61,6 +61,7 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
 
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
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 adda1e011f..2e18d47106 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
@@ -58,6 +58,8 @@
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
+
     <dimen name="module_v2x_panel_width">120px</dimen>
 
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 5839a19128..562b1d7038 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -59,6 +59,7 @@
     <dimen name="module_v2x_surrounding_top_textsize">32px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">36px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">30px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">50px</dimen>
 
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">140px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
index ff98b44a12..f0c403220a 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -57,6 +57,8 @@
     <dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
     <dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
+    <dimen name="module_v2x_surrounding_item_maigin_left">28px</dimen>
+
     <dimen name="module_v2x_panel_width">82px</dimen>
     <dimen name="module_v2x_panel_icon_cor">16px</dimen>
     <dimen name="share_empty_icon_width">117px</dimen>