From 240ea0e25d5e5d1e0768a3c68d827693c3f42b2b Mon Sep 17 00:00:00 2001
From: hanxueqing <1045352474@qq.com>
Date: Fri, 3 Jan 2020 23:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
---
 .../SearchContentActivity.java                 | 18 ++++++++++++++++++
 .../cmknowledgegraph/SearchEntryActivity.java  |  3 ---
 .../res/layout/activity_search_content.xml     |  3 ++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java b/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
index f741f69..81ea0f6 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/SearchContentActivity.java
@@ -1,9 +1,14 @@
 package com.example.cmknowledgegraph;
 
+import android.graphics.Typeface;
 import android.os.Bundle;
+import android.util.TypedValue;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.PersonalCenter.SearchServiceGet;
+
 public class SearchContentActivity extends AppCompatActivity {
 
     /**
@@ -16,6 +21,19 @@ public class SearchContentActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search_content);
+        TextView text_title=findViewById(R.id.search_content);
+
+        //设置内容的标题，位置，大小
+        String label_name=getIntent().getStringExtra("label").toString();
+        text_title.setPadding(50,80,100,100);
+        text_title.setText(label_name);
+        text_title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        text_title.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+
+        //遍历label和content的队列，显示内容
+        for(int i=1;i< SearchServiceGet.label.size();i++){
+
+        }
 
 
     }
diff --git a/app/src/main/java/com/example/cmknowledgegraph/SearchEntryActivity.java b/app/src/main/java/com/example/cmknowledgegraph/SearchEntryActivity.java
index 7e62c76..31db52b 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/SearchEntryActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/SearchEntryActivity.java
@@ -38,9 +38,6 @@ public class SearchEntryActivity extends AppCompatActivity {
                         startActivity(intent);
                         break;
                 }
-
-
-
             }
         });
         lv.setAdapter(adapter);
diff --git a/app/src/main/res/layout/activity_search_content.xml b/app/src/main/res/layout/activity_search_content.xml
index 05d454d..250e9b9 100644
--- a/app/src/main/res/layout/activity_search_content.xml
+++ b/app/src/main/res/layout/activity_search_content.xml
@@ -9,6 +9,7 @@
     <TextView
         android:id="@+id/search_content"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        />
 
 </LinearLayout>
\ No newline at end of file