Merge branch 'master' of http://git.trustie.net/xiongbo123/cmknowledgegraph

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);
@@ -31,35 +33,56 @@ public class LoginActivity extends AppCompatActivity {
         login_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-
+                if(tel_edit==null||tel_edit.getText().toString().equals("")){
-                //获取手机号和密码
+                    AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
-                String tel=tel_edit.getText().toString().trim();
+                    builder.setTitle("登录失败");// 设置标题
-                String password=password_edit.getText().toString();
+                    builder.setMessage("请输入电话号码");// 为对话框设置内容
-                //调用数据库类中的方法进行登录
+                    builder.create().show();// 使用show()方法显示对话框
+                }else if(password_edit==null||password_edit.getText().toString().equals("")){
+                    AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
+                    builder.setTitle("登录失败");// 设置标题
+                    builder.setMessage("请输入密码");// 为对话框设置内容
+                    builder.create().show();// 使用show()方法显示对话框
+                }else {
+                    //获取手机号和密码
+                    String tel = tel_edit.getText().toString().trim();
+                    String password = password_edit.getText().toString();
+                    //调用数据库类中的方法进行登录
 //                boolean isLogin= OperaSchema.longin(tel,password);//原来的数据库
-                Login login = new Login(tel,password);
+                    Login login = new Login(tel, password);
 
-                new Thread(new Runnable() {
+                    new Thread(new Runnable() {
-                    @Override
+                        @Override
-                    public void run() {
+                        public void run() {
-                        String username = login.connUser();
+                            LoginActivity.username = login.connUser();
-                        /**
+                            LoginActivity.usersuccess = 1;
-                         * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面
+                            Log.i("登录", "登录有没有问题" + username + "oooo");
-                         * 即，改变登录按钮为欢迎按钮
-                         */
-                        if(username!=null) {
-                            finish();//返回个人中心Activity
-                            //刷新个人中心Activity
 
-                        }else{//登陆失败提醒
-                            AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this);
-                            builder.setTitle("登陆提醒");// 设置标题
-                            builder.setMessage("登陆失败");// 为对话框设置内容
-                            builder.create().show();// 使用show()方法显示对话框
                         }
+                    }).start();
+/**
+ * 登陆成功，返回上一个界面，即个人中心界面，刷新个人中心界面
+ * 即，改变登录按钮为欢迎按钮
+ */
+                    while (LoginActivity.usersuccess == 0) {
+                        Log.i("suersuer======", "dkie" + LoginActivity.usersuccess);
                     }
-                }).start();
 
+                    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;
+                }
 
             }
         });

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

@@ -2,6 +2,7 @@ package com.example.cmknowledgegraph;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -14,14 +15,15 @@ import com.example.PersonalCenter.Register;
 import Schema.OperaSchema;
 
 public class RegisterActivity extends AppCompatActivity {
-
+    public static int regester = 0;
+    public static boolean isRegister;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
 
         final EditText tel_edit=findViewById(R.id.tel_register_edit);
-        final EditText password_edit=findViewById(R.id.password_edit);
+        final EditText password_edit=findViewById(R.id.password_register_edit);
         final EditText nickname_edit=findViewById(R.id.nickname_register_edit);
 
         /**
@@ -31,43 +33,69 @@ public class RegisterActivity extends AppCompatActivity {
         register.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                //获取手机号，密码，昵称
+                if(tel_edit==null||tel_edit.getText().toString().equals("")){
-                String tel=tel_edit.getText().toString().trim();
+                    AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
-                String password=password_edit.getText().toString();
+                    builder.setTitle("注册失败");// 设置标题
-                String NickName=nickname_edit.getText().toString();
+                    builder.setMessage("请输入电话号码");// 为对话框设置内容
-                //调用数据库类方法进行注册
+                    builder.create().show();// 使用show()方法显示对话框
+                }else if (password_edit==null||password_edit.getText().toString().equals("")){
+                    AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
+                    builder.setTitle("注册失败");// 设置标题
+                    builder.setMessage("请输入密码");// 为对话框设置内容
+                    builder.create().show();// 使用show()方法显示对话框
+                }else if(nickname_edit==null||nickname_edit.getText().toString().equals("")){
+                    AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
+                    builder.setTitle("注册失败");// 设置标题
+                    builder.setMessage("请输入用户名");// 为对话框设置内容
+                    builder.create().show();// 使用show()方法显示对话框
+                }else {
+                    //获取手机号，密码，昵称
+                    String tel = tel_edit.getText().toString().trim();
+                    String password = password_edit.getText().toString();
+                    String NickName = nickname_edit.getText().toString();
+                    //调用数据库类方法进行注册
 //                boolean isRegister= OperaSchema.register(tel,NickName,password);//原来的数据连接
-                Register register = new 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
+                    new Thread(new Runnable() {
-                                public void onClick(DialogInterface arg0, int arg1) {
+                        @Override
-                                    // TODO Auto-generated method stub
+                        public void run() {
-                                    //返回登录页面
+                            RegisterActivity.isRegister = register.regist();
-                                    finish();
+                            Log.i("hahaaha", "注册成功了吗" + isRegister);
-                                }
+                            RegisterActivity.regester = 1;
-                            });
-                            builder.create().show();// 使用show()方法显示对话框
-                        }else{//注册失败
-                            //注册失败提醒
-                            AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
-                            builder.setTitle("注册提醒");// 设置标题
-                            // builder.setIcon(R.drawable.ic_launcher);//设置图标
-                            builder.setMessage("注册失败");// 为对话框设置内容
                         }
+                    }).start();
+                    while (RegisterActivity.regester == 0) {
+                        Log.i("rererer======", "dsd" + RegisterActivity.regester);
                     }
-                }).start();
+                    if (RegisterActivity.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();
+                            }
+                        });
+                        builder.create().show();// 使用show()方法显示对话框
+                    } else {//注册失败
+                        //注册失败提醒
+                        Log.i("zh==-----==--==", "kidoosloe");
+                        AlertDialog.Builder builder = new AlertDialog.Builder(RegisterActivity.this);
+                        builder.setTitle("注册提醒");// 设置标题
+                        // builder.setIcon(R.drawable.ic_launcher);//设置图标
+                        builder.setMessage("注册失败");// 为对话框设置内容
+                        builder.create().show();
+                    }
+                    RegisterActivity.regester = 0;
+                    RegisterActivity.isRegister = false;
+                }
 
             }
         });

app/src/main/res/xml/network_security_config.xml

@@ -1,4 +1,5 @@
 <network-security-config>
+    <base-config cleartextTrafficPermitted="true"/>
     <domain-config>
         <domain includeSubdomains="true">example.com</domain>
         <pin-set expiration="2018-01-01">