From 335be670bc5cc0dd39cad54bc0aa269ddef4adfb Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Mon, 24 Sep 2018 15:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E9=99=90=E5=8A=A0=E8=BD=BDBug?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nutritionmaster/adapter/RecommendAdapter.java      |  5 +----
 .../recommend/RecommendFragment.java                   | 10 +++++++++-
 .../res/layout/normal_recommend_fragment_layout.xml    |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
index e175de0..ab1e39f 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
@@ -66,10 +66,7 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, B
     @Override
     public void loadMoreComplete() {
         super.loadMoreComplete();
-        for (int i = 0; i < 5; i++) {
-            RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]);
-            getData().add(recommendFood);
-        }
+
     }
 
     @Override
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
index 66b765b..110d408 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
@@ -83,16 +83,24 @@ public class RecommendFragment extends BaseFragment {
                 recyclerView.postDelayed(new Runnable() {
                     @Override
                     public void run() {
+
+                        Logger.d("加载数据");
+                        for (int i = 0; i < 6; i++) {
+                            RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]);
+                            adapter.getData().add(recommendFood);
+                        }
                         adapter.loadMoreComplete();
 //                        Logger.d("开始加载");
                     }
+
                 }, 1000);
             }
         }, recyclerView);
-        adapter.disableLoadMoreIfNotFullPage();
+//        adapter.disableLoadMoreIfNotFullPage();
         adapter.setEnableLoadMore(true);
         adapter.setHeaderView(LayoutInflater.from(getContext()).
                 inflate(R.layout.recommend_head, (ViewGroup) recyclerView.getParent(), false));
+        adapter.setPreLoadNumber(1);
         recyclerView.setNestedScrollingEnabled(false);
         manager = new GridLayoutManager(getContext(), 2);
         adapter.setHeaderViewAsFlow(false);
diff --git a/app/src/main/res/layout/normal_recommend_fragment_layout.xml b/app/src/main/res/layout/normal_recommend_fragment_layout.xml
index 8816cf8..56689ec 100644
--- a/app/src/main/res/layout/normal_recommend_fragment_layout.xml
+++ b/app/src/main/res/layout/normal_recommend_fragment_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -9,4 +9,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center" />
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file