From 3959bac0b2aaf02fb0de228b04ca18ad3bfe2972 Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Sun, 7 Oct 2018 17:40:38 +0800
Subject: [PATCH] 1

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../adapter/RecommendAdapter.java             | 56 +++++++++++++++----
 .../recommend/RecommendFragment.java          | 13 ++---
 .../main/res/layout/recommend_item_detail.xml |  7 ++-
 4 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1f28d26..59dc3d7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
         <!-- android:label="@string/title_activity_login" /> -->
         <activity android:name=".modules.addinformation.AddInformationActivity" />
         <activity android:name=".modules.classifyresult.DishResultActivity" />
-        <activity android:name=".modules.classifyresult.MaterialResultActivity"></activity>
+        <activity android:name=".modules.classifyresult.MaterialResultActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
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 747bfcd..0c22e23 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
@@ -1,9 +1,12 @@
 package com.example.ninefourone.nutritionmaster.adapter;
 
 
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
@@ -31,37 +34,66 @@ public class RecommendAdapter extends BaseMultiItemQuickAdapter<RecommendFood, B
      */
     public RecommendAdapter(List<RecommendFood> data) {
         super(data);
-        addItemType(RecommendFood.TYPE_BIG, R.layout.recommend_item_big);
+        addItemType(RecommendFood.TYPE_BIG, R.layout.recommend_item_middle);
         addItemType(RecommendFood.TYPE_DETAIL, R.layout.recommend_item_detail);
         addItemType(RecommendFood.TYPE_MIDDLE, R.layout.recommend_item_middle);
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, RecommendFood item) {
+    protected void convert(BaseViewHolder helper, final RecommendFood item) {
+        intent = new Intent(mContext, RecipeActivity.class);
+        intent.putExtra("SEND_OBJECT", item);
         ImageView imageView = helper.getView(R.id.recommend_item_imageview);
+        View view = helper.getView(R.id.whole_layout);
         Glide.with(mContext).load(item.getPicture()).into(imageView);
+
+
         switch (item.getItemType()) {
             case RecommendFood.TYPE_BIG:
                 helper.setText(R.id.recommend_item_title, item.getTitle());
+                view.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mContext.startActivity(intent);
+                    }
+                });
                 break;
             case RecommendFood.TYPE_DETAIL:
                 helper.setText(R.id.recommend_item_title, item.getTitle());
                 helper.setText(R.id.recommend_item_description, item.getDescription());
+                imageView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mContext.startActivity(intent);
+                    }
+                });
+
+                LinearLayout detailClick = helper.getView(R.id.detail_click);
+
+                detailClick.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        AlertDialog.Builder builder = new AlertDialog.Builder(mContext).setTitle("小知识")
+                                        .setMessage(item.getDescription()).setIcon(R.drawable.ic_add_recipe);
+                        AlertDialog dialog = builder.create();
+                        dialog.setCanceledOnTouchOutside(true);
+                        dialog.setCancelable(true);
+                        dialog.show();
+                    }
+                });
                 break;
             case RecommendFood.TYPE_MIDDLE:
                 helper.setText(R.id.recommend_item_title, item.getTitle());
+                view.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mContext.startActivity(intent);
+                    }
+                });
                 break;
         }
-        View view = helper.getView(R.id.whole_layout);
-        intent = new Intent(mContext, RecipeActivity.class);
-//        Logger.d(item.getItemType());
-        intent.putExtra("SEND_OBJECT", item);
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mContext.startActivity(intent);
-            }
-        });
+
+
     }
 
     @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 f6df750..f15f49a 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
@@ -44,7 +44,7 @@ public class RecommendFragment extends BaseFragment {
     private RecommendAdapter adapter;
     private ArrayList<RecommendFood> datas = new ArrayList<>();
     private GridLayoutManager manager;
-    private int[] indexs = new int[]{0, 1, 1, 2};
+    private int[] indexs = new int[]{0, 1, 2};
 
 
     @Override
@@ -113,8 +113,7 @@ public class RecommendFragment extends BaseFragment {
                 if (position == 0) {
                     return 2;
                 } else {
-                    if (adapter.getItemViewType(position) == RecommendFood.TYPE_BIG ||
-                            adapter.getItemViewType(position) == RecommendFood.TYPE_DETAIL) {
+                    if (adapter.getItemViewType(position) == RecommendFood.TYPE_DETAIL) {
 //                    Logger.d(manager.getSpanCount());
                         return 2;
                     } else {
@@ -150,7 +149,7 @@ public class RecommendFragment extends BaseFragment {
                         if (count > 11) {
                             break;
                         } else {
-                            int flag = indexs[count % 4];
+                            int flag = indexs[count % 3];
                             RecommendFood recommendFood = new RecommendFood(menus[i], flag);
                             if (!recommendFood.getPicture().equals("0")) {
                                 datas.add(recommendFood);
@@ -162,7 +161,7 @@ public class RecommendFragment extends BaseFragment {
                     /**
                      * 获取小知识
                      */
-                    getWebUtil().getRandomTricks(3, new Callback() {
+                    getWebUtil().getRandomTricks(5, new Callback() {
                         @Override
                         public void onFailure(Call call, IOException e) {
 
@@ -214,7 +213,7 @@ public class RecommendFragment extends BaseFragment {
                         if (count > 7) {
                             break;
                         } else {
-                            int flag = indexs[count % 4];
+                            int flag = indexs[count % 3];
                             RecommendFood recommendFood = new RecommendFood(menus[i], flag);
                             if (!recommendFood.getPicture().equals("0")) {
                                 datas.add(recommendFood);
@@ -226,7 +225,7 @@ public class RecommendFragment extends BaseFragment {
                     /**
                      * 获取小知识
                      */
-                    getWebUtil().getRandomTricks(3, new Callback() {
+                    getWebUtil().getRandomTricks(5, new Callback() {
                         @Override
                         public void onFailure(Call call, IOException e) {
 
diff --git a/app/src/main/res/layout/recommend_item_detail.xml b/app/src/main/res/layout/recommend_item_detail.xml
index 802c433..c305e5b 100644
--- a/app/src/main/res/layout/recommend_item_detail.xml
+++ b/app/src/main/res/layout/recommend_item_detail.xml
@@ -31,13 +31,14 @@
 
 
         <LinearLayout
+            android:id="@+id/detail_click"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="#f3f9de"
             android:orientation="vertical"
             android:paddingBottom="5dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
+            android:paddingLeft="15dp"
+            android:paddingRight="15dp"
             android:paddingTop="5dp">
 
             <TextView
@@ -46,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
                 android:text="小知识"
-                android:textSize="13sp"
+                android:textSize="12sp"
                 android:textStyle="bold" />
 
             <TextView