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 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 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 hashMap = new HashMap<>(); - hashMap.put("sn", sn); - hashMap.put("pageNum", pageNum); - hashMap.put("pageSize", 10); - + ShareEventParameter parameter = new ShareEventParameter("ZD802B1932L00622",pageNum,10); HashMap 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"