From 0703430181cff7364c3aad53911fedc2d8ab031a Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 22 Jul 2020 11:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=A9=BA=E7=99=BD=E9=A1=B5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=20xml=20rename?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      | 55 ++++++++++++++-----
 .../panel/bean/ShareEventDescription.java     |  1 -
 .../event/panel/bean/ShareEventItem.java      |  2 +
 .../event/panel/fragment/MyShareFragment.kt   |  2 +-
 .../panel/fragment/ShareEventsFragment.java   | 18 +++---
 ... module_event_panel_share_description.xml} |  0
 ...xml => module_event_panel_share_empty.xml} |  3 +-
 ....xml => module_event_panel_share_item.xml} |  9 +--
 ... module_event_panel_share_recylerview.xml} |  5 +-
 9 files changed, 61 insertions(+), 34 deletions(-)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_event_description.xml => module_event_panel_share_description.xml} (100%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_guide.xml => module_event_panel_share_empty.xml} (94%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_my_share_item.xml => module_event_panel_share_item.xml} (97%)
 rename modules/mogo-module-event-panel/src/main/res/layout/{module_event_panel_share_event_recylerview.xml => module_event_panel_share_recylerview.xml} (97%)

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 4d7322c590..e782b957ed 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
@@ -23,7 +23,8 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     public static enum ITEM_TYPE {
         ITEM_TYPE_NUM_DES,
-        ITEM_TYPE_SHARE_LIST
+        ITEM_TYPE_SHARE_LIST_ITEM,
+        ITEM_TYPE_SHARE_EMPTY
     }
 
     public ShareEventAdapter(Context context, ArrayList<ShareEventItem> dataArrayList) {
@@ -37,45 +38,63 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         //根据viewType创建自定义布局
         if (viewType == ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal()) {
-            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_event_description, parent,
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_description, parent,
                     false);
             shareDescriptionViewHolder holder = new shareDescriptionViewHolder(v);
             return holder;
-        } else {
-            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_my_share_item, parent,
+        } else if ((viewType == ITEM_TYPE.ITEM_TYPE_SHARE_LIST_ITEM.ordinal())) {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_item, parent,
                     false);
             shareItemViewHolder holder = new shareItemViewHolder(v);
             return holder;
+        } else {
+            View v = shareLayoutInflater.inflate(R.layout.module_event_panel_share_empty, parent,
+                    false);
+            shareEmptyViewHolder holder = new shareEmptyViewHolder(v);
+            return holder;
         }
 
     }
 
     @Override
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-        if (position < 1) {
+
+        if (position == 0) {
             ShareEventDescription data = new ShareEventDescription();
             data.shareNum = "12";
             data.approveNum = "10";
+
             ((shareDescriptionViewHolder) holder).shareNumTextView.setText(data.shareNum);
             ((shareDescriptionViewHolder) holder).approveNumTextView.setText(data.approveNum);
 
         } else {
-            ShareEventItem data = dataArrayList.get(position-1);
-            ((shareItemViewHolder) holder).caseStyleTextView.setText(data.caseStyle);
-            ((shareItemViewHolder) holder).caseAddressTextView.setText(data.caseAddress);
-            ((shareItemViewHolder) holder).caseTimeTextView.setText(data.caseTime);
+            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);
+            }
         }
 
     }
 
     @Override
     public int getItemCount() {
-        return dataArrayList.size() + 1;
+        return dataArrayList.size() + dataArrayList.size() > 0 ? 1 : 2;
     }
 
     @Override
     public int getItemViewType(int position) {
-        int type = position == 0 ? ITEM_TYPE.ITEM_TYPE_NUM_DES.ordinal() : ITEM_TYPE.ITEM_TYPE_SHARE_LIST.ordinal();
+        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;
     }
 
@@ -86,14 +105,16 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         private TextView caseStyleTextView;
         private TextView caseAddressTextView;
         private TextView caseTimeTextView;
