Merge remote-tracking branch 'origin/master'

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

@@ -34,13 +34,14 @@ public class Search {
                 for(String j: medicines) mediciesSet.add(j);
                 String[] reasons = me_rea[1].split("\\|");
                 for(String j: reasons) reasonsSet.add(j);
-                List<Set<String>> a = new ArrayList<Set<String>>();
-                a.add(mediciesSet);
-                a.add(reasonsSet);
-                return a;
+
             }
         }
+        List<Set<String>> a = new ArrayList<Set<String>>();
+        a.add(mediciesSet);
+        a.add(reasonsSet);
+        return a;
+
 
-        return null;
     }
 }

app/src/main/res/layout/activity_search.xml

@@ -86,9 +86,12 @@
             android:text="感冒发烧"
             android:background="#FFDEAD"/>
     </GridLayout>
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/search_back"/>
-
+<!--    <ImageView-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:src="@drawable/search_back"/>-->
+    <ListView
+        android:id="@+id/listView1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </LinearLayout>