Login and Register Function+Merge+New

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

@@ -2,6 +2,7 @@ package com.example.cmknowledgegraph;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -15,7 +16,8 @@ import com.example.PersonalCenter.Login;
 import Schema.OperaSchema;
 
 public class LoginActivity extends AppCompatActivity {
-
+    public static String username;
+    public static int usersuccess = 0;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -42,24 +44,32 @@ public class LoginActivity extends AppCompatActivity {
                 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()方法显示对话框
-                        }
+                        LoginActivity.username = login.connUser();
+                        LoginActivity.usersuccess = 1;
+                        Log.i("登录","登录有没有问题"+username+"oooo");
+
                     }
                 }).start();
-
+/**
+ * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面
+ * 即，改变登录按钮为欢迎按钮
+ */
+                while(LoginActivity.usersuccess==0) {Log.i("suersuer======","dkie"+LoginActivity.usersuccess);}
+
+                if(!LoginActivity.username.equals("")) {
+                    finish();//返回个人中心Activity
+                    //刷新个人中心Activity
+                    Log.i("成功","成功了");
+
+                }else{//登陆失败提醒
+                    AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
+                    builder.setTitle("登陆提醒");// 设置标题
+                    builder.setMessage("登陆失败");// 为对话框设置内容
+                    builder.create().show();// 使用show()方法显示对话框
+                    Log.i("失败","失败了");
+                }
+                LoginActivity.username = "";
+                LoginActivity.usersuccess = 0;
 
             }
         });