From ae9cfb9df980032d1126a9c54dbd818b463542bd 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 11:12:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/res/layout/activity_main.xml --- .../example/cmknowledgegraph/LoginActivity.java | 14 +++++++++++++- .../res/layout/activity_personality_center.xml | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java index 1405a0c..10db301 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java @@ -5,6 +5,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; import Schema.OperaSchema; @@ -32,7 +33,18 @@ public class LoginActivity extends AppCompatActivity { String password=password_edit.getText().toString(); //调用数据库类中的方法进行登录 boolean isLogin= OperaSchema.longin(tel,password); - + /** + * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面 + * 即，改变登录按钮为欢迎按钮 + */ + if(isLogin) { + finish();//返回个人中心Activity + }else{//登陆失败提醒 + AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this); + builder.setTitle("登陆提醒");// 设置标题 + builder.setMessage("登陆失败");// 为对话框设置内容 + builder.create().show();// 使用show()方法显示对话框 + } } }); } diff --git a/app/src/main/res/layout/activity_personality_center.xml b/app/src/main/res/layout/activity_personality_center.xml index 0c62c9c..49ba48c 100644 --- a/app/src/main/res/layout/activity_personality_center.xml +++ b/app/src/main/res/layout/activity_personality_center.xml @@ -21,7 +21,7 @@ android:layout_height="50dp" android:text="登录" android:textSize="20sp" - + android:background="#FFDAB9" android:layout_marginLeft="157dp"/>