Merge branch 'wangtianrui' into develop

app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java

@@ -1,9 +1,12 @@
 package com.example.ninefourone.nutritionmaster.adapter;
 
+import android.view.LayoutInflater;
+
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.example.ninefourone.nutritionmaster.R;
 import com.example.ninefourone.nutritionmaster.bean.RecommendFood;
+import com.orhanobut.logger.Logger;
 
 import java.util.List;
 
@@ -12,6 +15,8 @@ import java.util.List;
  */
 
 public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, BaseViewHolder> {
+    private int[] indexs = new int[]{0, 1, 1, 2};
+
     /**
      * Same as QuickAdapter#QuickAdapter(Context,int) but with
      * some initialization data.
@@ -43,4 +48,29 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, B
                 break;
         }
     }
+
+    @Override
+    public void loadMoreComplete() {
+        super.loadMoreComplete();
+        for (int i = 0; i < 5; i++) {
+            RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]);
+            getData().add(recommendFood);
+        }
+//        notifyDataSetChanged();
+//        Logger.d("加载成功");
+    }
+
+    @Override
+    public void loadMoreEnd() {
+        super.loadMoreEnd();
+//        Logger.d("数据没了");
+    }
+
+    @Override
+    public void loadMoreFail() {
+        super.loadMoreFail();
+//        Logger.d("加载失败");
+    }
+
+
 }

app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java

@@ -17,6 +17,8 @@ import com.orhanobut.logger.Logger;
 
 import java.util.ArrayList;
 
+import android.view.LayoutInflater;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
@@ -74,15 +76,33 @@ public class RecommendFragment extends BaseFragment {
         adapter.openLoadAnimation(BaseQuickAdapter.SCALEIN);
         adapter.isFirstOnly(false);
         recyclerView.setAdapter(adapter);
+
+        adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                recyclerView.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        adapter.loadMoreComplete();
+//                        Logger.d("开始加载");
+                    }
+                }, 1000);
+            }
+        }, recyclerView);
+        adapter.disableLoadMoreIfNotFullPage();
+        adapter.setEnableLoadMore(true);
+        adapter.setHeaderView(LayoutInflater.from(getContext()).
+                inflate(R.layout.recommend_head, (ViewGroup) recyclerView.getParent(), false));
         recyclerView.setNestedScrollingEnabled(false);
         manager = new GridLayoutManager(getContext(), 2);
+        adapter.setHeaderViewAsFlow(false);
         manager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
                 if (adapter.getItemViewType(position) == RecommendFood.TYPE_BIG ||
                         adapter.getItemViewType(position) == RecommendFood.TYPE_DETAIL) {
 //                    Logger.d(manager.getSpanCount());
-                    return manager.getSpanCount();
+                    return 2;
                 } else {
                     return 1;
                 }
@@ -97,9 +117,18 @@ public class RecommendFragment extends BaseFragment {
     @Override
     protected void loadData() {
         super.loadData();
-        for (int i = 0; i < 20; i++) {
+        for (int i = 0; i < 11; i++) {
             RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", indexs[i % 4]);
             datas.add(recommendFood);
         }
     }
+
+    /**
+     * 判断数据是否加载完了（服务器没了）
+     *
+     * @return
+     */
+    private boolean isDataOverCount() {
+        return false;
+    }
 }

app/src/main/res/layout/body_information_fragment.xml

@@ -14,7 +14,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="180dp"
+            android:layout_height="130dp"
             android:scaleType="fitXY"
             android:src="@drawable/body_bg" />
 

app/src/main/res/layout/recommend_head.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="140dp"
+    android:background="@color/colorPrimary"
+    android:src="@drawable/recommend_bg">
+
+</ImageView>

app/src/main/res/values/dimens.xml

@@ -12,7 +12,7 @@
     <dimen name="bt_height">36dp</dimen>
 
 
-    <dimen name="infor_layout_height">120dp</dimen>
+    <dimen name="infor_layout_height">110dp</dimen>
     <dimen name="infor_image_height">35dp</dimen>
     <dimen name="infor_chart_height">90dp</dimen>
     <dimen name="infor_chart_width">200dp</dimen>