From 83406a8e0bd526f849954878a6de80d5716ba0a3 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Tue, 2 Oct 2018 15:41:12 +0800 Subject: [PATCH 1/4] 1 --- .../nutritionmaster/NutritionMaster.java | 4 +--- .../nutritionmaster/adapter/CardAdapter.java | 2 +- .../nutritionmaster/adapter/CardHolder.java | 8 +++++--- .../ninefourone/nutritionmaster/bean/MyUser.java | 14 +++++++------- .../nutritionmaster/modules/MainActivity.java | 10 ++++------ .../customization/CustomizationFragment.java | 14 ++++++++++++-- .../nutritionmaster/utils/CalculateUtils.java | 13 +++++++++++++ .../nutritionmaster/utils/ConstantUtils.java | 4 ++++ app/src/main/res/layout/activity_main.xml | 1 + 9 files changed, 48 insertions(+), 22 deletions(-) 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 90bce02..67edc29 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java @@ -14,8 +14,6 @@ import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.Logger; import java.io.IOException; -import java.lang.reflect.Array; -import java.util.Arrays; import okhttp3.Call; import okhttp3.Callback; @@ -103,7 +101,7 @@ public class NutritionMaster extends Application { */ private void initUser() { user = new MyUser(); - user.setNickName("ScorpioMiku"); + user.setUsername("ScorpioMiku"); } /** diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java index 70c5404..80f5bc3 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardAdapter.java @@ -39,7 +39,7 @@ public class CardAdapter extends RecyclerView.Adapter { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) @Override public void onBindViewHolder(CardHolder holder, int position) { - holder.bindView(mList.get(position).getPictureId(), mList.get(position).getTitle(), context); + holder.bindView(mList.get(position).getPictureId(), mList.get(position), context); } @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index 8a6a3b8..0e726c5 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -11,6 +11,7 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.bean.DailyCard; import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity; import com.orhanobut.logger.Logger; @@ -41,12 +42,13 @@ public class CardHolder extends RecyclerView.ViewHolder { } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public void bindView(int picId, String text, final Context context) { - tvName.setText(text); + public void bindView(int picId, DailyCard dailyCard, final Context context) { + tvName.setText(dailyCard.getTitle()); + tvSign.setText(dailyCard.getDescription()); // ivPhoto.setImageDrawable(context.getDrawable(picId)); Glide.with(context).load(picId).into(ivPhoto); i = new Intent(context, CustomizationActivity.class); - i.putExtra("SEND_CODE", text); + i.putExtra("SEND_CODE", dailyCard.getTitle()); // Logger.d(text); itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java index 3758f6c..31afdac 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/MyUser.java @@ -10,7 +10,7 @@ public class MyUser { * password : password * last_login : null * is_superuser : false - * nickName : okhttptest + * username : okhttptest * first_name : * last_name : * email : @@ -28,7 +28,7 @@ public class MyUser { private String password; private Object last_login; private boolean is_superuser; - private String nickName; + private String username; private String first_name; private String last_name; private String email; @@ -108,12 +108,12 @@ public class MyUser { this.is_superuser = is_superuser; } - public String getNickName() { - return nickName; + public String getUsername() { + return username; } - public void setNickName(String nickName) { - this.nickName = nickName; + public void setUsername(String username) { + this.username = username; } public String getFirst_name() { @@ -212,7 +212,7 @@ public class MyUser { ", password='" + password + '\'' + ", last_login=" + last_login + ", is_superuser=" + is_superuser + - ", nickName='" + nickName + '\'' + + ", username='" + username + '\'' + ", first_name='" + first_name + '\'' + ", last_name='" + last_name + '\'' + ", email='" + email + '\'' + 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 5c07ed0..9293105 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 @@ -25,8 +25,8 @@ import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.adapter.HomePagerAdapter; import com.example.ninefourone.nutritionmaster.base.BaseActivity; import com.example.ninefourone.nutritionmaster.camera.FoodMaterialCamera; -import com.example.ninefourone.nutritionmaster.modules.addinformation.AddPhysiqueActivity; import com.example.ninefourone.nutritionmaster.modules.addinformation.AddInformationActivity; +import com.example.ninefourone.nutritionmaster.modules.addinformation.AddPhysiqueActivity; import com.example.ninefourone.nutritionmaster.modules.information.InformationActivity; import com.example.ninefourone.nutritionmaster.ui.NoScrollViewPager; import com.example.ninefourone.nutritionmaster.utils.CalculateUtils; @@ -109,6 +109,8 @@ public class MainActivity extends BaseActivity { RoundCornerProgressBar heightBar; @BindView(R.id.weight_bar) RoundCornerProgressBar weightBar; + @BindView(R.id.tool_bar_nickname) + TextView toolBarNickname; @Override @@ -129,7 +131,6 @@ public class MainActivity extends BaseActivity { } else { titleLayout.setBackgroundColor(getColor(R.color.bar_open)); } - } @Override @@ -137,13 +138,10 @@ public class MainActivity extends BaseActivity { // Logger.i("openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels); } }); -// initInforView(); initSpiderView(); initViewPager(); initSearchView(); initBMB(); -// initOccupations(); - } /** @@ -164,7 +162,7 @@ public class MainActivity extends BaseActivity { @Override public void initToolBar() { - + toolBarNickname.setText(user.getUsername()); } @Override diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java index daebe4e..88d4bf9 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java @@ -15,6 +15,7 @@ import com.example.ninefourone.nutritionmaster.bean.DailyCard; import com.example.ninefourone.nutritionmaster.cardconfig.CardConfig; import com.example.ninefourone.nutritionmaster.cardconfig.CardItemTouchCallBack; import com.example.ninefourone.nutritionmaster.cardconfig.SwipeCardLayoutManager; +import com.example.ninefourone.nutritionmaster.utils.CalculateUtils; import com.example.ninefourone.nutritionmaster.utils.ConstantUtils; import java.util.ArrayList; @@ -80,11 +81,20 @@ public class CustomizationFragment extends BaseFragment { @Override protected void loadData() { super.loadData(); - for (int i = 1; i <= 7; i++) { + for (int i = CalculateUtils.getWeek(); i <= 7; i++) { // mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普"); DailyCard dailyCard = new DailyCard( "周" + ConstantUtils.arab2Chinese(i) + "美食普", - "这里放描述", + ConstantUtils.dailyDescibes[i-1], + picList[i - 1] + ); + mDataList.add(dailyCard); + } + for (int i = 1; i < CalculateUtils.getWeek(); i++) { +// mDataList.add("周" + ConstantUtils.arab2Chinese(i) + "美食普"); + DailyCard dailyCard = new DailyCard( + "周" + ConstantUtils.arab2Chinese(i) + "美食普", + ConstantUtils.dailyDescibes[i-1], picList[i - 1] ); mDataList.add(dailyCard); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java index d51d33f..a17fe70 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/CalculateUtils.java @@ -2,6 +2,8 @@ package com.example.ninefourone.nutritionmaster.utils; import com.orhanobut.logger.Logger; +import java.util.Calendar; + /** * Created by ScorpioMiku on 2018/8/29. */ @@ -59,4 +61,15 @@ public class CalculateUtils { return "重度肥胖"; } } + + /** + * 获取星期几 + * + * @return + */ + public static int getWeek() { + Calendar calendar = Calendar.getInstance(); + Logger.d( calendar.get(Calendar.DAY_OF_WEEK)); + return calendar.get(Calendar.DAY_OF_WEEK)-1; + } } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java index 00e7978..3624ad7 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java @@ -7,6 +7,10 @@ import java.util.ArrayList; */ public class ConstantUtils { + + public static String[] dailyDescibes = {"快乐陪周一", "幸运伴周二", "轻松有周三", "温馨携周四", + "愉悦同周五", "休闲找周六", "潇洒属周日"}; + public static String arab2Chinese(int number) { switch (number) { case 1: diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b248c29..989267d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -59,6 +59,7 @@ android:src="@drawable/test_avatar" /> Date: Tue, 2 Oct 2018 15:57:44 +0800 Subject: [PATCH 2/4] 1 --- .../example/ninefourone/nutritionmaster/base/BaseActivity.java | 3 ++- .../ninefourone/nutritionmaster/modules/MainActivity.java | 1 + .../ninefourone/nutritionmaster/utils/ConstantUtils.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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 5cbb88b..614d9e1 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 @@ -22,11 +22,12 @@ public abstract class BaseActivity extends AppCompatActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); + this.user = NutritionMaster.user; setContentView(getLayoutId()); unbinder = ButterKnife.bind(this); initViews(savedInstanceState); initToolBar(); - this.user = NutritionMaster.user; + } 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 9293105..2ee2ccd 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 @@ -19,6 +19,7 @@ import android.widget.TextView; import com.ToxicBakery.viewpager.transforms.CubeOutTransformer; import com.akexorcist.roundcornerprogressbar.RoundCornerProgressBar; +import com.bumptech.glide.Glide; import com.cb.ratingbar.CBRatingBar; import com.example.ninefourone.nutritionmaster.NutritionMaster; import com.example.ninefourone.nutritionmaster.R; diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java index 3624ad7..6a3767d 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/utils/ConstantUtils.java @@ -266,4 +266,5 @@ public class ConstantUtils { "气虚质中气不足，脾胃消化功能较弱，药膳应忌过于粘腻、寒凉或难以消化之物，以免食滞难化，影响脾胃功能。", "平和质人阴阳气血平衡，药膳调理不可偏补、贪补，以保持人体阴阳平衡状态最为紧要。所谓“不伤不扰，顺其自然”。" }; + } From fb4654e24a89c25a95cda57e8bf932c7ce5493a2 Mon Sep 17 00:00:00 2001 From: ScorpioMiku <1056992492@qq.com> Date: Tue, 2 Oct 2018 16:45:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=93=E8=B4=A8=E6=B5=8B=E8=AF=95UI=20bu?= =?UTF-8?q?g=E6=94=B9=E5=A5=BD=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nutritionmaster/adapter/CardHolder.java | 1 - .../camera/FoodMaterialCamera.java | 17 ++++++++++++++++- .../addinformation/AddPhysiqueActivity.java | 6 ++++-- app/src/main/res/layout/add_item.xml | 3 +++ app/src/main/res/layout/cameras_layout.xml | 10 +++++----- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index 0e726c5..6a0610b 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -56,7 +56,6 @@ public class CardHolder extends RecyclerView.ViewHolder { context.startActivity(i); } }); - } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java index 2477de1..0c15f16 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/camera/FoodMaterialCamera.java @@ -7,6 +7,7 @@ import android.hardware.Camera; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; +import android.view.Display; import android.view.Surface; import android.view.View; import android.view.Window; @@ -17,6 +18,7 @@ import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; import com.example.ninefourone.nutritionmaster.utils.MessageUtils; +import com.orhanobut.logger.Logger; import butterknife.BindView; import butterknife.ButterKnife; @@ -42,6 +44,8 @@ public class FoodMaterialCamera extends AppCompatActivity { private CameraPreview mPreview; private int mCameraId = Camera.CameraInfo.CAMERA_FACING_BACK; + private int widthPixel; + private float heightPixel; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -55,6 +59,9 @@ public class FoodMaterialCamera extends AppCompatActivity { //注意：上面两个设置必须写在setContentView前面 setContentView(R.layout.cameras_layout); ButterKnife.bind(this); + Display display = getWindowManager().getDefaultDisplay(); + widthPixel = display.getWidth(); + heightPixel = display.getHeight() * (14.0f / 16); if (!checkCameraHardware(this)) { MessageUtils.MakeToast("不支持相机"); @@ -65,6 +72,12 @@ public class FoodMaterialCamera extends AppCompatActivity { setCameraDisplayOrientation(this, mCameraId, mCamera); } + @Override + public void onWindowFocusChanged(boolean hasFocus) { + super.onWindowFocusChanged(hasFocus); + + } + /** * 检查当前设备是否有相机 * @@ -109,8 +122,10 @@ public class FoodMaterialCamera extends AppCompatActivity { Camera c = null; try { c = Camera.open(); + Camera.Parameters mParameters = c.getParameters(); - mParameters.setPictureSize(720, 1280); + Logger.d(widthPixel+", "+heightPixel); + mParameters.setPictureSize(widthPixel, (int) heightPixel); c.setParameters(mParameters); } catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java index 7071c4c..cb99a0b 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddPhysiqueActivity.java @@ -94,7 +94,6 @@ public class AddPhysiqueActivity extends BaseActivity { private void initAddView() { BaseAdapter adapter = new BaseAdapter() { - @Override public int getCount() { return colors.length; @@ -113,6 +112,7 @@ public class AddPhysiqueActivity extends BaseActivity { @Override public View getView(final int position, View child, ViewGroup parent) { + child = LayoutInflater.from(parent.getContext()).inflate(R.layout.add_item, parent, false); child.findViewById(R.id.image).setBackgroundColor(colors[position]); @@ -143,7 +143,6 @@ public class AddPhysiqueActivity extends BaseActivity { } }); } else { - firstButtons[position].setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -190,6 +189,9 @@ public class AddPhysiqueActivity extends BaseActivity { @Override public void onTurned(int position) { bottomContent.setBackgroundColor(colors[position] - 60); + firstButtons[position].setEnabled(true); + secondButtons[position].setEnabled(true); + thirdButtons[position].setEnabled(true); } }); diff --git a/app/src/main/res/layout/add_item.xml b/app/src/main/res/layout/add_item.xml index 962700c..7073a8e 100644 --- a/app/src/main/res/layout/add_item.xml +++ b/app/src/main/res/layout/add_item.xml @@ -35,6 +35,7 @@ android:id="@+id/choose_first" android:layout_width="150dp" android:layout_height="50dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> @@ -46,6 +47,7 @@ android:layout_width="150dp" android:layout_height="50dp" android:layout_marginTop="20dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> @@ -57,6 +59,7 @@ android:layout_width="150dp" android:layout_height="50dp" android:layout_marginTop="20dp" + android:enabled="false" android:text="测试" android:textSize="13sp" android:visibility="gone"> diff --git a/app/src/main/res/layout/cameras_layout.xml b/app/src/main/res/layout/cameras_layout.xml index 8fd2bc9..13a1e8d 100644 --- a/app/src/main/res/layout/cameras_layout.xml +++ b/app/src/main/res/layout/cameras_layout.xml @@ -16,7 +16,7 @@ + android:layout_weight="14"> + android:layout_weight="2" + android:alpha="0.2" + android:background="#8a515050"> Date: Tue, 2 Oct 2018 16:51:39 +0800 Subject: [PATCH 4/4] 1 --- app/src/main/res/layout/activity_add.xml | 260 ++++++++++++----------- 1 file changed, 132 insertions(+), 128 deletions(-) diff --git a/app/src/main/res/layout/activity_add.xml b/app/src/main/res/layout/activity_add.xml index 20c024f..17d5182 100644 --- a/app/src/main/res/layout/activity_add.xml +++ b/app/src/main/res/layout/activity_add.xml @@ -27,7 +27,7 @@ - + android:layout_height="match_parent"> - - + android:orientation="vertical"> - - + + + + + + + + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +