Merge remote-tracking branch 'origin/master'

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

app/src/main/AndroidManifest.xml

@@ -16,9 +16,10 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".PersonalityCenterActivity" />
-        <activity android:name=".LoginActivity" />
+        <activity android:name=".LoginActivity" >
-        <activity android:name=".RegisterActivity" />
 
+        </activity>
+        <activity android:name=".RegisterActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -1,9 +1,12 @@
 package com.example.cmknowledgegraph;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageButton;
 
 import androidx.fragment.app.Fragment;
 
@@ -14,4 +17,18 @@ public class PersonContent extends Fragment {
         // Inflate the layout for this fragment
         return inflater.inflate( R.layout.activity_personality_center, container, false );  //要加载的layout文件
     }
+
+    public void onActivityCreated(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onActivityCreated(savedInstanceState);
+        Button login_pc_btn = (Button) getActivity().findViewById(R.id.login_pc_button);
+        login_pc_btn.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                //跳转到LoginActivity
+                Intent intent=new Intent();
+                intent.setClass(getActivity(),LoginActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
 }

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

@@ -2,14 +2,18 @@ package com.example.cmknowledgegraph;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
 public class PersonalityCenterActivity extends AppCompatActivity {
+    @SuppressLint("LongLogTag")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        Log.i("PersonalityCenterActivity","个人中心");
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_personality_center);
 
@@ -21,7 +25,7 @@ public class PersonalityCenterActivity extends AppCompatActivity {
                 Intent intent=new Intent();
                 intent.setClass(PersonalityCenterActivity.this,LoginActivity.class);
                 startActivity(intent);
-                System.out.println("点击个人中心的登录按钮");
+                Log.i("PersonalityCenterActivity","点击");
             }
         });
     }

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

@@ -1,9 +1,12 @@
 package com.example.cmknowledgegraph;
 
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageButton;
 
 import androidx.fragment.app.Fragment;
 
@@ -16,4 +19,14 @@ public class SearchContent extends Fragment {
         return inflater.inflate( R.layout.activity_search, container, false );  //要加载的layout文件
     }
 
+    public void onActivityCreated(Bundle savedInstanceState) {
+            // TODO Auto-generated method stub
+         	super.onActivityCreated(savedInstanceState);
+         	ImageButton search_btn = (ImageButton) getActivity().findViewById(R.id.search_btn);
+            search_btn.setOnClickListener(new View.OnClickListener() {
+         	        public void onClick(View v) {
+         	            //查找逻辑
+                }
+            });
+    }
 }

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

@@ -19,7 +19,8 @@
             android:paddingBottom="15dp"
             android:text="请输入您的搜索词汇"
             android:textColor="#C0C0C0"
-            android:textSize="40px" />
+            android:textSize="40px"
+            />
 
         <ImageButton
             android:id="@+id/search_btn"