From 8722d0a65b04eaaa7cf748a8bd763235a16e394d Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 7 Feb 2018 19:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9BaseList=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=A0=E9=80=92=E5=92=8C=E5=88=B7=E6=96=B0=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/DataUtils.java | 4 +-- .../adapter/AskSelectGameAdapter.java | 18 +++++----- .../ask/AskQuestionsHotAdapter.java | 14 +------- .../ask/AskQuestionsNewBodyAdapter.java | 12 +------ .../ask/myask/ConcernQuestionsAdapter.java | 12 +------ .../gamecenter/ask/myask/MyAnswerAdapter.java | 12 +------ .../gamecenter/ask/myask/MyDraftAdapter.java | 12 +------ .../ask/myask/MyQuestionsAdapter.java | 12 +------ .../questionsdetail/AnswerFoldAdapter.java | 12 +------ .../QuestionsDetailAdapter.java | 36 ++++++++++++++++--- .../QuestionsInviteAdapter.java | 16 ++------- .../QuestionsInviteFragment.java | 2 +- .../ask/search/AskSearchAdapter.java | 10 +++--- .../gh/gamecenter/baselist/ListAdapter.java | 19 ++++++++-- .../gh/gamecenter/baselist/ListFragment.java | 19 ++++++---- .../gamecenter/baselist/ListRepository.java | 13 ++----- .../baselist/OnListLoadListener.java | 3 ++ .../gamecenter/collection/AnswerAdapter.java | 12 +------ .../message/MessageFragmentAdapter.java | 12 +------ 19 files changed, 95 insertions(+), 155 deletions(-) diff --git a/app/src/debug/java/com/gh/gamecenter/DataUtils.java b/app/src/debug/java/com/gh/gamecenter/DataUtils.java index ec467d7af4..c5cc9f159c 100644 --- a/app/src/debug/java/com/gh/gamecenter/DataUtils.java +++ b/app/src/debug/java/com/gh/gamecenter/DataUtils.java @@ -34,8 +34,8 @@ public class DataUtils { */ public static void init(final Application context, String channel) { - // 神烦这些SDK上报，debug就不开了 - if (DEBUG) return; +// // 神烦这些SDK上报，debug就不开了 +// if (DEBUG) return; //TalkingData try { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java index 4e62122b43..596668d548 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java @@ -21,20 +21,16 @@ import com.gh.gamecenter.ask.entity.MeEntity; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.manager.UserManager; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** * Created by khy on 6/12/17. */ -public class AskSelectGameAdapter extends ListAdapter { +public class AskSelectGameAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private final List mEntityList = new ArrayList<>(); - private int mTitlePosition; private String mCommunityId; @@ -47,9 +43,15 @@ public class AskSelectGameAdapter extends ListAdapter { } @Override - protected void provideListData(List listData) { - mEntityList.clear(); - mEntityList.addAll((Collection) listData); + protected void provideListData(List listData) { + mEntityList.addAll(listData); + for (int i = 0; i < mEntityList.size(); i++) { + AskGameSelectEntity entity = mEntityList.get(i); + if (TextUtils.isEmpty(entity.getStatus())) { + mEntityList.remove(i); + i--; + } + } for (int i = 0; i < mEntityList.size(); i++) { AskGameSelectEntity entity = mEntityList.get(i); if (i == 0) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsHotAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsHotAdapter.java index cd24facfaf..05ac9665ff 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsHotAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsHotAdapter.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.ask; import android.content.Context; -import android.support.annotation.NonNull; import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; @@ -13,30 +12,19 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 2/12/17. */ -public class AskQuestionsHotAdapter extends ListAdapter { +public class AskQuestionsHotAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public AskQuestionsHotAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @NonNull - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java index 053e0e1481..1b6bba586f 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsNewBodyAdapter.java @@ -12,30 +12,20 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.ask.entity.Questions; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 5/12/17. */ -public class AskQuestionsNewBodyAdapter extends ListAdapter { +public class AskQuestionsNewBodyAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public AskQuestionsNewBodyAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java index 8f0ee06d65..078687950a 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/ConcernQuestionsAdapter.java @@ -13,30 +13,20 @@ import com.gh.gamecenter.ask.AskQuestionsNewViewHolder; import com.gh.gamecenter.ask.entity.Questions; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 20/12/17. */ -class ConcernQuestionsAdapter extends ListAdapter { +class ConcernQuestionsAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public ConcernQuestionsAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java index 7b87992674..f44608e7a8 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyAnswerAdapter.java @@ -13,29 +13,19 @@ import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.questionsdetail.AnswerViewHolder; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 20/12/17. */ -class MyAnswerAdapter extends ListAdapter { +class MyAnswerAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - MyAnswerAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java index aeff4a5ae9..4777f3441b 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyDraftAdapter.java @@ -13,29 +13,19 @@ import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.questionsdetail.AnswerViewHolder; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 20/12/17. */ -class MyDraftAdapter extends ListAdapter { +class MyDraftAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - MyDraftAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java index 30703a562a..f8c720d152 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/myask/MyQuestionsAdapter.java @@ -13,30 +13,20 @@ import com.gh.gamecenter.ask.AskQuestionsNewViewHolder; import com.gh.gamecenter.ask.entity.Questions; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 20/12/17. */ -public class MyQuestionsAdapter extends ListAdapter { +public class MyQuestionsAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public MyQuestionsAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java index 4697f9f1b9..3662d179ce 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/AnswerFoldAdapter.java @@ -12,29 +12,19 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 11/12/17. */ -public class AnswerFoldAdapter extends ListAdapter { +public class AnswerFoldAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public AnswerFoldAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java index 3132735e10..f01f38fb50 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java @@ -28,7 +28,9 @@ import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.entity.MeEntity; import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; import com.gh.gamecenter.baselist.ListAdapter; +import com.gh.gamecenter.baselist.LoadStatus; import com.google.android.flexbox.FlexboxLayout; +import com.lightgame.utils.Utils; import java.util.List; @@ -36,12 +38,10 @@ import java.util.List; * Created by khy on 7/12/17. */ -public class QuestionsDetailAdapter extends ListAdapter { +public class QuestionsDetailAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - private QuestionsDetailEntity mQuestionsDetailEntity; boolean mIsExpand = false; @@ -61,8 +61,34 @@ public class QuestionsDetailAdapter extends ListAdapter { } @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; + protected void provideListData(List listData) { + if (listData != null && listData.size() != 0 && mQuestionsDetailEntity != null) { + mEntityList.addAll(listData); + notifyItemRangeInserted(mEntityList.size() - listData.size() + 1, listData.size()); + } + } + + @Override + public void loadChange(LoadStatus status) { + switch (status) { + case OVER: + mIsOver = true; + break; + case ERROR: + mIsNetworkError = true; + break; + case RETRY: + mIsNetworkError = false; + break; + case NORMAL: + mIsNetworkError = false; + mIsOver = false; + return; + case REFRESH: + mEntityList.clear(); + break; + } + notifyDataSetChanged(); } diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java index 54fbdaa9d8..96f7bc8a05 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java @@ -13,29 +13,19 @@ import com.gh.gamecenter.ask.entity.InviteEntity; import com.gh.gamecenter.ask.entity.MeEntity; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 7/12/17. */ -public class QuestionsInviteAdapter extends ListAdapter { +public class QuestionsInviteAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public QuestionsInviteAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == 0) { @@ -83,10 +73,10 @@ public class QuestionsInviteAdapter extends ListAdapter { @Override public int getItemCount() { - return mEntityList != null ? mEntityList.size() + TOP_ITEM_COUNT + FOOTER_ITEM_COUNT : TOP_ITEM_COUNT + FOOTER_ITEM_COUNT; + return mEntityList.size() != 0 ? mEntityList.size() + TOP_ITEM_COUNT + FOOTER_ITEM_COUNT : 0; } - public void inviteSucces(String id) { + public void inviteSuccess(String id) { for (InviteEntity inviteEntity : mEntityList) { if (id.equals(inviteEntity.getId())) { MeEntity me = inviteEntity.getMe(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java index 437db3d876..77e0cf29dd 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteFragment.java @@ -128,7 +128,7 @@ public class QuestionsInviteFragment extends ListFragment { @Override public void onResponse(ResponseBody response) { super.onResponse(response); - mAdapter.inviteSucces(expertId); + mAdapter.inviteSuccess(expertId); toast(R.string.invite_success); } diff --git a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java index ecc030c918..c47305dc83 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/search/AskSearchAdapter.java @@ -23,12 +23,10 @@ import java.util.List; * Created by khy on 8/12/17. */ -public class AskSearchAdapter extends ListAdapter { +public class AskSearchAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - private String mSearchKey; public AskSearchAdapter(Context context, OnListClickListener listClickListener) { @@ -37,11 +35,11 @@ public class AskSearchAdapter extends ListAdapter { } @Override - protected void provideListData(List listData) { + protected void provideListData(List listData) { if (listData == null) { - mEntityList = null; + mEntityList.clear(); } else { - mEntityList = replayKeyword((List) listData); + mEntityList.addAll(replayKeyword(listData)); } notifyDataSetChanged(); } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java index 94be08f0b4..1cce04e6be 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListAdapter.java @@ -4,17 +4,20 @@ import android.content.Context; import com.lightgame.adapter.BaseRecyclerAdapter; +import java.util.ArrayList; import java.util.List; /** * Created by khy on 10/11/17. */ -public abstract class ListAdapter extends BaseRecyclerAdapter { +public abstract class ListAdapter extends BaseRecyclerAdapter { public static final int FOOTER_ITEM_COUNT = 1; public static final int TOP_ITEM_COUNT = 1; + protected final List mEntityList = new ArrayList<>(); + protected boolean mIsOver; protected boolean mIsNetworkError; @@ -23,7 +26,12 @@ public abstract class ListAdapter extends BaseRecyclerAdapter { super(context); } - protected abstract void provideListData(List listData); + protected void provideListData(List listData) { + if (listData != null && listData.size() != 0) { + mEntityList.addAll(listData); + notifyItemRangeInserted(mEntityList.size() - listData.size(), listData.size()); + } + } public boolean isNetworkError() { return mIsNetworkError; @@ -44,9 +52,14 @@ public abstract class ListAdapter extends BaseRecyclerAdapter { mIsNetworkError = false; mIsOver = false; return; + case REFRESH: + mEntityList.clear(); + notifyDataSetChanged(); + return; } - notifyDataSetChanged(); + if (getItemCount() > 0) + notifyItemChanged(getItemCount() - 1); } } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java index 31cc6a6ce2..4a105f35bb 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListFragment.java @@ -108,13 +108,15 @@ public abstract class ListFragment extends NormalFragment implements @Override public void onRefresh() { - mReuseNoConn.setVisibility(View.GONE); - mReuseNoData.setVisibility(View.GONE); - mListLoading.setVisibility(View.VISIBLE); - mListRv.setVisibility(View.GONE); - mListRefresh.setRefreshing(false); + mBaseHandler.postDelayed(() -> { + mReuseNoConn.setVisibility(View.GONE); + mReuseNoData.setVisibility(View.GONE); + mListLoading.setVisibility(View.VISIBLE); + mListRv.setVisibility(View.GONE); + mListRefresh.setRefreshing(false); - mListViewModel.load(LoadType.REFRESH); + mListViewModel.load(LoadType.REFRESH); + }, 500); } @Override @@ -165,4 +167,9 @@ public abstract class ListFragment extends NormalFragment implements public void onLoadOver() { provideListAdapter().loadChange(LoadStatus.OVER); } + + @Override + public void onLoadRefresh() { + provideListAdapter().loadChange(LoadStatus.REFRESH); + } } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java b/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java index ea7a143979..b3a1514636 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/ListRepository.java @@ -8,7 +8,6 @@ import com.lightgame.config.CommonDebug; import com.lightgame.utils.Utils; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import okhttp3.ResponseBody; @@ -26,7 +25,6 @@ public class ListRepository { public final static int PAGE_SIZE = 20; private MutableLiveData> mListLiveData; - private List mCacheListData; private OnListLoadListener mLoadListener; @@ -40,7 +38,6 @@ public class ListRepository { public ListRepository(OnListLoadListener loadListener) { mListOffset = 0; mLoadListener = loadListener; - mCacheListData = new ArrayList<>(); mListLiveData = new MutableLiveData<>(); } @@ -61,7 +58,7 @@ public class ListRepository { if (size == 0 && mListOffset == 0) { mLoadListener.onLoadEmpty(); } else { - if (size < PAGE_SIZE) { + if (size == 0 || mListOffset == 0 && size < PAGE_SIZE) { mIsOver = true; mLoadListener.onLoadOver(); } else { @@ -103,13 +100,13 @@ public class ListRepository { mListOffset = 0; mIsOver = false; mIsNetworkError = false; - mCacheListData.clear(); } protected void load(LoadType loadType) { if (loadType == null) loadType = LoadType.NORMAL; switch (loadType) { case REFRESH: + mLoadListener.onLoadRefresh(); resetOffset(); break; case RETRY: @@ -125,14 +122,10 @@ public class ListRepository { private void cacheAndNotifyListData(List listData) { - mCacheListData.addAll(listData); - mListLiveData.postValue(mCacheListData); + mListLiveData.postValue(listData); } public LiveData> getListLiveData() { - if (mCacheListData != null) { - mListLiveData.postValue(mCacheListData); - } return mListLiveData; } } diff --git a/app/src/main/java/com/gh/gamecenter/baselist/OnListLoadListener.java b/app/src/main/java/com/gh/gamecenter/baselist/OnListLoadListener.java index ffdba152f0..23da128bf1 100644 --- a/app/src/main/java/com/gh/gamecenter/baselist/OnListLoadListener.java +++ b/app/src/main/java/com/gh/gamecenter/baselist/OnListLoadListener.java @@ -10,6 +10,8 @@ import rx.Observable; public interface OnListLoadListener { + void onLoadRefresh(); + void onLoadNormal(); void onLoadDone(); @@ -24,6 +26,7 @@ public interface OnListLoadListener { /** * 列表数据接口 先放这里吧 + * * @param * @return */ diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index ae918459b4..92663637c0 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -13,29 +13,19 @@ import com.gh.gamecenter.ask.entity.AnswerEntity; import com.gh.gamecenter.ask.questionsdetail.AnswerViewHolder; import com.gh.gamecenter.baselist.ListAdapter; -import java.util.List; - /** * Created by khy on 22/12/17. */ -public class AnswerAdapter extends ListAdapter { +public class AnswerAdapter extends ListAdapter { private OnListClickListener mListClickListener; - private List mEntityList; - public AnswerAdapter(Context context, OnListClickListener listClickListener) { super(context); mListClickListener = listClickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public int getItemViewType(int position) { if (position == getItemCount() - 1) return ItemViewType.ITEM_FOOTER; diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java index 31bb8b7877..3a3b21de07 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragmentAdapter.java @@ -12,31 +12,21 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.entity.MessageEntity; -import java.util.List; - /** * Created by khy on 2017/4/10. * 消息-评论适配器 */ -public class MessageFragmentAdapter extends ListAdapter { +public class MessageFragmentAdapter extends ListAdapter { private OnListClickListener mClickListener; - private List mEntityList; - public MessageFragmentAdapter(Context context, OnListClickListener clickListener) { super(context); mClickListener = clickListener; } - @Override - protected void provideListData(List listData) { - mEntityList = (List) listData; - notifyDataSetChanged(); - } - @Override public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { View view;