From be04693e4d231f783a4f0c34cccfb3795725bb29 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Tue, 11 Sep 2018 21:05:12 +0800 Subject: [PATCH] all ok --- app/build.gradle | 22 +++--- ...{MenuAdapter.java => MakeStepAdapter.java} | 12 ++-- .../{MenuHolder.java => MakeStepHolder.java} | 15 +++-- .../adapter/MaterialAdapter.java | 42 ++++++++++++ .../adapter/MaterialHolder.java | 34 ++++++++++ .../nutritionmaster/bean/Material.java | 31 +++++++++ .../nutritionmaster/bean/Menu.java | 34 ++++++++++ .../RecipeActivity/RecipeActivity.java | 51 +++++++++----- .../BodyInformationFragment.java | 2 - app/src/main/res/layout/activity_main.xml | 14 ---- app/src/main/res/layout/activity_recipe.xml | 67 ++++++++++++++++--- app/src/main/res/layout/make_step_item.xml | 18 +++++ app/src/main/res/layout/material_item.xml | 39 +++++++++++ app/src/main/res/layout/menu_item.xml | 12 ---- 14 files changed, 316 insertions(+), 77 deletions(-) rename app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/{MenuAdapter.java => MakeStepAdapter.java} (66%) rename app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/{MenuHolder.java => MakeStepHolder.java} (56%) create mode 100644 app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java create mode 100644 app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java create mode 100644 app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java create mode 100644 app/src/main/res/layout/make_step_item.xml create mode 100644 app/src/main/res/layout/material_item.xml delete mode 100644 app/src/main/res/layout/menu_item.xml diff --git a/app/build.gradle b/app/build.gradle index d4d9192..74a9690 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,35 +40,35 @@ dependencies { implementation 'com.mxn.soul:flowingdrawer-core:2.0.0' implementation 'com.nineoldandroids:library:2.4.0' //图片形状库 - compile 'com.github.siyamed:android-shape-imageview:0.9.+@aar' + implementation 'com.github.siyamed:android-shape-imageview:0.9.+@aar' //cardview - compile 'com.android.support:cardview-v7:26.1.0' + implementation 'com.android.support:cardview-v7:26.1.0' //tablayout - compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar' + implementation 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.0@aar' //viewpager transforms - compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar' + implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar' //个人信息的那个条条 - compile 'com.akexorcist:RoundCornerProgressBar:2.0.3' + implementation 'com.akexorcist:RoundCornerProgressBar:2.0.3' //wave implementation 'me.itangqi.waveloadingview:library:0.3.5' //计步 implementation project(':todaystepcounterlib') //打分ui - compile 'com.github.CB-ysx:CBRatingBar:3.0.1' + implementation 'com.github.CB-ysx:CBRatingBar:3.0.1' //折线 implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' //searchview - compile 'com.miguelcatalan:materialsearchview:1.4.0' + implementation 'com.miguelcatalan:materialsearchview:1.4.0' //floatbuttom - compile 'com.nightonke:boommenu:2.1.1' + implementation 'com.nightonke:boommenu:2.1.1' //recycler and card implementation 'com.android.support:recyclerview-v7:26.1.0' implementation 'com.android.support:cardview-v7:26.1.0' //混合式recyclerview - compile 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' + implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' //翻页view - compile 'com.github.czy1121:turncardlistview:1.0.0' + implementation 'com.github.czy1121:turncardlistview:1.0.0' //油表盘 - compile 'com.github.lzyzsd:circleprogress:1.2.1' + implementation 'com.github.lzyzsd:circleprogress:1.2.1' } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java similarity index 66% rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuAdapter.java rename to app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java index 85c4728..5e8fd74 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuAdapter.java +++ b/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 { +public class MakeStepAdapter extends RecyclerView.Adapter { private ArrayList 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)); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java similarity index 56% rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuHolder.java rename to app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java index b1538b3..61f65b4 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MenuHolder.java +++ b/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); } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java new file mode 100644 index 0000000..b83e46e --- /dev/null +++ b/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 { + private ArrayList 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(); + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java new file mode 100644 index 0000000..1daabff --- /dev/null +++ b/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()); + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java new file mode 100644 index 0000000..ef32b29 --- /dev/null +++ b/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; + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Menu.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Menu.java index 62a704e..3cddc86 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Menu.java +++ b/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 materialArrayList; + private ArrayList makeSteps; + + public Menu(String menuName, ArrayList materialArrayList, ArrayList 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 getMaterialArrayList() { + return materialArrayList; + } + + public void setMaterialArrayList(ArrayList materialArrayList) { + this.materialArrayList = materialArrayList; + } + + public ArrayList getMakeSteps() { + return makeSteps; + } + + public void setMakeSteps(ArrayList makeSteps) { + this.makeSteps = makeSteps; + } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java index 335dfa5..b5c24d6 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java +++ b/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 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 list = new ArrayList<>(); + for (int i = 0; i < 7; i++) { + Material material = new Material("毛豆", 100); + list.add(material); } + ArrayList 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); - } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java index ceda657..9cc37d4 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java +++ b/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(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5d1a634..7ade751 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -254,20 +254,6 @@ android:layout_height="wrap_content" android:clipChildren="false"> - - - - - - - - - - - - - - @@ -107,8 +108,8 @@ android:layout_margin="5dp" app:arc_bottom_text="测试" app:arc_progress="50" - app:arc_suffix_text_size="15sp" - app:arc_text_size="20sp" /> + app:arc_suffix_text_size="12sp" + app:arc_text_size="12sp" /> + app:arc_suffix_text_size="12sp" + app:arc_text_size="12sp" /> + app:arc_suffix_text_size="12sp" + app:arc_text_size="12sp" /> @@ -205,10 +207,57 @@ android:layout_height="wrap_content" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/make_step_item.xml b/app/src/main/res/layout/make_step_item.xml new file mode 100644 index 0000000..8dcf491 --- /dev/null +++ b/app/src/main/res/layout/make_step_item.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/material_item.xml b/app/src/main/res/layout/material_item.xml new file mode 100644 index 0000000..3aa6b56 --- /dev/null +++ b/app/src/main/res/layout/material_item.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/menu_item.xml b/app/src/main/res/layout/menu_item.xml deleted file mode 100644 index 8818b8f..0000000 --- a/app/src/main/res/layout/menu_item.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file