From 6ff4fb84d00908e5a08bb3fc89821f883026755e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 29 Jul 2020 11:03:50 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9,rm=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=B1=BB,=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/adapter/ShareEventAdapter.java      | 52 ++++++++++++++-----
 .../panel/bean/ShareEventDescription.java     |  4 +-
 .../event/panel/bean/ShareEventItem.java      | 46 ++++++++++------
 .../event/panel/bean/ShareEventItemBase.java  | 16 ------
 .../event/panel/bean/ShareEventItemEnum.java  |  2 +-
 .../panel/fragment/ShareEventsFragment.java   | 21 +++-----
 .../panel/network/ShareEventParameter.java    | 18 +++++++
 .../layout/module_event_panel_share_item.xml  |  2 +-
 8 files changed, 101 insertions(+), 60 deletions(-)
 delete 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/network/ShareEventParameter.java

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 1732b63a74..b6b379a2f2 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
@@ -15,7 +15,6 @@ 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;
@@ -62,17 +61,46 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
 
         if (holder instanceof shareDescriptionViewHolder) {
-//            ShareEventDescription.ResultBean.EnthusiasmIndexBean data = (ShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position);
-//            ((shareDescriptionViewHolder) holder).shareNumTextView.setText(data.getShareNum());
-//            ((shareDescriptionViewHolder) holder).approveNumTextView.setText(data.getLikeNum());
+            if (dataArrayList.size() > position) {
+                ShareEventDescription.ResultBean.EnthusiasmIndexBean data = (ShareEventDescription.ResultBean.EnthusiasmIndexBean) dataArrayList.get(position);
+                if (data != null) {
+                    String shareNum = String.valueOf(data.getShareNum());
+                    String likeNum = String.valueOf(data.getLikeNum());
+                    if (shareNum != null) {
+                        ((shareDescriptionViewHolder) holder).shareNumTextView.setText(shareNum);
+                    }
+                    if (likeNum != null) {
+                        ((shareDescriptionViewHolder) holder).approveNumTextView.setText(likeNum);
+                    }
+                }
+            }
         } else if (holder instanceof shareItemViewHolder) {
-//            ShareEventItem.ResultBean.PageBean.ContentBean data = (ShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position);
-//
-//            ((shareItemViewHolder) holder).caseStyleTextView.setText(data.getSourceType());
-//            ((shareItemViewHolder) holder).caseAddressTextView.setText(data.getUploadAddress());
-//            ((shareItemViewHolder) holder).caseTimeTextView.setText(DateTimeUtils.getTimeText(data.getUploadTimestamp()));
-//            ((shareItemViewHolder) holder).caseUsefulTextView.setText(data.getLikeNum());
-//            ((shareItemViewHolder) holder).caseUselessTextView.setText(data.getLikeNum());
+            if (dataArrayList.size() > position) {
+                ShareEventItem.ResultBean.PageBean.ContentBean data = (ShareEventItem.ResultBean.PageBean.ContentBean) dataArrayList.get(position);
+                if (data != null) {
+                    String poitype = data.getPoiType();
+                    String address = data.getUploadAddress();
+                    String time = DateTimeUtils.getTimeText(data.getUploadTimestamp());
+                    String likeNum = String.valueOf(data.getLikeNum());
+                    String notLikeNum = String.valueOf(data.getNotLikeNum());
+                    if (poitype != null){
+                        ((shareItemViewHolder) holder).caseStyleTextView.setText(poitype);
+                    }
+                    if (address != null){
+                        ((shareItemViewHolder) holder).caseAddressTextView.setText(address);
+                    }
+                    if (time != null){
+                        ((shareItemViewHolder) holder).caseTimeTextView.setText(time);
+                    }
+                    if (likeNum != null){
+                        ((shareItemViewHolder) holder).caseUsefulTextView.setText(likeNum);
+                    }
+                    if(notLikeNum != null){
+                        ((shareItemViewHolder) holder).caseUselessTextView.setText(notLikeNum);
+                    }
+                }
+
+            }
         } else if (holder instanceof shareLoadStatusViewHolder) {
             ((shareLoadStatusViewHolder) holder).statusButton.setText("加载更多");
         }
