From 1752f13d6148df8d721e08d9bc37a7f604a38763 Mon Sep 17 00:00:00 2001
From: ScorpioMiku <1056992492@qq.com>
Date: Sat, 6 Oct 2018 14:31:59 +0800
Subject: [PATCH] 1
---
.../nutritionmaster/NutritionMaster.java | 3 +-
.../nutritionmaster/base/BaseActivity.java | 2 +-
.../nutritionmaster/base/BaseFragment.java | 2 +-
.../nutritionmaster/bean/ClassifyResult.java | 2 +-
.../{FoodMenuLight => FoodMenuLight.java} | 0
.../recommend/RecommendFragment.java | 19 +++---
.../nutritionmaster/utils/WebUtil.java | 60 +++++++++++--------
7 files changed, 49 insertions(+), 39 deletions(-)
rename app/src/main/java/com/example/ninefourone/nutritionmaster/bean/{FoodMenuLight => FoodMenuLight.java} (100%)
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 24a86e6..b0346c4 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/NutritionMaster.java
@@ -126,7 +126,8 @@ public class NutritionMaster extends Application {
*/
private void initOccupations() {
- WebUtil.getAllOccupations(new Callback() {
+ WebUtil webUtil = WebUtil.getInstance();
+ webUtil.getAllOccupations(new Callback() {
@Override
public void onFailure(Call call, IOException e) {
e.printStackTrace();
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 c86a8c3..758b122 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
@@ -28,7 +28,7 @@ public abstract class BaseActivity extends AppCompatActivity {
setContentView(getLayoutId());
unbinder = ButterKnife.bind(this);
initViews(savedInstanceState);
- webUtil = new WebUtil();
+ webUtil = WebUtil.getInstance();
initToolBar();
}
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
index 5b30d8f..66ecba3 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/base/BaseFragment.java
@@ -47,7 +47,7 @@ public abstract class BaseFragment extends Fragment {
super.onViewCreated(view, savedInstanceState);
unbinder = ButterKnife.bind(this, view);
initView(savedInstanceState);
- webUtil = new WebUtil();
+ webUtil = WebUtil.getInstance();
this.user = NutritionMaster.user;
}
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
index 93ec75c..97565fc 100644
--- a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
+++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/ClassifyResult.java
@@ -27,7 +27,7 @@ public class ClassifyResult implements Serializable {
public void getMenu() {
- WebUtil webUtil = new WebUtil();
+ WebUtil webUtil = WebUtil.getInstance();
webUtil.getMenu("素红烧肉", new Callback() {
@Override
public void onFailure(Call call, IOException e) {
diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight b/app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
similarity index 100%
rename from app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight
rename to app/src/main/java/com/example/ninefourone/nutritionmaster/bean/FoodMenuLight.java
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 44c10b9..4bfe7e9 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
@@ -133,11 +133,6 @@ public class RecommendFragment extends BaseFragment {
int flag = indexs[i % 4];
RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", flag);
datas.add(recommendFood);
-// if (flag == 2) {
-//
-// } else {
-//
-// }
}
}
@@ -148,12 +143,14 @@ public class RecommendFragment extends BaseFragment {
// Logger.d("加载数据");
for (int i = 0; i < 7; i++) {
int flag = indexs[i % 4];
- if (flag == 2) {
-
- } else {
- RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", flag);
- adapter.getData().add(recommendFood);
- }
+ RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", flag);
+ adapter.getData().add(recommendFood);
+// if (flag == 2) {
+//
+// } else {
+// RecommendFood recommendFood = new RecommendFood(1, "烧肉", "好吃", flag);
+// adapter.getData().add(recommendFood);
+// }
}
adapter.loadMoreComplete();
}
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 4fb70bd..d69bc61 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
@@ -1,9 +1,13 @@
package com.example.ninefourone.nutritionmaster.utils;
+
+import com.example.ninefourone.nutritionmaster.bean.FoodMenuLight;
+import com.example.ninefourone.nutritionmaster.bean.MyUser;
import com.google.gson.Gson;
import java.io.BufferedReader;
import java.io.DataOutputStream;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.StringWriter;
@@ -22,8 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import model.FoodMenuLight;
-import model.MyUser;
+
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
@@ -36,7 +39,7 @@ public class WebUtil {
private static WebUtil instance = new WebUtil();
private OkHttpClient mClient = new OkHttpClient();
- public WebUtil() {
+ private WebUtil() {
}
public static WebUtil getInstance() {
@@ -69,6 +72,7 @@ public class WebUtil {
mClient.newCall(request).enqueue(callback);
}
+
/**
* 获取count个随机菜谱,在回调中解析为一个Menu数组
*
@@ -162,7 +166,11 @@ public class WebUtil {
Request request = new Request.Builder().url("http://120.77.182.38/occupation/" + occupationName + "/").build();
mClient.newCall(request).enqueue(callback);
}
-
+ public static void getAllOccupations(Callback callback) {
+ OkHttpClient mClient = new OkHttpClient();
+ Request request = new Request.Builder().url("http://120.77.182.38/occupation/").build();
+ mClient.newCall(request).enqueue(callback);
+ }
/**
* 获取体质需要的食材
* {
@@ -294,24 +302,26 @@ public class WebUtil {
}
*/
+
/**
- public static void changeUserIllness(String username, String[] illnesses, Callback callback) {
- String url = "http://120.77.182.38/myuser/" + username + "/";
-
- FormBody.Builder builder = new FormBody.Builder();
- for (String illness : illnesses) {
- builder.add("illness", illness);
- }
- RequestBody formBody = builder.build();
-
- Request request = new Request.Builder()
- .url(url)
- .patch(formBody)
- .build();
-
- OkHttpClient mClient = new OkHttpClient();
- mClient.newCall(request).enqueue(callback);
- }*/
+ * public static void changeUserIllness(String username, String[] illnesses, Callback callback) {
+ * String url = "http://120.77.182.38/myuser/" + username + "/";
+ *
+ * FormBody.Builder builder = new FormBody.Builder();
+ * for (String illness : illnesses) {
+ * builder.add("illness", illness);
+ * }
+ * RequestBody formBody = builder.build();
+ *
+ * Request request = new Request.Builder()
+ * .url(url)
+ * .patch(formBody)
+ * .build();
+ *
+ * OkHttpClient mClient = new OkHttpClient();
+ * mClient.newCall(request).enqueue(callback);
+ * }
+ */
private static RequestBody buildUserRequestBody(MyUser user) {
try {
FormBody.Builder builder = new FormBody.Builder();
@@ -322,7 +332,7 @@ public class WebUtil {
String fieldName = f.toString().substring(f.toString().lastIndexOf(".") + 1);
f.setAccessible(true);
Object object = f.get(user);//获取属性的值
- if (object != null ) {
+ if (object != null) {
//illness属性是一个list,需要加入每个list的值,而不是list对象
if (fieldName.equals("illness")) {
List illnessList = (List) object;
@@ -385,10 +395,11 @@ public class WebUtil {
/**
* 用户吃了一个菜,更新用户本周已吃摄入的营养元素的量
* 返回当前user的最新信息,用MyUser类解析json
+ *
* @param username
* @param menuName
*/
- public void eatenMenu(String username, String menuName,Callback callback) {
+ public void eatenMenu(String username, String menuName, Callback callback) {
String url = "http://120.77.182.38/myuser/eaten_menu/";
RequestBody formBody = new FormBody.Builder()
.add("username", username)
@@ -403,9 +414,10 @@ public class WebUtil {
/**
* 返回符合元素信息的menus
+ *
* @param elements
*/
- public void getMenusByElements(Map elements,Callback callback) {
+ public void getMenusByElements(Map elements, Callback callback) {
String url = "http://120.77.182.38/menus/get_menus_by_elements/";
FormBody.Builder builder = new FormBody.Builder();
//构造RequestBody参数