Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

所有接口offset改为page（完成）

Browse Source
This commit is contained in:
kehaoyuan
2018-03-30 16:01:41 +08:00
parent 8daefb2e42
commit 23ca884684
70 changed files with 649 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java
View File

@ -48,7 +48,6 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
private OnSearchCallBackListener mSearchListener;
private List<ToolBoxEntity> mEntityList;
private List<ToolBoxEntity> mConcernList;
private String mSearchKey;
private String mToken;
@ -59,35 +58,42 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
private boolean mIsOver;
private boolean mIsNetworkError;
private int mConcernPage;
private int mPage;
public ToolBoxRvAdapter(Context context, OnRequestCallBackListener listener, OnSearchCallBackListener searchListener,
boolean isSearch, String key) {
super(context);
this.mIsSearch = isSearch;
this.mSearchKey = key;
mConcernPage = 1;
mPage = 1;
mToken = UserManager.getInstance().getToken();
mSearchListener = searchListener;
mCallBackListener = listener;
mEntityList = new ArrayList<>();
mConcernList = new ArrayList<>();
loadData(mIsSearch, 0);
loadData(mIsSearch);
}
public void loadData(boolean isSearch, int offset) {
public void loadData(boolean isSearch) {
int normalPage;
if (mIsLoading) {
return;
}
mIsLoading = true;
if (offset > 0 && !isSearch && mLoadConcernDataOver) {
offset = offset - mConcernList.size();
if (!isSearch && mLoadConcernDataOver) {
normalPage = mPage;
} else {
normalPage = mConcernPage;
}
Observable<List<ToolBoxEntity>> api;
if (!TextUtils.isEmpty(mToken) && !mLoadConcernDataOver) {
api = RetrofitManager.getInstance(mContext).getApi().getConcernToolKitData(UserManager.getInstance().getUserId(), offset, mSearchKey);
api = RetrofitManager.getInstance(mContext).getApi().getConcernToolKitData(UserManager.getInstance().getUserId(), normalPage, mSearchKey);
} else {
api = RetrofitManager.getInstance(mContext).getApi().getToolKitData(offset, mSearchKey);
api = RetrofitManager.getInstance(mContext).getApi().getToolKitData(normalPage, mSearchKey);
}
api
.subscribeOn(Schedulers.io())
@ -98,10 +104,10 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
super.onResponse(response);
if (!mLoadConcernDataOver && response.size() < 20) {
mEntityList.addAll(response);
mConcernList = mEntityList;
mLoadConcernDataOver = true;
mIsLoading = false;
loadData(mIsSearch, 0);
mConcernPage++;
loadData(mIsSearch);
} else {
if (response.size() >= 0) {
removeDuplicateData(mEntityList, response);
@ -116,6 +122,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
notifyDataSetChanged();
}
mPage++;
mIsLoading = false;
if (mEntityList.size() == 0) {
@ -288,7 +295,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter {
viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
loadData(mIsSearch, mEntityList.size());
loadData(mIsSearch);
}
});
} else if (mIsOver) {