Merge remote-tracking branch 'origin/master'

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

app/src/main/AndroidManifest.xml

@@ -14,9 +14,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".SearchEntryActivity"></activity>
+        <activity android:name=".SearchContentActivity"></activity>
+        <activity android:name=".SearchEntryActivity" />
         <activity android:name=".PersonalityCenterActivity" />
-        <activity android:name=".LoginActivity"></activity>
+        <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>

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

@@ -21,6 +21,8 @@ public class SearchServiceGet {
 
     public static ArrayList<String> label;//存储标签内容
     public static ArrayList<String> content;//存储数据内容
+    public static Map mapType;
+    public static boolean SearchSuccess=false;
 
     public static String executeSearchGet(String name){
         HttpURLConnection connection = null;
@@ -59,33 +61,18 @@ public class SearchServiceGet {
                     //查询成功，在开始解析数据
                     //把data里的数据转换为Map，遍历map，打印键值对
                     String data=jo.get("data").toString();
-                    Map mapType = JSON.parseObject(data,Map.class);
+                    mapType = JSON.parseObject(data,Map.class);
-                    for (Object obj : mapType.keySet()){
+                    for (Object obj : mapType.keySet()) {
-                        if(!obj.equals("teammates")){
+                        //把键值对放入队列中,前提是标签的内容不为空
-                            //把键值对放入队列中
+                        if(mapType.get(obj)!=null) {
                             label.add(obj.toString());
                             content.add(mapType.get(obj).toString());
-                            System.out.println("key为："+obj+"值为："+mapType.get(obj));
+                            System.out.println("key为：" + obj + "值为：" + mapType.get(obj));
-                        }else{
-
                         }
-
                     }
-                    //
+                    SearchSuccess=true;//查找成功标志
-                }else{
-                    //查询失败什么都没有查到
-                    //在页面显示什么都没有查到
                 }
-
-
-
-
-
-
-
                 return response.toString();
-                //
-
             } catch (IOException e) {
                 e.printStackTrace();
             }finally {
@@ -107,7 +94,4 @@ public class SearchServiceGet {
         return "";
     }
 
-    public static void main(String args[]){
-        executeSearchGet("平和质");
-    }
 }

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

@@ -1,20 +1,17 @@
 package com.example.cmknowledgegraph;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ListView;
 
 import androidx.fragment.app.Fragment;
 
-import com.example.PersonalCenter.Search;
+import com.example.PersonalCenter.SearchServiceGet;
-import com.hankcs.hanlp.seg.common.Term;
-import com.hankcs.hanlp.tokenizer.StandardTokenizer;
 
 import java.util.List;
 import java.util.Set;
@@ -23,49 +20,30 @@ public class SearchContent extends Fragment {
 
 public static List<Set<String>> a;
 public static int k=0;
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+        Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate( R.layout.activity_search, container, false );  //要加载的layout文件
-    }
+        }
 
     public void onActivityCreated(Bundle savedInstanceState) {
-            // TODO Auto-generated method stub
+        // TODO Auto-generated method stub
-         	super.onActivityCreated(savedInstanceState);
+        super.onActivityCreated(savedInstanceState);
         EditText search_edit = getActivity().findViewById(R.id.search_edit);
-
+        ImageButton search_btn = (ImageButton) getActivity().findViewById(R.id.search_btn);
-         	ImageButton search_btn = (ImageButton) getActivity().findViewById(R.id.search_btn);
+        search_btn.setOnClickListener(new View.OnClickListener() {
-
+                public void onClick(View v) {
-            search_btn.setOnClickListener(new View.OnClickListener() {
+                    Log.i("haha", "=======Oncli");
-         	        public void onClick(View v) {
+                    //点击查找按钮之后，去除输入的句子，传给后台
-                        Log.i("haha","=======Oncli");
+                    String inputContent = search_edit.getText().toString();
-         	            //查找逻辑
+                    SearchServiceGet.executeSearchGet(inputContent);
-                        List<Term> termList = StandardTokenizer.segment("什么是糖尿病");
+                    //执行到这里，已经把data里的数据取出来了或没有，但是都要跳转页面到SearchEntryActivity页面
-                        System.out.println(termList);
+                    Intent intent = new Intent();
-                        String sickname = search_edit.getText().toString();
+                    intent.setClass(getActivity(), SearchEntryActivity.class);
-                        Search search = new Search(sickname);
+                    startActivity(intent);
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                 SearchContent.a = search.search();
-                                 SearchContent.k = 1;
-
-                            }
-                        }).start();
-                        while(SearchContent.k==0) {Log.i("i","i");}
-                        if(SearchContent.a!=null){
-                            String[] medicines = a.get(0).toArray(new String[0]);
-                            String[] reasons = a.get(1).toArray(new String[0]);
-                            ListView lv = getActivity().findViewById(R.id.listView1);
-                            ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1,medicines);
-                            lv.setAdapter(adapter);
-
-                        }
-                        SearchContent.k=0;
-                        SearchContent.a=null;
-
-
                 }
-            });
+                });
+        }
     }
-}
+
+

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

@@ -0,0 +1,22 @@
+package com.example.cmknowledgegraph;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SearchContentActivity extends AppCompatActivity {
+
+    /**
+     * 此页面由SearchEntryActivity页面跳转而来
+     * 通过获得intent携带的数据，访问map，确定数值
+     * 显示在用户界面上
+     * @param savedInstanceState
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_search_content);
+
+
+    }
+}

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

@@ -1,8 +1,15 @@
 package com.example.cmknowledgegraph;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
 import androidx.appcompat.app.AppCompatActivity;
 
-import android.os.Bundle;
+import com.example.PersonalCenter.SearchServiceGet;
 
 public class SearchEntryActivity extends AppCompatActivity {
 
@@ -10,5 +17,32 @@ public class SearchEntryActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search_entry);
+
+        //有SearchContent跳转到这里。在这里访问全局变量，实例化ListView
+        Intent intent=new Intent();
+        intent.setClass(this,SearchContentActivity.class);
+
+        ListView lv = findViewById(R.id.listView1);
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_list_item_1, SearchServiceGet.label);
+        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                //根据点击不同的item跳转到不同的页面
+                switch (i){
+                    case 0:
+                        intent.putExtra("label",SearchServiceGet.label.get(1));
+                        startActivity(intent);
+                        break;
+                    case 1:
+                        intent.putExtra("label",SearchServiceGet.label.get(2));
+                        startActivity(intent);
+                        break;
+                }
+
+
+
+            }
+        });
+        lv.setAdapter(adapter);
     }
 }

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SearchContentActivity">
+
+    <TextView
+        android:id="@+id/search_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>