Commit 32a2c6d0 by mReturn

fix快速滑动列表 数据无法正常请求问题

parent 5e5692d7
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 264
ext.verson_name = "2.6.4"
ext.version_code = 265
ext.verson_name = "2.6.5"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
......@@ -24,7 +24,8 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
private int mUserId;
private UserInfo mUserInfo;
private int type;//1.全部 2.已学习 3.已发布
private int mPage;
private int mPage = 1;
private int requestPage;
private int requestCount; //判断请求次数,不是第一次时释放jzvd
public String keyStr; //搜索关键字
private ObservableField<Object> datas = new ObservableField<>();
......@@ -57,14 +58,17 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
if (requestCount > 0)
JzvdStd.releaseAllVideos();
Observable<BaseResponse<BasePageBean<CommonLearnBean>>> observable = null;
if (requestPage >= mPage && mPage != 1)
return;
requestPage = mPage;
switch (type) {
case 1:
// observable = Api.getService(LearnService.class).getAllCourse(mUserId, keyStr, mPage, Constants.PAGESIZE);
observable = Api.getService(LearnService.class).getLearnVideos(mUserId,1,1, keyStr, mPage, Constants.PAGESIZE);
observable = Api.getService(LearnService.class).getLearnVideos(mUserId, 1, 1, keyStr, mPage, Constants.PAGESIZE);
break;
case 4:
// observable = Api.getService(LearnService.class).getAllCourse(mUserId, keyStr, mPage, Constants.PAGESIZE);
observable = Api.getService(LearnService.class).getLearnVideos(mUserId,2,1, keyStr, mPage, Constants.PAGESIZE);
observable = Api.getService(LearnService.class).getLearnVideos(mUserId, 2, 1, keyStr, mPage, Constants.PAGESIZE);
break;
case 2:
observable = Api.getService(LearnService.class).getLearnedCourse(mUserId, keyStr, mPage, Constants.PAGESIZE);
......@@ -78,7 +82,10 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
datas.set(courses);
mPage++;
requestCount++;
}, responeThrowable -> datas.set(Constants.FAILED)));
}, responeThrowable -> {
requestPage = 0;
datas.set(Constants.FAILED);
}));
}
}
......@@ -102,6 +109,7 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
public void shareVideo(CommonLearnBean item) {
mView.shareVideo(item);
}
public void likeVideo(CommonLearnBean item) {
mView.likeVideo(item);
}
......
......@@ -52,7 +52,8 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
private int mUserId;
private int mSiteId;
private int mState;
private int mPage;
private int mPage = 1;
private int requestPage;
UserInfo userInfo;
public int sopOrderVersion;
......@@ -96,12 +97,18 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
@Override
public void getOrders(int state, int userId, int siteId, int page, int pageSize) {
if (requestPage >= page && page !=1)
return;
requestPage = page;
OrderApiFactory.getOrders(state, userId, siteId, page, pageSize).subscribe(baseObserver(
orderBasePageBean -> {
datas.set(orderBasePageBean);
mPage++;
EventBus.getDefault().post(new RefreshTab(-1));
}, responeThrowable -> datas.set(Constants.FAILED)));
}, responeThrowable -> {
requestPage = 0;
datas.set(Constants.FAILED);
}));
}
//已完成订单
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment