all ok

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

@@ -14,23 +14,23 @@ import java.util.ArrayList;
  * Created by ScorpioMiku on 2018/9/9.
  */
 
-public class MenuAdapter extends RecyclerView.Adapter<MenuHolder> {
+public class MakeStepAdapter extends RecyclerView.Adapter<MakeStepHolder> {
     private ArrayList<String> mList;
     private Context mContext;
 
-    public MenuAdapter(ArrayList mList, Context mContext) {
+    public MakeStepAdapter(ArrayList mList, Context mContext) {
         this.mList = mList;
         this.mContext = mContext;
     }
 
     @Override
-    public MenuHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.menu_item, parent, false);
-        return new MenuHolder(view);
+    public MakeStepHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.make_step_item, parent, false);
+        return new MakeStepHolder(view);
     }
 
     @Override
-    public void onBindViewHolder(MenuHolder holder, int position) {
+    public void onBindViewHolder(MakeStepHolder holder, int position) {
         holder.bindView(mList.get(position));
     }
 

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

@@ -7,21 +7,24 @@ import android.widget.TextView;
 import com.example.ninefourone.nutritionmaster.R;
 
 import butterknife.BindView;
+import butterknife.ButterKnife;
 
 /**
  * Created by ScorpioMiku on 2018/9/9.
  */
 
-public class MenuHolder extends RecyclerView.ViewHolder {
-    @BindView(R.id.text)
-    TextView textView;
+public class MakeStepHolder extends RecyclerView.ViewHolder {
 
-    public MenuHolder(View itemView) {
+
+    @BindView(R.id.make_step_text_view)
+    TextView makeStepTextView;
+
+    public MakeStepHolder(View itemView) {
         super(itemView);
-
+        ButterKnife.bind(this, itemView);
     }
 
     public void bindView(String text) {
-        textView.setText(text);
+        makeStepTextView.setText(text);
     }
 }

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

@@ -0,0 +1,42 @@
+package com.example.ninefourone.nutritionmaster.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.example.ninefourone.nutritionmaster.R;
+import com.example.ninefourone.nutritionmaster.bean.Material;
+
+import java.util.ArrayList;
+
+/**
+ * Created by ScorpioMiku on 2018/9/9.
+ */
+
+public class MaterialAdapter extends RecyclerView.Adapter<MaterialHolder> {
+    private ArrayList<Material> mList;
+    private Context mContext;
+
+    public MaterialAdapter(ArrayList mList, Context mContext) {
+        this.mList = mList;
+        this.mContext = mContext;
+    }
+
+    @Override
+    public MaterialHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.material_item, parent, false);
+        return new MaterialHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MaterialHolder holder, int position) {
+        holder.bindView(mList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return mList.size();
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.example.ninefourone.nutritionmaster.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.TextView;
+
+import com.example.ninefourone.nutritionmaster.R;
+import com.example.ninefourone.nutritionmaster.bean.Material;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by ScorpioMiku on 2018/9/9.
+ */
+
+public class MaterialHolder extends RecyclerView.ViewHolder {
+
+
+    @BindView(R.id.weight_number)
+    TextView weightNumber;
+    @BindView(R.id.name)
+    TextView name;
+
+    public MaterialHolder(View itemView) {
+        super(itemView);
+        ButterKnife.bind(this,itemView);
+    }
+
+    public void bindView(Material material) {
+        weightNumber.setText(material.getWeight() + "");
+        name.setText(material.getMaterialName());
+    }
+}

app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java

@@ -0,0 +1,31 @@
+package com.example.ninefourone.nutritionmaster.bean;
+
+/**
+ * Created by ScorpioMiku on 2018/9/11.
+ */
+
+public class Material {
+    private String materialName;
+    private float weight;
+
+    public Material(String materialName, float weight) {
+        this.materialName = materialName;
+        this.weight = weight;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public float getWeight() {
+        return weight;
+    }
+
+    public void setWeight(float weight) {
+        this.weight = weight;
+    }
+}

app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Menu.java

@@ -1,10 +1,44 @@
 package com.example.ninefourone.nutritionmaster.bean;
 
+import java.util.ArrayList;
+
 /**
  * Created by ScorpioMiku on 2018/9/9.
  */
 
 public class Menu {
     private String menuName;
+    private ArrayList<Material> materialArrayList;
+    private ArrayList<String> makeSteps;
 
+
+    public Menu(String menuName, ArrayList<Material> materialArrayList, ArrayList<String> makeSteps) {
+        this.menuName = menuName;
+        this.materialArrayList = materialArrayList;
+        this.makeSteps = makeSteps;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public ArrayList<Material> getMaterialArrayList() {
+        return materialArrayList;
+    }
+
+    public void setMaterialArrayList(ArrayList<Material> materialArrayList) {
+        this.materialArrayList = materialArrayList;
+    }
+
+    public ArrayList<String> getMakeSteps() {
+        return makeSteps;
+    }
+
+    public void setMakeSteps(ArrayList<String> makeSteps) {
+        this.makeSteps = makeSteps;
+    }
 }

app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java

@@ -1,20 +1,19 @@
 package com.example.ninefourone.nutritionmaster.modules.RecipeActivity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.example.ninefourone.nutritionmaster.R;
-import com.example.ninefourone.nutritionmaster.adapter.MenuAdapter;
+import com.example.ninefourone.nutritionmaster.adapter.MakeStepAdapter;
+import com.example.ninefourone.nutritionmaster.adapter.MaterialAdapter;
 import com.example.ninefourone.nutritionmaster.base.BaseActivity;
+import com.example.ninefourone.nutritionmaster.bean.Material;
 import com.example.ninefourone.nutritionmaster.bean.Menu;
 import com.example.ninefourone.nutritionmaster.bean.RecommendFood;
 import com.example.ninefourone.nutritionmaster.utils.UiUtils;
+import com.github.lzyzsd.circleprogress.ArcProgress;
 import com.orhanobut.logger.Logger;
 
 import java.util.ArrayList;
@@ -24,10 +23,21 @@ import butterknife.BindView;
 public class RecipeActivity extends BaseActivity {
 
 
+    @BindView(R.id.protein_circle)
+    ArcProgress proteinCircle;
+    @BindView(R.id.fat_circle)
+    ArcProgress fatCircle;
+    @BindView(R.id.carbohydrate_circle)
+    ArcProgress carbohydrateCircle;
+    @BindView(R.id.material_recycler_view)
+    RecyclerView materialRecyclerView;
+    @BindView(R.id.detail_way_recycler_view)
+    RecyclerView detailWayRecyclerView;
     private RecommendFood recommendFood;
     private Menu menu;
 
-    private ArrayList<String> menuList = new ArrayList<>();
+    private MaterialAdapter materialAdapter;
+    private MakeStepAdapter makeStepAdapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,12 +51,8 @@ public class RecipeActivity extends BaseActivity {
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-
-        final int changedHeight = UiUtils.dp2px(this, 214);
-
         Intent intent = getIntent();
         recommendFood = (RecommendFood) intent.getSerializableExtra("SEND_OBJECT");
-        Logger.d(recommendFood.getItemType());
         initList();
     }
 
@@ -61,14 +67,25 @@ public class RecipeActivity extends BaseActivity {
     }
 
     private void initList() {
-        for (int i = 0; i < 10; i++) {
-            menuList.add("1");
+        ArrayList<Material> list = new ArrayList<>();
+        for (int i = 0; i < 7; i++) {
+            Material material = new Material("毛豆", 100);
+            list.add(material);
         }
+        ArrayList<String> mList = new ArrayList<>();
+        for (int i = 0; i < 7; i++) {
+            String step = "第一步";
+            mList.add(step);
+        }
+        menu = new Menu("毛豆炒肉", list, mList);
+
+        makeStepAdapter = new MakeStepAdapter(menu.getMakeSteps(), this);
+        detailWayRecyclerView.setAdapter(makeStepAdapter);
+        detailWayRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+
+        materialAdapter = new MaterialAdapter(menu.getMaterialArrayList(), this);
+        materialRecyclerView.setAdapter(materialAdapter);
+        materialRecyclerView.setLayoutManager(new LinearLayoutManager(this));
     }
 
-    @Override
-    public void initRecyclerView() {
-        super.initRecyclerView();
-        MenuAdapter adapter = new MenuAdapter(menuList, this);
-    }
 }

app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java

@@ -36,7 +36,6 @@ import me.itangqi.waveloadingview.WaveLoadingView;
 
 public class BodyInformationFragment extends BaseFragment {
 
-
     Unbinder unbinder;
     @BindView(R.id.step_text_view)
     TextView stepTextView;
@@ -69,7 +68,6 @@ public class BodyInformationFragment extends BaseFragment {
         initChart();
     }
 
-
     public static BaseFragment getInstance() {
         return new BodyInformationFragment();
     }