From 040e658d47a47719b7b8e1ccab1f99e924cf923c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=A3=AB?=
 =?UTF-8?q?=E5=A5=87?= <1045352474@qq.com>
Date: Thu, 24 Oct 2019 14:41:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
---
 app/src/main/AndroidManifest.xml                                | 2 ++
 .../com/example/cmknowledgegraph/PersonalityCenterActivity.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c24311..fb1a403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".PersonalityCenterActivity" />
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".RegisterActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
index 3db2b1e..d4c64da 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
@@ -21,6 +21,7 @@ public class PersonalityCenterActivity extends AppCompatActivity {
                 Intent intent=new Intent();
                 intent.setClass(PersonalityCenterActivity.this,LoginActivity.class);
                 startActivity(intent);
+                System.out.println("点击个人中心的登录按钮");
             }
         });
     }