From 656ba6bcca57191831cd9b0ffe5c343aff50077b Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 10 Aug 2020 20:50:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[add]=20=E5=8A=A0=E8=BD=BD=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9Axml=E6=96=87=E4=BB=B6=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/adapter/V2XShareEventAdapter.java     | 29 +++++++------
 .../v2x/fragment/V2XShareEventsFragment.java  |  4 --
 .../drawable/bg_v2x_event_share_type_blue.xml |  9 ++++
 .../layout/item_v2x_event_share_load_more.xml | 20 +++++++++
 .../layout/item_v2x_event_share_no_more.xml   | 43 +++++++++++++++++++
 .../module_v2x_event_share_load_status.xml    | 16 -------
 6 files changed, 89 insertions(+), 32 deletions(-)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_share_type_blue.xml
 create mode 100644 modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
 create mode 100644 modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
index 5e684b861c..99ef9dec10 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java
@@ -1,9 +1,6 @@
 package com.mogo.module.v2x.adapter;
 
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,7 +9,6 @@ import android.widget.RatingBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -64,11 +60,16 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                     false);
             shareEmptyViewHolder holder = new shareEmptyViewHolder(v);
             return holder;
-        } else {
-            View v = shareLayoutInflater.inflate(R.layout.module_v2x_event_share_load_status, parent,
+        } else if (viewType == V2XShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS){
+            View v = shareLayoutInflater.inflate(R.layout.item_v2x_event_share_load_more, parent,
                     false);
             shareLoadStatusViewHolder holder = new shareLoadStatusViewHolder(v);
             return holder;
+        }else {
+            View v = shareLayoutInflater.inflate(R.layout.item_v2x_event_share_no_more, parent,
+                    false);
+            shareLoadNoMoreViewHolder holder = new shareLoadNoMoreViewHolder(v);
+            return holder;
         }
     }
 
@@ -148,13 +149,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
                 }
 
             }
-        } else if (holder instanceof shareLoadStatusViewHolder) {
-            V2XShareEventLoadMoreItem item = (V2XShareEventLoadMoreItem) dataArrayList.get(dataArrayList.size() - 1);
-            ((shareLoadStatusViewHolder) holder).statusButton.setText(item.getStatusText());
-            ((shareLoadStatusViewHolder) holder).statusButton.setClickable(item.isClickable());
-
         }
-
     }
 
     @Override
@@ -244,4 +239,14 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
             });
         }
     }
+
+    /*
+    * 没有更多记录了
+    * */
+    class shareLoadNoMoreViewHolder extends RecyclerView.ViewHolder {
+
+        public shareLoadNoMoreViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
 }
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 e3f80a1d3c..69275306fd 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
@@ -132,13 +132,9 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba
                         //当前页有数据
                         dataArrayList.addAll(resultData.getResult().getPage().getContent());
                         item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS);
-                        item.setStatusText("查看更早记录");
-                        item.setClickable(true);
                     } else {
                         //当前页没有数据
                         item.setViewType(V2XShareEventItemEnum.ITEM_TYPE_NO_MORE);
-                        item.setStatusText("没有更多了");
-                        item.setClickable(false);
                     }
                     if (total > 10) {
                         dataArrayList.add(item);
diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_share_type_blue.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_share_type_blue.xml
new file mode 100644
index 0000000000..df0192f209
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_share_type_blue.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="24px" />
+    <gradient
+        android:angle="180"
+        android:endColor="#5CC1FF"
+        android:startColor="#256BFF"/>
+</shape>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
new file mode 100644
index 0000000000..f4be8180bf
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="40px"
+    android:paddingTop="40px">
+
+    <Button
+        android:id="@+id/event_share_load_status"
+        android:layout_width="220px"
+        android:layout_height="wrap_content"
+        android:paddingTop="12px"
+        android:paddingBottom="12px"
+        android:layout_centerInParent="true"
+        android:background="@drawable/bg_v2x_event_share_type_blue"
+        android:text="查看更早记录"
+        android:textColor="#FFFFFF"
+        android:textSize="18px" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
new file mode 100644
index 0000000000..d4475985ab
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="40px"
+    android:paddingBottom="40px">
+
+    <TextView
+        android:id="@+id/event_share_load_no_more"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:alpha="0.6"
+        android:paddingTop="12px"
+        android:paddingBottom="12px"
+        android:text="没有更多记录了"
+        android:textColor="#FFFFFF"
+        android:textSize="18px" />
+
+    <ImageView
+        android:id="@+id/left_line"
+        android:layout_width="wrap_content"
+        android:layout_height="0.5px"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="46px"
+        android:layout_marginRight="16px"
+        android:layout_toLeftOf="@id/event_share_load_no_more"
+        android:background="#FFFFFF" />
+
+    <ImageView
+        android:id="@+id/right_line"
+        android:layout_width="wrap_content"
+        android:layout_height="0.5px"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16px"
+        android:layout_marginRight="46px"
+        android:layout_toRightOf="@id/event_share_load_no_more"
+        android:background="#FFFFFF" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml
deleted file mode 100644
index bb784d086b..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_load_status.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center">
-
-    <Button
-        android:id="@+id/event_share_load_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="没有更多了"
-        android:textColor="#000000"
-        android:textSize="18sp"/>
-
-</RelativeLayout>
\ No newline at end of file

From e1443d722290d59ac215c30eaa873b5b68855cbc Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 10 Aug 2020 20:53:58 +0800
Subject: [PATCH 2/2] no message

---
 .../src/main/res/layout/item_v2x_event_share_no_more.xml        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
index d4475985ab..79f0a1a814 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_share_no_more.xml
@@ -21,6 +21,7 @@
         android:id="@+id/left_line"
         android:layout_width="wrap_content"
         android:layout_height="0.5px"
+        android:alpha="0.5"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_marginLeft="46px"
@@ -32,6 +33,7 @@
         android:id="@+id/right_line"
         android:layout_width="wrap_content"
         android:layout_height="0.5px"
+        android:alpha="0.5"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginLeft="16px"