From ccd3e0633c1270100de0208dacc9eeb797272424 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Fri, 5 Oct 2018 19:10:54 +0800 Subject: [PATCH] 1 --- .../nutritionmaster/NutritionMaster.java | 2 +- .../nutritionmaster/base/BaseActivity.java | 1 - .../cardconfig/CardItemTouchCallBack.java | 10 +- .../information/InformationActivity.java | 19 ++- .../customization/CustomizationActivity.java | 13 ++ .../recommend/RecommendFragment.java | 2 - .../nutritionmaster/utils/WebUtil.java | 2 +- app/src/main/res/drawable/ic_calorie.xml | 6 + app/src/main/res/drawable/ic_copy.xml | 6 +- .../drawable/ic_exchange_customization.xml | 8 +- app/src/main/res/drawable/ic_fat.xml | 6 + app/src/main/res/drawable/ic_protein.xml | 5 + app/src/main/res/drawable/ic_sugar.xml | 10 ++ .../res/layout/activity_customization.xml | 149 ++++++++++++++++-- .../main/res/layout/customization_item.xml | 123 ++++++++------- app/src/main/res/layout/dish_result_item.xml | 4 +- .../main/res/layout/recommend_item_big.xml | 2 +- .../main/res/layout/recommend_item_middle.xml | 11 +- app/src/main/res/menu/menu_main.xml | 6 - app/src/main/res/values/dimens.xml | 2 +- 20 files changed, 282 insertions(+), 105 deletions(-) create mode 100644 app/src/main/res/drawable/ic_calorie.xml create mode 100644 app/src/main/res/drawable/ic_fat.xml create mode 100644 app/src/main/res/drawable/ic_protein.xml create mode 100644 app/src/main/res/drawable/ic_sugar.xml diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java index d2a80a5..8e9c5d3 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java @@ -4,6 +4,7 @@ import android.app.Activity; import android.app.Application; import android.os.Bundle; +import com.example.ninefourone.nutritionmaster.bean.FoodMenu; import com.example.ninefourone.nutritionmaster.bean.MyUser; import com.example.ninefourone.nutritionmaster.bean.Occupation; @@ -88,7 +89,6 @@ public class NutritionMaster extends Application { }); initOccupations(); initUser(); -// getAccessToken(); Thread thread = new Thread(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java index 614d9e1..a014b84 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseActivity.java @@ -27,7 +27,6 @@ public abstract class BaseActivity extends AppCompatActivity { unbinder = ButterKnife.bind(this); initViews(savedInstanceState); initToolBar(); - } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java index 6fd06c0..0f26040 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/cardconfig/CardItemTouchCallBack.java @@ -211,11 +211,11 @@ public class CardItemTouchCallBack extends ItemTouchHelper.Callback { */ @Override public float getSwipeEscapeVelocity(float defaultValue) { - Log.d(TAG, "getSwipeEscapeVelocity: " + defaultValue); - View topView = mRecyclerView.getChildAt(mRecyclerView.getChildCount() - 1); - if (isUpOrDown(topView)) { //如果是向上或者向下滑动 - return Float.MAX_VALUE; //就返回阈值为很大 - } +// Log.d(TAG, "getSwipeEscapeVelocity: " + defaultValue); +// View topView = mRecyclerView.getChildAt(mRecyclerView.getChildCount() - 1); +// if (isUpOrDown(topView)) { //如果是向上或者向下滑动 +// return Float.MAX_VALUE; //就返回阈值为很大 +// } return super.getSwipeEscapeVelocity(defaultValue); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java index 021a437..a0c7de7 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/information/InformationActivity.java @@ -1,15 +1,32 @@ package com.example.ninefourone.nutritionmaster.modules.information; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.widget.ImageView; +import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; + public class InformationActivity extends AppCompatActivity { + @BindView(R.id.back_button) + ImageView backButton; + @BindView(R.id.title_text) + TextView titleText; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_information); + ButterKnife.bind(this); + } + + @OnClick(R.id.back_button) + public void onViewClicked() { + finish(); } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java index 4791a8a..0aca3b8 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java @@ -6,13 +6,19 @@ import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.base.BaseActivity; +import com.example.ninefourone.nutritionmaster.bean.FoodMenu; import com.orhanobut.logger.Logger; +import java.util.ArrayList; + import butterknife.BindView; import butterknife.ButterKnife; public class CustomizationActivity extends BaseActivity { + private ArrayList breakfastList = new ArrayList<>(); + private ArrayList lunchList = new ArrayList<>(); + private ArrayList dinnerList = new ArrayList<>(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -27,6 +33,7 @@ public class CustomizationActivity extends BaseActivity { @Override public void initViews(Bundle savedInstanceState) { + loadData(); String text = getIntent().getStringExtra("SEND_CODE"); Logger.d(text); } @@ -40,4 +47,10 @@ public class CustomizationActivity extends BaseActivity { public void onPointerCaptureChanged(boolean hasCapture) { } + + @Override + public void loadData() { + super.loadData(); + + } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java index 301f33e..a39b1fd 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/recommend/RecommendFragment.java @@ -91,13 +91,11 @@ public class RecommendFragment extends BaseFragment { adapter.getData().add(recommendFood); } adapter.loadMoreComplete(); -// Logger.d("开始加载"); } }, 1000); } }, recyclerView); -// adapter.disableLoadMoreIfNotFullPage(); adapter.setEnableLoadMore(true); adapter.setHeaderView(LayoutInflater.from(getContext()). inflate(R.layout.recommend_head, (ViewGroup) recyclerView.getParent(), false)); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java index 358222d..f139dca 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java @@ -39,7 +39,7 @@ public class WebUtil { private static WebUtil instance = new WebUtil(); private OkHttpClient mClient = new OkHttpClient(); - private WebUtil() { + public WebUtil() { } public static WebUtil getInstance() { diff --git a/app/src/main/res/drawable/ic_calorie.xml b/app/src/main/res/drawable/ic_calorie.xml new file mode 100644 index 0000000..f627574 --- /dev/null +++ b/app/src/main/res/drawable/ic_calorie.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml index fc173d3..224926c 100644 --- a/app/src/main/res/drawable/ic_copy.xml +++ b/app/src/main/res/drawable/ic_copy.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/ic_exchange_customization.xml b/app/src/main/res/drawable/ic_exchange_customization.xml index a89b3d5..a4cad63 100644 --- a/app/src/main/res/drawable/ic_exchange_customization.xml +++ b/app/src/main/res/drawable/ic_exchange_customization.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/app/src/main/res/drawable/ic_fat.xml b/app/src/main/res/drawable/ic_fat.xml new file mode 100644 index 0000000..371ee5d --- /dev/null +++ b/app/src/main/res/drawable/ic_fat.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_protein.xml b/app/src/main/res/drawable/ic_protein.xml new file mode 100644 index 0000000..f0a5460 --- /dev/null +++ b/app/src/main/res/drawable/ic_protein.xml @@ -0,0 +1,5 @@ + + + + diff --git a/app/src/main/res/drawable/ic_sugar.xml b/app/src/main/res/drawable/ic_sugar.xml new file mode 100644 index 0000000..93f4f08 --- /dev/null +++ b/app/src/main/res/drawable/ic_sugar.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_customization.xml b/app/src/main/res/layout/activity_customization.xml index 0b4bd26..6067ff0 100644 --- a/app/src/main/res/layout/activity_customization.xml +++ b/app/src/main/res/layout/activity_customization.xml @@ -12,6 +12,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="11" + android:background="#eae8e8" android:orientation="vertical"> + android:text="早餐" + android:textColor="#fff" + android:textSize="17sp" /> + android:layout_height="wrap_content" + android:background="#eae8e8"> + android:text="午餐" + android:textColor="#fff" + android:textSize="17sp" /> + android:layout_height="wrap_content" + android:background="#eae8e8"> + android:text="晚餐" + android:textColor="#fff" + android:textSize="17sp" /> + android:layout_height="wrap_content" + android:background="#eae8e8"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -174,8 +295,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:text="根据已吃卡路里刷新" - android:textColor="#f0311e" + android:text="复制到饮食记录" + android:textColor="#363534" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/customization_item.xml b/app/src/main/res/layout/customization_item.xml index f7c18be..7a79ed8 100644 --- a/app/src/main/res/layout/customization_item.xml +++ b/app/src/main/res/layout/customization_item.xml @@ -1,69 +1,76 @@ - - - - - - - - - - - - + android:layout_height="70dp" + android:layout_margin="5dp" + app:cardCornerRadius="15dp"> + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:id="@+id/customization_item_image" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_centerVertical="true" + android:layout_marginLeft="15dp" + android:scaleType="centerCrop" + tools:src="@drawable/food_test" /> - + android:layout_centerVertical="true" + android:layout_marginLeft="15dp" + android:layout_toRightOf="@id/customization_item_image" + android:orientation="vertical"> + + + + + + + + + + + + + + - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dish_result_item.xml b/app/src/main/res/layout/dish_result_item.xml index 51e1fe5..6613460 100644 --- a/app/src/main/res/layout/dish_result_item.xml +++ b/app/src/main/res/layout/dish_result_item.xml @@ -10,7 +10,7 @@ @@ -40,7 +40,7 @@ android:layout_height="match_parent" android:gravity="center" android:paddingLeft="15dp" - android:textColor="#fff" + android:textColor="#535252" tools:text="麻婆豆腐" /> diff --git a/app/src/main/res/layout/recommend_item_big.xml b/app/src/main/res/layout/recommend_item_big.xml index 9470f83..98203a4 100644 --- a/app/src/main/res/layout/recommend_item_big.xml +++ b/app/src/main/res/layout/recommend_item_big.xml @@ -25,7 +25,7 @@ + app:cardCornerRadius="20dp" + app:cardElevation="0dp"> + - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index c5bb617..3703272 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -2,12 +2,6 @@ - 20dp 100dp - 180dp + 150dp 5dp