From 111b53ecb8569069694443611351d9f56b8debd3 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 22 Jul 2020 19:08:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E5=88=86=E4=BA=AB=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/event/panel/adapter/ShareEventAdapter.java    | 9 ++++++++-
 .../main/res/layout/module_event_panel_share_empty.xml   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
index e782b957ed..3b98db4480 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
@@ -1,14 +1,18 @@
 package com.zhidao.mogo.module.event.panel.adapter;
 
 import android.content.Context;
+import android.nfc.Tag;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.mogo.utils.logger.Logger;
 import com.zhidao.mogo.module.event.panel.R;
 import com.zhidao.mogo.module.event.panel.bean.ShareEventDescription;
 import com.zhidao.mogo.module.event.panel.bean.ShareEventItem;
@@ -18,7 +22,6 @@ import java.util.ArrayList;
 public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private Context context;
     private ArrayList<ShareEventItem> dataArrayList;
-    private Object Tag = "ShareEventAdapter";
     private final LayoutInflater shareLayoutInflater;
 
     public static enum ITEM_TYPE {
@@ -138,6 +141,10 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     class shareEmptyViewHolder extends RecyclerView.ViewHolder {
         public shareEmptyViewHolder(@NonNull View itemView) {
             super(itemView);
+            Button shareBtn = itemView.findViewById(R.id.share_event_button);
+            shareBtn.setOnClickListener (view-> {
+                Logger.d("我的分享列表","去分享");
+            });
         }
     }
 }
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
index 98c49f2548..0ea626a3ee 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
@@ -25,7 +25,7 @@
         android:text="你还没有分享过道路事件，快去试试吧" />
 
     <Button
-        android:id="@+id/shre_event_button"
+        android:id="@+id/share_event_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/share_event_null_des"

From f2b6fc725dd54e6a56e9b2298b3595692a2d6b1d Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 23 Jul 2020 17:09:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[add]=E5=88=97=E8=A1=A8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      | 81 +++++++++----------
 .../panel/bean/ShareEventDescription.java     |  6 +-
 .../event/panel/bean/ShareEventItem.java      |  4 +-
 .../event/panel/bean/ShareEventItemBase.java  | 14 ++++
 .../event/panel/bean/ShareEventItemEnum.java  | 10 +++
 .../panel/fragment/ShareEventsFragment.java   | 47 ++++++++---
 .../layout/module_event_panel_share_item.xml  |  6 +-
 .../module_event_panel_share_load_status.xml  | 15 ++++
 .../module_event_panel_share_recylerview.xml  |  2 +
 9 files changed, 128 insertions(+), 57 deletions(-)
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemBase.java
 create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemEnum.java
 create mode 100644 modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml

diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
index 3b98db4480..18417ba9cb 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/adapter/ShareEventAdapter.java
@@ -1,8 +1,6 @@
 package com.zhidao.mogo.module.event.panel.adapter;
 
 import android.content.Context;
-import android.nfc.Tag;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,21 +14,17 @@ import com.mogo.utils.logger.Logger;
 import com.zhidao.mogo.module.event.panel.R;
 import com.zhidao.mogo.module.event.panel.bean.ShareEventDescription;
 import com.zhidao.mogo.module.event.panel.bean.ShareEventItem;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItemBase;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItemEnum;
 
 import java.util.ArrayList;
 
 public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private Context context;
-    private ArrayList<ShareEventItem> dataArrayList;
+    private ArrayList<ShareEventItemBase> dataArrayList;
     private final LayoutInflater shareLayoutInflater;
 
-    public static enum ITEM_TYPE {
-        ITEM_TYPE_NUM_DES,
-        ITEM_TYPE_SHARE_LIST_ITEM,
-        ITEM_TYPE_SHARE_EMPTY
-    }
-
-    public ShareEventAdapter(Context context, ArrayList<ShareEventItem> dataArrayList) {
+    public ShareEventAdapter(Context context, ArrayList<ShareEventItemBase> dataArrayList) {
         this.context = context;
         this.dataArrayList = dataArrayList;
         shareLayoutInflater = LayoutInflater.from(context);
@@ -40,65 +34,58 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         //根据viewType创建自定义布局
-        if (viewType == ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal()) {
+        if (viewType == ShareEventItemEnum.ITEM_TYPE_NUM_DES) {
             View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_description, parent,
                     false);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
-        } else if ((viewType == ITEM_TYPE.ITEM_TYPE_SHARE_LIST_ITEM.ordinal())) {
+        } else if (viewType == ShareEventItemEnum.ITEM_TYPE_SHARE_LIST) {
             View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_item, parent,
                     false);
             shareItemViewHolder holder = new shareItemViewHolder(v);
             return holder;
-        } else {
+        } else if (viewType == ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY) {
             View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_empty, parent,
                     false);
             shareEmptyViewHolder holder = new shareEmptyViewHolder(v);
             return holder;
+        } else {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_load_status, parent,
+                    false);
+            shareLoadStatusViewHolder holder = new shareLoadStatusViewHolder(v);
+            return holder;
         }