-//        private TextView caseUsefulTextView;
+        private TextView caseUsefulTextView;
+        private TextView caseUselessTextView;
 
         public shareItemViewHolder(@NonNull View itemView) {
             super(itemView);
             caseStyleTextView = itemView.findViewById(R.id.road_case_style);
             caseAddressTextView = itemView.findViewById(R.id.road_case_address);
             caseTimeTextView = itemView.findViewById(R.id.road_case_share_time);
-//            caseUsefulTextView = itemView.findViewById(R.id.road_case_useful_num);
+            caseUsefulTextView = itemView.findViewById(R.id.road_case_useful_num);
+            caseUselessTextView = itemView.findViewById(R.id.road_case_useless_num);
         }
     }
 
@@ -111,4 +132,12 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
     }
 
+    /*
+     * 去分享
+     * */
+    class shareEmptyViewHolder extends RecyclerView.ViewHolder {
+        public shareEmptyViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
 }
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 ddd728241f..f8980d92f3 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
@@ -3,5 +3,4 @@ package com.zhidao.mogo.module.event.panel.bean;
 public class ShareEventDescription {
     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 d04f3d4660..509492eb58 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
@@ -6,6 +6,8 @@ public class ShareEventItem 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/fragment/MyShareFragment.kt b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
index 5feeafa005..06c387766a 100644
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/fragment/MyShareFragment.kt
@@ -10,7 +10,7 @@ class MyShareFragment : MvpFragment<MyShareFragment, MySharePresenter>() {
      *
      * @return
      */
-    override fun getLayoutId(): Int = R.layout.module_event_panel_my_share_item
+    override fun getLayoutId(): Int = R.layout.module_event_panel_share_item
 
     /**
      * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免
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 cf8a4d4ad1..0ec47f825f 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
@@ -27,7 +27,7 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
 
     @Override
     protected int getLayoutId() {
-        return R.layout.module_event_panel_share_event_recylerview;
+        return R.layout.module_event_panel_share_recylerview;
     }
 
     @Override
@@ -38,7 +38,7 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.module_event_panel_share_event_recylerview, container, false);
+        view = inflater.inflate(R.layout.module_event_panel_share_recylerview, container, false);
         initRecyclerView();
         initData();
         return view;
@@ -54,13 +54,13 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     }
 
     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);
-        }
+//        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);
+//        }
     }
 
     @NonNull
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml
similarity index 100%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_description.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
similarity index 94%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
index bb0949eaff..98c49f2548 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_guide.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_empty.xml
@@ -1,14 +1,13 @@
 <?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="match_parent">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/share_event_guide_des"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
         android:layout_centerHorizontal="true"
-        android:background="#0000ff"
         android:gravity="center"
         android:text="小窍门:分享路况、点赞其他车友，有助于提高热心指数"
         android:textColor="#FFFFFF"
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
similarity index 97%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
index 87f4c653ab..cb1c941fdc 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_my_share_item.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_item.xml
@@ -12,9 +12,10 @@
         android:gravity="center"
         android:paddingLeft="20dp"
         android:paddingTop="20dp"
+        android:background="#1E90FF"
         android:text="道路类型"
         android:textColor="#FFFFFF"
-        android:textSize="20sp" />
+        android:textSize="15sp" />
 
     <TextView
         android:id="@+id/road_case_address"
@@ -25,7 +26,7 @@
         android:paddingLeft="15dp"
         android:text="东城区北三环"
         android:textColor="#FFFFFF"
-        android:textSize="25sp" />
+        android:textSize="20sp" />
 
     <TextView
         android:id="@+id/road_case_share_time"
@@ -36,7 +37,7 @@
         android:paddingLeft="20dp"
         android:text="时间:"
         android:textColor="#FFFFFF"
-        android:textSize="15sp" />
+        android:textSize="13sp" />
 
     <Button
         android:id="@+id/road_case_useless"
@@ -59,7 +60,7 @@
         android:textColor="#FFFFFF"
         android:textSize="15sp" />
 
-    <Button
+    <TextView
         android:id="@+id/road_case_uselful"
         android:layout_width="40dp"
         android:layout_height="40dp"
diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
similarity index 97%
rename from modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
rename to modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
index 882c71cee9..4951050a70 100644
--- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_event_recylerview.xml
+++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_recylerview.xml
@@ -8,8 +8,5 @@
     android:orientation="vertical"
     android:overScrollMode="never"
     android:background="#000000"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-
-
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>