diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 4300c17..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/libs/mysql-connector-java-5.1.27.jar b/app/libs/mysql-connector-java-5.1.27.jar
new file mode 100644
index 0000000..8bed6a2
Binary files /dev/null and b/app/libs/mysql-connector-java-5.1.27.jar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 559a0ad..7af3216 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/test/DBUtils.java b/app/src/main/java/com/example/test/DBUtils.java
index 4000b5f..fecc511 100644
--- a/app/src/main/java/com/example/test/DBUtils.java
+++ b/app/src/main/java/com/example/test/DBUtils.java
@@ -8,10 +8,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import static android.content.ContentValues.TAG;
+
public class DBUtils {
private static String driver = "com.mysql.jdbc.Driver";//mysql驱动
- private static String url = "jdbc:mysql://114.55.30.62/懒虫";//mysql数据库连接url
+ private static String url = "jdbc:mysql://114.55.30.62:3306/懒虫";//mysql数据库连接url
private static String user = "root";
private static String password = "root";
@@ -72,6 +74,7 @@ public class DBUtils {
e.printStackTrace();
} finally {
try {
+
conn.close();
if (st != null) {
st.close();
@@ -84,24 +87,19 @@ public class DBUtils {
return -1;
}
- public boolean getInfo(int id){
+ public int getroomflag(int id){
Connection conn = getConnection();
Statement st = null;
try {
st = conn.createStatement();
- String sql = "select * from user where uid='"+id+"'";
+ String sql = "select flag from room where id='"+id+"'";
PreparedStatement ps = conn.prepareStatement(sql);
if(ps!=null){
ResultSet rs = ps.executeQuery();
rs.next();
- UserBean.uid=id;
- UserBean.username=rs.getString("username") ;
- UserBean.password=rs.getString("userpassword") ;
- //UserBean.name=rs.getString("name");
- //UserBean.age=rs.getInt("age");
- // UserBean.imgurl=rs.getString("imgurl");
- Log.v("uid",id+"");
- return true;
+ int flag= rs.getInt("flag");
+ Log.v("flag",flag+"");
+ return flag;
}
} catch (SQLException e) {
e.printStackTrace();
@@ -110,57 +108,62 @@ public class DBUtils {
conn.close();
if (st != null) {
st.close();
+
}
} catch (SQLException e) {
e.printStackTrace();
}
}
- return false;
+ return -1;
}
- public int getroomflag(int id){
+
+ public boolean setflag(int id,int flag){
Connection conn = getConnection();
Statement st = null;
try {
st = conn.createStatement();
- String sql = "select flag from room where id='"+id+"'";
+ String sql = "update room set flag='"+flag+"'where id= '"+id+"'";
PreparedStatement ps = conn.prepareStatement(sql);
- if(ps!=null){
- ResultSet rs = ps.executeQuery();
- rs.next();
- int flag= rs.getInt("flag");
- Log.v("flag",flag+"");
- return flag;
- }
+ // ps.setInt(1, flag);
+ ps.executeUpdate();
+ return true;
} catch (SQLException e) {
e.printStackTrace();
} finally {
try {
- conn.close();
if (st != null) {
st.close();
-
}
} catch (SQLException e) {
e.printStackTrace();
}
}
- return -1;
+ return false;
}
-
- public boolean setflag(int id,int flag){
+ public boolean getInfo(int id){
Connection conn = getConnection();
Statement st = null;
try {
st = conn.createStatement();
- String sql = "update room set flag='"+flag+"'where id= '"+id+"'";
+ String sql = "select * from user where uid='"+id+"'";
PreparedStatement ps = conn.prepareStatement(sql);
- // ps.setInt(1, flag);
- ps.executeUpdate();
- return true;
+ if(ps!=null){
+ ResultSet rs = ps.executeQuery();
+ rs.next();
+ UserBean.uid=id;
+ UserBean.username=rs.getString("username") ;
+ UserBean.password=rs.getString("userpassword") ;
+ //UserBean.name=rs.getString("name");
+ // UserBean.age=rs.getInt("age");
+ //User.imgurl=rs.getString("imgurl");
+ Log.v("uid",id+"");
+ return true;
+ }
} catch (SQLException e) {
e.printStackTrace();
} finally {
try {
+ conn.close();
if (st != null) {
st.close();
}
@@ -168,8 +171,7 @@ public class DBUtils {
e.printStackTrace();
}
}
- return false;
+ return false;
}
-
}
diff --git a/app/src/main/java/com/example/test/LoginActivity.java b/app/src/main/java/com/example/test/LoginActivity.java
index 05356af..5c4b88a 100644
--- a/app/src/main/java/com/example/test/LoginActivity.java
+++ b/app/src/main/java/com/example/test/LoginActivity.java
@@ -38,7 +38,7 @@ public class LoginActivity extends AppCompatActivity {
int id=db.searchUser(username,userpassword);
Log.v("login",username+userpassword);
Log.v("login","lelelel");
- if(id!=-1){
+ if(id!=-1){
//登陆成功
@@ -69,32 +69,10 @@ public class LoginActivity extends AppCompatActivity {
register.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- final String username=name.getText().toString();
- final String userpassword=password.getText().toString();
-
- new Thread(){
- public void run(){
- //
- boolean result=db.insertUser(username,userpassword);
- Log.v("login",username+userpassword);
- Log.v("login","lelelel");
- if(result){
- //注册成功
- Looper.prepare();
- Toast toast=Toast.makeText(context, "注册成功",Toast.LENGTH_SHORT);
- toast.show();
- Looper.loop();
- }
- else{
- //注册失败
- Looper.prepare();
- Toast toast=Toast.makeText(context, "用户名已存在",Toast.LENGTH_SHORT);
- toast.show();
- Looper.loop();
- }
- }
- }.start();
-
+ Log.v("login","start");
+ Intent intent = new Intent(LoginActivity.this,RegisterActivity.class);
+ startActivity(intent);
+ // Looper.loop();
}
});
diff --git a/app/src/main/java/com/example/test/RegisterActivity.java b/app/src/main/java/com/example/test/RegisterActivity.java
new file mode 100644
index 0000000..50af782
--- /dev/null
+++ b/app/src/main/java/com/example/test/RegisterActivity.java
@@ -0,0 +1,119 @@
+package com.example.test;
+
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Color;
+import android.os.Bundle;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class RegisterActivity extends AppCompatActivity {
+ private TextView tv_main_title;//标题
+ private TextView tv_back;//返回按钮
+ private Button btn_doregister;//注册按钮
+ //用户名,密码,再次输入的密码的控件
+ private EditText et_user_name,et_psw,et_psw_again;
+ //用户名,密码,再次输入的密码的控件的获取值
+ private String userName, userpassword,pswAgain;
+ //标题布局
+ private RelativeLayout rl_title_bar;
+ DBUtils db=new DBUtils();
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ //设置页面布局 ,注册界面
+ setContentView(R.layout.activity_register);
+ //设置此界面为竖屏
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+ init();
+ }
+
+ private void init() {
+ //从main_title_bar.xml 页面布局中获取对应的UI控件
+ tv_main_title=findViewById(R.id.tv_main_title);
+ tv_main_title.setText("注册");
+ tv_back=findViewById(R.id.tv_back);
+ //布局根元素
+ rl_title_bar=findViewById(R.id.title_bar);
+ rl_title_bar.setBackgroundColor(Color.TRANSPARENT);
+ //从activity_register.xml 页面中获取对应的UI控件
+ btn_doregister=findViewById(R.id.btn_doregister);
+ et_user_name=findViewById(R.id.et_user_name);
+ et_psw=findViewById(R.id.et_psw);
+ et_psw_again=findViewById(R.id.et_psw_again);
+ tv_back.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //返回键
+ RegisterActivity.this.finish();
+ }
+ });
+ //注册按钮
+ btn_doregister.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ //获取输入在相应控件中的字符串
+ getEditString();
+ Log.v("login",userName);
+ //判断输入框内容
+ if(TextUtils.isEmpty(userName)){
+ Toast.makeText(RegisterActivity.this, "请输入用户名", Toast.LENGTH_SHORT).show();
+ // return;
+ }else if(TextUtils.isEmpty(userpassword)){
+ Toast.makeText(RegisterActivity.this, "请输入密码", Toast.LENGTH_SHORT).show();
+ //return;
+ }else if(TextUtils.isEmpty(pswAgain)){
+ Toast.makeText(RegisterActivity.this, "请再次输入密码", Toast.LENGTH_SHORT).show();
+ //return;
+ }else if(!userpassword.equals(pswAgain)){
+ Toast.makeText(RegisterActivity.this, "输入两次的密码不一样", Toast.LENGTH_SHORT).show();
+ // return;
+ /**
+ *从mysql中读取输入的用户名,判断mysql中是否有此用户名
+ */
+ }else{
+ Toast.makeText(RegisterActivity.this, "注册成功", Toast.LENGTH_SHORT).show();
+
+ //把账号、密码和账号标识保存到sp里面
+ /**
+ * 保存账号和密码到mysql中
+ */
+ new Thread(){
+ public void run(){
+ db.insertUser(userName, userpassword);
+ //注册成功后把账号传递到LoginActivity.java中
+ // 返回值到loginActivity显示
+ Log.v("login","startgergrger53425324543532454254324525324");
+ Intent data = new Intent();
+ data.putExtra("userName", userName);
+ setResult(RESULT_OK, data);
+ //RESULT_OK为Activity系统常量,状态码为-1,
+ // 表示此页面下的内容操作成功将data返回到上一页面,如果是用back返回过去的则不存在用setResult传递data值
+ RegisterActivity.this.finish();
+ }
+ }.start();
+
+ }
+ }
+ });
+ }
+ /**
+ * 获取控件中的字符串
+ */
+ private void getEditString(){
+ userName=et_user_name.getText().toString().trim();
+ userpassword =et_psw.getText().toString().trim();
+ pswAgain=et_psw_again.getText().toString().trim();
+ Log.v("login",userName);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 2cff503..cb27ae0 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -81,7 +81,7 @@
android:layout_marginTop="15dp"
android:layout_marginRight="35dp"
android:background="@drawable/register_selector"
- android:text="注册"
+ android:text="注 册"
android:textColor="@android:color/white"
android:textSize="18sp" />
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 84fa031..273670d 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -69,16 +69,17 @@
android:textColor="#000000"
android:textColorHint="#a3a3a3"
android:textSize="14sp"/>
+
+ android:textSize="18sp" />
\ No newline at end of file