From 87c2335b4c0c020e316394b94d6a314e50762664 Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Mon, 4 Mar 2019 20:36:58 +0800
Subject: [PATCH 1/4] 1
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index a635dc1..f1e41cc 100644
--- a/README.md
+++ b/README.md
@@ -106,9 +106,9 @@
* 菜谱的简单介绍
* 浏览记录(post username和menuname和时间)
-王:定制( 需要赵给我比如:蛋白质在100-200范围内的菜谱)
+王:定制( 需要蒋给我比如:蛋白质在100-200范围内的菜谱)
-赵:
+蒋:
* 体质表: 添加几列对某种物质的需求 √
@@ -361,7 +361,7 @@
* ~~连续识别,出现错误的,点一下消去 锐!~~
* ~~bug: 连续拍照后 点了一周定制 锐~~
* ~~*食材模糊识别 ok*~~
-* ~~通过食材组合,搜索菜 ,菜要符合username的信息 赵和锐 `getMenusByMaterials`~~
+* ~~通过食材组合,搜索菜 ,菜要符合username的信息 蒋和锐 `getMenusByMaterials`~~
* 卡路里不对
* ~~*早餐晚餐的搜索不随机 shuffle了一下.ok*~~
From d8ae182023b3308cb0850dd4907ec5082faf18f4 Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Fri, 2 Nov 2018 20:44:47 +0800
Subject: [PATCH 2/4] web server done
---
.gitignore => NutritionMaster/.gitignore | 0
.../.idea}/codeStyles/Project.xml | 0
.../.idea}/runConfigurations.xml | 0
README.md => NutritionMaster/README.md | 0
{app => NutritionMaster/app}/.gitignore | 0
{app => NutritionMaster/app}/build.gradle | 0
.../app}/libs/YoudaoBase.jar | Bin
.../app}/libs/YoudaoCnDictOffline.jar | Bin
.../app}/libs/YoudaoTranslateOffline.jar | Bin
.../app}/libs/YoudaoTranslateOnline.jar | Bin
.../app}/libs/arm64-v8a/libdict-parser.so | Bin
.../app}/libs/armeabi-v7a/libdict-parser.so | Bin
.../app}/libs/armeabi/libdict-parser.so | Bin
.../app}/libs/mips/libdict-parser.so | Bin
.../app}/libs/mips64/libdict-parser.so | Bin
.../app}/libs/x86/libdict-parser.so | Bin
.../app}/libs/x86_64/libdict-parser.so | Bin
.../app}/proguard-rules.pro | 0
.../ExampleInstrumentedTest.java | 0
.../app}/src/main/AndroidManifest.xml | 0
.../nutritionmaster/NutritionMaster.java | 0
.../nutritionmaster/adapter/CardAdapter.java | 0
.../nutritionmaster/adapter/CardHolder.java | 0
.../adapter/CustomizationAdapter.java | 0
.../adapter/CustomizationHolder.java | 0
.../nutritionmaster/adapter/DishHolder.java | 0
.../adapter/HistoryAdapter.java | 0
.../adapter/HistoryHolder.java | 0
.../adapter/HomePagerAdapter.java | 0
.../nutritionmaster/adapter/IllAdapter.java | 0
.../adapter/IllnessHolder.java | 0
.../adapter/MakeStepAdapter.java | 0
.../adapter/MakeStepHolder.java | 0
.../adapter/MaterialAdapter.java | 0
.../adapter/MaterialHolder.java | 0
.../adapter/MaterialResultAdapter.java | 0
.../adapter/MaterialResultHolder.java | 0
.../adapter/PickerAdapter.java | 0
.../nutritionmaster/adapter/PickerHolder.java | 0
.../adapter/RecommendAdapter.java | 0
.../adapter/ResultListAdapter.java | 0
.../adapter/ResultListHolder.java | 0
.../nutritionmaster/base/BaseActivity.java | 0
.../nutritionmaster/base/BaseDialog.java | 0
.../nutritionmaster/base/BaseFragment.java | 0
.../nutritionmaster/bean/ClassifyResult.java | 0
.../nutritionmaster/bean/DailyCard.java | 0
.../nutritionmaster/bean/Element.java | 0
.../nutritionmaster/bean/FoodMaterial.java | 0
.../nutritionmaster/bean/FoodMenu.java | 0
.../nutritionmaster/bean/FoodMenuLight.java | 0
.../nutritionmaster/bean/History.java | 0
.../nutritionmaster/bean/Illness.java | 0
.../nutritionmaster/bean/Material.java | 0
.../bean/MenuClassification.java | 0
.../nutritionmaster/bean/MyUser.java | 0
.../nutritionmaster/bean/Occupation.java | 0
.../nutritionmaster/bean/Physique.java | 0
.../nutritionmaster/bean/RecommendFood.java | 0
.../nutritionmaster/bean/ResultList.java | 0
.../nutritionmaster/bean/Trick.java | 0
.../nutritionmaster/camera/CameraPreview.java | 0
.../camera/ClassifierCamera.java | 0
.../cardconfig/CardConfig.java | 0
.../cardconfig/CardItemTouchCallBack.java | 0
.../cardconfig/SwipeCardLayoutManager.java | 0
.../nutritionmaster/modules/MainActivity.java | 0
.../RecipeActivity/RecipeActivity.java | 0
.../AddInformationActivity.java | 0
.../addinformation/AddPhysiqueActivity.java | 0
.../classifyresult/DishResultActivity.java | 0
.../MaterialResultActivity.java | 0
.../historysearch/HistoryActivity.java | 0
.../information/InformationActivity.java | 0
.../modules/login/LoginActivity.java | 0
.../BodyInformationFragment.java | 0
.../bodyinformation/ElementDialog.java | 0
.../customization/CustomizationActivity.java | 0
.../customization/CustomizationFragment.java | 0
.../recommend/RecommendFragment.java | 0
.../nutritionmaster/step/StepStarter.java | 0
.../nutritionmaster/ui/InformationDialog.java | 0
.../nutritionmaster/ui/NoScrollViewPager.java | 0
.../nutritionmaster/utils/CalculateUtils.java | 0
.../nutritionmaster/utils/ChartDrawer.java | 0
.../nutritionmaster/utils/ConstantUtils.java | 0
.../utils/MaterialClassifier.java | 0
.../nutritionmaster/utils/MessageUtils.java | 0
.../utils/PermissionUtils.java | 0
.../nutritionmaster/utils/UiUtils.java | 0
.../nutritionmaster/utils/WebUtil.java | 0
.../main/res/drawable-v24/ic_drawer_home.png | Bin
.../drawable-v24/ic_launcher_foreground.xml | 0
.../src/main/res/drawable-v24/selector.xml | 0
.../app}/src/main/res/drawable/body_bg.png | Bin
.../app}/src/main/res/drawable/camera_bg.jpg | Bin
.../src/main/res/drawable/food_material.jpg | Bin
.../app}/src/main/res/drawable/food_test.jpg | Bin
.../app}/src/main/res/drawable/foods.jpg | Bin
.../app}/src/main/res/drawable/friday.jpg | Bin
.../app}/src/main/res/drawable/ic.png | Bin
.../src/main/res/drawable/ic_add_recipe.xml | 0
.../src/main/res/drawable/ic_back_button.xml | 0
.../res/drawable/ic_back_button_white.xml | 0
.../app}/src/main/res/drawable/ic_bmi.xml | 0
.../app}/src/main/res/drawable/ic_calorie.xml | 0
.../app}/src/main/res/drawable/ic_copy.xml | 0
.../src/main/res/drawable/ic_data_add.xml | 0
.../main/res/drawable/ic_defualt_avatar.xml | 0
.../src/main/res/drawable/ic_dialog_age.xml | 0
.../main/res/drawable/ic_dialog_height.xml | 0
.../src/main/res/drawable/ic_dialog_sex.xml | 0
.../main/res/drawable/ic_dialog_weight.xml | 0
.../src/main/res/drawable/ic_exchange.xml | 0
.../drawable/ic_exchange_customization.xml | 0
.../app}/src/main/res/drawable/ic_fat.xml | 0
.../app}/src/main/res/drawable/ic_flavour.xml | 0
.../main/res/drawable/ic_fortune_cookie.xml | 0
.../app}/src/main/res/drawable/ic_height.xml | 0
.../app}/src/main/res/drawable/ic_ill.xml | 0
.../main/res/drawable/ic_ill_add_button.xml | 0
.../src/main/res/drawable/ic_infor_weight.xml | 0
.../res/drawable/ic_launcher_background.xml | 0
.../src/main/res/drawable/ic_occupation.xml | 0
.../app}/src/main/res/drawable/ic_ok.xml | 0
.../app}/src/main/res/drawable/ic_power.xml | 0
.../app}/src/main/res/drawable/ic_protein.xml | 0
.../app}/src/main/res/drawable/ic_record.xml | 0
.../src/main/res/drawable/ic_right_arch.xml | 0
.../app}/src/main/res/drawable/ic_score.xml | 0
.../app}/src/main/res/drawable/ic_search.xml | 0
.../app}/src/main/res/drawable/ic_step.xml | 0
.../app}/src/main/res/drawable/ic_sugar.xml | 0
.../src/main/res/drawable/ic_take_photo.xml | 0
.../app}/src/main/res/drawable/ic_weight.xml | 0
.../app}/src/main/res/drawable/icon_black.xml | 0
.../src/main/res/drawable/icon_colorful.png | Bin
.../app}/src/main/res/drawable/monday.jpg | Bin
.../src/main/res/drawable/recommend_bg.jpg | Bin
.../app}/src/main/res/drawable/result_bg.png | Bin
.../app}/src/main/res/drawable/saturday.jpg | Bin
.../app}/src/main/res/drawable/sunday.jpg | Bin
.../src/main/res/drawable/test_avatar.jpg | Bin
.../app}/src/main/res/drawable/thursday.jpg | Bin
.../app}/src/main/res/drawable/tuesday.jpg | Bin
.../app}/src/main/res/drawable/wednesday.jpg | Bin
.../app}/src/main/res/layout/activity_add.xml | 0
.../res/layout/activity_add_information.xml | 0
.../res/layout/activity_customization.xml | 0
.../main/res/layout/activity_dish_result.xml | 0
.../src/main/res/layout/activity_history.xml | 0
.../main/res/layout/activity_information.xml | 0
.../src/main/res/layout/activity_login.xml | 0
.../src/main/res/layout/activity_main.xml | 0
.../res/layout/activity_material_result.xml | 0
.../src/main/res/layout/activity_recipe.xml | 0
.../res/layout/add_information_activity.xml | 0
.../app}/src/main/res/layout/add_item.xml | 0
.../res/layout/body_information_fragment.xml | 0
.../src/main/res/layout/cameras_layout.xml | 0
.../app}/src/main/res/layout/card_item.xml | 0
.../src/main/res/layout/customization.xml | 0
.../main/res/layout/customization_item.xml | 0
.../app}/src/main/res/layout/dish_item.xml | 0
.../src/main/res/layout/dish_result_item.xml | 0
.../src/main/res/layout/element_dialog.xml | 0
.../app}/src/main/res/layout/ill_item.xml | 0
.../src/main/res/layout/make_step_item.xml | 0
.../src/main/res/layout/material_item.xml | 0
.../main/res/layout/material_result_item.xml | 0
.../normal_recommend_fragment_layout.xml | 0
.../app}/src/main/res/layout/picker_item.xml | 0
.../src/main/res/layout/recommend_head.xml | 0
.../main/res/layout/recommend_item_detail.xml | 0
.../main/res/layout/recommend_item_middle.xml | 0
.../app}/src/main/res/layout/score.xml | 0
.../app}/src/main/res/menu/menu_main.xml | 0
.../res/mipmap-anydpi-v26/ic_launcher.xml | 0
.../mipmap-anydpi-v26/ic_launcher_round.xml | 0
.../src/main/res/mipmap-hdpi/ic_launcher.png | Bin
.../res/mipmap-hdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-mdpi/ic_launcher.png | Bin
.../res/mipmap-mdpi/ic_launcher_round.png | Bin
.../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
.../res/mipmap-xhdpi/ic_launcher_round.png | Bin
.../main/res/mipmap-xxhdpi/camera_button.png | Bin
.../mipmap-xxhdpi/camera_button_pressed.png | Bin
.../main/res/mipmap-xxhdpi/ic_launcher.png | Bin
.../res/mipmap-xxhdpi/ic_launcher_round.png | Bin
.../app}/src/main/res/mipmap-xxxhdpi/ic.png | Bin
.../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin
.../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin
.../app}/src/main/res/values/arrays.xml | 0
.../app}/src/main/res/values/colors.xml | 0
.../app}/src/main/res/values/dimens.xml | 0
.../app}/src/main/res/values/strings.xml | 0
.../app}/src/main/res/values/styles.xml | 0
.../nutritionmaster/ExampleUnitTest.java | 0
build.gradle => NutritionMaster/build.gradle | 0
{datas => NutritionMaster/datas}/11111.csv | 0
.../datas}/menu_classification (1).csv | 0
.../datas}/menu_classification.csv | 0
.../datas}/new_menu_names.csv | 0
.../datas}/occupation_classification.csv | Bin
.../datas}/physique (1).xlsx | Bin
{datas => NutritionMaster/datas}/元素效果.txt | 0
{datas => NutritionMaster/datas}/早中晚餐.rar | Bin
{datas => NutritionMaster/datas}/病).csv | 0
.../datas}/职业 （bmi分类）.xlsx | Bin
{datas => NutritionMaster/datas}/职业.xlsx | Bin
{datas => NutritionMaster/datas}/营养.txt | 0
.../datas}/营养标准.xlsx | Bin
.../gradle.properties | 0
.../gradle}/wrapper/gradle-wrapper.jar | Bin
.../gradle}/wrapper/gradle-wrapper.properties | 0
gradlew => NutritionMaster/gradlew | 0
gradlew.bat => NutritionMaster/gradlew.bat | 0
.../settings.gradle | 0
.../todaystepcounterlib}/.gitignore | 0
.../todaystepcounterlib}/build.gradle | 0
.../libs/microlog4android-1.0.0.jar | Bin
.../todaystepcounterlib}/proguard-rules.pro | 0
.../src/main/AndroidManifest.xml | 0
.../today/step/lib/ISportStepInterface.aidl | 0
.../src/main/assets/microlog.properties | 0
.../today/step/lib/BaseClickBroadcast.java | 0
.../java/com/today/step/lib/DateUtils.java | 0
.../today/step/lib/ITodayStepDBHelper.java | 0
.../today/step/lib/JobSchedulerService.java | 0
.../main/java/com/today/step/lib/Logger.java | 0
.../com/today/step/lib/Microlog4Android.java | 0
.../today/step/lib/OnStepCounterListener.java | 0
.../com/today/step/lib/PreferencesHelper.java | 0
.../today/step/lib/SportStepJsonUtils.java | 0
.../today/step/lib/StepAlertManagerUtils.java | 0
.../today/step/lib/TodayStepAlertReceive.java | 0
.../lib/TodayStepBootCompleteReceiver.java | 0
.../com/today/step/lib/TodayStepCounter.java | 0
.../com/today/step/lib/TodayStepDBHelper.java | 0
.../com/today/step/lib/TodayStepData.java | 0
.../com/today/step/lib/TodayStepDetector.java | 0
.../com/today/step/lib/TodayStepManager.java | 0
.../com/today/step/lib/TodayStepService.java | 0
.../step/lib/TodayStepShutdownReceiver.java | 0
.../com/today/step/lib/WakeLockUtils.java | 0
.../ic_notification_default.png | Bin
.../src/main/res/values/strings.xml | 0
.../MyRobolectricTestRunner.java | 0
.../TodayStepDBHelperTest.java | 0
文档.md => NutritionMaster/文档.md | 0
.../服务器文档.md | 0
.../.idea/NutritionMasterSpider.iml | 12 +
NutritionMasterSpider/.idea/misc.xml | 4 +
NutritionMasterSpider/.idea/modules.xml | 8 +
NutritionMasterSpider/.idea/workspace.xml | 648 ++++++++++++++++++
NutritionMasterSpider/bao_cheat.py | 44 ++
NutritionMasterSpider/baobspider.py | 133 ++++
NutritionMasterSpider/baospider.py | 61 ++
NutritionMasterSpider/bbspider.py | 92 +++
NutritionMasterSpider/demo/__init__.py | 0
NutritionMasterSpider/demo/get_name.py | 13 +
NutritionMasterSpider/demo/test.py | 0
.../demo/xinshipu_selenium.py | 32 +
NutritionMasterSpider/demo/食材.py | 102 +++
NutritionMasterSpider/functions/__init__.py | 0
.../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 162 bytes
.../__pycache__/baidu_api.cpython-36.pyc | Bin 0 -> 1955 bytes
.../__pycache__/get_proxy.cpython-36.pyc | Bin 0 -> 1933 bytes
.../__pycache__/get_selector.cpython-36.pyc | Bin 0 -> 436 bytes
.../__pycache__/send_request.cpython-36.pyc | Bin 0 -> 2427 bytes
.../__pycache__/wtrte_csv.cpython-36.pyc | Bin 0 -> 865 bytes
NutritionMasterSpider/functions/baidu_api.py | 82 +++
NutritionMasterSpider/functions/get_proxy.py | 51 ++
.../functions/get_selector.py | 9 +
.../functions/send_request.py | 87 +++
NutritionMasterSpider/functions/wtrte_csv.py | 19 +
NutritionMasterSpider/info_add.py | 72 ++
NutritionMasterSpider/nutrition_add.py | 75 ++
NutritionMasterSpider/reget_image_url.py | 87 +++
NutritionMasterSpider/test.py | 0
NutritionMasterSpider/ttmeishi.py | 162 +++++
NutritionMasterSpider/write_calorie.py | 73 ++
NutritionMasterSpider/xinshipu.py | 86 +++
NutritionMasterSpider/xzs/__init__.py | 0
NutritionMasterSpider/xzs/get_trick.py | 93 +++
NutritionMasterWeb | 1 +
286 files changed, 2046 insertions(+)
rename .gitignore => NutritionMaster/.gitignore (100%)
rename {.idea => NutritionMaster/.idea}/codeStyles/Project.xml (100%)
rename {.idea => NutritionMaster/.idea}/runConfigurations.xml (100%)
rename README.md => NutritionMaster/README.md (100%)
rename {app => NutritionMaster/app}/.gitignore (100%)
rename {app => NutritionMaster/app}/build.gradle (100%)
rename {app => NutritionMaster/app}/libs/YoudaoBase.jar (100%)
rename {app => NutritionMaster/app}/libs/YoudaoCnDictOffline.jar (100%)
rename {app => NutritionMaster/app}/libs/YoudaoTranslateOffline.jar (100%)
rename {app => NutritionMaster/app}/libs/YoudaoTranslateOnline.jar (100%)
rename {app => NutritionMaster/app}/libs/arm64-v8a/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/armeabi-v7a/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/armeabi/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/mips/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/mips64/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/x86/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/libs/x86_64/libdict-parser.so (100%)
rename {app => NutritionMaster/app}/proguard-rules.pro (100%)
rename {app => NutritionMaster/app}/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java (100%)
rename {app => NutritionMaster/app}/src/main/AndroidManifest.xml (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java (100%)
rename {app => NutritionMaster/app}/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable-v24/ic_drawer_home.png (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable-v24/selector.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/body_bg.png (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/camera_bg.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/food_material.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/food_test.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/foods.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/friday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic.png (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_add_recipe.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_back_button.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_back_button_white.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_bmi.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_calorie.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_copy.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_data_add.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_defualt_avatar.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_age.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_height.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_sex.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_dialog_weight.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_exchange.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_exchange_customization.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_fat.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_flavour.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_fortune_cookie.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_height.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ill.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ill_add_button.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_infor_weight.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_launcher_background.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_occupation.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_ok.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_power.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_protein.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_record.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_right_arch.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_score.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_search.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_step.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_sugar.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_take_photo.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/ic_weight.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/icon_black.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/icon_colorful.png (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/monday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/recommend_bg.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/result_bg.png (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/saturday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/sunday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/test_avatar.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/thursday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/tuesday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/drawable/wednesday.jpg (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_add.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_add_information.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_customization.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_dish_result.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_history.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_information.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_login.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_main.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_material_result.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/activity_recipe.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/add_information_activity.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/add_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/body_information_fragment.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/cameras_layout.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/card_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/customization.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/customization_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/dish_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/dish_result_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/element_dialog.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/ill_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/make_step_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/material_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/material_result_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/normal_recommend_fragment_layout.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/picker_item.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/recommend_head.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/recommend_item_detail.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/recommend_item_middle.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/layout/score.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/menu/menu_main.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/camera_button.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/camera_button_pressed.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
rename {app => NutritionMaster/app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%)
rename {app => NutritionMaster/app}/src/main/res/values/arrays.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/values/colors.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/values/dimens.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/values/strings.xml (100%)
rename {app => NutritionMaster/app}/src/main/res/values/styles.xml (100%)
rename {app => NutritionMaster/app}/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java (100%)
rename build.gradle => NutritionMaster/build.gradle (100%)
rename {datas => NutritionMaster/datas}/11111.csv (100%)
rename {datas => NutritionMaster/datas}/menu_classification (1).csv (100%)
rename {datas => NutritionMaster/datas}/menu_classification.csv (100%)
rename {datas => NutritionMaster/datas}/new_menu_names.csv (100%)
rename {datas => NutritionMaster/datas}/occupation_classification.csv (100%)
rename {datas => NutritionMaster/datas}/physique (1).xlsx (100%)
rename {datas => NutritionMaster/datas}/元素效果.txt (100%)
rename {datas => NutritionMaster/datas}/早中晚餐.rar (100%)
rename {datas => NutritionMaster/datas}/病).csv (100%)
rename {datas => NutritionMaster/datas}/职业 （bmi分类）.xlsx (100%)
rename {datas => NutritionMaster/datas}/职业.xlsx (100%)
rename {datas => NutritionMaster/datas}/营养.txt (100%)
rename {datas => NutritionMaster/datas}/营养标准.xlsx (100%)
rename gradle.properties => NutritionMaster/gradle.properties (100%)
rename {gradle => NutritionMaster/gradle}/wrapper/gradle-wrapper.jar (100%)
rename {gradle => NutritionMaster/gradle}/wrapper/gradle-wrapper.properties (100%)
rename gradlew => NutritionMaster/gradlew (100%)
rename gradlew.bat => NutritionMaster/gradlew.bat (100%)
rename settings.gradle => NutritionMaster/settings.gradle (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/.gitignore (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/build.gradle (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/libs/microlog4android-1.0.0.jar (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/proguard-rules.pro (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/AndroidManifest.xml (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/assets/microlog.properties (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/BaseClickBroadcast.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/DateUtils.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/ITodayStepDBHelper.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/JobSchedulerService.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/Logger.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/Microlog4Android.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/OnStepCounterListener.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/PreferencesHelper.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/SportStepJsonUtils.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/StepAlertManagerUtils.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepAlertReceive.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepCounter.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepDBHelper.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepData.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepDetector.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepManager.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepService.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/java/com/today/step/lib/WakeLockUtils.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/res/mipmap-xxxhdpi/ic_notification_default.png (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/main/res/values/strings.xml (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java (100%)
rename {todaystepcounterlib => NutritionMaster/todaystepcounterlib}/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java (100%)
rename 文档.md => NutritionMaster/文档.md (100%)
rename 服务器文档.md => NutritionMaster/服务器文档.md (100%)
create mode 100644 NutritionMasterSpider/.idea/NutritionMasterSpider.iml
create mode 100644 NutritionMasterSpider/.idea/misc.xml
create mode 100644 NutritionMasterSpider/.idea/modules.xml
create mode 100644 NutritionMasterSpider/.idea/workspace.xml
create mode 100644 NutritionMasterSpider/bao_cheat.py
create mode 100644 NutritionMasterSpider/baobspider.py
create mode 100644 NutritionMasterSpider/baospider.py
create mode 100644 NutritionMasterSpider/bbspider.py
create mode 100644 NutritionMasterSpider/demo/__init__.py
create mode 100644 NutritionMasterSpider/demo/get_name.py
create mode 100644 NutritionMasterSpider/demo/test.py
create mode 100644 NutritionMasterSpider/demo/xinshipu_selenium.py
create mode 100644 NutritionMasterSpider/demo/食材.py
create mode 100644 NutritionMasterSpider/functions/__init__.py
create mode 100644 NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/__pycache__/get_proxy.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/__pycache__/send_request.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/__pycache__/wtrte_csv.cpython-36.pyc
create mode 100644 NutritionMasterSpider/functions/baidu_api.py
create mode 100644 NutritionMasterSpider/functions/get_proxy.py
create mode 100644 NutritionMasterSpider/functions/get_selector.py
create mode 100644 NutritionMasterSpider/functions/send_request.py
create mode 100644 NutritionMasterSpider/functions/wtrte_csv.py
create mode 100644 NutritionMasterSpider/info_add.py
create mode 100644 NutritionMasterSpider/nutrition_add.py
create mode 100644 NutritionMasterSpider/reget_image_url.py
create mode 100644 NutritionMasterSpider/test.py
create mode 100644 NutritionMasterSpider/ttmeishi.py
create mode 100644 NutritionMasterSpider/write_calorie.py
create mode 100644 NutritionMasterSpider/xinshipu.py
create mode 100644 NutritionMasterSpider/xzs/__init__.py
create mode 100644 NutritionMasterSpider/xzs/get_trick.py
create mode 160000 NutritionMasterWeb
diff --git a/.gitignore b/NutritionMaster/.gitignore
similarity index 100%
rename from .gitignore
rename to NutritionMaster/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/NutritionMaster/.idea/codeStyles/Project.xml
similarity index 100%
rename from .idea/codeStyles/Project.xml
rename to NutritionMaster/.idea/codeStyles/Project.xml
diff --git a/.idea/runConfigurations.xml b/NutritionMaster/.idea/runConfigurations.xml
similarity index 100%
rename from .idea/runConfigurations.xml
rename to NutritionMaster/.idea/runConfigurations.xml
diff --git a/README.md b/NutritionMaster/README.md
similarity index 100%
rename from README.md
rename to NutritionMaster/README.md
diff --git a/app/.gitignore b/NutritionMaster/app/.gitignore
similarity index 100%
rename from app/.gitignore
rename to NutritionMaster/app/.gitignore
diff --git a/app/build.gradle b/NutritionMaster/app/build.gradle
similarity index 100%
rename from app/build.gradle
rename to NutritionMaster/app/build.gradle
diff --git a/app/libs/YoudaoBase.jar b/NutritionMaster/app/libs/YoudaoBase.jar
similarity index 100%
rename from app/libs/YoudaoBase.jar
rename to NutritionMaster/app/libs/YoudaoBase.jar
diff --git a/app/libs/YoudaoCnDictOffline.jar b/NutritionMaster/app/libs/YoudaoCnDictOffline.jar
similarity index 100%
rename from app/libs/YoudaoCnDictOffline.jar
rename to NutritionMaster/app/libs/YoudaoCnDictOffline.jar
diff --git a/app/libs/YoudaoTranslateOffline.jar b/NutritionMaster/app/libs/YoudaoTranslateOffline.jar
similarity index 100%
rename from app/libs/YoudaoTranslateOffline.jar
rename to NutritionMaster/app/libs/YoudaoTranslateOffline.jar
diff --git a/app/libs/YoudaoTranslateOnline.jar b/NutritionMaster/app/libs/YoudaoTranslateOnline.jar
similarity index 100%
rename from app/libs/YoudaoTranslateOnline.jar
rename to NutritionMaster/app/libs/YoudaoTranslateOnline.jar
diff --git a/app/libs/arm64-v8a/libdict-parser.so b/NutritionMaster/app/libs/arm64-v8a/libdict-parser.so
similarity index 100%
rename from app/libs/arm64-v8a/libdict-parser.so
rename to NutritionMaster/app/libs/arm64-v8a/libdict-parser.so
diff --git a/app/libs/armeabi-v7a/libdict-parser.so b/NutritionMaster/app/libs/armeabi-v7a/libdict-parser.so
similarity index 100%
rename from app/libs/armeabi-v7a/libdict-parser.so
rename to NutritionMaster/app/libs/armeabi-v7a/libdict-parser.so
diff --git a/app/libs/armeabi/libdict-parser.so b/NutritionMaster/app/libs/armeabi/libdict-parser.so
similarity index 100%
rename from app/libs/armeabi/libdict-parser.so
rename to NutritionMaster/app/libs/armeabi/libdict-parser.so
diff --git a/app/libs/mips/libdict-parser.so b/NutritionMaster/app/libs/mips/libdict-parser.so
similarity index 100%
rename from app/libs/mips/libdict-parser.so
rename to NutritionMaster/app/libs/mips/libdict-parser.so
diff --git a/app/libs/mips64/libdict-parser.so b/NutritionMaster/app/libs/mips64/libdict-parser.so
similarity index 100%
rename from app/libs/mips64/libdict-parser.so
rename to NutritionMaster/app/libs/mips64/libdict-parser.so
diff --git a/app/libs/x86/libdict-parser.so b/NutritionMaster/app/libs/x86/libdict-parser.so
similarity index 100%
rename from app/libs/x86/libdict-parser.so
rename to NutritionMaster/app/libs/x86/libdict-parser.so
diff --git a/app/libs/x86_64/libdict-parser.so b/NutritionMaster/app/libs/x86_64/libdict-parser.so
similarity index 100%
rename from app/libs/x86_64/libdict-parser.so
rename to NutritionMaster/app/libs/x86_64/libdict-parser.so
diff --git a/app/proguard-rules.pro b/NutritionMaster/app/proguard-rules.pro
similarity index 100%
rename from app/proguard-rules.pro
rename to NutritionMaster/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java b/NutritionMaster/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
similarity index 100%
rename from app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
rename to NutritionMaster/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/NutritionMaster/app/src/main/AndroidManifest.xml
similarity index 100%
rename from app/src/main/AndroidManifest.xml
rename to NutritionMaster/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java b/NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
rename to NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
diff --git a/app/src/main/res/drawable-v24/ic_drawer_home.png b/NutritionMaster/app/src/main/res/drawable-v24/ic_drawer_home.png
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_drawer_home.png
rename to NutritionMaster/app/src/main/res/drawable-v24/ic_drawer_home.png
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/NutritionMaster/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to NutritionMaster/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable-v24/selector.xml b/NutritionMaster/app/src/main/res/drawable-v24/selector.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/selector.xml
rename to NutritionMaster/app/src/main/res/drawable-v24/selector.xml
diff --git a/app/src/main/res/drawable/body_bg.png b/NutritionMaster/app/src/main/res/drawable/body_bg.png
similarity index 100%
rename from app/src/main/res/drawable/body_bg.png
rename to NutritionMaster/app/src/main/res/drawable/body_bg.png
diff --git a/app/src/main/res/drawable/camera_bg.jpg b/NutritionMaster/app/src/main/res/drawable/camera_bg.jpg
similarity index 100%
rename from app/src/main/res/drawable/camera_bg.jpg
rename to NutritionMaster/app/src/main/res/drawable/camera_bg.jpg
diff --git a/app/src/main/res/drawable/food_material.jpg b/NutritionMaster/app/src/main/res/drawable/food_material.jpg
similarity index 100%
rename from app/src/main/res/drawable/food_material.jpg
rename to NutritionMaster/app/src/main/res/drawable/food_material.jpg
diff --git a/app/src/main/res/drawable/food_test.jpg b/NutritionMaster/app/src/main/res/drawable/food_test.jpg
similarity index 100%
rename from app/src/main/res/drawable/food_test.jpg
rename to NutritionMaster/app/src/main/res/drawable/food_test.jpg
diff --git a/app/src/main/res/drawable/foods.jpg b/NutritionMaster/app/src/main/res/drawable/foods.jpg
similarity index 100%
rename from app/src/main/res/drawable/foods.jpg
rename to NutritionMaster/app/src/main/res/drawable/foods.jpg
diff --git a/app/src/main/res/drawable/friday.jpg b/NutritionMaster/app/src/main/res/drawable/friday.jpg
similarity index 100%
rename from app/src/main/res/drawable/friday.jpg
rename to NutritionMaster/app/src/main/res/drawable/friday.jpg
diff --git a/app/src/main/res/drawable/ic.png b/NutritionMaster/app/src/main/res/drawable/ic.png
similarity index 100%
rename from app/src/main/res/drawable/ic.png
rename to NutritionMaster/app/src/main/res/drawable/ic.png
diff --git a/app/src/main/res/drawable/ic_add_recipe.xml b/NutritionMaster/app/src/main/res/drawable/ic_add_recipe.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_recipe.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_add_recipe.xml
diff --git a/app/src/main/res/drawable/ic_back_button.xml b/NutritionMaster/app/src/main/res/drawable/ic_back_button.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back_button.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_back_button.xml
diff --git a/app/src/main/res/drawable/ic_back_button_white.xml b/NutritionMaster/app/src/main/res/drawable/ic_back_button_white.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_back_button_white.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_back_button_white.xml
diff --git a/app/src/main/res/drawable/ic_bmi.xml b/NutritionMaster/app/src/main/res/drawable/ic_bmi.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bmi.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_bmi.xml
diff --git a/app/src/main/res/drawable/ic_calorie.xml b/NutritionMaster/app/src/main/res/drawable/ic_calorie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_calorie.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_calorie.xml
diff --git a/app/src/main/res/drawable/ic_copy.xml b/NutritionMaster/app/src/main/res/drawable/ic_copy.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_copy.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_copy.xml
diff --git a/app/src/main/res/drawable/ic_data_add.xml b/NutritionMaster/app/src/main/res/drawable/ic_data_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_data_add.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_data_add.xml
diff --git a/app/src/main/res/drawable/ic_defualt_avatar.xml b/NutritionMaster/app/src/main/res/drawable/ic_defualt_avatar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_defualt_avatar.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_defualt_avatar.xml
diff --git a/app/src/main/res/drawable/ic_dialog_age.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_age.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_age.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_age.xml
diff --git a/app/src/main/res/drawable/ic_dialog_height.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_height.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_height.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_height.xml
diff --git a/app/src/main/res/drawable/ic_dialog_sex.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_sex.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_sex.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_sex.xml
diff --git a/app/src/main/res/drawable/ic_dialog_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_dialog_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dialog_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_dialog_weight.xml
diff --git a/app/src/main/res/drawable/ic_exchange.xml b/NutritionMaster/app/src/main/res/drawable/ic_exchange.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_exchange.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_exchange.xml
diff --git a/app/src/main/res/drawable/ic_exchange_customization.xml b/NutritionMaster/app/src/main/res/drawable/ic_exchange_customization.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_exchange_customization.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_exchange_customization.xml
diff --git a/app/src/main/res/drawable/ic_fat.xml b/NutritionMaster/app/src/main/res/drawable/ic_fat.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fat.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_fat.xml
diff --git a/app/src/main/res/drawable/ic_flavour.xml b/NutritionMaster/app/src/main/res/drawable/ic_flavour.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_flavour.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_flavour.xml
diff --git a/app/src/main/res/drawable/ic_fortune_cookie.xml b/NutritionMaster/app/src/main/res/drawable/ic_fortune_cookie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fortune_cookie.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_fortune_cookie.xml
diff --git a/app/src/main/res/drawable/ic_height.xml b/NutritionMaster/app/src/main/res/drawable/ic_height.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_height.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_height.xml
diff --git a/app/src/main/res/drawable/ic_ill.xml b/NutritionMaster/app/src/main/res/drawable/ic_ill.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ill.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ill.xml
diff --git a/app/src/main/res/drawable/ic_ill_add_button.xml b/NutritionMaster/app/src/main/res/drawable/ic_ill_add_button.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ill_add_button.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ill_add_button.xml
diff --git a/app/src/main/res/drawable/ic_infor_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_infor_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_infor_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_infor_weight.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/NutritionMaster/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_background.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable/ic_occupation.xml b/NutritionMaster/app/src/main/res/drawable/ic_occupation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_occupation.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_occupation.xml
diff --git a/app/src/main/res/drawable/ic_ok.xml b/NutritionMaster/app/src/main/res/drawable/ic_ok.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_ok.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_ok.xml
diff --git a/app/src/main/res/drawable/ic_power.xml b/NutritionMaster/app/src/main/res/drawable/ic_power.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_power.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_power.xml
diff --git a/app/src/main/res/drawable/ic_protein.xml b/NutritionMaster/app/src/main/res/drawable/ic_protein.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_protein.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_protein.xml
diff --git a/app/src/main/res/drawable/ic_record.xml b/NutritionMaster/app/src/main/res/drawable/ic_record.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_record.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_record.xml
diff --git a/app/src/main/res/drawable/ic_right_arch.xml b/NutritionMaster/app/src/main/res/drawable/ic_right_arch.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_right_arch.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_right_arch.xml
diff --git a/app/src/main/res/drawable/ic_score.xml b/NutritionMaster/app/src/main/res/drawable/ic_score.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_score.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_score.xml
diff --git a/app/src/main/res/drawable/ic_search.xml b/NutritionMaster/app/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_step.xml b/NutritionMaster/app/src/main/res/drawable/ic_step.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_step.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_step.xml
diff --git a/app/src/main/res/drawable/ic_sugar.xml b/NutritionMaster/app/src/main/res/drawable/ic_sugar.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sugar.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_sugar.xml
diff --git a/app/src/main/res/drawable/ic_take_photo.xml b/NutritionMaster/app/src/main/res/drawable/ic_take_photo.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_take_photo.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_take_photo.xml
diff --git a/app/src/main/res/drawable/ic_weight.xml b/NutritionMaster/app/src/main/res/drawable/ic_weight.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_weight.xml
rename to NutritionMaster/app/src/main/res/drawable/ic_weight.xml
diff --git a/app/src/main/res/drawable/icon_black.xml b/NutritionMaster/app/src/main/res/drawable/icon_black.xml
similarity index 100%
rename from app/src/main/res/drawable/icon_black.xml
rename to NutritionMaster/app/src/main/res/drawable/icon_black.xml
diff --git a/app/src/main/res/drawable/icon_colorful.png b/NutritionMaster/app/src/main/res/drawable/icon_colorful.png
similarity index 100%
rename from app/src/main/res/drawable/icon_colorful.png
rename to NutritionMaster/app/src/main/res/drawable/icon_colorful.png
diff --git a/app/src/main/res/drawable/monday.jpg b/NutritionMaster/app/src/main/res/drawable/monday.jpg
similarity index 100%
rename from app/src/main/res/drawable/monday.jpg
rename to NutritionMaster/app/src/main/res/drawable/monday.jpg
diff --git a/app/src/main/res/drawable/recommend_bg.jpg b/NutritionMaster/app/src/main/res/drawable/recommend_bg.jpg
similarity index 100%
rename from app/src/main/res/drawable/recommend_bg.jpg
rename to NutritionMaster/app/src/main/res/drawable/recommend_bg.jpg
diff --git a/app/src/main/res/drawable/result_bg.png b/NutritionMaster/app/src/main/res/drawable/result_bg.png
similarity index 100%
rename from app/src/main/res/drawable/result_bg.png
rename to NutritionMaster/app/src/main/res/drawable/result_bg.png
diff --git a/app/src/main/res/drawable/saturday.jpg b/NutritionMaster/app/src/main/res/drawable/saturday.jpg
similarity index 100%
rename from app/src/main/res/drawable/saturday.jpg
rename to NutritionMaster/app/src/main/res/drawable/saturday.jpg
diff --git a/app/src/main/res/drawable/sunday.jpg b/NutritionMaster/app/src/main/res/drawable/sunday.jpg
similarity index 100%
rename from app/src/main/res/drawable/sunday.jpg
rename to NutritionMaster/app/src/main/res/drawable/sunday.jpg
diff --git a/app/src/main/res/drawable/test_avatar.jpg b/NutritionMaster/app/src/main/res/drawable/test_avatar.jpg
similarity index 100%
rename from app/src/main/res/drawable/test_avatar.jpg
rename to NutritionMaster/app/src/main/res/drawable/test_avatar.jpg
diff --git a/app/src/main/res/drawable/thursday.jpg b/NutritionMaster/app/src/main/res/drawable/thursday.jpg
similarity index 100%
rename from app/src/main/res/drawable/thursday.jpg
rename to NutritionMaster/app/src/main/res/drawable/thursday.jpg
diff --git a/app/src/main/res/drawable/tuesday.jpg b/NutritionMaster/app/src/main/res/drawable/tuesday.jpg
similarity index 100%
rename from app/src/main/res/drawable/tuesday.jpg
rename to NutritionMaster/app/src/main/res/drawable/tuesday.jpg
diff --git a/app/src/main/res/drawable/wednesday.jpg b/NutritionMaster/app/src/main/res/drawable/wednesday.jpg
similarity index 100%
rename from app/src/main/res/drawable/wednesday.jpg
rename to NutritionMaster/app/src/main/res/drawable/wednesday.jpg
diff --git a/app/src/main/res/layout/activity_add.xml b/NutritionMaster/app/src/main/res/layout/activity_add.xml
similarity index 100%
rename from app/src/main/res/layout/activity_add.xml
rename to NutritionMaster/app/src/main/res/layout/activity_add.xml
diff --git a/app/src/main/res/layout/activity_add_information.xml b/NutritionMaster/app/src/main/res/layout/activity_add_information.xml
similarity index 100%
rename from app/src/main/res/layout/activity_add_information.xml
rename to NutritionMaster/app/src/main/res/layout/activity_add_information.xml
diff --git a/app/src/main/res/layout/activity_customization.xml b/NutritionMaster/app/src/main/res/layout/activity_customization.xml
similarity index 100%
rename from app/src/main/res/layout/activity_customization.xml
rename to NutritionMaster/app/src/main/res/layout/activity_customization.xml
diff --git a/app/src/main/res/layout/activity_dish_result.xml b/NutritionMaster/app/src/main/res/layout/activity_dish_result.xml
similarity index 100%
rename from app/src/main/res/layout/activity_dish_result.xml
rename to NutritionMaster/app/src/main/res/layout/activity_dish_result.xml
diff --git a/app/src/main/res/layout/activity_history.xml b/NutritionMaster/app/src/main/res/layout/activity_history.xml
similarity index 100%
rename from app/src/main/res/layout/activity_history.xml
rename to NutritionMaster/app/src/main/res/layout/activity_history.xml
diff --git a/app/src/main/res/layout/activity_information.xml b/NutritionMaster/app/src/main/res/layout/activity_information.xml
similarity index 100%
rename from app/src/main/res/layout/activity_information.xml
rename to NutritionMaster/app/src/main/res/layout/activity_information.xml
diff --git a/app/src/main/res/layout/activity_login.xml b/NutritionMaster/app/src/main/res/layout/activity_login.xml
similarity index 100%
rename from app/src/main/res/layout/activity_login.xml
rename to NutritionMaster/app/src/main/res/layout/activity_login.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/NutritionMaster/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to NutritionMaster/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_material_result.xml b/NutritionMaster/app/src/main/res/layout/activity_material_result.xml
similarity index 100%
rename from app/src/main/res/layout/activity_material_result.xml
rename to NutritionMaster/app/src/main/res/layout/activity_material_result.xml
diff --git a/app/src/main/res/layout/activity_recipe.xml b/NutritionMaster/app/src/main/res/layout/activity_recipe.xml
similarity index 100%
rename from app/src/main/res/layout/activity_recipe.xml
rename to NutritionMaster/app/src/main/res/layout/activity_recipe.xml
diff --git a/app/src/main/res/layout/add_information_activity.xml b/NutritionMaster/app/src/main/res/layout/add_information_activity.xml
similarity index 100%
rename from app/src/main/res/layout/add_information_activity.xml
rename to NutritionMaster/app/src/main/res/layout/add_information_activity.xml
diff --git a/app/src/main/res/layout/add_item.xml b/NutritionMaster/app/src/main/res/layout/add_item.xml
similarity index 100%
rename from app/src/main/res/layout/add_item.xml
rename to NutritionMaster/app/src/main/res/layout/add_item.xml
diff --git a/app/src/main/res/layout/body_information_fragment.xml b/NutritionMaster/app/src/main/res/layout/body_information_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/body_information_fragment.xml
rename to NutritionMaster/app/src/main/res/layout/body_information_fragment.xml
diff --git a/app/src/main/res/layout/cameras_layout.xml b/NutritionMaster/app/src/main/res/layout/cameras_layout.xml
similarity index 100%
rename from app/src/main/res/layout/cameras_layout.xml
rename to NutritionMaster/app/src/main/res/layout/cameras_layout.xml
diff --git a/app/src/main/res/layout/card_item.xml b/NutritionMaster/app/src/main/res/layout/card_item.xml
similarity index 100%
rename from app/src/main/res/layout/card_item.xml
rename to NutritionMaster/app/src/main/res/layout/card_item.xml
diff --git a/app/src/main/res/layout/customization.xml b/NutritionMaster/app/src/main/res/layout/customization.xml
similarity index 100%
rename from app/src/main/res/layout/customization.xml
rename to NutritionMaster/app/src/main/res/layout/customization.xml
diff --git a/app/src/main/res/layout/customization_item.xml b/NutritionMaster/app/src/main/res/layout/customization_item.xml
similarity index 100%
rename from app/src/main/res/layout/customization_item.xml
rename to NutritionMaster/app/src/main/res/layout/customization_item.xml
diff --git a/app/src/main/res/layout/dish_item.xml b/NutritionMaster/app/src/main/res/layout/dish_item.xml
similarity index 100%
rename from app/src/main/res/layout/dish_item.xml
rename to NutritionMaster/app/src/main/res/layout/dish_item.xml
diff --git a/app/src/main/res/layout/dish_result_item.xml b/NutritionMaster/app/src/main/res/layout/dish_result_item.xml
similarity index 100%
rename from app/src/main/res/layout/dish_result_item.xml
rename to NutritionMaster/app/src/main/res/layout/dish_result_item.xml
diff --git a/app/src/main/res/layout/element_dialog.xml b/NutritionMaster/app/src/main/res/layout/element_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/element_dialog.xml
rename to NutritionMaster/app/src/main/res/layout/element_dialog.xml
diff --git a/app/src/main/res/layout/ill_item.xml b/NutritionMaster/app/src/main/res/layout/ill_item.xml
similarity index 100%
rename from app/src/main/res/layout/ill_item.xml
rename to NutritionMaster/app/src/main/res/layout/ill_item.xml
diff --git a/app/src/main/res/layout/make_step_item.xml b/NutritionMaster/app/src/main/res/layout/make_step_item.xml
similarity index 100%
rename from app/src/main/res/layout/make_step_item.xml
rename to NutritionMaster/app/src/main/res/layout/make_step_item.xml
diff --git a/app/src/main/res/layout/material_item.xml b/NutritionMaster/app/src/main/res/layout/material_item.xml
similarity index 100%
rename from app/src/main/res/layout/material_item.xml
rename to NutritionMaster/app/src/main/res/layout/material_item.xml
diff --git a/app/src/main/res/layout/material_result_item.xml b/NutritionMaster/app/src/main/res/layout/material_result_item.xml
similarity index 100%
rename from app/src/main/res/layout/material_result_item.xml
rename to NutritionMaster/app/src/main/res/layout/material_result_item.xml
diff --git a/app/src/main/res/layout/normal_recommend_fragment_layout.xml b/NutritionMaster/app/src/main/res/layout/normal_recommend_fragment_layout.xml
similarity index 100%
rename from app/src/main/res/layout/normal_recommend_fragment_layout.xml
rename to NutritionMaster/app/src/main/res/layout/normal_recommend_fragment_layout.xml
diff --git a/app/src/main/res/layout/picker_item.xml b/NutritionMaster/app/src/main/res/layout/picker_item.xml
similarity index 100%
rename from app/src/main/res/layout/picker_item.xml
rename to NutritionMaster/app/src/main/res/layout/picker_item.xml
diff --git a/app/src/main/res/layout/recommend_head.xml b/NutritionMaster/app/src/main/res/layout/recommend_head.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_head.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_head.xml
diff --git a/app/src/main/res/layout/recommend_item_detail.xml b/NutritionMaster/app/src/main/res/layout/recommend_item_detail.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_item_detail.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_item_detail.xml
diff --git a/app/src/main/res/layout/recommend_item_middle.xml b/NutritionMaster/app/src/main/res/layout/recommend_item_middle.xml
similarity index 100%
rename from app/src/main/res/layout/recommend_item_middle.xml
rename to NutritionMaster/app/src/main/res/layout/recommend_item_middle.xml
diff --git a/app/src/main/res/layout/score.xml b/NutritionMaster/app/src/main/res/layout/score.xml
similarity index 100%
rename from app/src/main/res/layout/score.xml
rename to NutritionMaster/app/src/main/res/layout/score.xml
diff --git a/app/src/main/res/menu/menu_main.xml b/NutritionMaster/app/src/main/res/menu/menu_main.xml
similarity index 100%
rename from app/src/main/res/menu/menu_main.xml
rename to NutritionMaster/app/src/main/res/menu/menu_main.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to NutritionMaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_button.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/camera_button.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button.png
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/camera_button_pressed.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to NutritionMaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/arrays.xml b/NutritionMaster/app/src/main/res/values/arrays.xml
similarity index 100%
rename from app/src/main/res/values/arrays.xml
rename to NutritionMaster/app/src/main/res/values/arrays.xml
diff --git a/app/src/main/res/values/colors.xml b/NutritionMaster/app/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to NutritionMaster/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/NutritionMaster/app/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to NutritionMaster/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/NutritionMaster/app/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to NutritionMaster/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/NutritionMaster/app/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to NutritionMaster/app/src/main/res/values/styles.xml
diff --git a/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java b/NutritionMaster/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
similarity index 100%
rename from app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
rename to NutritionMaster/app/src/test/java/com/example/ninefourone/nutritionmaster/ExampleUnitTest.java
diff --git a/build.gradle b/NutritionMaster/build.gradle
similarity index 100%
rename from build.gradle
rename to NutritionMaster/build.gradle
diff --git a/datas/11111.csv b/NutritionMaster/datas/11111.csv
similarity index 100%
rename from datas/11111.csv
rename to NutritionMaster/datas/11111.csv
diff --git a/datas/menu_classification (1).csv b/NutritionMaster/datas/menu_classification (1).csv
similarity index 100%
rename from datas/menu_classification (1).csv
rename to NutritionMaster/datas/menu_classification (1).csv
diff --git a/datas/menu_classification.csv b/NutritionMaster/datas/menu_classification.csv
similarity index 100%
rename from datas/menu_classification.csv
rename to NutritionMaster/datas/menu_classification.csv
diff --git a/datas/new_menu_names.csv b/NutritionMaster/datas/new_menu_names.csv
similarity index 100%
rename from datas/new_menu_names.csv
rename to NutritionMaster/datas/new_menu_names.csv
diff --git a/datas/occupation_classification.csv b/NutritionMaster/datas/occupation_classification.csv
similarity index 100%
rename from datas/occupation_classification.csv
rename to NutritionMaster/datas/occupation_classification.csv
diff --git a/datas/physique (1).xlsx b/NutritionMaster/datas/physique (1).xlsx
similarity index 100%
rename from datas/physique (1).xlsx
rename to NutritionMaster/datas/physique (1).xlsx
diff --git a/datas/元素效果.txt b/NutritionMaster/datas/元素效果.txt
similarity index 100%
rename from datas/元素效果.txt
rename to NutritionMaster/datas/元素效果.txt
diff --git a/datas/早中晚餐.rar b/NutritionMaster/datas/早中晚餐.rar
similarity index 100%
rename from datas/早中晚餐.rar
rename to NutritionMaster/datas/早中晚餐.rar
diff --git a/datas/病).csv b/NutritionMaster/datas/病).csv
similarity index 100%
rename from datas/病).csv
rename to NutritionMaster/datas/病).csv
diff --git a/datas/职业 （bmi分类）.xlsx b/NutritionMaster/datas/职业 （bmi分类）.xlsx
similarity index 100%
rename from datas/职业 （bmi分类）.xlsx
rename to NutritionMaster/datas/职业 （bmi分类）.xlsx
diff --git a/datas/职业.xlsx b/NutritionMaster/datas/职业.xlsx
similarity index 100%
rename from datas/职业.xlsx
rename to NutritionMaster/datas/职业.xlsx
diff --git a/datas/营养.txt b/NutritionMaster/datas/营养.txt
similarity index 100%
rename from datas/营养.txt
rename to NutritionMaster/datas/营养.txt
diff --git a/datas/营养标准.xlsx b/NutritionMaster/datas/营养标准.xlsx
similarity index 100%
rename from datas/营养标准.xlsx
rename to NutritionMaster/datas/营养标准.xlsx
diff --git a/gradle.properties b/NutritionMaster/gradle.properties
similarity index 100%
rename from gradle.properties
rename to NutritionMaster/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/NutritionMaster/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.jar
rename to NutritionMaster/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/NutritionMaster/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/wrapper/gradle-wrapper.properties
rename to NutritionMaster/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/NutritionMaster/gradlew
similarity index 100%
rename from gradlew
rename to NutritionMaster/gradlew
diff --git a/gradlew.bat b/NutritionMaster/gradlew.bat
similarity index 100%
rename from gradlew.bat
rename to NutritionMaster/gradlew.bat
diff --git a/settings.gradle b/NutritionMaster/settings.gradle
similarity index 100%
rename from settings.gradle
rename to NutritionMaster/settings.gradle
diff --git a/todaystepcounterlib/.gitignore b/NutritionMaster/todaystepcounterlib/.gitignore
similarity index 100%
rename from todaystepcounterlib/.gitignore
rename to NutritionMaster/todaystepcounterlib/.gitignore
diff --git a/todaystepcounterlib/build.gradle b/NutritionMaster/todaystepcounterlib/build.gradle
similarity index 100%
rename from todaystepcounterlib/build.gradle
rename to NutritionMaster/todaystepcounterlib/build.gradle
diff --git a/todaystepcounterlib/libs/microlog4android-1.0.0.jar b/NutritionMaster/todaystepcounterlib/libs/microlog4android-1.0.0.jar
similarity index 100%
rename from todaystepcounterlib/libs/microlog4android-1.0.0.jar
rename to NutritionMaster/todaystepcounterlib/libs/microlog4android-1.0.0.jar
diff --git a/todaystepcounterlib/proguard-rules.pro b/NutritionMaster/todaystepcounterlib/proguard-rules.pro
similarity index 100%
rename from todaystepcounterlib/proguard-rules.pro
rename to NutritionMaster/todaystepcounterlib/proguard-rules.pro
diff --git a/todaystepcounterlib/src/main/AndroidManifest.xml b/NutritionMaster/todaystepcounterlib/src/main/AndroidManifest.xml
similarity index 100%
rename from todaystepcounterlib/src/main/AndroidManifest.xml
rename to NutritionMaster/todaystepcounterlib/src/main/AndroidManifest.xml
diff --git a/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl b/NutritionMaster/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
similarity index 100%
rename from todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
rename to NutritionMaster/todaystepcounterlib/src/main/aidl/com/today/step/lib/ISportStepInterface.aidl
diff --git a/todaystepcounterlib/src/main/assets/microlog.properties b/NutritionMaster/todaystepcounterlib/src/main/assets/microlog.properties
similarity index 100%
rename from todaystepcounterlib/src/main/assets/microlog.properties
rename to NutritionMaster/todaystepcounterlib/src/main/assets/microlog.properties
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/BaseClickBroadcast.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/DateUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/ITodayStepDBHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/JobSchedulerService.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Logger.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/Microlog4Android.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/OnStepCounterListener.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/PreferencesHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/SportStepJsonUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/StepAlertManagerUtils.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepAlertReceive.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepBootCompleteReceiver.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepCounter.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDBHelper.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepData.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepDetector.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepManager.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepService.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/TodayStepShutdownReceiver.java
diff --git a/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java b/NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
similarity index 100%
rename from todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
rename to NutritionMaster/todaystepcounterlib/src/main/java/com/today/step/lib/WakeLockUtils.java
diff --git a/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png b/NutritionMaster/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
similarity index 100%
rename from todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
rename to NutritionMaster/todaystepcounterlib/src/main/res/mipmap-xxxhdpi/ic_notification_default.png
diff --git a/todaystepcounterlib/src/main/res/values/strings.xml b/NutritionMaster/todaystepcounterlib/src/main/res/values/strings.xml
similarity index 100%
rename from todaystepcounterlib/src/main/res/values/strings.xml
rename to NutritionMaster/todaystepcounterlib/src/main/res/values/strings.xml
diff --git a/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java b/NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
similarity index 100%
rename from todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
rename to NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/MyRobolectricTestRunner.java
diff --git a/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java b/NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
similarity index 100%
rename from todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
rename to NutritionMaster/todaystepcounterlib/src/test/java/com.today.step.lib/TodayStepDBHelperTest.java
diff --git a/文档.md b/NutritionMaster/文档.md
similarity index 100%
rename from 文档.md
rename to NutritionMaster/文档.md
diff --git a/服务器文档.md b/NutritionMaster/服务器文档.md
similarity index 100%
rename from 服务器文档.md
rename to NutritionMaster/服务器文档.md
diff --git a/NutritionMasterSpider/.idea/NutritionMasterSpider.iml b/NutritionMasterSpider/.idea/NutritionMasterSpider.iml
new file mode 100644
index 0000000..e98082a
--- /dev/null
+++ b/NutritionMasterSpider/.idea/NutritionMasterSpider.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/misc.xml b/NutritionMasterSpider/.idea/misc.xml
new file mode 100644
index 0000000..240f774
--- /dev/null
+++ b/NutritionMasterSpider/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/modules.xml b/NutritionMasterSpider/.idea/modules.xml
new file mode 100644
index 0000000..e07063c
--- /dev/null
+++ b/NutritionMasterSpider/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NutritionMasterSpider/.idea/workspace.xml b/NutritionMasterSpider/.idea/workspace.xml
new file mode 100644
index 0000000..70df0eb
--- /dev/null
+++ b/NutritionMasterSpider/.idea/workspace.xml
@@ -0,0 +1,648 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 延
+ fi_pa
+ 新建
+ comment
+ 毛笔字体生成效果
+ 验证
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1535340831983
+
+
+ 1535340831983
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NutritionMasterSpider/bao_cheat.py b/NutritionMasterSpider/bao_cheat.py
new file mode 100644
index 0000000..ae30d8e
--- /dev/null
+++ b/NutritionMasterSpider/bao_cheat.py
@@ -0,0 +1,44 @@
+import requests
+import json
+from lxml import etree
+# from functions import send_request, get_selector
+
+header = {
+ 'authority': 'www.zhenhaotv.com',
+ 'method': 'POST',
+ 'path': '/',
+ 'scheme': 'https',
+ 'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
+ 'accept-encoding': 'gzip, deflate, br',
+ 'accept-language': 'zh-CN,zh;q=0.9',
+ 'cache-control': 'max-age=0',
+ 'content-length': '86',
+ 'content-type': 'application/x-www-form-urlencoded',
+ 'cookie': 'Hm_lvt_1ebdb876cf5aaff194ebd474e2ae2c52=1538639708; SERVERID=4d5d41d7b10da55b4b26f74f163ced97|1538640214|1538639706; Hm_lpvt_1ebdb876cf5aaff194ebd474e2ae2c52=1538640215',
+ 'origin': 'https://www.zhenhaotv.com',
+ 'referer': 'https://www.zhenhaotv.com/',
+ 'upgrade-insecure-requests': '1',
+ 'user-agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
+}
+
+data = {
+ 'text': '小老弟',
+ 'font': '9',
+ 'size': '68',
+ 'color': '#000000',
+ 'bg': '#ffffff',
+ 'list': 'open'
+}
+
+url = "https://www.zhenhaotv.com"
+
+status_code = 0
+# s = get_selector.get_selector(send_request.post_request())
+s = etree.HTML(requests.post(url=url, data=data, headers=header).text)
+final_url = s.xpath('//div[@class="panel panel-default"]//img/@src')[0]
+final_url = url + final_url.strip('.')
+
+r = requests.get(final_url)
+status_code = r.status_code
+print(status_code, final_url)
+# while status_code != 200:
diff --git a/NutritionMasterSpider/baobspider.py b/NutritionMasterSpider/baobspider.py
new file mode 100644
index 0000000..f580ab7
--- /dev/null
+++ b/NutritionMasterSpider/baobspider.py
@@ -0,0 +1,133 @@
+# -*- coding:utf-8 -*-
+from functions import send_request, get_selector
+import os
+
+author_urls = {
+ "欧阳询": "http://www.yac8.com/news/?list_refer-theme-%C5%B7%D1%F4%D1%AF_",
+ "王羲之": "http://www.yac8.com/news/?list_refer-theme-%CD%F5%F4%CB%D6%AE_",
+ "颜真卿": "http://www.yac8.com/news/?list_refer-theme-%D1%D5%D5%E6%C7%E4_",
+ "文徵明": "http://www.yac8.com/news/?list_refer-theme-%CE%C4%E1%E7%C3%F7_",
+ "赵孟頫": "http://www.yac8.com/news/?list_refer-theme-%D5%D4%C3%CF%EE%5C_",
+ "柳公权": "http://www.yac8.com/news/?list_refer-theme-%C1%F8%B9%AB%C8%A8_"
+}
+
+base_url = "http://www.yac8.com"
+
+test_dic = {
+ "欧阳询": "http://www.yac8.com/news/?list_refer-theme-%C5%B7%D1%F4%D1%AF_",
+}
+
+def get_urls(all_author):
+ """
+ 获取书法家的所有文章
+ :param all_author:
+ :return:
+ """
+ all_author_dic = {}
+ for name in all_author:
+ try:
+ page = 1
+ url = all_author[name] + "{index}.html".format(index=page)
+ # print(url)
+ s = get_selector.get_selector(send_request.send_requests(url))
+ result = s.xpath('//div[@class="navBtn font1_2"]/text()')[0]
+ page_max = result[3:result.index('页')]
+ result_dic = {}
+ for er_page in range(int(page_max)):
+ try:
+ url = all_author[name] + "{index}.html".format(index=er_page + 1)
+ # print("doing", name, "page{page}".format(page=er_page + 1))
+ s = get_selector.get_selector(send_request.send_requests(url))
+ result_url = s.xpath('//li//div[@class="b"]//h4/a/@href')
+ result_title = [None] * len(result_url)
+ for i in range(len(result_url)):
+ try:
+ s = get_selector.get_selector(send_request.send_requests(base_url + result_url[i].strip('.')))
+ # print("正在打开 {url_} 获取title".format(url_=base_url + result_url[i].strip('.')))
+ result_title[i] = s.xpath('//div[@class="a"]/h1/text()')[0]
+ if "�" in result_title[i]:
+ result_title[i] = result_title.replace("�", "頫")
+ if "\\" in result_title[i]:
+ result_title[i] = result_title[i].replace("\\", "")
+ result_dic[result_title[i]] = base_url + result_url[i].strip('.')
+ except:
+ pass
+ print("done", name, "page{page}".format(page=er_page + 1))
+ except Exception as e:
+ print("error:获取这一篇文章出错", url, e)
+ # print(result_dic)
+ all_author_dic[name] = result_dic
+ except Exception as e:
+ print("error:获取这一页出错了", e)
+ return all_author_dic
+
+def get_img_info(dic):
+ """
+ 获取图片并下载
+ :return:
+ """
+ for name in dic:
+ path = create_dir(r"/root/bao", name)#先创建任务文件夹
+ print("***正在弄***", name)
+ for title in dic[name]:
+ try:
+ all_imgs = []
+ # print("正在下载", title, dic[name][title])
+ file_path = create_dir(path, title) # 再创建文章文件夹
+ s = get_selector.get_selector(send_request.send_requests(dic[name][title]))
+ result_page = s.xpath('//td//a[@rel="nofollow"]/text()')
+ img_list = s.xpath('//div[@id="newsContent"]//img/@src')
+ if img_list is not []:
+ for i in range(len(img_list)):
+ if img_list[i][0] is '.':
+ img_list[i] = base_url + img_list[i].lstrip('.')
+ all_imgs.extend(img_list)
+ if result_page is not []:
+ max_page = int(result_page[-2].strip('.'))
+ else:
+ max_page = 1
+ if max_page > 1:
+ for er_page in range(max_page)[1:]:
+ url = dic[name][title].rstrip('.html')
+ url = url + "_{page}.html".format(page=er_page + 1)
+ s = get_selector.get_selector(send_request.send_requests(url))
+ # print("获取图片链接", url)
+ img_list = s.xpath('//div[@id="newsContent"]//img/@src')
+ if img_list is not []:
+ for j in range(len(img_list)):
+ if img_list[j][0] is '.':
+ img_list[j] = base_url + img_list[j].lstrip('.')
+ all_imgs.extend(img_list)
+ count = 1
+ for img in all_imgs:
+ filename = file_path + "\\{i}.jpg".format(i=count)
+ # print("downloading", filename)
+ down_load(img, filename)
+ count = count + 1
+ except Exception as e:
+ print("下载图片错了", e)
+
+def create_dir(path, name):
+ try:
+ fi_path = path + '\\' + name
+ os.mkdir(fi_path)
+ except Exception as e:
+ print("创建文件夹错误", e)
+ return fi_path
+
+def down_load(url, filename):
+ """
+
+ :param filename: 文件夹路径
+ :return:
+ """
+ try:
+ content = send_request.download_img(url)
+ with open(filename, 'wb') as file:
+ file.write(content)
+ except Exception as e:
+ print("写入错误", e)
+
+
+
+get_img_info(get_urls(test_dic))
\ No newline at end of file
diff --git a/NutritionMasterSpider/baospider.py b/NutritionMasterSpider/baospider.py
new file mode 100644
index 0000000..848c775
--- /dev/null
+++ b/NutritionMasterSpider/baospider.py
@@ -0,0 +1,61 @@
+from functions import send_request, get_selector
+import os
+
+base_url = "http://www.shufabeitie.com"
+person_name_list = ["东晋王羲之", "元代赵孟頫", "明代文徵明", "唐代颜真卿"]
+test_name_list = ["唐代孙过庭"]
+
+def get_urls(name_list):
+ all_tie = {}
+ for name in name_list:
+ try:
+ url = "/".join((base_url, "shufa", name))
+ print("正在处理", name, url)
+ s = get_selector.get_selector(send_request.send_requests(url))
+ result = s.xpath('//div[@class="col-md-4 col-sm-6"]//a/@href')
+ for i in result:
+ all_tie[i.split('/')[-2]] = base_url + i
+ print(all_tie)
+ except Exception as e:
+ print("字帖获取失败了", e)
+ return all_tie
+
+def get_info(dic):
+ for name in dic:
+ try:
+ s = get_selector.get_selector(send_request.send_requests(dic[name]))
+ img1 = base_url + s.xpath('//div[@id="a0"]/img/@src')[0]
+ img_urls = s.xpath('//div[@id="a0"]/following-sibling::*/@data-original')
+ for i in range(len(img_urls)):
+ img_urls[i] = base_url + img_urls[i]
+ img_urls.append(img1)
+ dic[name] = img_urls
+ print("get info done", name)
+ except Exception as e:
+ print("图片链接获取失败", e)
+ return dic
+
+
+def write_in(dic):
+ for name in dic:
+ try:
+ path = create_dir(name)
+ print("创建文件夹", name)
+ for url in dic[name]:
+ filename = path + '//' + url.split('/')[-1]
+ with open(filename, 'wb') as file:
+ file.write(send_request.download_img(url))
+ print("write", url)
+ except Exception as e:
+ print("写入失败", e)
+
+def create_dir(name):
+ try:
+ dir_path = r"E:\datapy\bb" + "\\" + name
+ os.mkdir(dir_path)
+ except Exception as e:
+ print("文件夹创建失败", e)
+ return dir_path
+
+dic = get_info(get_urls(person_name_list))
+write_in(dic)
\ No newline at end of file
diff --git a/NutritionMasterSpider/bbspider.py b/NutritionMasterSpider/bbspider.py
new file mode 100644
index 0000000..d9b660d
--- /dev/null
+++ b/NutritionMasterSpider/bbspider.py
@@ -0,0 +1,92 @@
+from selenium import webdriver
+from functions import send_request, get_selector
+import time
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+import os
+
+base_url = "http://www.shufabeitie.com"
+person_name_list = ["东晋王羲之", "元代赵孟頫", "明代文徵明", "唐代颜真卿"]
+test_name_list = ["东晋王羲之"]
+
+def get_urls(list):
+ """
+ 获取该网站所有的贴
+ :param list: person_name_list
+ :return:
+ """
+ urls = []
+ for name in list:
+ try:
+ time.sleep(5)
+ url = base_url + "/shufa/" + name
+ print(name, "start")
+ s = get_selector.get_selector(send_request.send_requests(url))
+ result = s.xpath('//div[@class="caption ellipsis"]//a/@href')
+ for i in range(len(result)):
+ result[i] = base_url + result[i]
+ print(name, "done")
+ urls.extend(result)
+ except Exception as e:
+ print(e)
+ print(urls)
+ return urls
+
+def get_img_element_id(url):
+ try:
+ s = get_selector.get_selector(send_request.send_requests(url))
+ id_list = s.xpath('//div[@id="beitie-imgs-container"]//div/@id')
+ return id_list
+ except Exception as e:
+ print(e)
+
+def get_info(urls):
+ """
+ 从所有的贴中取出图片
+ :param urls: 所有的地址
+ :return:
+ """
+ browser = webdriver.Chrome()
+ wait = WebDriverWait(browser, 10)
+ all_list_dic = {}
+
+ for url in urls[:1]:
+ time.sleep(2)
+ browser.get(url)
+ print("正在处理", url)
+ btn = wait.until(EC.element_to_be_clickable((By.ID, "beitie-pagination-next")))
+ #btn = browser.find_element_by_id("")
+ id_list = get_img_element_id(url)
+ img_list = []
+ for img_id in id_list:
+ try:
+ time.sleep(3)
+ # img_elment = browser.find_element_by_xpath('//div[@id="{id}"]/img'.format(id=img_id))#取属性
+ img_element = wait.until(
+ EC.visibility_of_element_located((By.XPATH, '//div[@id="{id}"]/img'.format(id=img_id))))
+ img = img_element.get_attribute('src')
+ print(img)
+ img_list.append(img)
+ time.sleep(3)
+ btn.click()
+ except Exception as e:
+ print("下载图片出错", e)
+ write_in(img_list)
+
+def create_dir(name):
+ dir_path = r"E:\datapy\bb\东晋王羲之" + "\\" + name
+ os.mkdir(dir_path)
+ return dir_path
+
+
+def write_in(urls):
+ dir_name = urls[0].split('/')[4]
+ path = create_dir(dir_name)
+ for url in urls:
+ create_dir(dir_name)
+ file_name = path + "\\" + url.split('/')[-1] + '.jpg'
+ with open(file_name, 'wb') as file:
+ file.write(send_request.download_img(url))
+
+get_info(get_urls(test_name_list))
diff --git a/NutritionMasterSpider/demo/__init__.py b/NutritionMasterSpider/demo/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/demo/get_name.py b/NutritionMasterSpider/demo/get_name.py
new file mode 100644
index 0000000..5667460
--- /dev/null
+++ b/NutritionMasterSpider/demo/get_name.py
@@ -0,0 +1,13 @@
+from functions import get_selector, send_request
+
+base_url = "https://www.xinshipu.com/%E9%A5%AE%E9%A3%9F%E5%81%A5%E5%BA%B7.html"
+
+def get_info():
+ s = get_selector.get_selector(send_request.send_requests(base_url))
+ name = s.xpath('//li//a[@rel="cpdq"]/text()')
+ return name
+
+with open( r"E:\datapy\类型名称.txt", 'w', encoding='utf-8') as file :
+ for i in get_info():
+ file.write(i)
+ file.write('\n')
diff --git a/NutritionMasterSpider/demo/test.py b/NutritionMasterSpider/demo/test.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/demo/xinshipu_selenium.py b/NutritionMasterSpider/demo/xinshipu_selenium.py
new file mode 100644
index 0000000..da63545
--- /dev/null
+++ b/NutritionMasterSpider/demo/xinshipu_selenium.py
@@ -0,0 +1,32 @@
+from selenium import webdriver
+from selenium.webdriver.common.keys import Keys
+import time
+
+base_url = "https://www.xinshipu.com/"
+
+browser = webdriver.Chrome()
+time.sleep(1)
+browser.get(base_url)
+names = []
+urls = []
+with open(r"E:\datapy\类型名称.txt", 'r', encoding='utf-8') as file:
+ for i in file.readlines():
+ s = i.strip('\n')
+ names.append(s)
+index = 1
+for i in names:
+ try:
+ search_box = browser.find_element_by_id('q')
+ time.sleep(2)
+ search_box.clear()
+ search_box.send_keys(i)
+ search_box.send_keys(Keys.ENTER)
+ urls.append(browser.current_url)
+ print(i, "done", index, browser.current_url)
+ index += 1
+ except Exception as e:
+ print("这一页没有内容 ", e)
+with open(r"E:\datapy\网页.txt", 'w', encoding='utf-8') as file:
+ for i in urls:
+ file.write(i)
+ file.write('\n')
diff --git a/NutritionMasterSpider/demo/食材.py b/NutritionMasterSpider/demo/食材.py
new file mode 100644
index 0000000..293f010
--- /dev/null
+++ b/NutritionMasterSpider/demo/食材.py
@@ -0,0 +1,102 @@
+# 8 9 10 14 15 25
+from functions import get_selector, send_request
+import time
+import csv
+
+aim_url = "http://www.chinacaipu.com/shicai/"
+
+def get_urls():
+ """
+
+ :return:
+ """
+ urls = []
+ s = get_selector.get_selector(send_request.send_requests(aim_url))
+ m = [8, 9, 10, 14, 15, 25]
+ for i in m:
+ url = s.xpath('//div[@class="fd_cont"]//dl[%d]//a/@href' % i)
+ urls = urls + url
+ return urls
+
+def get_info(url):
+ """
+
+ :param url:
+ :return: 返回的a是营养价值，b是食用效果
+ """
+ dic = {
+ "食材": "",
+ "简介": "",
+ "营养价值": "",
+ "食用效果": ""
+ }
+ try:
+ s = get_selector.get_selector(send_request.send_requests(url))
+ # 储存功效信息
+ fun = s.xpath('//div[@class="fd_yygx"]//strong[1]/following-sibling::*')
+ final_fun = []
+ intro = s.xpath('//div[@class="n_sp_main_info"]//p/text()')
+ dic["食材"] = s.xpath('//div[@class="fd_tit2"]//strong/text()')
+ t = []
+ jianjie = s.xpath('//div[@class="n_sp_main_info"]//p/text()')
+ for i in jianjie:
+ t.append(i.strip())
+ dic["简介"] = t
+ for i in range(len(fun)):
+ info = s.xpath('//div[@class="fd_yygx"]//strong[1]/following-sibling::*[%d]/text()' % (i + 1))
+ if info is not None:
+ final_fun = final_fun + info
+ for m in range(len(final_fun)):
+ final_fun[m] = final_fun[m].strip()
+ for i in range(len(intro)):
+ intro[i] = intro[i].strip()
+ final_fun.remove('')
+ for i in range(len(final_fun)):
+ if "的挑选" in final_fun[i]:
+ final_fun = final_fun[0:i]
+ break
+ for i in range(len(final_fun)):
+ if "的存储方法" in final_fun[i]:
+ final_fun = final_fun[0:i]
+ break
+ a = []
+ b = []
+ for i in range(len(final_fun)):
+ if "的食用效果" in final_fun[i]:
+ a = final_fun[1:i]
+ b = final_fun[i + 1:]
+ if len(a) is 0:
+ print(final_fun[0])
+ if "的营养价值" in final_fun[0]:
+ print("doit")
+ a = final_fun[1:]
+ print(a)
+ print(b)
+ dic["营养价值"] = a
+ dic["食用效果"] = b
+ return dic
+ except Exception as e:
+ print(e)
+
+def write_files(dics):
+ with open(r'E:\datapy\直接食用.csv', 'w', newline="") as file:
+ index = 1
+ fieldnames = ["食材", "简介", "营养价值", "食用效果"]
+ writer = csv.DictWriter(file, fieldnames=fieldnames)
+ writer.writeheader()
+ for dic in dics:
+ try:
+ writer.writerow(dic)
+ index = index + 1
+ print("write", index)
+ except Exception as e:
+ print(e)
+
+dic_list = []
+for i in get_urls():
+ time.sleep(2)
+ print("正在", i)
+ dic_list.append(get_info(i))
+ print("done")
+write_files(dic_list)
+
diff --git a/NutritionMasterSpider/functions/__init__.py b/NutritionMasterSpider/functions/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/__init__.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..558f84ea5bbf3568bc1eae7298bd80f16a129f8f
GIT binary patch
literal 162
zcmXr!<>hM7n;6Xi1dl-k3@`#24nSPY0whuxf*CX!{Z=v*frJsnFMn677_Zb4r=rBn
zyyBREO6QEkqFeb_w9>p}
jkYI64e0*kJW=VX!UP0w84x8Nkl+v73JCH@iK+FID$*3um
literal 0
HcmV?d00001
diff --git a/NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/baidu_api.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..06349772bc31eda80f0645fe0a1c993a560ed347
GIT binary patch
literal 1955
zcma)6OK;mo5ayDUM9X&Kq^avPZR)1E2q+A_A3;%6*3&hu$ddIiYrvqnlthXW>E+UT
zK<>r4_nJe{OHchvy!KG^+*?nbrJXd%sRVXrc6K@Y&CIu(+T4sjdGp&(uOb}x2lw75
zg8c&w_caL2VPtU=q#(p>-r^M=3s}S<9DXAx0*+t_uLZV*cjdQ&Dy&*nut>5l`h4%Fe0PU)pB6pPEcdS*zM@R&(mOedsB>=}i47o}2d$Y8^%I<)&qAp%m-g
z)8nNn7YY|HL`f&pg-jBnWHZylsv*y27jj0sygEz|#s`Z=8#1bOd)SsMjgB*F(pLFu
zBwrn76z{mBWP9D_AbA%ho5(0TEuu}`RJoo$pbhh7zBnItTC(PxD7)=hvbx{zWD}Kg
z-b-ZaJ!Rf{+0e0s@0NfmF0d$$&U`Zb=AopFEzxt1s~HP7$q3)QxKF}aVEm(1_heG)4~n95rC9p
zg9xyTuq#B^k1?L`pnPGd(-;c;zjFj`9QRMN^5X1Ao$eFWn7U`pMQNmx$!;>9$nB-}
z(q|+V^@qr{+wJv~xgs*|>3V4a)|ys5^V?%9QEVDDUYj6G-JhvAU(qLGH^E<2S&
zWDVrIY?zOYAe(Q&Si$8UBl3`P6f(L-({1qZ;CT)n$PGLq=Gxo}L2g3B_#5hB{0SMx
zgdnmXxlrwMc0tw$#L%ZW!6q@@4^d;HyM9=+z)ORCZ-oS>`ca1Sb}0vQcLM~6Bot+X
z7ZJG!^AAw7G(PA7bb$XQdW}}dL^pu&m}_x;c%T3$-|%^I0U$)%(WkyhbQQx)8W@)D
zsC4A>1LtEzTMQA~aIV=?3XqF%pv$_*p$$YHf!2bGg27VQf)U{P6^w;NffFkZ>cvwY
zBg_M~hu6YNFohLwiZ}3d_5j;0MjB%5xfW@7#dK&DG9xS4a~-DADvX8492Or#EX2{Z
z|K`BC5O56oAaXQ1j*{1iyN)1kxkV)$UPW$rcE%}tqQU=jq|Z(HyLv<#%LhO;tWwok
zoT)C}Go7K&&o2Bh(Ou7?gt1(SXsTsH6aA1*h)rVazC`p(Pj{(H!mxp`oc+)Y=&1XV
zyD|lp3EHJZvEh!&I@LAmha6%|sV}&c_-mE9raO$SF-eISli|5XEW%puBjSs!=t{_7
z?>E^DoT`uXkNdM8FyNBaji7UZhA!JXPhPAhk$bir}gI0Di;1Lel!B@SG>kteYqjQf}OD3*K1qpX$azO@}Y$~-#A@W=nEkub@
zh>-}18n~d67*Rh%g*b^54Q7qtd6Z6cAS#+o;~+vgqZF9r6?(&?EXDx|K6`4pv&J`ZJFq62gc*t1ok50d`?tr&^L9^`(~)Nem!ACODY?Cm}s|rB>X>mAyXfiP4Q;7txJ_
z9Kkst&o(B#;H6ZO;zXc5xQO5m_6XjG9#9b9SJl=rJBv|E!>E}A?OtDNLvJmj4@7@~
z{A2AZvZSlPL)Ro{y*{|s%^&Y?+K~f6wTpmmM`0+0TY8kuAL@2*GIU)O*(nx!rYPTSx)PGINdz@Ld&_!
zR~B|`y<-sih2~ElJ>Ix?YsX;=Pe6*w`GtkKLPXH{raUq-;`KnB?y)w0y1n`3`Yr)w
z%w`kmz98Z-=<6WDbZeCcia1>maZO5{KwZ{dTJ)G1$S!Ar%DR|x19=s21{g;{!sR;m
z++xXw%MmCSSI#Ey@9rn~5X4e}<({Oo!
z4R%OG!7RXTpmsHevu)$pj2E8UR}F{;*@JI@=|jW@!EtNu+{DsF%HL(WVYy3ljj6KE
zYN^p&9^jZ6Uz&nE-KANNGef)zGrG$un|BPzerd(CNfzk_H67NRU6qU*pkKHSDK#}!Fn
zxrK?uWmw^Mh+e?8QUNskm`90BlsigG_T>t^iGbZ{@CKxHQ2;#P640-TIHL2dehiod
z2@;sbfP|g?kI#B9!T#O;?|kyr=B}3A8tSW`O~gG9cR7Z7(}6uiCqh#
zrLt|5C=(E8`vvJ2L^LfE#||_OpNDRh(+WE*oqfk2HOiRh5g$o%Fyj^lN;iJ4TGBP6C})1
kY!gP>l|z_~NF-3-s@cRd>D%I+a>X}7?A;xZhpZm@4-U~5jsO4v
literal 0
HcmV?d00001
diff --git a/NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc b/NutritionMasterSpider/functions/__pycache__/get_selector.cpython-36.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ccbe4895387b700f21d8269cd0029f18aa909acb
GIT binary patch
literal 436
zcmYk2K}!Nr5XWcUu8^YQv2I@XB9%cAA(03XDZzFKTL|&Ja%*>$_nx4k5!fY)x&_?}
z@)!htioU>J!%*lGM2BWQgaf}nGygXX^Cq84C4Rqe4?h6lllTut*(RapNjPxyz{e^g
zaK?=*s4{NaV8tf%3KoVjp`{RYj7kcF$Ph(B6-c^i4X4ouwE!}8Txu&#`cFW~LI>+sx9+}EH5&B38PtAOAMU9N5)#8~Z>#TQ|nOQZC
z?5L26H-z{P@W2zQ1mZ978|HzRs#WtBc;cL0$1-VD1VVjatT{7t=FDa1`_4IDtkv9i
z@Bi}I?`2K9uT2#l`j?=J4G>hLB+}a0>JjPdZJiW4qis-wnjvYMOz&CLIv{PE+O%|6
zYnP})%g{R1r4?w)v`TBxx|FoE`phBhtF70GDsM6Ar##sm?75!`#^1cW#bUWPSWEW8
zC<^A58}r_|wV)fuG7;Nvc^}4-MII=;k6YfR*PQp8O@FEGT~5=8-DIC%3+3GM;>E_|
z1@GLo4{oeoKkr514)fk;-JPWFt#0$A&*qjF8uN{Xi%W}*X7hsA3T_2F94|X0aI-E7
zEGE=bP*>wYVPR#67bHnmva%-7VN
zY!R;FdQcvG``zK4FCYE%>%)6r<%*Rw;6dNZc(hWCIg=TWivc%a-JuJjZYl$8RB4+9
zlyRX-GVHS?ld6PhgiIX%24>kaAmEtdfCt~-d-U@U>)ErQoIbeFgIRq>nYfR#M8sIi
zkw?mvOpGyBZVt5{g+eNavoA8363PG)a2staLIyGuem9{^oeom?7@&jCVo-$fmU1RN
zQ?gyDtds*Y)TxbPtE;n68wKbQwJ#*x4r
z-#8~2uVSx;Vg?0Lwm1*pl%Ga%2E|zvvnY_jM>l%~70;n~9tEP7^P~_j!BEW}G1b2v
z%5A^6`)e@s7mR0*WBe*u{I4TPfpFn!#}Iz1$f{B|fxHmQDRjrTdNQz8n%s_~B%prS
z-&!~h=wnX%Is%Fz6br_yiPP@GU~v5er!@+vg|wg#jiC<7!5W!EvscQK!wU2qNDAd#
z^SHCRkQ8>oS*_ez%a9Z%Hjosoee0<>t4RYH{3}2!Pj*#hriqX|chh6eX&3R^F47bC
z;C=tbNvpWmQAmCd>;+?c-<#Q)zOJsw_npPt
zbp_xj99S5`WrW>>h5{uyNC8!-`V3Npk`ah$E&KvQS;>@3M;t@+BkUh&%AYy7$dy$!
zb$+R$P_3fU01eU*)oGYUXb0`Qr&lyiCKOk3HQH5EDgiezp;m#wT01wb^9(2_z=>-|PD%E#ewSRzp70oiFJ4ahld0y35XF9GFd5Sn5;!`-%b!sbAH8J
zsQIopJH5ZY+ji$yy_Xxl+gg3!c(>qmBDcQ1+x$4?eOYVH?f40AcB}q%rLnx#THb8e
zO}%MsymG=w_TGNmpPO;49Lh$<43?v2CeLgUC|L$)&IzP6mS*a^TaCpUHu3hJdfVH-
z_Fj0?uf6AM-iP((=Gy;Rjk!f{?@5~#(}h+jGE=Bo`(Y|FU}SkhYFMcbUu&FYCyW*d-}}zcwhWny1zh~ogQ*H&W3W=
zGd7MmQZ#V3^q6C2WztTUxW(Bh%EpUj5%!g2q@sW=Z!HjoM2SXvNH@_*1fvMXorpNX
jI*N>#V#y!i`~GAHjC>_RznCvjC&w
Date: Mon, 4 Mar 2019 20:52:56 +0800
Subject: [PATCH 3/4] 1
---
NutritionMaster/README.md | 405 --------------------------------------
1 file changed, 405 deletions(-)
delete mode 100644 NutritionMaster/README.md
diff --git a/NutritionMaster/README.md b/NutritionMaster/README.md
deleted file mode 100644
index f1e41cc..0000000
--- a/NutritionMaster/README.md
+++ /dev/null
@@ -1,405 +0,0 @@
-
-## 营养大师
-
-一款基于数据分析的智能饮食推荐APP
-
-仓库地址: https://github.com/wangtianrui/NutritionMaster
-
-### 数据分析
-
-* 人体健康信息
- * 体重
- * 身高
- * 年龄
-* 菜品信息
- * 菜的名称
- * 卡路里
- * 蛋白质,脂肪等
- * 推荐的食用量
-* 某个人群对应的改善体质(减肥,塑性,增肌等)的方案
- * 菜谱
- * 运动方式
-
-### 数据集和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/ 数据集官网
- * 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
-* 更牛逼的食材分析和菜谱推荐: http://pic2recipe.csail.mit.edu/ 加强版百度API
-* 莫须有数据集
- * 糖尿病 时间-血糖含量关系数据 : https://archive.ics.uci.edu/ml/datasets/diabetes
- * GPA和饮食习惯的关系 : https://www.kaggle.com/borapajo/food-choices
-
-**王天锐收集的资料**
-
-0、9种体质 //暂定
-1、根据用户的体质来进行推荐菜谱与制定营养计划 ---- 两种模式：9体模式和普通健身模式
-2、用户可以随时输入自己当前吃的食物的名字与量 ---- 随时记
-3、动态爬虫——http://www.boohee.com/ 每种食材的卡路里等信息（优先kaggle）
-4、卡路里累加器及其可视化、每天个人信息可视化
-5、https://www.xinshipu.com/ 菜谱信息
-6、通过照片提取出食物的卡路里等信息 百度api
-7、http://www.zyyssl.com/cookbook.html //中药食材信息、药膳信息、9体、各种病针对的药膳
-8、照片识菜帮
-9、http://www.ttmeishi.com/CaiXi/YaoShan/ //病人对应的食谱
-10、测算http://www.chinacaipu.com/zt/sccs.html 体质算法
-11、http://www.chinacaipu.com/menu/jianya/ 特殊人群（压力之类的）
-
-
-
-### 需求分析
-
-* 登陆、注册
-* 输入基本信息信息（身高、体重、性别、年龄）
- * 额外信息（工作、周均运动时间、睡眠段、九体、病史）
-* 针对没有填写额外信息的用户：选择减肥、增肌、塑形 、保持
-* 可视化（自己的信息和目标标准的比较、根据上述选择改变）每天的量（手环、手机计步器），近几天的曲线
-* 推荐菜谱：两个tab，一个定制菜谱，一个是随机智能推送
- * 单一菜推荐
- * 组合推荐
- * 一周大菜谱推荐（根据每日你自己加的一些信息动态改变）
- * 如果填了额外信息的，就是药膳推荐（一周药膳、周二普通、周三药膳。。。。）（注意可能不想减肥啥的）
-* 百度api->动态录入每顿饭的信息（防抖处理，这里吹牛逼算法，推测吃了多少卡路里），识别后把，动态改变一周定制计划
-* 做菜环节加入识菜帮所有功能，并加入详细食材信息卡路里等
-* 针对特殊人群，混到推荐里推送有利于健康的**方法**信息（敷黄瓜方法）
-* 特殊病人群体每日相关东西的摄取量的一个限定区间显示
-* ocr体检单信息录入
-* **针对照片中菜的数量分析吃了多少菜,包含多少卡路里**
-
-
-
-### 10-6更新：小细节
-
-* BMI小数
-* 需不需要为每个用户加一个用于存放一周定制的类，（这个应该不是特别需要，只是想想）
-* 模糊搜索
-* 食材对应menu
-
-
-
-#### 24日更新内容
-
-
-
-粉尘接触得多的 吃纤维素
-
-* 职业,某种病对各种物质的需求
- * 修改职业,病(一些菜谱分类),体质 表
- * 把职业分为几类(多动的,少动的)用于BMI标准
-* https://www.google.com/search?q=%E8%90%A5%E5%85%BB%E5%85%83%E7%B4%A0%E9%9C%80%E6%B1%82&oq=%E8%90%A5%E5%85%BB%E5%85%83%E7%B4%A0&aqs=chrome.1.69i57j69i59j0l4.5781j0j1&sourceid=chrome&ie=UTF-8
-* 职业\病\九体\体质(BMI) 结合起来的**物质需求标准** (要求有 **卡路里** 六芒星),以周为单位计算需求量
-* 特殊职业(比如运动员)对身体素质(BMI)标准
-* 早 中晚餐分类:
- * 早: 饼 粥 羹 面 奶
-* **加入季节方案(比如夏天就推荐防暑的,冬天推荐暖身的)**
-* 蒋:
- * 补充菜谱: url补充缺失值,卡路里,热量,脂肪,蛋白质等
- * 爬卡路里时,原来的菜名是一列,新爬到的是一列,后面几列就是卡路里,脂肪等,注意数据规整
- * 爬不到就先空下,根据食材的信息计算
- * 食材的信息(包括卡路里等)
- * http://www.boohee.com/food/search?keyword=%E8%8C%B6%E5%8F%B6%EF%BC%88%E7%BA%A650%E5%85%8B%EF%BC%89
- * 菜谱的简单介绍
-* 浏览记录(post username和menuname和时间)
-
-王:定制( 需要蒋给我比如:蛋白质在100-200范围内的菜谱)
-
-蒋:
-
-* 体质表: 添加几列对某种物质的需求 √
-
-* 职业表: 添加几列对某种物质的需求,添加一列BMI的需求 √
-
-* user表: 添加综合对物质的需求 √
-
-* 菜单表:
- * 添加一列早/午晚餐,早为1,else为0. 根据 饼 粥 羹 面 奶 判断
- * 补充一下缺失的url,卡路里 √
- * 添加几列各种物质的需求 √
- * 有一部分数据是爬下的csv里面直接读取,一部分缺失的用food_material的组合来计算
-
-* **对接任务**: 接口使用方法可以参尻main函数里面的注释和数据库ER图
-
- * WebUtil改成了单例,一些方法注意一下
-
- * 注册: `createUser`.注意年龄应该让用户填出生年,获取年龄时每次都根据年份计算一下
-
- * 直接set设置用户的各种信息,不需要的就空着不用set,特殊的一点是病有多个值,要用一个List
-
- 
-
- * 修改用户信息 `changeUserInfo`,注意username必须设置,其他的是需要改的值.**修改会覆盖之前的内容**.比如用户之前illness是健忘食谱,想增加一个高血压食谱, 就需要把之前的也写上,就是一起传 `健忘食谱,高血压食谱`这两个参数.写到List里面. 具体参考main函数里面的
-
- * 获取九体信息 `getPhysique`方法
-
- * 获取用户营养元素所需的量: 先`getUser`获取到用户的病/职业/体质名字,然后根据这些名字查询每个 病/职业/体质信息对应的元素需求,最后加权计算 (这里是不是麻烦了点?)
-
- * 用户职业BMI分类 3多动,2中等,1少动 先 `getUser`获取到用户的职业名字.然后`getOccupation`获取到该职业的BMI分类
-
- * 动态改变用户已吃的营养元素的量: 在用户表添加element参数,每周自动清空一次
-
- * Map的可选参数: `[calorie,carbohydrate,fat ,protein,cellulose,vitaminA,vitaminB1,vitaminB2,vitaminB6,vitaminC,vitaminE,carotene,cholesterol,Mg,Ca,Fe,Zn,Cu,Mn,K ,P ,Na,Se,niacin ,thiamine]`
-
- ```java
- public static void main(String[] args) {
- //只传入变动的参数就行.
- //比如 这顿饭摄入了100卡路里,10脂肪.就这样写.
- Map params = new HashMap<>();
- params.put("calorie", 100.0);
- params.put("fat", 10.0);
-
- //第一个参数是username,第二个参数是摄入的营养元素值.可以看函数的源码,有注释
- WebUtil.getInstance().eatenElements("test5", params, new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
-
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- System.out.println(new Gson().fromJson(response.body().string(), MyUser.class));
-
- }
- });
- }
- ```
-
- * 获取用户本周已摄入的营养元素的量: `getUser`得到当前用户的信息,解析后用`MyUser`的`getEaten_elements()`获取到Element对象.里面有各种元素信息
-
- * 根据多个食材组合来搜菜
-
- ```java
- List materialList = new ArrayList<>();
- materialList.add("黄瓜");
- materialList.add("茄子");
- // materialList.add("鸡蛋");
- WebUtil.getInstance().getMenusByMaterials(materialList, new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
-
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- //必须判断状态码,如果为200说明正常,如果为404,说明这几个食材组合查询不到可以做的菜
- if (response.code() == 200) {
- String json = response.body().string();
- FoodMenu[] menus = new Gson().fromJson(json, FoodMenu[].class);
- System.out.println(menus);
- for (FoodMenu menu : menus) {
- System.out.println(menu.getName());
- }
- } else {
- System.out.println("查不到组合食材可以做的菜");
- }
- }
- });
- ```
-
- * 用户的浏览历史: 添加用户和菜谱的多对多关系
-
- ```java
- //获取历史记录 传入username
- WebUtil.getInstance().getEatenHistory("test5", new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
-
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- String json = response.body().string();
- History[] histories = new Gson().fromJson(json, History[].class);
- System.out.println(Arrays.toString(histories));
- }
- });
- //添加历史记录 传入username 和 Menu的名字
- WebUtil.getInstance().addEatenHistory("test5", "多味茄子泥", new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
-
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- String json = response.body().string();
- History history = new Gson().fromJson(json, History.class);
- System.out.println(history);
- }
- });
- ```
-
- * 菜名搜索: `getMenu`方法,传入菜名(菜名通过其他的各种关联方式获取) (menu.calorie是直接爬到的卡路里值,营养元素里的menu.elements.calorie卡路里是根据每个食材的卡路里计算的,相对来说,menu.calorie的值更准确)
-
- * 功效搜菜 `getMenuClassification`传入分类(功效)参数,比如川菜.搜到所有的川菜名字.然后可以用菜名搜索搜某个菜的详细信息
-
- * **点赞或评论来影响推荐顺序**
-
- * **晒图区域**
-
- * 营养量搜菜 : 搜索某个营养量范围内的菜
-
- 可选参数: `[calorie,carbohydrate,fat ,protein,cellulose,vitaminA,vitaminB1,vitaminB2,vitaminB6,vitaminC,vitaminE,carotene,cholesterol,Mg,Ca,Fe,Zn,Cu,Mn,K ,P ,Na,Se,niacin ,thiamine]`
-
- ```java
- public static void main(String[] args) {
- //首先构造一个Map, key是参数的名字,value是参数的值.用不到的参数不用写.
- //我在服务器端根据这些参数构造一个sql,就是 ... WHERE key1 <= val1 AND ...这样的.
- //所以你只传入需要作为搜索条件的参数就可以了.
- Map params = new HashMap<>();
- params.put("calorie", 100.0);
- params.put("fat", 10.0);
- WebUtil.getInstance().getMenusByElements(params, new Callback() {
- @Override
- public void onFailure(Call call, IOException e) {
-
- }
-
- @Override
- public void onResponse(Call call, Response response) throws IOException {
- String json = response.body().string();
- System.out.println(json);
- //用轻量级的菜单类MenuLight解析json,这个类只有Menu的[名字,卡路里,元素对象的主码id]这三个域.想获取详细信息可以用getMenu方法获取
- //这样是为了查询更快
- FoodMenuLight[] foodMenuLights = new Gson().fromJson(json, FoodMenuLight[].class);
- System.out.println(Arrays.toString(foodMenuLights));
- }
- });
- }
- ```
-
- * **季节搜菜**
-
- * 小知识获取 : `getRandomTricks`
-
-
-
-
-
-
-
-
-
-#### 又想到的补充内容
-
-- 根据口味推荐,或者口味混合搭配推荐
-- 注意冬天不推荐夏天的菜谱
-
-### 数据库设计
-
-
-
-**加下划线为主码,加粗为外码,默认not null**
-
-* **菜谱**(str菜名, **nullable str体质_名称**(对应最优菜谱的效果) ,int卡路里,int制作时间(分钟),str口味,str工艺,str做法,str图片url)
- * menu
-* **食材**( str名称)
- * material
-* **体质**(str体质名称,str体质特点,str运动调理方式)
- * physique
-* **体质性状**(str性状名称)
- * Physical properties
-* **菜谱功能和分类**( str分类名称)
- * menu classification
-* **用户**( str用户名,str密码, **nullable str 体质-名称**,**nullable str特殊职业**)
- * User
-* **特殊职业**( str职业名称)
- * Occupation
-* 菜谱功能分类_可治愈的职业\_特殊职业( **特殊职业-str职业名称**, **菜谱功能和分类-str分类名称**)
-* 菜谱\_做菜_食材 ( **str菜谱-菜名**,**str食材-名称**,int用量)
- * cook quantity
-* 食材\_效果_体质( **str食材-名称**, **nullable str体质-名称**,int效果(1有利于,0不利于))
- * Material effect
-* 体质\_身体状态_体质性状( **str体质-名称**, **str体质性状-性状名称**)
- * physical_state
-* 菜谱\_菜谱效果_菜谱功能和分类( **str菜谱-菜名**, **str菜谱功能和分类-分类名称**)
- * menu_effect
-
-
-
-### 服务器请求
-
-| 说明 | 方法 | 请求示例 | 备注 |
-| ------ | ---- | ---------------------------------------- | ----------------------------- |
-| 查询菜单信息 | GET | http://120.77.182.38/menus/某菜名/ | 不加菜名默认请求所有菜单(服务器可能扛不住) |
-| 查询食材信息 | GET | http://120.77.182.38/foodmaterial/西红柿/ | 同上 |
-| 查询用户信息 | GET | http://120.77.182.38/myuser/zhaolizhi/ | 同上 |
-| 新建用户信息 | POST | http://120.77.182.38/myuser/ | 参数见下图 |
-| 查询菜谱分类 | GET | http://120.77.182.38/menuclassification/糖尿病食谱/ | 不加分类名默认请求所有分类(和对应的菜谱),响应时间较长 |
-| 查询职业信息 | GET | http://120.77.182.38/occupation/电力工程师/ | 不加职业名默认查询所有,响应较快 返回职业对应的菜单分类 |
-| 查询体质信息 | GET | http://120.77.182.38/physique/气虚质/ | 返回体质需要的食材 |
-| | | | |
-| | | | |
-
-* POST新建用户信息`params`示例
-
- * 1♂ 0♀
- * `occupation_name`,`physical_name`的值必须和数据库对应
-
- 
-
-
-
-## 国赛阶段
-
-### 代码
-
-* 优化了`getRandomMenus方法`,传入username参数.会根据user的体质,职业,病理推荐菜
-
- ```java
- public void getRandomMenus(int count, String username, Callback callback)
- ```
-
- 这个方法之前的版本没有username参数,**现在弃用原来的版本,原来的方法仍然可以调用,需要把项目的所有getRandomMenus方法调用加上一个username参数**
-
-### 问题
-
-* ~~连续识别,出现错误的,点一下消去 锐!~~
-* ~~bug: 连续拍照后 点了一周定制 锐~~
-* ~~*食材模糊识别 ok*~~
-* ~~通过食材组合,搜索菜 ,菜要符合username的信息 蒋和锐 `getMenusByMaterials`~~
-* 卡路里不对
-* ~~*早餐晚餐的搜索不随机 shuffle了一下.ok*~~
-
- * ~~`get_menus_by_elements` django随机一下~~
-* 周定制下面的两个按钮 锐
-* ~~*搜菜如果搜不到 把name减一下再搜 ok*~~
-* getRandomMenus的调用里面加上username参数 锐
-* 吃饭的时候没拍照,吃饭完了才想添加,但是菜图片没有了.需要输入添加 (王)
-* 口味信息采集
-* 历史记录
-* 社交功能: 点赞,晒图,评论
-
-
- ### 时间安排
-
-* 周日上午答辩
-* 周五排练
-
-### PPT安排
-
-* 小组分工介绍
-
-
-* 产品背景 秦
-* 量身定制 林
-* 周定制 林
-* 动态添加 智能定量 赵
-* 拍食材做菜(食菜帮) 赵
-* 菜谱推荐 秦
-
-* 产品亮点 秦
-* 产品难点 王
-* 未来展望 王
- * 相信在不就得将来,在AI智能定制膳食的帮助下,人们不再为职业病,慢性病所烦恼,享受科学膳食带来的健康生活.
-
-### 需要演示的功能
-
-* 拍照 菜品识别 识别 烤鸭 土豆丝 鱼香肉丝 红烧肉 炒面 (动态调量,修改当天余额)
-* 拍照 食材识别 胡萝卜 白萝卜 姜 长条茄子 菜花 (根据用户的信息,并且是多搜索)
-
-* 周定制(最左边的fragment)
\ No newline at end of file
From e9f783934885340bdae9f03c9f82b5fe9eaf8dfb Mon Sep 17 00:00:00 2001
From: jiangyuwei666 <739843128@qq.com>
Date: Mon, 4 Mar 2019 20:57:51 +0800
Subject: [PATCH 4/4] 1
---
NutritionMaster/README.md | 405 ++++++++++++++++++++++++++++++++++++++
1 file changed, 405 insertions(+)
create mode 100644 NutritionMaster/README.md
diff --git a/NutritionMaster/README.md b/NutritionMaster/README.md
new file mode 100644
index 0000000..f1e41cc
--- /dev/null
+++ b/NutritionMaster/README.md
@@ -0,0 +1,405 @@
+
+## 营养大师
+
+一款基于数据分析的智能饮食推荐APP
+
+仓库地址: https://github.com/wangtianrui/NutritionMaster
+
+### 数据分析
+
+* 人体健康信息
+ * 体重
+ * 身高
+ * 年龄
+* 菜品信息
+ * 菜的名称
+ * 卡路里
+ * 蛋白质,脂肪等
+ * 推荐的食用量
+* 某个人群对应的改善体质(减肥,塑性,增肌等)的方案
+ * 菜谱
+ * 运动方式
+
+### 数据集和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/ 数据集官网
+ * 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
+* 更牛逼的食材分析和菜谱推荐: http://pic2recipe.csail.mit.edu/ 加强版百度API
+* 莫须有数据集
+ * 糖尿病 时间-血糖含量关系数据 : https://archive.ics.uci.edu/ml/datasets/diabetes
+ * GPA和饮食习惯的关系 : https://www.kaggle.com/borapajo/food-choices
+
+**王天锐收集的资料**
+
+0、9种体质 //暂定
+1、根据用户的体质来进行推荐菜谱与制定营养计划 ---- 两种模式：9体模式和普通健身模式
+2、用户可以随时输入自己当前吃的食物的名字与量 ---- 随时记
+3、动态爬虫——http://www.boohee.com/ 每种食材的卡路里等信息（优先kaggle）
+4、卡路里累加器及其可视化、每天个人信息可视化
+5、https://www.xinshipu.com/ 菜谱信息
+6、通过照片提取出食物的卡路里等信息 百度api
+7、http://www.zyyssl.com/cookbook.html //中药食材信息、药膳信息、9体、各种病针对的药膳
+8、照片识菜帮
+9、http://www.ttmeishi.com/CaiXi/YaoShan/ //病人对应的食谱
+10、测算http://www.chinacaipu.com/zt/sccs.html 体质算法
+11、http://www.chinacaipu.com/menu/jianya/ 特殊人群（压力之类的）
+
+
+
+### 需求分析
+
+* 登陆、注册
+* 输入基本信息信息（身高、体重、性别、年龄）
+ * 额外信息（工作、周均运动时间、睡眠段、九体、病史）
+* 针对没有填写额外信息的用户：选择减肥、增肌、塑形 、保持
+* 可视化（自己的信息和目标标准的比较、根据上述选择改变）每天的量（手环、手机计步器），近几天的曲线
+* 推荐菜谱：两个tab，一个定制菜谱，一个是随机智能推送
+ * 单一菜推荐
+ * 组合推荐
+ * 一周大菜谱推荐（根据每日你自己加的一些信息动态改变）
+ * 如果填了额外信息的，就是药膳推荐（一周药膳、周二普通、周三药膳。。。。）（注意可能不想减肥啥的）
+* 百度api->动态录入每顿饭的信息（防抖处理，这里吹牛逼算法，推测吃了多少卡路里），识别后把，动态改变一周定制计划
+* 做菜环节加入识菜帮所有功能，并加入详细食材信息卡路里等
+* 针对特殊人群，混到推荐里推送有利于健康的**方法**信息（敷黄瓜方法）
+* 特殊病人群体每日相关东西的摄取量的一个限定区间显示
+* ocr体检单信息录入
+* **针对照片中菜的数量分析吃了多少菜,包含多少卡路里**
+
+
+
+### 10-6更新：小细节
+
+* BMI小数
+* 需不需要为每个用户加一个用于存放一周定制的类，（这个应该不是特别需要，只是想想）
+* 模糊搜索
+* 食材对应menu
+
+
+
+#### 24日更新内容
+
+
+
+粉尘接触得多的 吃纤维素
+
+* 职业,某种病对各种物质的需求
+ * 修改职业,病(一些菜谱分类),体质 表
+ * 把职业分为几类(多动的,少动的)用于BMI标准
+* https://www.google.com/search?q=%E8%90%A5%E5%85%BB%E5%85%83%E7%B4%A0%E9%9C%80%E6%B1%82&oq=%E8%90%A5%E5%85%BB%E5%85%83%E7%B4%A0&aqs=chrome.1.69i57j69i59j0l4.5781j0j1&sourceid=chrome&ie=UTF-8
+* 职业\病\九体\体质(BMI) 结合起来的**物质需求标准** (要求有 **卡路里** 六芒星),以周为单位计算需求量
+* 特殊职业(比如运动员)对身体素质(BMI)标准
+* 早 中晚餐分类:
+ * 早: 饼 粥 羹 面 奶
+* **加入季节方案(比如夏天就推荐防暑的,冬天推荐暖身的)**
+* 蒋:
+ * 补充菜谱: url补充缺失值,卡路里,热量,脂肪,蛋白质等
+ * 爬卡路里时,原来的菜名是一列,新爬到的是一列,后面几列就是卡路里,脂肪等,注意数据规整
+ * 爬不到就先空下,根据食材的信息计算
+ * 食材的信息(包括卡路里等)
+ * http://www.boohee.com/food/search?keyword=%E8%8C%B6%E5%8F%B6%EF%BC%88%E7%BA%A650%E5%85%8B%EF%BC%89
+ * 菜谱的简单介绍
+* 浏览记录(post username和menuname和时间)
+
+王:定制( 需要蒋给我比如:蛋白质在100-200范围内的菜谱)
+
+蒋:
+
+* 体质表: 添加几列对某种物质的需求 √
+
+* 职业表: 添加几列对某种物质的需求,添加一列BMI的需求 √
+
+* user表: 添加综合对物质的需求 √
+
+* 菜单表:
+ * 添加一列早/午晚餐,早为1,else为0. 根据 饼 粥 羹 面 奶 判断
+ * 补充一下缺失的url,卡路里 √
+ * 添加几列各种物质的需求 √
+ * 有一部分数据是爬下的csv里面直接读取,一部分缺失的用food_material的组合来计算
+
+* **对接任务**: 接口使用方法可以参尻main函数里面的注释和数据库ER图
+
+ * WebUtil改成了单例,一些方法注意一下
+
+ * 注册: `createUser`.注意年龄应该让用户填出生年,获取年龄时每次都根据年份计算一下
+
+ * 直接set设置用户的各种信息,不需要的就空着不用set,特殊的一点是病有多个值,要用一个List
+
+ 
+
+ * 修改用户信息 `changeUserInfo`,注意username必须设置,其他的是需要改的值.**修改会覆盖之前的内容**.比如用户之前illness是健忘食谱,想增加一个高血压食谱, 就需要把之前的也写上,就是一起传 `健忘食谱,高血压食谱`这两个参数.写到List里面. 具体参考main函数里面的
+
+ * 获取九体信息 `getPhysique`方法
+
+ * 获取用户营养元素所需的量: 先`getUser`获取到用户的病/职业/体质名字,然后根据这些名字查询每个 病/职业/体质信息对应的元素需求,最后加权计算 (这里是不是麻烦了点?)
+
+ * 用户职业BMI分类 3多动,2中等,1少动 先 `getUser`获取到用户的职业名字.然后`getOccupation`获取到该职业的BMI分类
+
+ * 动态改变用户已吃的营养元素的量: 在用户表添加element参数,每周自动清空一次
+
+ * Map的可选参数: `[calorie,carbohydrate,fat ,protein,cellulose,vitaminA,vitaminB1,vitaminB2,vitaminB6,vitaminC,vitaminE,carotene,cholesterol,Mg,Ca,Fe,Zn,Cu,Mn,K ,P ,Na,Se,niacin ,thiamine]`
+
+ ```java
+ public static void main(String[] args) {
+ //只传入变动的参数就行.
+ //比如 这顿饭摄入了100卡路里,10脂肪.就这样写.
+ Map params = new HashMap<>();
+ params.put("calorie", 100.0);
+ params.put("fat", 10.0);
+
+ //第一个参数是username,第二个参数是摄入的营养元素值.可以看函数的源码,有注释
+ WebUtil.getInstance().eatenElements("test5", params, new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ System.out.println(new Gson().fromJson(response.body().string(), MyUser.class));
+
+ }
+ });
+ }
+ ```
+
+ * 获取用户本周已摄入的营养元素的量: `getUser`得到当前用户的信息,解析后用`MyUser`的`getEaten_elements()`获取到Element对象.里面有各种元素信息
+
+ * 根据多个食材组合来搜菜
+
+ ```java
+ List materialList = new ArrayList<>();
+ materialList.add("黄瓜");
+ materialList.add("茄子");
+ // materialList.add("鸡蛋");
+ WebUtil.getInstance().getMenusByMaterials(materialList, new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ //必须判断状态码,如果为200说明正常,如果为404,说明这几个食材组合查询不到可以做的菜
+ if (response.code() == 200) {
+ String json = response.body().string();
+ FoodMenu[] menus = new Gson().fromJson(json, FoodMenu[].class);
+ System.out.println(menus);
+ for (FoodMenu menu : menus) {
+ System.out.println(menu.getName());
+ }
+ } else {
+ System.out.println("查不到组合食材可以做的菜");
+ }
+ }
+ });
+ ```
+
+ * 用户的浏览历史: 添加用户和菜谱的多对多关系
+
+ ```java
+ //获取历史记录 传入username
+ WebUtil.getInstance().getEatenHistory("test5", new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ String json = response.body().string();
+ History[] histories = new Gson().fromJson(json, History[].class);
+ System.out.println(Arrays.toString(histories));
+ }
+ });
+ //添加历史记录 传入username 和 Menu的名字
+ WebUtil.getInstance().addEatenHistory("test5", "多味茄子泥", new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ String json = response.body().string();
+ History history = new Gson().fromJson(json, History.class);
+ System.out.println(history);
+ }
+ });
+ ```
+
+ * 菜名搜索: `getMenu`方法,传入菜名(菜名通过其他的各种关联方式获取) (menu.calorie是直接爬到的卡路里值,营养元素里的menu.elements.calorie卡路里是根据每个食材的卡路里计算的,相对来说,menu.calorie的值更准确)
+
+ * 功效搜菜 `getMenuClassification`传入分类(功效)参数,比如川菜.搜到所有的川菜名字.然后可以用菜名搜索搜某个菜的详细信息
+
+ * **点赞或评论来影响推荐顺序**
+
+ * **晒图区域**
+
+ * 营养量搜菜 : 搜索某个营养量范围内的菜
+
+ 可选参数: `[calorie,carbohydrate,fat ,protein,cellulose,vitaminA,vitaminB1,vitaminB2,vitaminB6,vitaminC,vitaminE,carotene,cholesterol,Mg,Ca,Fe,Zn,Cu,Mn,K ,P ,Na,Se,niacin ,thiamine]`
+
+ ```java
+ public static void main(String[] args) {
+ //首先构造一个Map, key是参数的名字,value是参数的值.用不到的参数不用写.
+ //我在服务器端根据这些参数构造一个sql,就是 ... WHERE key1 <= val1 AND ...这样的.
+ //所以你只传入需要作为搜索条件的参数就可以了.
+ Map params = new HashMap<>();
+ params.put("calorie", 100.0);
+ params.put("fat", 10.0);
+ WebUtil.getInstance().getMenusByElements(params, new Callback() {
+ @Override
+ public void onFailure(Call call, IOException e) {
+
+ }
+
+ @Override
+ public void onResponse(Call call, Response response) throws IOException {
+ String json = response.body().string();
+ System.out.println(json);
+ //用轻量级的菜单类MenuLight解析json,这个类只有Menu的[名字,卡路里,元素对象的主码id]这三个域.想获取详细信息可以用getMenu方法获取
+ //这样是为了查询更快
+ FoodMenuLight[] foodMenuLights = new Gson().fromJson(json, FoodMenuLight[].class);
+ System.out.println(Arrays.toString(foodMenuLights));
+ }
+ });
+ }
+ ```
+
+ * **季节搜菜**
+
+ * 小知识获取 : `getRandomTricks`
+
+
+
+
+
+
+
+
+
+#### 又想到的补充内容
+
+- 根据口味推荐,或者口味混合搭配推荐
+- 注意冬天不推荐夏天的菜谱
+
+### 数据库设计
+
+
+
+**加下划线为主码,加粗为外码,默认not null**
+
+* **菜谱**(str菜名, **nullable str体质_名称**(对应最优菜谱的效果) ,int卡路里,int制作时间(分钟),str口味,str工艺,str做法,str图片url)
+ * menu
+* **食材**( str名称)
+ * material
+* **体质**(str体质名称,str体质特点,str运动调理方式)
+ * physique
+* **体质性状**(str性状名称)
+ * Physical properties
+* **菜谱功能和分类**( str分类名称)
+ * menu classification
+* **用户**( str用户名,str密码, **nullable str 体质-名称**,**nullable str特殊职业**)
+ * User
+* **特殊职业**( str职业名称)
+ * Occupation
+* 菜谱功能分类_可治愈的职业\_特殊职业( **特殊职业-str职业名称**, **菜谱功能和分类-str分类名称**)
+* 菜谱\_做菜_食材 ( **str菜谱-菜名**,**str食材-名称**,int用量)
+ * cook quantity
+* 食材\_效果_体质( **str食材-名称**, **nullable str体质-名称**,int效果(1有利于,0不利于))
+ * Material effect
+* 体质\_身体状态_体质性状( **str体质-名称**, **str体质性状-性状名称**)
+ * physical_state
+* 菜谱\_菜谱效果_菜谱功能和分类( **str菜谱-菜名**, **str菜谱功能和分类-分类名称**)
+ * menu_effect
+
+
+
+### 服务器请求
+
+| 说明 | 方法 | 请求示例 | 备注 |
+| ------ | ---- | ---------------------------------------- | ----------------------------- |
+| 查询菜单信息 | GET | http://120.77.182.38/menus/某菜名/ | 不加菜名默认请求所有菜单(服务器可能扛不住) |
+| 查询食材信息 | GET | http://120.77.182.38/foodmaterial/西红柿/ | 同上 |
+| 查询用户信息 | GET | http://120.77.182.38/myuser/zhaolizhi/ | 同上 |
+| 新建用户信息 | POST | http://120.77.182.38/myuser/ | 参数见下图 |
+| 查询菜谱分类 | GET | http://120.77.182.38/menuclassification/糖尿病食谱/ | 不加分类名默认请求所有分类(和对应的菜谱),响应时间较长 |
+| 查询职业信息 | GET | http://120.77.182.38/occupation/电力工程师/ | 不加职业名默认查询所有,响应较快 返回职业对应的菜单分类 |
+| 查询体质信息 | GET | http://120.77.182.38/physique/气虚质/ | 返回体质需要的食材 |
+| | | | |
+| | | | |
+
+* POST新建用户信息`params`示例
+
+ * 1♂ 0♀
+ * `occupation_name`,`physical_name`的值必须和数据库对应
+
+ 
+
+
+
+## 国赛阶段
+
+### 代码
+
+* 优化了`getRandomMenus方法`,传入username参数.会根据user的体质,职业,病理推荐菜
+
+ ```java
+ public void getRandomMenus(int count, String username, Callback callback)
+ ```
+
+ 这个方法之前的版本没有username参数,**现在弃用原来的版本,原来的方法仍然可以调用,需要把项目的所有getRandomMenus方法调用加上一个username参数**
+
+### 问题
+
+* ~~连续识别,出现错误的,点一下消去 锐!~~
+* ~~bug: 连续拍照后 点了一周定制 锐~~
+* ~~*食材模糊识别 ok*~~
+* ~~通过食材组合,搜索菜 ,菜要符合username的信息 蒋和锐 `getMenusByMaterials`~~
+* 卡路里不对
+* ~~*早餐晚餐的搜索不随机 shuffle了一下.ok*~~
+
+ * ~~`get_menus_by_elements` django随机一下~~
+* 周定制下面的两个按钮 锐
+* ~~*搜菜如果搜不到 把name减一下再搜 ok*~~
+* getRandomMenus的调用里面加上username参数 锐
+* 吃饭的时候没拍照,吃饭完了才想添加,但是菜图片没有了.需要输入添加 (王)
+* 口味信息采集
+* 历史记录
+* 社交功能: 点赞,晒图,评论
+
+
+ ### 时间安排
+
+* 周日上午答辩
+* 周五排练
+
+### PPT安排
+
+* 小组分工介绍
+
+
+* 产品背景 秦
+* 量身定制 林
+* 周定制 林
+* 动态添加 智能定量 赵
+* 拍食材做菜(食菜帮) 赵
+* 菜谱推荐 秦
+
+* 产品亮点 秦
+* 产品难点 王
+* 未来展望 王
+ * 相信在不就得将来,在AI智能定制膳食的帮助下,人们不再为职业病,慢性病所烦恼,享受科学膳食带来的健康生活.
+
+### 需要演示的功能
+
+* 拍照 菜品识别 识别 烤鸭 土豆丝 鱼香肉丝 红烧肉 炒面 (动态调量,修改当天余额)
+* 拍照 食材识别 胡萝卜 白萝卜 姜 长条茄子 菜花 (根据用户的信息,并且是多搜索)
+
+* 周定制(最左边的fragment)
\ No newline at end of file