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..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 @@ -4,30 +4,27 @@ import android.content.Context; 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; +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 { private Context context; - private ArrayList dataArrayList; - private Object Tag = "ShareEventAdapter"; + private ArrayList 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 dataArrayList) { + public ShareEventAdapter(Context context, ArrayList dataArrayList) { this.context = context; this.dataArrayList = dataArrayList; shareLayoutInflater = LayoutInflater.from(context); @@ -37,65 +34,58 @@ public class ShareEventAdapter extends RecyclerView.Adapter 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; } /* @@ -138,6 +128,22 @@ public class ShareEventAdapter extends RecyclerView.Adapter { + 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 { - private RecyclerView recyclerView; private View view; private ShareEventAdapter adapter; - private ArrayList dataArrayList = new ArrayList(); + private ArrayList dataArrayList = new ArrayList(); @Override protected int getLayoutId() { @@ -46,21 +48,44 @@ public class ShareEventsFragment extends MvpFragment