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 fcfded0..1a897d6 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
@@ -41,11 +41,13 @@ public class NutritionMaster extends Application {
public static NutritionMaster mInstance;
private int appCount = 0;
- public static MyUser user =null;
+ public static MyUser user = null;
public static Physique physique = null;
public static Occupation occupation = null;
public static Element element = null;
+
+
@Override
public void onCreate() {
super.onCreate();
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 a3ed52c..dbe5d9f 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
@@ -101,7 +101,7 @@ public abstract class BaseActivity extends AppCompatActivity {
protected void upUser() {
NutritionMaster.user = user;
NutritionMaster.element = new Element(user);
- Logger.d("用户信息已改" + NutritionMaster.user.toString());
+// Logger.d("用户信息已改" + NutritionMaster.user.toString());
}
@Override
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
index 5decc31..f976af2 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/BodyInformationFragment.java
@@ -9,16 +9,17 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.RemoteException;
+import android.support.v7.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.LinearLayout;
import android.widget.TextView;
import com.example.ninefourone.nutritionmaster.NutritionMaster;
import com.example.ninefourone.nutritionmaster.R;
import com.example.ninefourone.nutritionmaster.base.BaseFragment;
import com.example.ninefourone.nutritionmaster.bean.Element;
-import com.example.ninefourone.nutritionmaster.utils.CalculateUtils;
import com.example.ninefourone.nutritionmaster.utils.ChartDrawer;
import com.github.mikephil.charting.charts.LineChart;
import com.github.mikephil.charting.data.Entry;
@@ -31,6 +32,7 @@ import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
+import butterknife.OnClick;
import butterknife.Unbinder;
import me.itangqi.waveloadingview.WaveLoadingView;
@@ -53,6 +55,8 @@ public class BodyInformationFragment extends BaseFragment {
TextView calorieText;
@BindView(R.id.weight_text)
TextView weightText;
+ @BindView(R.id.see_whole_elements)
+ LinearLayout seeWholeElements;
private int stepCount = 0;
private static final int REFRESH_STEP_WHAT = 0;
@@ -136,6 +140,12 @@ public class BodyInformationFragment extends BaseFragment {
}
}
+ @OnClick(R.id.see_whole_elements)
+ public void onViewClicked() {
+ AlertDialog dialog = new ElementDialog.Builder(getContext()).create();
+ dialog.show();
+ }
+
/**
* 定时器，修改UI
@@ -209,10 +219,10 @@ public class BodyInformationFragment extends BaseFragment {
Logger.d(NutritionMaster.element);
try {
Element elementTemp = NutritionMaster.element.calculateData(NutritionMaster.user);
- int temp = (int) (elementTemp.getCalorie());
- calorieText.setText(temp + "");
- temp = (int) (NutritionMaster.user.getEaten_elements().getCalorie() / temp * 100);
- waveLoadingView.setProgressValue(temp);
+ float temp = (float) (elementTemp.getCalorie());
+ calorieText.setText((int) temp + "");
+ int progress = (int) (NutritionMaster.user.getEaten_elements().getCalorie() / temp * 100);
+ waveLoadingView.setProgressValue(progress);
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
new file mode 100644
index 0000000..4edb6ae
--- /dev/null
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/bodyinformation/ElementDialog.java
@@ -0,0 +1,128 @@
+package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.bodyinformation;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.example.ninefourone.nutritionmaster.NutritionMaster;
+import com.example.ninefourone.nutritionmaster.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by ScorpioMiku on 2018/10/8.
+ */
+
+public class ElementDialog extends AlertDialog {
+ protected ElementDialog(@NonNull Context context) {
+ super(context);
+ }
+
+ protected ElementDialog(@NonNull Context context, int themeResId) {
+ super(context, themeResId);
+ }
+
+ protected ElementDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
+ super(context, cancelable, cancelListener);
+ }
+
+ public static class Builder {
+ @BindView(R.id.calorie_tag)
+ TextView calorieTag;
+ @BindView(R.id.calorie_text)
+ TextView calorieText;
+ @BindView(R.id.suger_tag)
+ TextView sugerTag;
+ @BindView(R.id.suger_text)
+ TextView sugerText;
+ @BindView(R.id.fat_tag)
+ TextView fatTag;
+ @BindView(R.id.fat_text)
+ TextView fatText;
+ @BindView(R.id.protein_tag)
+ TextView proteinTag;
+ @BindView(R.id.protein_text)
+ TextView proteinText;
+ @BindView(R.id.cellulose_tag)
+ TextView celluloseTag;
+ @BindView(R.id.cellulose_text)
+ TextView celluloseText;
+ @BindView(R.id.vitamin_a_tag)
+ TextView vitaminATag;
+ @BindView(R.id.vitamin_a_text)
+ TextView vitaminAText;
+ @BindView(R.id.vitamin_b_1_tag)
+ TextView vitaminB1Tag;
+ @BindView(R.id.vitamin_b_1_text)
+ TextView vitaminB1Text;
+ @BindView(R.id.vitamin_b_2_tag)
+ TextView vitaminB2Tag;
+ @BindView(R.id.vitamin_b_2_text)
+ TextView vitaminB2Text;
+ @BindView(R.id.vitamin_b_6_tag)
+ TextView vitaminB6Tag;
+ @BindView(R.id.vitamin_b_6_text)
+ TextView vitaminB6Text;
+ @BindView(R.id.vitamin_c_tag)
+ TextView vitaminCTag;
+ @BindView(R.id.vitamin_c_text)
+ TextView vitaminCText;
+ @BindView(R.id.vitamin_e_tag)
+ TextView vitaminETag;
+ @BindView(R.id.vitamin_e_text)
+ TextView vitaminEText;
+ @BindView(R.id.carotene_tag)
+ TextView caroteneTag;
+ @BindView(R.id.carotene_text)
+ TextView caroteneText;
+ @BindView(R.id.cholesterol_tag)
+ TextView cholesterolTag;
+ @BindView(R.id.cholesterol_text)
+ TextView cholesterolText;
+ @BindView(R.id.ca_tag)
+ TextView caTag;
+ @BindView(R.id.ca_text)
+ TextView caText;
+ @BindView(R.id.na_tag)
+ TextView naTag;
+ @BindView(R.id.na_text)
+ TextView naText;
+
+ private AlertDialog dialog;
+
+ public Builder(Context context) {
+
+ View view = LayoutInflater.from(context).inflate(R.layout.element_dialog, null);
+ dialog = new AlertDialog.Builder(context).setView(view).create();
+ dialog.getWindow().setLayout(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+ ButterKnife.bind(this, view);
+ calorieText.setText(NutritionMaster.user.getEaten_elements().getCalorie() + "");
+ sugerText.setText(NutritionMaster.user.getEaten_elements().getCarbohydrate() + "");
+ fatText.setText(NutritionMaster.user.getEaten_elements().getFat() + "");
+ proteinText.setText(NutritionMaster.user.getEaten_elements().getProtein() + "");
+ celluloseText.setText(NutritionMaster.user.getEaten_elements().getCellulose() + "");
+ vitaminAText.setText(NutritionMaster.user.getEaten_elements().getVitaminA() + "");
+ vitaminB1Text.setText(NutritionMaster.user.getEaten_elements().getVitaminB1() + "");
+ vitaminB2Text.setText(NutritionMaster.user.getEaten_elements().getVitaminB2() + "");
+ vitaminB6Text.setText(NutritionMaster.user.getEaten_elements().getVitaminB6() + "");
+ vitaminCText.setText(NutritionMaster.user.getEaten_elements().getVitaminC() + "");
+ vitaminEText.setText(NutritionMaster.user.getEaten_elements().getVitaminE() + "");
+ caroteneText.setText(NutritionMaster.user.getEaten_elements().getCarotene() + "");
+ cholesterolText.setText(NutritionMaster.user.getEaten_elements().getCholesterol() + "");
+ caText.setText(NutritionMaster.user.getEaten_elements().getCa() + "");
+ naText.setText(NutritionMaster.user.getEaten_elements().getNa() + "");
+
+ }
+
+ public AlertDialog create() {
+ return dialog;
+ }
+ }
+}
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 a8fb445..0f33849 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
@@ -64,6 +64,7 @@ public class CustomizationActivity extends BaseActivity {
loadData();
String text = getIntent().getStringExtra("SEND_CODE");
Logger.d(text);
+
}
@Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a8ef9f6..9bdba26 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -104,13 +104,13 @@
@@ -178,6 +178,19 @@
+
+
+
+
+
+
-
-
-
-
diff --git a/app/src/main/res/layout/body_information_fragment.xml b/app/src/main/res/layout/body_information_fragment.xml
index d6cea8f..862eedf 100644
--- a/app/src/main/res/layout/body_information_fragment.xml
+++ b/app/src/main/res/layout/body_information_fragment.xml
@@ -149,6 +149,7 @@
android:src="@drawable/ic_infor_weight" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/element_dialog.xml b/app/src/main/res/layout/element_dialog.xml
new file mode 100644
index 0000000..2912f3e
--- /dev/null
+++ b/app/src/main/res/layout/element_dialog.xml
@@ -0,0 +1,413 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file