From 9f00cab4095743602f62bc2598002f2ffd4842e6 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Sun, 19 Nov 2017 12:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gh/gamecenter/game/GameFragmentAdapter.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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<ViewHolder> {
 
                     @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<ViewHolder> {
 
                     @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<ViewHolder> {
                         /**
                          * {@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<ViewHolder> {
     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() {