diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java index 04f9144..4d1d520 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/MainActivity.java @@ -210,13 +210,16 @@ public class MainActivity extends BaseActivity { * 初始化悬浮按钮 */ private void initBMB() { - for (int i = 0; i < boomMenuButton.getPiecePlaceEnum().pieceNumber(); i++) { - HamButton.Builder builder = new HamButton.Builder() - .normalImageRes(R.drawable.ic_bmi) - .normalTextRes(R.string.app_name) - .subNormalTextRes(R.string.self_information); - boomMenuButton.addBuilder(builder); - } + + HamButton.Builder builder = new HamButton.Builder() + .normalImageRes(R.drawable.food_material) + .normalTextRes(R.string.food_meterial_title); + boomMenuButton.addBuilder(builder); + HamButton.Builder builder2 = new HamButton.Builder() + .normalImageRes(R.drawable.foods) + .normalTextRes(R.string.food_title); + boomMenuButton.addBuilder(builder2); + } } diff --git a/app/src/main/res/drawable/food_material.jpg b/app/src/main/res/drawable/food_material.jpg new file mode 100644 index 0000000..6630a08 Binary files /dev/null and b/app/src/main/res/drawable/food_material.jpg differ diff --git a/app/src/main/res/drawable/foods.jpg b/app/src/main/res/drawable/foods.jpg new file mode 100644 index 0000000..9d8cb6a Binary files /dev/null and b/app/src/main/res/drawable/foods.jpg differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 70759af..46c1144 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -167,8 +167,8 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" app:bmb_buttonEnum="ham" - app:bmb_buttonPlaceEnum="buttonPlace_ham_4" - app:bmb_piecePlaceEnum="piecePlace_ham_4" /> + app:bmb_buttonPlaceEnum="buttonPlace_ham_2" + app:bmb_piecePlaceEnum="piecePlace_ham_2" /> diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml index 359be6d..5a8601f 100644 --- a/app/src/main/res/layout/body_information_fragment.xml +++ b/app/src/main/res/layout/body_information_fragment.xml @@ -104,8 +104,8 @@ 当前值 标准值 M1080.3,453.7c-77.2,88.2 -214.6,234.4 -214.6,234.4s22,160.2 35.3,269.7c5.9,55.9 -37.5,80.1 -86,58.1 -92.6,-43.4 -233.7,-111 -265.3,-126.4 -32.3,14.7 -174.2,81.6 -267.5,124.9 -49.2,21.3 -92.6,-2.2 -87.5,-58.1 12.5,-109.5 35.3,-269 35.3,-269S91.1,541.9 13.2,453.7c-27.9,-32.3 -9.6,-77.9 44.8,-86 111.7,-19.8 284.4,-51.4 284.4,-51.4s94.8,-163.1 154.3,-263.1C529.8,-7.8 552.6,-0.4 556.3,1c10.3,2.9 26.5,15.4 47,52.2 58.8,99.9 152.1,263.1 152.1,263.1s170.5,31.6 280.7,51.4c53.6,8.1 71.3,54.4 44.1,86z + 食材识别 + 菜品识别