From ace242b9dd1224554c86932d38e52ec5dfcc5c5f Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 30 Jul 2020 20:42:50 +0800 Subject: [PATCH] =?UTF-8?q?[add]=E6=9A=82=E6=97=B6=E5=9B=BE=E7=89=87,?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/adapter/ShareEventAdapter.java | 65 ++++++++++++---- .../panel/bean/ShareEventDescription.java | 5 +- .../event/panel/bean/ShareEventItem.java | 4 +- .../event/panel/bean/ShareEventItemEnum.java | 1 + .../panel/bean/ShareEventLoadMoreItem.java | 29 +++++++ .../panel/fragment/ShareEventsFragment.java | 72 ++++++++++++++---- .../panel/presenter/ShareEventsPresenter.java | 5 ++ .../res/drawable/icon_enthusiasm_second.png | Bin 0 -> 6831 bytes .../main/res/drawable/share_rating_bar.xml | 16 ++++ .../module_event_panel_share_description.xml | 11 +-- .../module_event_panel_share_load_status.xml | 19 ++--- .../src/main/res/values/dimens.xml | 17 +++-- 12 files changed, 187 insertions(+), 57 deletions(-) create mode 100644 modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/bean/ShareEventLoadMoreItem.java create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png create mode 100644 modules/mogo-module-event-panel/src/main/res/drawable/share_rating_bar.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 516f08f9b7..a2e90045c2 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,7 +1,6 @@ package com.zhidao.mogo.module.event.panel.adapter; import android.content.Context; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,24 +19,24 @@ 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.ShareEventItemEnum; +import com.zhidao.mogo.module.event.panel.bean.ShareEventLoadMoreItem; import com.zhidao.mogo.module.event.panel.fragment.EventPanelFragment; +import com.zhidao.mogo.module.event.panel.presenter.ShareEventsPresenter; import java.util.ArrayList; public class ShareEventAdapter extends RecyclerView.Adapter { private Context context; + private ShareEventsPresenter presenter; private ArrayList dataArrayList; private final LayoutInflater shareLayoutInflater; - private boolean emptylist;//分享空白页 private IMogoServiceApis mApis; - public void setEmptylist(boolean emptylist) { - this.emptylist = emptylist; - } - public ShareEventAdapter(Context context, ArrayList dataArrayList) { + public ShareEventAdapter(Context context, ArrayList dataArrayList, ShareEventsPresenter presenter) { this.context = context; this.dataArrayList = dataArrayList; + this.presenter = presenter; shareLayoutInflater = LayoutInflater.from(context); mApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); } @@ -69,6 +68,31 @@ public class ShareEventAdapter extends RecyclerView.Adapter { EventPanelFragment.Companion.getInstance().hidePanel(); @@ -199,6 +227,15 @@ public class ShareEventAdapter extends RecyclerView.Adapter parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); @@ -118,8 +121,8 @@ public class ShareEventsFragment extends MvpFragment parameters = new HashMap<>(); parameters.put("data", GsonUtil.jsonFromObject(parameter)); @@ -129,13 +132,40 @@ public class ShareEventsFragment extends MvpFragment(RequestOptions.create(getContext())) { @Override public void onSuccess(ShareEventItem resultData) { - if (resultData != null && resultData.getResult() != null - && resultData.getResult().getPage().getContent().size() > 0) { - adapter.setEmptylist(false); - dataArrayList.addAll(resultData.getResult().getPage().getContent()); + ShareEventLoadMoreItem item = new ShareEventLoadMoreItem(); + if (resultData != null && resultData.getResult() != null) { + if (resultData.getResult().getPage() != null) { + int total = resultData.getResult().getPage().getTotal(); + if (total == 0) { + //空白 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + dataArrayList.add(item); + } else { + if (resultData.getResult().getPage().getContent().size() > 0) { + //当前页有数据 + if (dataArrayList.size() > 0) { + Object data = dataArrayList.get(dataArrayList.size() - 1); + if (data instanceof ShareEventLoadMoreItem) { + dataArrayList.remove(dataArrayList.size() - 1); + } + } + dataArrayList.addAll(resultData.getResult().getPage().getContent()); + item.setViewType(ShareEventItemEnum.ITEM_TYPE_LOAD_MORE_STATUS); + item.setStatusText("查看更早记录"); + } else { + //当前页没有数据 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE); + item.setStatusText("没有更多了"); + } + dataArrayList.add(item); + } + } Log.d(TAG, "分享列表---:" + dataArrayList.get(0)); } else { - adapter.setEmptylist(true); + //空白 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + + dataArrayList.add(item); } adapter.notifyDataSetChanged(); } @@ -147,9 +177,23 @@ public class ShareEventsFragment extends MvpFragment 10) { + if (pageNum <= 1) {//没有分享 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_SHARE_EMPTY); + } else {//没有更多了 + item.setViewType(ShareEventItemEnum.ITEM_TYPE_NO_MORE); + } + dataArray.add(item); + } + } + @NonNull @Override protected ShareEventsPresenter createPresenter() { return new ShareEventsPresenter(this); } + + } diff --git a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java index 4538dd7a7d..e1f7ef604c 100644 --- a/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java +++ b/modules/mogo-module-event-panel/src/main/java/com/zhidao/mogo/module/event/panel/presenter/ShareEventsPresenter.java @@ -8,4 +8,9 @@ public class ShareEventsPresenter extends Presenter { public ShareEventsPresenter(IView view) { super((ShareEventsFragment) view); } + + public void getMoreShareEventList(){ + mView.getShareEventList(mView.getPageNum()+1,10); + } + } diff --git a/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png b/modules/mogo-module-event-panel/src/main/res/drawable/icon_enthusiasm_second.png new file mode 100644 index 0000000000000000000000000000000000000000..4894b507b26c027dbfb4bb099a8bd929e1bc8f5c GIT binary patch literal 6831 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 + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml index 5b436aa95b..b4f42bea9f 100644 --- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_share_description.xml @@ -77,23 +77,18 @@ + android:layout_marginTop="20dp"/> 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 index 7a9c631005..8ed4a217d7 100644 --- 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 @@ -1,15 +1,16 @@ - + +