Merge remote-tracking branch 'origin/master'

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

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

@@ -69,10 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mTextMessage = findViewById(R.id.message);
         navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
 
-        //HanLP测试
-        String content = "发烧感冒";
-        List<String> keywordList = HanLP.extractKeyword(content, 5);
-        System.out.println(keywordList);
+
         }
 
-        }
+}

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

@@ -40,9 +40,9 @@ public class PersonContent extends Fragment {
         super.onResume();
         if(LoginActivity.isLogin){
             Button longin_pc_btn=(Button) getActivity().findViewById(R.id.login_pc_button);
-            longin_pc_btn.setText("欢迎");
+            longin_pc_btn.setText("Hello"+LoginActivity.username);
         }
 
-
+//高血压
     }
 }

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

@@ -1,13 +1,11 @@
 package com.example.cmknowledgegraph;
 
-import android.content.DialogInterface;
 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.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListView;
@@ -15,12 +13,12 @@ import android.widget.ListView;
 import androidx.fragment.app.Fragment;
 
 import com.example.PersonalCenter.Search;
-import com.hankcs.hanlp.HanLP;
+import com.hankcs.hanlp.seg.common.Term;
+import com.hankcs.hanlp.tokenizer.StandardTokenizer;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-
+//
 public class SearchContent extends Fragment {
 
 public static List<Set<String>> a;
@@ -34,9 +32,7 @@ public static int k=0;
     public void onActivityCreated(Bundle savedInstanceState) {
             // TODO Auto-generated method stub
          	super.onActivityCreated(savedInstanceState);
-            //获取搜索内容，然后用HanLP匹配，提取关键词
-         	EditText search_edit = getActivity().findViewById(R.id.search_edit);
-
+        EditText search_edit = getActivity().findViewById(R.id.search_edit);
 
          	ImageButton search_btn = (ImageButton) getActivity().findViewById(R.id.search_btn);
 
@@ -44,36 +40,26 @@ public static int k=0;
          	        public void onClick(View v) {
                         Log.i("haha","=======Oncli");
          	            //查找逻辑
+                        List<Term> termList = StandardTokenizer.segment("什么是糖尿病");
+                        System.out.println(termList);
                         String sickname = search_edit.getText().toString();
-
                         Search search = new Search(sickname);
                         new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                 SearchContent.a = search.search();//查找出来的是一个Set集合的List
+                                 SearchContent.a = search.search();
                                  SearchContent.k = 1;
 
                             }
                         }).start();
                         while(SearchContent.k==0) {Log.i("i","i");}
                         if(SearchContent.a!=null){
-                            Set<String> medicinesSet = a.get(0);//获取药的集合
-                            Set<String> reasons = a.get(1);
-                            //要讲medicines改成String集合
-//                            Object[] medicines = medicinesSet.toArray();
-                            List<String> medicinesList = new ArrayList<String>();
-                            for(String medicine: medicinesSet) medicinesList.add(medicine);
-                            String[] medicines = medicinesList.toArray(new String[medicinesList.size()]);
+                            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);
 
-                        }else{
-                            String[] kong = {};
-                            ListView lv = getActivity().findViewById(R.id.listView1);
-                            ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_list_item_1,kong);
-                            lv.setAdapter(adapter);
-
                         }
                         SearchContent.k=0;
                         SearchContent.a=null;

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

@@ -0,0 +1,44 @@
+package com.example.cmknowledgegraph;
+
+import com.hankcs.hanlp.HanLP;
+import com.hankcs.hanlp.suggest.Suggester;
+
+import java.util.List;
+
+public class test {
+
+    public void init(){
+
+
+        /**
+         * 查询逻辑
+         * 一般来说，查询是 头痛+怎么办 胃+不+舒服 眼睛+痛 冷水喝多了，肚子痛（肚子痛，喝，冷水）
+         * 不会加主语
+         * 大部分是  主体加动词
+         * 选用 关键词提取和标准分词，
+         */
+        String content = "我的胃不舒服";
+        List<String> keywordList = HanLP.extractKeyword(content, 5);
+        System.out.println(keywordList);
+
+
+        //关键词联想
+        Suggester suggester = new Suggester();
+        String[] titleArray =
+                (
+                        "威廉王子发表演说 呼吁保护野生动物\n" +
+                                "《时代》年度人物最终入围名单出炉 普京马云入选\n" +
+                                "“黑格比”横扫菲：菲吸取“海燕”经验及早疏散\n" +
+                                "日本保密法将正式生效 日媒指其损害国民知情权\n" +
+                                "英报告说空气污染带来“公共健康危机”"
+                ).split("\\n");
+        for (String title : titleArray)
+        {
+            suggester.addSentence(title);
+        }
+
+        System.out.println(suggester.suggest("发言", 1));       // 语义
+        System.out.println(suggester.suggest("危机公共", 1));   // 字符
+        System.out.println(suggester.suggest("mayun", 1));      // 拼音
+    }
+}

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

@@ -3,13 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/home_back_1"
     tools:context=".MainActivity">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/home"
-        tools:ignore="ContentDescription" />
-
 
 </LinearLayout>

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

@@ -18,7 +18,7 @@
             android:layout_marginLeft="80dp"
             android:layout_marginTop="10dp"
             android:paddingBottom="15dp"
-            android:text="请输入您的搜索词汇"
+            android:text="糖尿病怎么办"
             android:textColor="#C0C0C0"
             android:textSize="40px"
             />