From bbf1b5b39882eceaf9510b52311b29a81c2dc21e Mon Sep 17 00:00:00 2001 From: zhaolizhi <499531245@qq.com> Date: Tue, 28 Aug 2018 10:33:13 +0800 Subject: [PATCH 1/4] 1 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2a8d617..759fdcb 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ * 图像识别食物,获取卡路里: https://cloud.baidu.com/product/imagerecognition/fine_grained * **nutrition facts** from food : https://www.kaggle.com/openfoodfacts/world-food-facts#en.openfoodfacts.org.products.tsv + * https://world.openfoodfacts.org/ 数据集官网 * 456赞,目前为止发现的最高的相关数据集 * nutrition facts for **McDonald’s** : https://www.kaggle.com/mcdonalds/nutrition-facts * Calories, fat, and sugar for every cheeseburger, fries, and milkshake on menu From ed89bec66dcef27740e5c307fa8e3ea0c1ebb544 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Tue, 4 Sep 2018 16:06:26 +0800 Subject: [PATCH 2/4] 1 --- .../example/ninefourone/nutritionmaster/bean/RecommendFood.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java index 8a9a423..1caf57f 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java @@ -9,6 +9,7 @@ import com.orhanobut.logger.Logger; public class RecommendFood implements MultiItemEntity { + //三种view public static final int TYPE_BIG = 0; public static final int TYPE_MIDDLE = 1; public static final int TYPE_DETAIL = 2; From c1a0ea6e6c1ef949b15584654136e88940060a02 Mon Sep 17 00:00:00 2001 From: zhaolizhi <499531245@qq.com> Date: Thu, 6 Sep 2018 09:25:11 +0800 Subject: [PATCH 3/4] design database --- README.md | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2736273..d8c44ce 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ ### 数据集和api +**赵励志收集的资料** + * 图像识别食物,获取卡路里: https://cloud.baidu.com/product/imagerecognition/fine_grained * **nutrition facts** from food : https://www.kaggle.com/openfoodfacts/world-food-facts#en.openfoodfacts.org.products.tsv * https://world.openfoodfacts.org/ 数据集官网 @@ -54,18 +56,7 @@ * 糖尿病 时间-血糖含量关系数据 : https://archive.ics.uci.edu/ml/datasets/diabetes * GPA和饮食习惯的关系 : https://www.kaggle.com/borapajo/food-choices -### 应用逻辑 - -贴流程图 - -### 任务分配 - -| 姓名 | 任务 | -| ---- | ----------------- | -| 蒋昱葳 | 1. 网络爬虫收集相关信息和数据集 | -| 王天锐 | | -| 秦楚霁 | | -| 赵励志 | | +**王天锐收集的资料** 0、9种体质 //暂定 1、根据用户的体质来进行推荐菜谱与制定营养计划 ---- 两种模式：9体模式和普通健身模式 @@ -82,6 +73,8 @@ +### 需求分析 + * 登陆、注册 * 输入基本信息信息（身高、体重、性别、年龄） * 额外信息（工作、周均运动时间、睡眠段、九体、病史） @@ -96,8 +89,11 @@ * 做菜环节加入识菜帮所有功能，并加入详细食材信息卡路里等 * 针对特殊人群，混到推荐里推送有利于健康的**方法**信息（敷黄瓜方法） * 特殊病人群体每日相关东西的摄取量的一个限定区间显示 +* ocr体检单信息录入 +* **针对照片中菜的数量分析吃了多少菜,包含多少卡路里** +**技术难点** 1、服务器 @@ -109,3 +105,22 @@ +### 数据库设计 + +![](http://ww1.sinaimg.cn/large/0077h8xtly1fuz0a6yb4gj30z10hl1kx.jpg) + +**加下划线为主码,加粗为外码,默认not null** + +* 菜谱(str菜名, **str体质_名称**(对应最优菜谱的效果) ,int卡路里,date制作时间,str口味,str工艺,str做法,str图片url) +* 菜谱\_做菜_食材 ( **str菜谱-菜名**,**str食材-名称**,int用量) +* 食材( str名称) +* 体质(str体质名称,str体质特点,str运动调理方式) +* 食材\_效果_体质( **str食材-名称**, **str体质-名称**,int效果(1有利于,0不利于)) +* 体质性状(str性状名称) +* 体质\_身体状态_体质性状( **str体质-名称**, **str体质性状-性状名称**) +* 菜谱功能和分类( str分类名称) +* 菜谱\_菜谱效果_菜谱功能和分类( **str菜谱-菜名**, **str菜谱功能和分类-分类名称**) +* 用户( str用户名,str密码, **nullable str 体质-名称**,nullable str特殊职业,) +* 特殊职业( str职业名称) +* 菜谱功能分类_可治愈的职业\_特殊职业( **特殊职业-str职业名称**, **菜谱功能和分类-str分类名称**) + From 2a98c39fbd0e7f5da65f93709db796429a24a1b3 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Thu, 6 Sep 2018 18:02:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?head=E9=97=AE=E9=A2=98=E5=B7=B2=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../recommend/RecommendFragment.java | 12 ++++++++---- app/src/main/res/layout/recommend_head.xml | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) 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 7663eff..218e888 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 @@ -99,12 +99,16 @@ public class RecommendFragment extends BaseFragment { 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()); + if (position == 0) { return 2; } else { - return 1; + if (adapter.getItemViewType(position) == RecommendFood.TYPE_BIG || + adapter.getItemViewType(position) == RecommendFood.TYPE_DETAIL) { +// Logger.d(manager.getSpanCount()); + return 2; + } else { + return 1; + } } } }); diff --git a/app/src/main/res/layout/recommend_head.xml b/app/src/main/res/layout/recommend_head.xml index 4e80c67..fd35a8e 100644 --- a/app/src/main/res/layout/recommend_head.xml +++ b/app/src/main/res/layout/recommend_head.xml @@ -1,8 +1,8 @@ \ No newline at end of file