From 7d3eb46e785cd5a7e28815faefac5b4be573ec61 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:34:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/res/layout/activity_main.xml --- app/src/main/java/Schema/OperaSchema.java | 24 ++++++---------- .../cmknowledgegraph/LoginActivity.java | 14 ++++++++++ .../cmknowledgegraph/RegisterActivity.java | 28 +++++++++++++++++++ app/src/main/res/layout/activity_login.xml | 1 + 4 files changed, 52 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/Schema/OperaSchema.java b/app/src/main/java/Schema/OperaSchema.java index 8a724e2..4895cde 100644 --- a/app/src/main/java/Schema/OperaSchema.java +++ b/app/src/main/java/Schema/OperaSchema.java @@ -54,23 +54,17 @@ public class OperaSchema { "where tel='"+tel+"'"); rst=pstmt.executeQuery(); if(rst==null){//注册成功 - //注册成功提醒 - AlertDialog.Builder builder = new AlertDialog.Builder(LoginActivity.this); - builder.setTitle("登陆提醒");// 设置标题 - builder.setMessage("注册成功");// 为对话框设置内容 - builder.create().show();// 使用show()方法显示对话框 - builder.setPositiveButton("确定", new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface arg0, int arg1) { - // TODO Auto-generated method stub - //点击确定返回登录界面 - finish(); - } - }); - } + //把用户信息填入表中 + pstmt=conn.prepareStatement("insert into UserInfo(tel,nickname,paw) values(?,?,?)"); + pstmt.setString(1,tel); + pstmt.setString(2,nickname); + pstmt.setString(3,password); + pstmt.executeUpdate(); + return true; + }else return false; } catch (SQLException e) { e.printStackTrace(); } + return false; } } diff --git a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java index edb42fd..a36970f 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java @@ -1,9 +1,11 @@ package com.example.cmknowledgegraph; +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; @@ -49,6 +51,18 @@ public class LoginActivity extends AppCompatActivity { } } }); + + //TextView注册跳转 + TextView register_text=findViewById(R.id.register_text); + register_text.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + //跳转到注册页面 + Intent intent=new Intent(); + intent.setClass(LoginActivity.this,RegisterActivity.class); + startActivity(intent); + } + }); } diff --git a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java index edcf80e..b28defd 100644 --- a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java +++ b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java @@ -1,12 +1,16 @@ package com.example.cmknowledgegraph; +import android.content.DialogInterface; import android.os.Bundle; 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; + public class RegisterActivity extends AppCompatActivity { @Override @@ -30,6 +34,30 @@ 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() { + + @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("注册失败");// 为对话框设置内容 + } } }); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 665fcae..4030adf 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -74,6 +74,7 @@ android:layout_marginLeft="70dp" android:textColor="#8B4513"/>