Commit 4792c921 authored by jianglx's avatar jianglx

优化下拉刷新失败

parent 5f2732e9
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 151
versionName "1.5.1"
versionCode 155
versionName "1.5.5"
multiDexEnabled true
......
......@@ -163,6 +163,12 @@ public class CampFragment extends BaseFragment<CampPresenter> implements BaseQui
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
@OnClick({R2.id.tv_camp_type, R2.id.iv_camp_map, R2.id.v_shadow})
public void onViewClicked(View view) {
int id = view.getId();
......
......@@ -213,6 +213,12 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void setIMData(DiscoveryIMTokenBean bean) {
if ("0".equals(itemDatabean.getIsPraise())) {//0:未点赞 1:已点赞
Map<String, Object> map = new LinkedHashMap<>();
......
......@@ -146,7 +146,11 @@ public class QuestionAndAnswerFragment extends BaseFragment<DiscoveryPresenter>
onFresh();
break;
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
@Override
......
......@@ -198,6 +198,12 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void setIMData(DiscoveryIMTokenBean bean) {
if ("0".equals(itemDatabean.getIsPraise())) {//0:未点赞 1:已点赞
Map<String, Object> map = new LinkedHashMap<>();
......
......@@ -168,6 +168,12 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter> impleme
processData((DiscoveryRecommendBean) result);
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(DiscoveryRecommendBean bean) {
if (mPage == 1) {
countPage = bean.getData().getTotalPage();
......
......@@ -171,6 +171,12 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void initData(CarAttributeListBean data) {
attributeListBean = data;
// .get(0).getChildren();
......
......@@ -47,7 +47,6 @@ import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.listener.SwitchFragment;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.refresh.IFooterWrapper;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.rv.component.utils.Cookie;
......
......@@ -195,10 +195,15 @@ public class SelectShopActivity extends BaseStatusActivity<CommonPresenter> impl
mAdapter.addData(bean.getData().getData());
mAdapter.loadMoreComplete();
}
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
/**
* 获取通用空布局
*
......
......@@ -228,6 +228,12 @@ public class AllOrderFragment extends BaseFragment<CommonPresenter> implements B
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
/**
* 支付类型选择
......
......@@ -181,5 +181,11 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
}
......@@ -273,6 +273,13 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (mPage == 1)
mSimpleRefreshLayout.onRefreshComplete();
}
/**
* 支付类型选择
*/
......
......@@ -38,7 +38,7 @@ import io.reactivex.schedulers.Schedulers;
* Desc:已出行
*/
public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
public class HaveToTravelFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
@BindView(R2.id.recyclerView)
RecyclerView recyclerView;
@BindView(R2.id.refresh)
......@@ -73,9 +73,9 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
if (1 == dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean.getNo()), 1);
}else if (2== dataBean.getType()){
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean.getNo()), 2);
}
}
......@@ -85,9 +85,9 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
int id = view.getId();
if (id == R.id.tv_process){
if (id == R.id.tv_process) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean.getNo()));
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean.getNo()));
}
}
});
......@@ -177,4 +177,11 @@ public class HaveToTravelFragment extends BaseFragment<CommonPresenter>implement
mAdapter.loadMoreComplete();
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (mPage == 1)
mSimpleRefreshLayout.onRefreshComplete();
}
}
\ No newline at end of file
......@@ -201,4 +201,11 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
mAdapter.loadMoreComplete();
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (mPage == 1)
mSimpleRefreshLayout.onRefreshComplete();
}
}
\ No newline at end of file
......@@ -525,6 +525,12 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
/**
* 用户收益
*
......
......@@ -158,6 +158,12 @@ public class MyReleaseAskFragment extends BaseFragment<CommonPresenter> implemen
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(MyReleaseAskBean bean) {
if (mPage == 1) {
countPage = bean.getData().getPageSize();
......
......@@ -194,6 +194,12 @@ public class MyReleasePatFragment extends BaseFragment<CommonPresenter> implemen
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(MyReleaseBean bean) {
if (mPage == 1) {
countPage = bean.getData().getPageSize();
......
......@@ -188,6 +188,12 @@ public class MyReleaseVideoFragment extends BaseFragment<CommonPresenter> implem
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void deleteData() {
if (OkGoUtil.getToken() != null) {
Map<String, Object> header = new LinkedHashMap<>();
......
......@@ -341,6 +341,12 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
/******
* 完善banner信息
* @param data
......
......@@ -113,6 +113,12 @@ public class CarPurchaseListActivity extends BaseStatusActivity<CarPurchasePrese
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(CarPurChaseListBean bean) {
if (mPage == 1) {
countPage = bean.getData().getTotalPage();
......
......@@ -81,6 +81,11 @@ public class ExpiredCouponFragment extends BaseFragment<CouponAllPresenter> impl
mSimpleRefreshLayout.onRefreshComplete();
processData((CouponBean) result);
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(CouponBean bean) {
if (bean !=null && bean.getData()!=null && bean.getData().size() >0) {
......
......@@ -86,6 +86,12 @@ public class UsedCouponFragment extends BaseFragment<CouponAllPresenter> impleme
processData((CouponBean) result);
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(CouponBean bean) {
if (bean !=null && bean.getData()!=null && bean.getData().size() >0) {
mAdapter.getData().clear();
......
......@@ -106,6 +106,12 @@ public class WaitCouponFragment extends BaseFragment<CouponAllPresenter> impleme
processData((CouponBean) result);
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void processData(CouponBean bean) {
if (bean != null && bean.getData() != null && bean.getData().size() > 0) {
mAdapter.getData().clear();
......
......@@ -192,6 +192,15 @@ public class CustomerListActivity extends BaseStatusActivity<CommonPresenter> im
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if(isRefresh) {
refreshLayout.onRefreshComplete();
isRefresh = false ;
}
}
@Override
public void onRefresh() {
isRefresh = true;
......
......@@ -88,6 +88,12 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
simpleRefreshLayout.onRefreshComplete();
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
super.loadData(savedInstanceState, intent);
......
......@@ -129,4 +129,11 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (mPage == 1)
mSimpleRefreshLayout.onRefreshComplete();
}
}
......@@ -90,6 +90,12 @@ public class UserDetailFragment extends BaseFragment<CommonPresenter> implements
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
simpleRefreshLayout.onRefreshComplete();
}
private void getConsumeRecordData(int position) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
......
......@@ -103,6 +103,13 @@ public class PopularizeActivity extends BaseStatusActivity<CommonPresenter> impl
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refresh.onRefreshComplete();
}
@Override
public void onLoadMoreRequested() {
if (currentPage >= pageTotal) {
......
......@@ -87,6 +87,13 @@ public class ActivationFragment extends BaseFragment<CommonPresenter> implements
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
private void getActivationData() {
if (!TextUtils.isEmpty(OkGoUtil.getToken())) {
Map<String, Object> header = new HashMap<>();
......
......@@ -97,6 +97,13 @@ public class InComeRecordFragment extends BaseFragment<CommonPresenter> implemen
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
@Override
public void onLoadMoreRequested() {
......
......@@ -89,6 +89,13 @@ public class InviteFragment extends BaseFragment<CommonPresenter> implements Bas
}
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
//
// private void getInviteData() {
// String result = "{\"status\":200,\"message\":\"Success\",\"data\":{\"failureTime\":5184000,\"inviteMembers\":[ {\n" +
......
......@@ -63,6 +63,13 @@ public class ConsumeDetailActivity extends BaseStatusActivity<CommonPresenter> i
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
@Override
protected int setLayout() {
return R.layout.activity_consume_detail;
......
......@@ -66,7 +66,13 @@ public class EnchashmentRecordActivity extends BaseStatusActivity<CommonPresente
}
}
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (pageNo == 1)
simpleRefreshLayout.onRefreshComplete();
}
@Override
......
......@@ -89,6 +89,13 @@ public class CommisionAllFragment extends BaseFragment<CommonPresenter> implemen
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
@Override
public void onLoadMoreRequested() {
......
......@@ -86,6 +86,13 @@ public class CommisionFinishFragment extends BaseFragment<CommonPresenter> imple
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
@Override
public void onLoadMoreRequested() {
if (currentPage >= pageTotal) {
......
......@@ -86,6 +86,13 @@ public class CommisionUnFinishFragment extends BaseFragment<CommonPresenter> imp
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
if (currentPage == 1)
refreshLayout.onRefreshComplete();
}
@Override
public void onLoadMoreRequested() {
if (currentPage >= pageTotal) {
......
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 to comment