-
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
-        if (position == 0) {
-            ShareEventDescription data = new ShareEventDescription();
-            data.shareNum = "12";
-            data.approveNum = "10";
-
+        if (holder instanceof shareDescriptionViewHolder) {
+            ShareEventDescription data = (ShareEventDescription) dataArrayList.get(position);
             ((shareDescriptionViewHolder) holder).shareNumTextView.setText(data.shareNum);
             ((shareDescriptionViewHolder) holder).approveNumTextView.setText(data.approveNum);
-
-        } else {
-            if (dataArrayList.size() > 0) {
-                ShareEventItem data = dataArrayList.get(position - 1);
-                data.usefulNum = "2";
-                data.uselessNum = "3";
-                ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
-                ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
-                ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
-                ((shareItemViewHolder) holder).caseUsefulTextView.setText(data.usefulNum);
-                ((shareItemViewHolder) holder).caseUselessTextView.setText(data.uselessNum);
-            }
+        } else if (holder instanceof shareItemViewHolder) {
+            ShareEventItem data = (ShareEventItem) dataArrayList.get(position);
+            ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
+            ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
+            ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
+            ((shareItemViewHolder) holder).caseUsefulTextView.setText(data.usefulNum);
+            ((shareItemViewHolder) holder).caseUselessTextView.setText(data.uselessNum);
+        } else if (holder instanceof shareLoadStatusViewHolder) {
+            ((shareLoadStatusViewHolder) holder).statusButton.setText("加载更多");
         }
 
     }
 
     @Override
     public int getItemCount() {
-        return dataArrayList.size() + dataArrayList.size() > 0 ? 1 : 2;
+        return dataArrayList.size();
     }
 
     @Override
     public int getItemViewType(int position) {
-        switch (dataArrayList.size()) {
-            case 0:
-                return position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_EMPTY.ordinal();
-        }
-
-        int type = position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_LIST_ITEM.ordinal();
-        return type;
+        int viewType = dataArrayList.get(position).getViewType();
+        return viewType;
     }
 
     /*
@@ -142,9 +129,21 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         public shareEmptyViewHolder(@NonNull View itemView) {
             super(itemView);
             Button shareBtn = itemView.findViewById(R.id.share_event_button);
-            shareBtn.setOnClickListener (view-> {
-                Logger.d("我的分享列表","去分享");
+            shareBtn.setOnClickListener(view -> {
+                Logger.d("我的分享列表", "去分享");
             });
         }
     }
+
+    /*
+     * 加载更多/没有更多
+     * */
+    class shareLoadStatusViewHolder extends RecyclerView.ViewHolder {
+        private TextView statusButton;
+
+        public shareLoadStatusViewHolder(@NonNull View itemView) {
+            super(itemView);
+            statusButton = itemView.findViewById(R.id.event_share_load_status);
+        }
+    }
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
index f8980d92f3..447c72b90f 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventDescription.java
@@ -1,6 +1,10 @@
 package com.zhidao.mogo.module.event.panel.bean;
 
