diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index c3a008f4ed..9189658f1c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -198,7 +198,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { - if (!TextUtils.isEmpty(mCacheRequestTag)) return; mIsSubjectDigestError = true; notifyItemChanged(0); if (isLoadMore) { @@ -226,7 +225,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { @Override public void onFailure(HttpException e) { - if (!TextUtils.isEmpty(mCacheRequestTag)) return; mIsSlideError = true; showView(); if (isFirst) { @@ -310,17 +308,19 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { /** * {@link com.gh.gamecenter.retrofit.OkHttpCacheInterceptor#intercept(Interceptor.Chain)} */ - if (response.size() > 0 && response.get(0).isCache()) { + if (mCacheRequestTag == null && (response.size() == 0 || response.get(0).isCache())) { mCacheRequestTag = "retry"; initSubjectDigest(true); - } else { - mCacheRequestTag = null; } } @Override public void onFailure(HttpException e) { - if (!TextUtils.isEmpty(mCacheRequestTag)) return; + if (mCacheRequestTag == null) { + mCacheRequestTag = "retry"; + initSubjectDigest(true); + return; + } if (mCallBackListener != null) { mCallBackListener.loadDone(); } @@ -393,12 +393,12 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { private void showView() { if (mIsSlideError && mIsListError) { mCallBackListener.loadError(); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); } else if (mIsSlideError) { notifyItemChanged(0); } else if (mIsListError) { notifyItemChanged(getItemCount() - 1); } - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); } public void initLocationMap() {