Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop

app/src/main/java/com/example/ninefourone/nutritionmaster/camera/ClassifierCamera.java

@@ -248,7 +248,7 @@ public class ClassifierCamera extends AppCompatActivity {
      *
      * @param view
      */
-    @OnClick({R.id.more_take_photo_button_capture, R.id.more_takephoto_ok})
+    @OnClick({R.id.more_take_photo_button_capture, R.id.more_takephoto_ok, R.id.results_text_view})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.more_take_photo_button_capture:
@@ -270,6 +270,10 @@ public class ClassifierCamera extends AppCompatActivity {
                 refreshUI();
                 finish();
                 break;
+            case R.id.results_text_view:
+                resultList.remove(resultList.size() - 1);
+                refreshUI();
+                break;
         }
     }
 

app/src/main/java/com/example/ninefourone/nutritionmaster/utils/WebUtil.java

@@ -154,12 +154,66 @@ public class WebUtil {
         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);
+    }
+
     public void getUser(String username, Callback callback) {
         mClient = new OkHttpClient();
         Request request = new Request.Builder().url("http://120.77.182.38/myuser/" + username + "/").build();
         mClient.newCall(request).enqueue(callback);
     }
 
+    public static String HttpPost(String requestUrl, String accessToken, String params) throws Exception {
+        System.out.println(params);
+        String generalUrl = "";
+        generalUrl = requestUrl + "?access_token=" + accessToken;
+        System.out.println("发送的连接为:" + generalUrl);
+        URL url = new URL(generalUrl);
+        // 打开和URL之间的连接
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        System.out.println("打开链接，开始发送请求" + new Date().getTime() / 1000);
+        connection.setRequestMethod("POST");
+        // 设置通用的请求属性
+        connection.setRequestProperty("Content-Type", "application/json");
+        connection.setRequestProperty("Connection", "Keep-Alive");
+        connection.setUseCaches(false);
+        connection.setDoOutput(true);
+        connection.setDoInput(true);
+
+        // 得到请求的输出流对象
+        DataOutputStream out = new DataOutputStream(connection.getOutputStream());
+        out.writeBytes(params);
+        out.flush();
+        out.close();
+
+        // 建立实际的连接
+        connection.connect();
+        // 获取所有响应头字段
+        Map<String, List<String>> headers = connection.getHeaderFields();
+        // 遍历所有的响应头字段
+        for (String key : headers.keySet()) {
+            System.out.println(key + "--->" + headers.get(key));
+        }
+        // 定义 BufferedReader输入流来读取URL的响应
+        BufferedReader in = null;
+        if (requestUrl.contains("nlp"))
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "GBK"));
+        else
+            in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+        String result = "";
+        String getLine;
+        while ((getLine = in.readLine()) != null) {
+            result += getLine;
+        }
+        in.close();
+        System.out.println("请求结束" + new Date().getTime() / 1000);
+        System.out.println("result:" + result);
+        return result;
+    }
+
     /**
      * 注意在回调中处理username重复的情况
      *//*