-public class ShareEventDescription {
+import java.io.Serializable;
+
+public class ShareEventDescription extends ShareEventItemBase implements Serializable {
+
     public String shareNum;
     public String approveNum;
+
 }
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
index 509492eb58..7eb81467ec 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItem.java
@@ -2,12 +2,14 @@ package com.zhidao.mogo.module.event.panel.bean;
 
 import java.io.Serializable;
 
-public class ShareEventItem implements Serializable {
+public class ShareEventItem extends ShareEventItemBase implements Serializable {
+
     public String caseStyle;
     public String caseAddress;
     public String caseTime;
     public String usefulNum;
     public String uselessNum;
+
 }
 
 
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemBase.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemBase.java
new file mode 100644
index 0000000000..25cc97f468
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemBase.java
@@ -0,0 +1,14 @@
+package com.zhidao.mogo.module.event.panel.bean;
+
+public class ShareEventItemBase {
+
+    private int viewType;
+
+    public int getViewType() {
+        return viewType;
+    }
+
+    public void setViewType(int viewType) {
+        this.viewType = viewType;
+    }
+}
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemEnum.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemEnum.java
new file mode 100644
index 0000000000..b38d7602b2
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemEnum.java
@@ -0,0 +1,10 @@
+package com.zhidao.mogo.module.event.panel.bean;
+
+public interface ShareEventItemEnum {
+
+    int ITEM_TYPE_NUM_DES = 0;
+    int ITEM_TYPE_SHARE_LIST = 1;
+    int ITEM_TYPE_SHARE_EMPTY = 2;
+    int ITEM_TYPE_LOAD_STATUS = 3;
+
+}
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
index 0ec47f825f..737f300213 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/ShareEventsFragment.java
@@ -13,17 +13,19 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.zhidao.mogo.module.event.panel.R;
 import com.zhidao.mogo.module.event.panel.adapter.ShareEventAdapter;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventDescription;
 import com.zhidao.mogo.module.event.panel.bean.ShareEventItem;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItemBase;
+import com.zhidao.mogo.module.event.panel.bean.ShareEventItemEnum;
 import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter;
 
 import java.util.ArrayList;
 
 public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareEventsPresenter> {
-
     private RecyclerView recyclerView;
     private View view;
     private ShareEventAdapter adapter;
-    private ArrayList<ShareEventItem> dataArrayList = new ArrayList<ShareEventItem>();
+    private ArrayList dataArrayList = new ArrayList();
 
     @Override
     protected int getLayoutId() {
@@ -46,21 +48,44 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
 
     private void initRecyclerView() {
         recyclerView = view.findViewById(R.id.road_case_share_list);
-        adapter = new ShareEventAdapter(getActivity(),dataArrayList);
+        adapter = new ShareEventAdapter(getActivity(), dataArrayList);
         recyclerView.setAdapter(adapter);
         LinearLayoutManager linearLayoutManager =
-                new LinearLayoutManager( getActivity(), LinearLayoutManager.VERTICAL, false );
+                new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false);
         recyclerView.setLayoutManager(linearLayoutManager);
     }
 
     private void initData() {
-//        for (int i = 0; i < 12; i++) {
-//            ShareEventItem data = new ShareEventItem();
-//            data.caseStyle = "道路拥堵";
-//            data.caseAddress = "环球贸易中心";
-//            data.caseTime = "2020-07-21 12:00:00";
-//            dataArrayList.add(data);
-//        }
+        //描述数据
+        ShareEventDescription descdata = new ShareEventDescription();
+        descdata.setViewType(ShareEventItemEnum.ITEM_TYPE_NUM_DES);
+        descdata.shareNum = "2";
+        descdata.approveNum = "4";
+        dataArrayList.add(descdata);
+        //列表数据
+        boolean empty = false;
+        //空白
+        if (empty){
+            ShareEventItemBase emptydata = new ShareEventItemBase();
+            emptydata.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY);
+            dataArrayList.add(emptydata);
+        }else {
+            for (int i = 0; i < 5; i++) {
+                ShareEventItem data = new ShareEventItem();
+                data.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_LIST);
+                data.caseStyle = "道路拥堵";
+                data.caseAddress = "环球贸易中心";
+                data.caseTime = "2020-07-21 12:00:00";
+                data.usefulNum = "2";
+                data.uselessNum = "4";
+                dataArrayList.add(data);
+            }
+            //加载更多
+            ShareEventItemBase loaddata = new ShareEventItemBase();
+            loaddata.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_STATUS);
+            dataArrayList.add(loaddata);
+        }
+
     }
 
     @NonNull
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
index cb1c941fdc..5716f43138 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
@@ -10,7 +10,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingLeft="20dp"
+        android:layout_marginLeft="20dp"
         android:paddingTop="20dp"
         android:background="#1E90FF"
         android:text="道路类型"
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/road_case_style"
         android:gravity="center"
-        android:paddingLeft="15dp"
+        android:layout_marginLeft="20dp"
         android:text="东城区北三环"
         android:textColor="#FFFFFF"
         android:textSize="20sp" />
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/road_case_address"
         android:gravity="center"
-        android:paddingLeft="20dp"
+        android:layout_marginLeft="20dp"
         android:text="时间:"
         android:textColor="#FFFFFF"
         android:textSize="13sp" />
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml
new file mode 100644
index 0000000000..7a9c631005
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_load_status.xml
@@ -0,0 +1,15 @@
+<?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">
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/event_share_load_status"
+        android:textColor="#000000"
+        android:text="没有更多了"
+        android:textSize="18sp"
+        android:gravity="center"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
index 4951050a70..6d61dcb641 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
@@ -8,5 +8,7 @@
     android:orientation="vertical"
     android:overScrollMode="never"
     android:background="#000000"
+    tools:itemCount="1"
+    tools:listitem="@layout/module_event_panel_share_description"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>