From a5acd866c6ca41e388ea6983a1c0359cfd2ea57e Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Thu, 8 Nov 2018 12:49:52 +0800
Subject: [PATCH] history

---
 .../nutritionmaster/modules/MainActivity.java | 20 ++++++++++++++++---
 .../customization/CustomizationActivity.java  | 18 +++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

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 cec4a1b..bfedb64 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
@@ -139,6 +139,8 @@ public class MainActivity extends BaseActivity {
 
     private HomePagerAdapter homePagerAdapter;
 
+    public static float[] scores = {3.1f, 2.5f, 1.7f, 5.9f, 4.6f};
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_main;
@@ -165,7 +167,7 @@ public class MainActivity extends BaseActivity {
 //                Logger.i("openRatio=" + openRatio + " ,offsetPixels=" + offsetPixels);
             }
         });
-        initSpiderView();
+
         initViewPager();
         initSearchView();
         initBMB();
@@ -252,7 +254,7 @@ public class MainActivity extends BaseActivity {
      * 初始化蛛网图
      */
     private void initSpiderView() {
-        float[] scores = {9.1f, 6.5f, 7.7f, 8.9f, 8.6f};
+
         String[] flags = {"糖分", "淡水", "蛋白质", "维生素", "矿物质"};
 
         List<RadarEntry> radarEntries = new ArrayList<>();
@@ -313,6 +315,15 @@ public class MainActivity extends BaseActivity {
 
     }
 
+    public void refreshSpider() {
+        for (int i = 0; i < scores.length; i++) {
+            scores[i] += (1 - i / 2);
+            if (scores[i] >= 10) {
+                scores[i] = 9.9f;
+            }
+        }
+    }
+
     /**
      * 初始化SearchView
      */
@@ -320,7 +331,7 @@ public class MainActivity extends BaseActivity {
         searchView.setOnQueryTextListener(new MaterialSearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                MessageUtils.MakeToast(query);
+
                 return false;
             }
 
@@ -574,6 +585,7 @@ public class MainActivity extends BaseActivity {
 //                }
 //            });
 //        }else{
+        initSpiderView();
         illButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -623,4 +635,6 @@ public class MainActivity extends BaseActivity {
         });
 //        }
     }
+
+
 }
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 1ce292c..e6575d1 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
@@ -128,6 +128,9 @@ public class CustomizationActivity extends BaseActivity {
     @Override
     public void loadData() {
         super.loadData();
+        breakfastList.clear();
+        dinnerList.clear();
+        lunchList.clear();
         final WebUtil webUtil = WebUtil.getInstance();
         webUtil.getMenusByElements(getElementLimit(), new Callback() {
             @Override
@@ -192,9 +195,9 @@ public class CustomizationActivity extends BaseActivity {
                             }
                         });
                     }
-                }else{
+                } else {
                     Random random = new Random(NutritionMaster.randomSeed + CalculateUtils.title2Int(text));
-                    start = random.nextInt(foodMenus.length );
+                    start = random.nextInt(foodMenus.length);
                     for (int i = start; i < start + 12; i++) {
                         webUtil.getMenu(foodMenus[i].getName(), new Callback() {
                             @Override
@@ -254,6 +257,8 @@ public class CustomizationActivity extends BaseActivity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.change_button:
+                NutritionMaster.randomSeed = CalculateUtils.getSecond();
+                loadData();
                 break;
             case R.id.copy_button:
                 break;
@@ -317,5 +322,14 @@ public class CustomizationActivity extends BaseActivity {
 
     }
 
+    /**
+     * 添加到饮食记录
+     */
+    private void addRecord() {
+        for (int i = 0; i < breakfastList.size(); i++) {
+
+        }
+    }
+
 
 }