From cd3502e9658835460723e3aebe869729e877832a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 10:25:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E5=A4=8D=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/v2x/fragment/V2XShareEventsFragment.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
index 961a08bc2a..d4095a09f9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java
@@ -141,10 +141,11 @@ public class V2XShareEventsFragment extends MvpFragment<V2XShareEventsFragment,
                     //空白
                     item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
                     dataArrayList.add(item);
+                    int len = dataArrayList.size();
                 } else {
                     if (dataArrayList.size() > 0) {
                         Object data = dataArrayList.get(dataArrayList.size() - 1);
-                        if (data instanceof V2XShareEventLoadMoreItem || data instanceof V2XShareEventLoadMoreItem) {
+                        if (data instanceof V2XShareEventLoadMoreItem) {
                             dataArrayList.remove(dataArrayList.size() - 1);
                         }
                     }

From 97f65449352a5219abe2db77785fc9c223e9852e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 17 Sep 2020 11:49:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=B8=AD=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BBUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/v2x_network_loading_item.xml     | 17 +++++++++--------
 .../src/main/res/values-mdpi/dimens.xml         |  5 ++---
 .../src/main/res/values-xhdpi/dimens.xml        |  5 ++---
 .../src/main/res/values/dimens.xml              |  6 ++----
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
index 1bceae5354..063ab8f34e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
@@ -8,11 +8,11 @@
 
     <ProgressBar
         android:id="@+id/loading_imageview"
-        android:layout_width="@dimen/v2x_loading_ani_width"
-        android:layout_height="@dimen/v2x_loading_ani_width"
+        android:layout_width="45dp"
+        android:layout_height="43dp"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="60px"
+        android:layout_marginTop="@dimen/v2x_panel_loading_top"
         android:indeterminateTint="#256BFF"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,13 +28,14 @@
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
         android:alpha="0.7"
-        android:paddingTop="@dimen/dp_14"
         android:text="正在获取信息…"
+        android:paddingTop="@dimen/dp_25"
         android:textColor="@color/v2x_FFF_666"
         android:textSize="@dimen/dp_34"
-        app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
+        app:layout_constraintBottom_toTopOf="@+id/refresh_button"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
 
     <Button
         android:id="@+id/refresh_button"
@@ -43,7 +44,7 @@
         android:layout_below="@id/loading_text"
         android:layout_centerHorizontal="true"
         android:layout_gravity="top|center"
-        android:layout_marginTop="@dimen/shaer_refresh_padding"
+        android:layout_marginTop="@dimen/dp_40"
         android:background="@drawable/v2xt_dw_common_corner_bkg_light"
         android:gravity="center"
         android:text="刷新"
@@ -51,6 +52,6 @@
         android:textSize="@dimen/dp_32"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />
+        app:layout_constraintTop_toBottomOf="@+id/loading_text" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 0391d9bb8e..17ca5b934f 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
@@ -60,7 +60,7 @@
     <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>
-    <dimen name="v2x_loading_ani_width">100px</dimen>
+    <dimen name="v2x_loading_ani_width">50px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
@@ -72,8 +72,7 @@
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
-
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
-
+    <dimen name="v2x_panel_loading_top">120px</dimen>
 
 </resources>
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 3c60d87158..0eeefcea53 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
@@ -58,7 +58,7 @@
     <dimen name="module_v2x_panel_icon_cor">30px</dimen>
     <dimen name="module_v2x_panel_width">140px</dimen>
     <dimen name="share_empty_icon_width">219px</dimen>
-    <dimen name="v2x_loading_ani_width">200px</dimen>
+    <dimen name="v2x_loading_ani_width">100px</dimen>
     <dimen name="v2x_share_btn_width">281px</dimen>
     <dimen name="v2x_share_btn_height">90px</dimen>
     <dimen name="v2x_index_rating_top">28px</dimen>
@@ -71,8 +71,7 @@
     <dimen name="share_btn_middle_padding">54px</dimen>
     <dimen name="v2x_panel_btn_translationY">-10px</dimen>
     <dimen name="v2x_panel_btn_image_width">114px</dimen>
-
     <dimen name="module_v2x_panel_tab_height">158px</dimen>
-
+    <dimen name="v2x_panel_loading_top">300px</dimen>
 
 </resources>
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 861e240354..f32aa68013 100644
--- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml
@@ -60,7 +60,7 @@
     <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>
-    <dimen name="v2x_loading_ani_width">100px</dimen>
+    <dimen name="v2x_loading_ani_width">50px</dimen>
     <dimen name="v2x_share_btn_width">150px</dimen>
     <dimen name="v2x_share_btn_height">48px</dimen>
     <dimen name="v2x_index_rating_top">17px</dimen>
@@ -72,9 +72,7 @@
     <dimen name="share_index_bottom_padding">15px</dimen>
     <dimen name="share_btn_middle_padding">29px</dimen>
     <dimen name="v2x_panel_btn_translationY">-8px</dimen>
-
-
     <dimen name="module_v2x_panel_tab_height">84px</dimen>
-
+    <dimen name="v2x_panel_loading_top">120px</dimen>
 
 </resources>