From a0db58816bbf7673ab58a5fd33a125c914d30d74 Mon Sep 17 00:00:00 2001 From: zhaolizhi <499531245@qq.com> Date: Wed, 7 Nov 2018 19:43:38 +0800 Subject: [PATCH] history --- README.md | 7 +- .../nutritionmaster/bean/History.java | 81 ++++++++++++++++--- .../nutritionmaster/utils/WebUtil.java | 36 ++++----- 3 files changed, 93 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 87f3bb3..a635dc1 100644 --- a/README.md +++ b/README.md @@ -358,10 +358,10 @@ ### 问题 -* 连续识别,出现错误的,点一下消去 锐 -* bug: 连续拍照后 点了一周定制 锐 +* ~~连续识别,出现错误的,点一下消去 锐!~~ +* ~~bug: 连续拍照后 点了一周定制 锐~~ * ~~*食材模糊识别 ok*~~ -* 通过食材组合,搜索菜 ,菜要符合username的信息 赵和锐 `getMenusByMaterials` +* ~~通过食材组合,搜索菜 ,菜要符合username的信息 赵和锐 `getMenusByMaterials`~~ * 卡路里不对 * ~~*早餐晚餐的搜索不随机 shuffle了一下.ok*~~ @@ -371,6 +371,7 @@ * getRandomMenus的调用里面加上username参数 锐 * 吃饭的时候没拍照,吃饭完了才想添加,但是菜图片没有了.需要输入添加 (王) * 口味信息采集 +* 历史记录 * 社交功能: 点赞,晒图,评论 diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java index 75b48b4..cf3cfd4 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java @@ -1,15 +1,17 @@ package com.example.ninefourone.nutritionmaster.bean; public class History { - /** - * id : 13 time : 2018-11-02T15:35:20.015542+08:00 user : 11 menu : 多味茄子泥 + * id : 13 + * menu : {"name":"多味茄子泥","calorie":105,"elements":6383,"image_url":"http://s1.ig.meishij.net/p/20121204/3fde157430b268b189a913983fdda3e6_150x150.jpg"} + * time : 2018-11-02T15:34:27.050541+08:00 + * user : 11 */ private int id; + private MenuBean menu; private String time; private int user; - private String menu; public int getId() { return id; @@ -19,6 +21,14 @@ public class History { this.id = id; } + public MenuBean getMenu() { + return menu; + } + + public void setMenu(MenuBean menu) { + this.menu = menu; + } + public String getTime() { return time; } @@ -35,16 +45,69 @@ public class History { this.user = user; } - public String getMenu() { - return menu; - } + public static class MenuBean { + /** + * name : 多味茄子泥 + * calorie : 105 + * elements : 6383 + * image_url : http://s1.ig.meishij.net/p/20121204/3fde157430b268b189a913983fdda3e6_150x150.jpg + */ - public void setMenu(String menu) { - this.menu = menu; + private String name; + private int calorie; + private int elements; + private String image_url; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCalorie() { + return calorie; + } + + public void setCalorie(int calorie) { + this.calorie = calorie; + } + + public int getElements() { + return elements; + } + + public void setElements(int elements) { + this.elements = elements; + } + + public String getImage_url() { + return image_url; + } + + public void setImage_url(String image_url) { + this.image_url = image_url; + } + + @Override + public String toString() { + return "MenuBean{" + + "name='" + name + '\'' + + ", calorie=" + calorie + + ", elements=" + elements + + ", image_url='" + image_url + '\'' + + '}'; + } } @Override public String toString() { - return "History{" + "id=" + id + ", time='" + time + '\'' + ", user=" + user + ", menu='" + menu + '\'' + '}'; + return "History{" + + "id=" + id + + ", menu=" + menu + + ", time='" + time + '\'' + + ", user=" + user + + '}' + '\n'; } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java index c6d8172..493f4ae 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java @@ -46,11 +46,11 @@ public class WebUtil { } /** - * 获取具体的菜谱信息 { "flavor": "咸鲜味", "calorie": 234, "name": "雪丽对虾", - * "technology": "炸", "image_url": + * 获取具体的菜谱信息 { "flavor": "咸鲜味", "calorie": 234, "name": "雪丽对虾", "technology": + * "炸", "image_url": * "http://s1.ig.meishij.net/p/20091012/fed63858e633540c8df73e62692520fb_150x150.jpg", - * "cook_quantity": [ { "menu": "雪丽对虾", "quantity": "500", "material": "对虾" - * }, { "menu": "雪丽对虾", "quantity": "60", "material": "鸡蛋清" }, } + * "cook_quantity": [ { "menu": "雪丽对虾", "quantity": "500", "material": "对虾" }, { + * "menu": "雪丽对虾", "quantity": "60", "material": "鸡蛋清" }, } */ public void getMenu(String menuName, Callback callback) { Request request = new Request.Builder().url("http://120.77.182.38/menus/" + menuName + "/").build(); @@ -95,9 +95,9 @@ public class WebUtil { } /** - * 获取某食材可以做的菜 [ { "menu": "西红柿鸡蛋汤", "quantity": "适量", "material": - * "西红柿" }, { "menu": "瘦身版红菜汤", "quantity": "4-5片", "material": "西红柿" }, - * { "menu": "西红柿炖豆腐", "quantity": "三个", "material": "西红柿" }, ] + * 获取某食材可以做的菜 [ { "menu": "西红柿鸡蛋汤", "quantity": "适量", "material": "西红柿" }, { + * "menu": "瘦身版红菜汤", "quantity": "4-5片", "material": "西红柿" }, { "menu": + * "西红柿炖豆腐", "quantity": "三个", "material": "西红柿" }, ] * * @param materialName * @param callback @@ -108,10 +108,9 @@ public class WebUtil { } /** - * 获取某菜谱分类对应的菜 { "classification": "川菜", "cure_occupation": [], - * "menu_effect": [ "三色鲍脯", "三色鸡酪", "三菇冬瓜汤", "三菌烩蛇段", "三鲜乌鱼汤", - * "三鲜参片汤", "三鲜猪肝汤", "下饭的素版麻婆豆腐", "丝瓜鱼肚卷", "五更豆酥鱼", "元鱼烧鸡", - * "冬苋菜豆腐汤", "冬菜排骨汤", + * 获取某菜谱分类对应的菜 { "classification": "川菜", "cure_occupation": [], "menu_effect": [ + * "三色鲍脯", "三色鸡酪", "三菇冬瓜汤", "三菌烩蛇段", "三鲜乌鱼汤", "三鲜参片汤", "三鲜猪肝汤", "下饭的素版麻婆豆腐", + * "丝瓜鱼肚卷", "五更豆酥鱼", "元鱼烧鸡", "冬苋菜豆腐汤", "冬菜排骨汤", */ public void getMenuClassification(String classificationName, Callback callback) { Request request = new Request.Builder() @@ -120,8 +119,8 @@ public class WebUtil { } /** - * 获取职业需要的菜谱分类 { "occupation_name": "电力工程师", "menuclassification_set": - * [ "接触电离辐射人员食谱", "防癌抗癌食谱", "明目食谱", "关节炎食谱", "壮腰健肾食谱" ] } + * 获取职业需要的菜谱分类 { "occupation_name": "电力工程师", "menuclassification_set": [ + * "接触电离辐射人员食谱", "防癌抗癌食谱", "明目食谱", "关节炎食谱", "壮腰健肾食谱" ] } */ public void getOccupation(String occupationName, Callback callback) { Request request = null; @@ -134,8 +133,8 @@ public class WebUtil { } /** - * 获取体质需要的食材 { "physical_name": "气虚质", "cure_material": [ "人参", "人参须", - * "去芯莲子", "去芯莲子（3~4人份）", "土茯苓", ... ] } + * 获取体质需要的食材 { "physical_name": "气虚质", "cure_material": [ "人参", "人参须", "去芯莲子", + * "去芯莲子（3~4人份）", "土茯苓", ... ] } */ public void getPhysique(String physiqueName, Callback callback) { Request request = new Request.Builder().url("http://120.77.182.38/physique/" + physiqueName + "/").build(); @@ -146,8 +145,8 @@ public class WebUtil { * 获取病相关的菜谱和元素信息 传入含有病的意义的菜谱分类名称,比如青少年食谱 *

* { "menu_classification": { "classification": "青少年食谱", "cure_occupation": [ - * "学生" ], "menu_effect": [ "三鲜鳝汤", "上海糖醋小排骨", ... ] }, "elements": { - * "id": 84, "calorie": 1.1, ... } } + * "学生" ], "menu_effect": [ "三鲜鳝汤", "上海糖醋小排骨", ... ] }, "elements": { "id": 84, + * "calorie": 1.1, ... } } */ public void getIllness(String illnessClassification, Callback callback) { Request request = new Request.Builder().url("http://120.77.182.38/illness/" + illnessClassification + "/") @@ -298,8 +297,7 @@ public class WebUtil { } /** - * 用户吃了一个菜,更新用户本周已吃摄入的营养元素的量 传入这顿饭摄入的营养量 - * 返回当前user的最新信息,用MyUser类解析json + * 用户吃了一个菜,更新用户本周已吃摄入的营养元素的量 传入这顿饭摄入的营养量 返回当前user的最新信息,用MyUser类解析json */ public void eatenElements(String username, Map elements, Callback callback) { String url = "http://120.77.182.38/myuser/eaten_menu/";