From 2183134bdab96b739bab4dbcef033e507cf1a6be Mon Sep 17 00:00:00 2001
From: ongbo <1308161085@qq.com>
Date: Thu, 24 Oct 2019 16:24:59 +0800
Subject: [PATCH] Login and Register Function+Merge+New

---
 .../cmknowledgegraph/LoginActivity.java       | 42 +++++++++------
 .../cmknowledgegraph/RegisterActivity.java    | 54 +++++++++++--------
 2 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
index a36970f..28d4390 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
@@ -10,6 +10,8 @@ import android.widget.TextView;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.PersonalCenter.Login;
+
 import Schema.OperaSchema;
 
 public class LoginActivity extends AppCompatActivity {
@@ -34,21 +36,31 @@ public class LoginActivity extends AppCompatActivity {
                 String tel=tel_edit.getText().toString().trim();
                 String password=password_edit.getText().toString();
                 //调用数据库类中的方法进行登录
-                boolean isLogin= OperaSchema.longin(tel,password);
-                /**
-                 * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面
-                 * 即，改变登录按钮为欢迎按钮
-                 */
-                if(isLogin) {
-                        finish();//返回个人中心Activity
-                    //刷新个人中心Activity
-
-                }else{//登陆失败提醒
-                    AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
-                    builder.setTitle("登陆提醒");// 设置标题
-                    builder.setMessage("登陆失败");// 为对话框设置内容
-                    builder.create().show();// 使用show()方法显示对话框
-                }
+//                boolean isLogin= OperaSchema.longin(tel,password);//原来的数据库
+                Login login = new Login(tel,password);
+
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        String username = login.connUser();
+                        /**
+                         * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面
+                         * 即，改变登录按钮为欢迎按钮
+                         */
+                        if(username!=null) {
+                            finish();//返回个人中心Activity
+                            //刷新个人中心Activity
+
+                        }else{//登陆失败提醒
+                            AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
+                            builder.setTitle("登陆提醒");// 设置标题
+                            builder.setMessage("登陆失败");// 为对话框设置内容
+                            builder.create().show();// 使用show()方法显示对话框
+                        }
+                    }
+                }).start();
+
+
             }
         });
 
diff --git a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
index b28defd..34caefe 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
@@ -9,6 +9,8 @@ import android.widget.EditText;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.PersonalCenter.Register;
+
 import Schema.OperaSchema;
 
 public class RegisterActivity extends AppCompatActivity {
@@ -34,30 +36,38 @@ public class RegisterActivity extends AppCompatActivity {
                 String password=password_edit.getText().toString();
                 String NickName=nickname_edit.getText().toString();
                 //调用数据库类方法进行注册
-                boolean isRegister= OperaSchema.register(tel,NickName,password);
-                if(isRegister){
-                    //注册成功，对话框提醒
-                    AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
-                    builder.setTitle("注册提醒");// 设置标题
-                    // builder.setIcon(R.drawable.ic_launcher);//设置图标
-                    builder.setMessage("注册成功");// 为对话框设置内容
-                    builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
+//                boolean isRegister= OperaSchema.register(tel,NickName,password);//原来的数据连接
+                Register register = new Register(tel,NickName,password);
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        boolean isRegister = register.regist();
+                        if(isRegister){
+                            //注册成功，对话框提醒
+                            AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
+                            builder.setTitle("注册提醒");// 设置标题
+                            // builder.setIcon(R.drawable.ic_launcher);//设置图标
+                            builder.setMessage("注册成功");// 为对话框设置内容
+                            builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
 
-                        @Override
-                        public void onClick(DialogInterface arg0, int arg1) {
-                            // TODO Auto-generated method stub
-                            //返回登录页面
-                            finish();
+                                @Override
+                                public void onClick(DialogInterface arg0, int arg1) {
+                                    // TODO Auto-generated method stub
+                                    //返回登录页面
+                                    finish();
+                                }
+                            });
+                            builder.create().show();// 使用show()方法显示对话框
+                        }else{//注册失败
+                            //注册失败提醒
+                            AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
+                            builder.setTitle("注册提醒");// 设置标题
+                            // builder.setIcon(R.drawable.ic_launcher);//设置图标
+                            builder.setMessage("注册失败");// 为对话框设置内容
                         }
-                    });
-                    builder.create().show();// 使用show()方法显示对话框
-                }else{//注册失败
-                    //注册失败提醒
-                    AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
-                    builder.setTitle("注册提醒");// 设置标题
-                    // builder.setIcon(R.drawable.ic_launcher);//设置图标
-                    builder.setMessage("注册失败");// 为对话框设置内容
-                }
+                    }
+                }).start();
+
 
             }
         });