@@ -86,7 +114,7 @@ public class ShareEventAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     @Override
     public int getItemViewType(int position) {
-        if (position == 0){
+        if (position == 0) {
             return ShareEventItemEnum.ITEM_TYPE_NUM_DES;
         }
         return ShareEventItemEnum.ITEM_TYPE_SHARE_LIST;
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 0cd04c40b9..6ddb417a58 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,8 +1,10 @@
 package com.zhidao.mogo.module.event.panel.bean;
 
+import com.mogo.commons.data.BaseData;
+
 import java.io.Serializable;
 
-public class ShareEventDescription extends ShareEventItemBase implements Serializable {
+public class ShareEventDescription extends BaseData implements Serializable {
     /**
      * detailMsg :
      * result : {"enthusiasmIndex":{"id":68,"sn":"ZD802B1932L00622","score":10,"shareNum":1024,"likeNum":0,"notLikeNum":0,"enthusiasmIndex":1,"createTime":"2020-07-28T06:21:11.523+0000","updateTime":"2020-07-28T06:21:11.523+0000"}}
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 d96df29da8..9b7fdce6d2 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
@@ -1,13 +1,16 @@
 package com.zhidao.mogo.module.event.panel.bean;
 
+import com.mogo.commons.data.BaseData;
+
 import java.io.Serializable;
 import java.util.List;
 
-public class ShareEventItem extends ShareEventItemBase implements Serializable {
+public class ShareEventItem extends BaseData implements Serializable {
+
 
     /**
      * detailMsg :
-     * result : {"page":{"total":1024,"pageSize":1,"pageNum":4,"content":[{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]}}
+     * result : {"page":{"total":1024,"pageSize":1,"pageNum":4,"content":[{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"notLikeNum":0,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]}}
      */
 
     private String detailMsg;
@@ -31,7 +34,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
 
     public static class ResultBean {
         /**
-         * page : {"total":1024,"pageSize":1,"pageNum":4,"content":[{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]}
+         * page : {"total":1024,"pageSize":1,"pageNum":4,"content":[{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"notLikeNum":0,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]}
          */
 
         private PageBean page;
@@ -49,7 +52,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
              * total : 1024
              * pageSize : 1
              * pageNum : 4
-             * content : [{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]
+             * content : [{"coordinates":[116.407653,39.966487],"uploadTimestamp":1592901273966,"timeout":1593100800000,"uploadAddress":"安定门外大街","distance":0,"dbId":"725026095564550144","poiType":"10002","sn":"ZD802B1932L00622","userId":0,"userName":"小松鼠艾德蒙","userHead":"http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png","likeNum":18,"notLikeNum":0,"uploadType":2,"uploadUser":"123","imgUrl":null,"content":null,"gasStationId":null,"gasStationName":null,"gasImg":null,"gasPrices":null,"endDate":"2020-06-26 00:00:00","fabulous":false,"direction":180,"virtualLikeNum":822,"status":1,"sourceType":"10002","hitId":"0K-mf3MBeovPWpwE9IfR","userType":2,"data":[{"url":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546939076.mp4%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546939%253B1592550539%2526q-key-time%253D1592546939%253B1592550539%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253D74a4058ad7579ea210dafcf78d7a19460cffb899?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D679bff1838c7d497d38f48ef999b50e80c5856c4","thumbnail":"http://petchfile-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592546956790.png%3Fsign%3Dq-sign-algorithm%253Dsha1%2526q-ak%253DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%2526q-sign-time%253D1592546956%253B1592550556%2526q-key-time%253D1592546956%253B1592550556%2526q-header-list%253D%2526q-url-param-list%253D%2526q-signature%253Dcc9a35349fc55e433f934af88df576ae792b3987?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKIDCWfcNwD5PXVWLxwejccR3Tiz5zhIkx0T%26q-sign-time%3D1595574735%3B1595578335%26q-key-time%3D1595574735%3B1595578335%26q-header-list%3D%26q-url-param-list%3D%26q-signature%3D99b5a92a4f97909d8c217dbeec2ec6e9ec1052f4","content":null,"illegalCount":null}]}]
              */
 
             private int total;
@@ -104,6 +107,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                             ", userName='" + userName + '\'' +
                             ", userHead='" + userHead + '\'' +
                             ", likeNum=" + likeNum +
+                            ", notLikeNum=" + notLikeNum +
                             ", uploadType=" + uploadType +
                             ", uploadUser='" + uploadUser + '\'' +
                             ", imgUrl=" + imgUrl +
@@ -138,6 +142,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                  * userName : 小松鼠艾德蒙
                  * userHead : http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1592476328925.png
                  * likeNum : 18
+                 * notLikeNum : 0
                  * uploadType : 2
                  * uploadUser : 123
                  * imgUrl : null
@@ -168,14 +173,15 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                 private String userName;
                 private String userHead;
                 private int likeNum;
+                private int notLikeNum;
                 private int uploadType;
                 private String uploadUser;
-                private String imgUrl;
-                private String content;
-                private String gasStationId;
-                private String gasStationName;
-                private String gasImg;
-                private String gasPrices;
+                private Object imgUrl;
+                private Object content;
+                private Object gasStationId;
+                private Object gasStationName;
+                private Object gasImg;
+                private Object gasPrices;
                 private String endDate;
                 private boolean fabulous;
                 private int direction;
@@ -275,6 +281,14 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     this.likeNum = likeNum;
                 }
 
+                public int getNotLikeNum() {
+                    return notLikeNum;
+                }
+
+                public void setNotLikeNum(int notLikeNum) {
+                    this.notLikeNum = notLikeNum;
+                }
+
                 public int getUploadType() {
                     return uploadType;
                 }
@@ -295,7 +309,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return imgUrl;
                 }
 
-                public void setImgUrl(String imgUrl) {
+                public void setImgUrl(Object imgUrl) {
                     this.imgUrl = imgUrl;
                 }
 
@@ -303,7 +317,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return content;
                 }
 
-                public void setContent(String content) {
+                public void setContent(Object content) {
                     this.content = content;
                 }
 
@@ -311,7 +325,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasStationId;
                 }
 
-                public void setGasStationId(String gasStationId) {
+                public void setGasStationId(Object gasStationId) {
                     this.gasStationId = gasStationId;
                 }
 
@@ -319,7 +333,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasStationName;
                 }
 
-                public void setGasStationName(String gasStationName) {
+                public void setGasStationName(Object gasStationName) {
                     this.gasStationName = gasStationName;
                 }
 
@@ -327,7 +341,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasImg;
                 }
 
-                public void setGasImg(String gasImg) {
+                public void setGasImg(Object gasImg) {
                     this.gasImg = gasImg;
                 }
 
@@ -335,7 +349,7 @@ public class ShareEventItem extends ShareEventItemBase implements Serializable {
                     return gasPrices;
                 }
 
-                public void setGasPrices(String gasPrices) {
+                public void setGasPrices(Object gasPrices) {
                     this.gasPrices = gasPrices;
                 }
 
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
deleted file mode 100644
index 75ee349932..0000000000
--- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventItemBase.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.zhidao.mogo.module.event.panel.bean;
-
-import com.mogo.commons.data.BaseData;
-
-public class ShareEventItemBase extends BaseData {
-
-    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
index b38d7602b2..2881b9aec9 100644
--- 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
@@ -5,6 +5,6 @@ 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;
+    int ITEM_TYPE_LOAD_MORE_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 1c14cc7615..fd936c8d12 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
@@ -25,6 +25,7 @@ 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.network.HostConstant;
 import com.zhidao.mogo.module.event.panel.network.ShareEventApiService;
+import com.zhidao.mogo.module.event.panel.network.ShareEventParameter;
 import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter;
 
 import java.util.ArrayList;
@@ -80,14 +81,14 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
     }
 
     /*
-     * 热心指数等信息
+     * 热心指数等
      * */
     private void getShareEventDescription() {
-        String sn = Utils.getSn();
-        HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("sn", sn);
+        //ZD802B1932L00622
+        //Utils.getSn()
+        ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622");
         Map<String, Object> parameters = new HashMap<>();
-        parameters.put("data", GsonUtil.jsonFromObject(hashMap));
+        parameters.put("data", GsonUtil.jsonFromObject(parameter));
 
         shareEventApiService.getEnthusiasmIndex(parameters)
                 .subscribeOn(Schedulers.io())
@@ -115,15 +116,9 @@ public class ShareEventsFragment extends MvpFragment<ShareEventsFragment, ShareE
      * 分享列表
      * */
     private void getShareEventList(int page, int size) {
-        String sn = Utils.getSn();
-        HashMap<String, Object> hashMap = new HashMap<>();
-        hashMap.put("sn", sn);
-        hashMap.put("pageNum", pageNum);
-        hashMap.put("pageSize", 10);
-
+        ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622",pageNum,10);
         HashMap<String, Object> parameters = new HashMap<>();
-        parameters.put("data", GsonUtil.jsonFromObject(hashMap));
-
+        parameters.put("data", GsonUtil.jsonFromObject(parameter));
 
         shareEventApiService.getShareEventList(parameters)
                 .subscribeOn(Schedulers.io())
diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/network/ShareEventParameter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/network/ShareEventParameter.java
new file mode 100644
index 0000000000..906a55770f
--- /dev/null
+++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/network/ShareEventParameter.java
@@ -0,0 +1,18 @@
+package com.zhidao.mogo.module.event.panel.network;
+
+public class ShareEventParameter {
+    private String sn;
+    private int pageNum;
+    private int pageSize;
+
+    public ShareEventParameter(String sn) {
+        this.sn = sn;
+    }
+
+    public ShareEventParameter(String sn, int pageNum, int pageSize) {
+        this.sn = sn;
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+    }
+
+}
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 5716f43138..37c807b444 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
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:layout_marginLeft="20dp"
-        android:paddingTop="20dp"
+        android:paddingTop="10dp"
         android:background="#1E90FF"
         android:text="道路类型"
         android:textColor="#FFFFFF"