From 03eebf2c073a1721fb33cbe4e033ccabaeac3240 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Tue, 3 Jul 2018 09:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E4=BE=9D=E8=B5=96=E7=9A=84?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qa/recommends/AskQuestionsRecommendsFragment.java  | 10 +++++++++-
 .../res/layout/fragment_ask_questions_recommends.xml   |  8 ++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
index 2ab0ae567a..f5e1bc809b 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/recommends/AskQuestionsRecommendsFragment.java
@@ -117,7 +117,6 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        refreshLayout.setEnableLoadMore(false);
         refreshLayout.setOnRefreshListener(
                 refreshLayout -> {
                     if (!mInitRefresh) {
@@ -226,6 +225,15 @@ public class AskQuestionsRecommendsFragment extends ListFragment<AnswerEntity, A
         mAdapter.viewPagerAutoScroll(false);
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (refreshLayout != null) {
+            mInitRefresh = false;
+            refreshLayout.finishRefresh(0);
+        }
+    }
+
     public void scrollToTop() {
         mLayoutManager.smoothScrollToPosition(mListRv, null, 0);
     }
diff --git a/app/src/main/res/layout/fragment_ask_questions_recommends.xml b/app/src/main/res/layout/fragment_ask_questions_recommends.xml
index 561418e47b..54a5383a76 100644
--- a/app/src/main/res/layout/fragment_ask_questions_recommends.xml
+++ b/app/src/main/res/layout/fragment_ask_questions_recommends.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android = "http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app = "http://schemas.android.com/apk/res-auto"
     android:layout_width = "match_parent"
     android:layout_height = "match_parent">
 
@@ -7,7 +8,10 @@
         android:id = "@+id/refresh_layout"
         android:layout_below = "@id/refresh_hint"
         android:layout_width = "match_parent"
-        android:layout_height = "match_parent">
+        android:layout_height = "match_parent"
+        app:srlEnableLoadMore = "false"
+        app:srlEnableAutoLoadMore = "false"
+        app:srlEnableClipFooterWhenFixedBehind = "false">
 
         <com.gh.common.view.SwipeRefreshHeader
             android:id = "@+id/swipe_refresh_header"