Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml

app/src/main/java/com/example/PersonalCenter/SearchServiceGet.java

@@ -52,7 +52,9 @@ public class SearchServiceGet {
                 //开始解析返回的数据
                 JSONObject jo=JSONObject.fromObject(response.toString());
                 code=jo.getInt("code");
+                System.out.println("code==@@@@@@@@@@20"+code);
                 if(code!=0){  //查询成功，在开始解析数据
+                    System.out.println("code==@@@@@@@@@@20"+code);
                     name_back=jo.getString("message");//查询的主语
                     //把data看作一个JSONObject，无论里面由多少元素，都转换为JSONArray，存在数组里
                     JSONObject jo_data=jo.getJSONObject("data");

app/src/main/java/com/example/cmknowledgegraph/ConditionCode.java

@@ -8,8 +8,8 @@ public interface ConditionCode {
      * MedicineToOperation 药 用法
      * MedicineToSympton 药 作用
      */
-    public final  int DiseaseToSymptom=100;
-    public final  int DiseaseToMedicines=200;
+    public final  int DiseaseToSymptom=200;
+    public final  int DiseaseToMedicines=100;
     public final  int MedicineToOperation=300;
     public final  int MedicineToSymptom=400;
 

app/src/main/java/com/example/cmknowledgegraph/SearchContent.java

@@ -36,12 +36,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                     Log.i("haha", "=======Oncli");
 //                    //点击查找按钮之后，取出输入的句子，传给后台
                     String inputContent = search_edit.getText().toString();
-//                    SearchServiceGet.executeSearchGet(inputContent);
-                    SearchServiceGet.exxcuteTest(inputContent);
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            SearchServiceGet.executeSearchGet(inputContent);
+                            Intent intent = new Intent();
+                            intent.setClass(getActivity(), SearchEntryActivity.class);
+                            startActivity(intent);
+                        }
+                    }).start();
+
+//                    SearchServiceGet.exxcuteTest(inputContent);
 //                    //执行到这里，已经把data里的数据取出来了或没有，但是都要跳转页面到SearchEntryActivity页面
-                    Intent intent = new Intent();
-                    intent.setClass(getActivity(), SearchEntryActivity.class);
-                    startActivity(intent);
+
                 }
                 });
         }