From 6e8b39001db71618e5d3c117a8d3dbef218664a1 Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Thu, 30 Aug 2018 12:44:20 +0800
Subject: [PATCH] 1

---
 .../nutritionmaster/bean/User.java            | 14 +++++++++++
 .../nutritionmaster/utils/CalculateUtils.java | 23 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java

diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java
new file mode 100644
index 0000000..54c888c
--- /dev/null
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/User.java
@@ -0,0 +1,14 @@
+package com.example.ninefourone.nutritionmaster.bean;
+
+/**
+ * Created by ScorpioMiku on 2018/8/30.
+ */
+
+public class User {
+    private float height;
+    private float weight;
+    private float BMI;
+    private String sex;
+    private int age;
+    private String job;
+}
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 0af2728..65f90e8 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
@@ -13,12 +13,33 @@ public class CalculateUtils {
      * @return
      */
     public static float BMI(float height, float weight) {
-        height = height / 100;
+        if (height > 10) {
+            height = height / 100;
+        }
         return weight / (height * height);
     }
 
+    /**
+     * 通过身高获得健康的体重
+     *
+     * @param height
+     * @return
+     */
+    public static float[] standardH2W(float height) {
+        if (height > 10) {
+            height = height / 100;
+        }
+        float min;
+        float max;
+        min = (float) 18.5 * height * height;
+        max = (float) 14 * height * height;
+        float[] re = {min, max};
+        return re;
+    }
+
     /**
      * 根据BMI得到体质情况
+     *
      * @param BMI
      * @return
      */