shen/NutritionMaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jiangyuwei' of https://github.com/wangtianrui/NutritionMaster into jiangyuwei

Browse Source
This commit is contained in:
ScorpioMiku
2018-02-11 20:24:44 +08:00
parent 8f8a98a775 e9f7839348
commit deefa86cd3
286 changed files with 2049 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
.gitignore → NutritionMaster/.gitignore vendored
View File

0
.idea/codeStyles/Project.xml → NutritionMaster/.idea/codeStyles/Project.xml generated
View File

0
.idea/runConfigurations.xml → NutritionMaster/.idea/runConfigurations.xml generated
View File

6
README.md → NutritionMaster/README.md
View File

@@ -106,9 +106,9 @@
* 菜谱的简单介绍
* 浏览记录(post username和menuname和时间)
王:定制( 需要赵给我比如:蛋白质在100-200范围内的菜谱)
王:定制( 需要蒋给我比如:蛋白质在100-200范围内的菜谱)
赵:
蒋:
* 体质表: 添加几列对某种物质的需求 √
@@ -361,7 +361,7 @@
* ~~连续识别,出现错误的,点一下消去 锐!~~
* ~~bug: 连续拍照后 点了一周定制 锐~~
* ~~*食材模糊识别 ok*~~
* ~~通过食材组合,搜索菜 ,菜要符合username的信息 赵和锐 `getMenusByMaterials`~~
* ~~通过食材组合,搜索菜 ,菜要符合username的信息 蒋和锐 `getMenusByMaterials`~~
* 卡路里不对
* ~~*早餐晚餐的搜索不随机 shuffle了一下.ok*~~

0
app/.gitignore → NutritionMaster/app/.gitignore vendored
View File

0
app/build.gradle → NutritionMaster/app/build.gradle
View File

0
app/libs/YoudaoBase.jar → NutritionMaster/app/libs/YoudaoBase.jar
View File

0
app/libs/YoudaoCnDictOffline.jar → NutritionMaster/app/libs/YoudaoCnDictOffline.jar
View File

0
app/libs/YoudaoTranslateOffline.jar → NutritionMaster/app/libs/YoudaoTranslateOffline.jar
View File

0
app/libs/YoudaoTranslateOnline.jar → NutritionMaster/app/libs/YoudaoTranslateOnline.jar
View File

0
app/libs/arm64-v8a/libdict-parser.so → NutritionMaster/app/libs/arm64-v8a/libdict-parser.so
View File

0
app/libs/armeabi-v7a/libdict-parser.so → NutritionMaster/app/libs/armeabi-v7a/libdict-parser.so
View File

0
app/libs/armeabi/libdict-parser.so → NutritionMaster/app/libs/armeabi/libdict-parser.so
View File

0
app/libs/mips/libdict-parser.so → NutritionMaster/app/libs/mips/libdict-parser.so
View File

0
app/libs/mips64/libdict-parser.so → NutritionMaster/app/libs/mips64/libdict-parser.so
View File

0
app/libs/x86/libdict-parser.so → NutritionMaster/app/libs/x86/libdict-parser.so
View File

0
app/libs/x86_64/libdict-parser.so → NutritionMaster/app/libs/x86_64/libdict-parser.so
View File

0
app/proguard-rules.pro → NutritionMaster/app/proguard-rules.pro vendored
View File

0
app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java → NutritionMaster/app/src/androidTest/java/com/example/ninefourone/nutritionmaster/ExampleInstrumentedTest.java
View File

0
app/src/main/AndroidManifest.xml → NutritionMaster/app/src/main/AndroidManifest.xml
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CustomizationHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/DishHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HistoryHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/HomePagerAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/IllnessHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MakeStepHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/MaterialResultHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/PickerHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/RecommendAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListAdapter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/ResultListHolder.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseDialog.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/DailyCard.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Element.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMaterial.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenu.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/History.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Illness.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Material.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MenuClassification.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Occupation.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Physique.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/RecommendFood.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ResultList.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/Trick.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/CameraPreview.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardConfig.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/SwipeCardLayoutManager.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/RecipeActivity/RecipeActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddInformationActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/DishResultActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/classifyresult/MaterialResultActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/historysearch/HistoryActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/login/LoginActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/step/StepStarter.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/InformationDialog.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/ui/NoScrollViewPager.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ChartDrawer.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MaterialClassifier.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/MessageUtils.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/PermissionUtils.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/UiUtils.java
View File

0
app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java → NutritionMaster/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java
View File

0
app/src/main/res/drawable-v24/ic_drawer_home.png → NutritionMaster/app/src/main/res/drawable-v24/ic_drawer_home.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 B

After

Width:  |  Height:  |  Size: 108 B

0
app/src/main/res/drawable-v24/ic_launcher_foreground.xml → NutritionMaster/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View File

0
app/src/main/res/drawable-v24/selector.xml → NutritionMaster/app/src/main/res/drawable-v24/selector.xml
View File

0
app/src/main/res/drawable/body_bg.png → NutritionMaster/app/src/main/res/drawable/body_bg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 783 KiB

After

Width:  |  Height:  |  Size: 783 KiB

0
app/src/main/res/drawable/camera_bg.jpg → NutritionMaster/app/src/main/res/drawable/camera_bg.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

0
app/src/main/res/drawable/food_material.jpg → NutritionMaster/app/src/main/res/drawable/food_material.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
app/src/main/res/drawable/food_test.jpg → NutritionMaster/app/src/main/res/drawable/food_test.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

0
app/src/main/res/drawable/foods.jpg → NutritionMaster/app/src/main/res/drawable/foods.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

0
app/src/main/res/drawable/friday.jpg → NutritionMaster/app/src/main/res/drawable/friday.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 137 KiB

After

Width:  |  Height:  |  Size: 137 KiB

Some files were not shown because too many files have changed in this diff Show More