From 7e988db6b1c5e41af394e94c78e9520cd7756ab5 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 10:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
---
 app/src/main/java/Schema/InitSchema.java      | 13 +++++++
 app/src/main/java/Schema/OperaSchema.java     | 36 +++++++++++++++++++
 .../cmknowledgegraph/LoginActivity.java       |  4 +++
 .../PersonalityCenterActivity.java            | 14 ++++++++
 .../layout/activity_personality_center.xml    |  2 +-
 5 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/Schema/InitSchema.java
 create mode 100644 app/src/main/java/Schema/OperaSchema.java

diff --git a/app/src/main/java/Schema/InitSchema.java b/app/src/main/java/Schema/InitSchema.java
new file mode 100644
index 0000000..4880e71
--- /dev/null
+++ b/app/src/main/java/Schema/InitSchema.java
@@ -0,0 +1,13 @@
+package Schema;
+
+import java.sql.Connection;
+
+public class InitSchema {
+
+    /**
+     * 连接到数据库
+     */
+    public static Connection getConnect(){
+        return null;
+    }
+}
diff --git a/app/src/main/java/Schema/OperaSchema.java b/app/src/main/java/Schema/OperaSchema.java
new file mode 100644
index 0000000..688f0c4
--- /dev/null
+++ b/app/src/main/java/Schema/OperaSchema.java
@@ -0,0 +1,36 @@
+package Schema;
+
+import android.gesture.Prediction;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class OperaSchema {
+
+    /**
+     * 连接数据库，进行登录，参数是手机号（string），密码（string）
+     * 用户表（UserInfo）,手机号，用户名，密码
+     * 登陆成功返回true，登陆失败返回false
+     */
+    public static boolean longin(String tel,String password){
+        Connection conn=InitSchema.getConnect();
+        ResultSet rst;
+        PreparedStatement pstmt;
+        try {
+            pstmt=conn.prepareStatement("select paw\n" +
+                                            "from UserInfo\n" +
+                                            "where tel='"+tel+"'");
+            rst=pstmt.executeQuery();
+            String paw=rst.getString("paw");
+            if(password.equals(paw)){
+                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 c97f2a2..1405a0c 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
@@ -7,6 +7,8 @@ import android.widget.EditText;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import Schema.OperaSchema;
+
 public class LoginActivity extends AppCompatActivity {
 
     @Override
@@ -29,6 +31,8 @@ public class LoginActivity extends AppCompatActivity {
                 String tel=tel_edit.getText().toString().trim();
                 String password=password_edit.getText().toString();
                 //调用数据库类中的方法进行登录
+                boolean isLogin= OperaSchema.longin(tel,password);
+
             }
         });
     }
diff --git a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
index b9ab481..3db2b1e 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/PersonalityCenterActivity.java
@@ -2,12 +2,26 @@ package com.example.cmknowledgegraph;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 
 public class PersonalityCenterActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_personality_center);
+
+        Button longin_pc_btn=(Button) findViewById(R.id.login_pc_button);
+        longin_pc_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                //跳转到LoginActivity
+                Intent intent=new Intent();
+                intent.setClass(PersonalityCenterActivity.this,LoginActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 }
diff --git a/app/src/main/res/layout/activity_personality_center.xml b/app/src/main/res/layout/activity_personality_center.xml
index 9d617d2..0c62c9c 100644
--- a/app/src/main/res/layout/activity_personality_center.xml
+++ b/app/src/main/res/layout/activity_personality_center.xml
@@ -16,7 +16,7 @@
         android:src="@mipmap/picture"/>
 
     <Button
-        android:id="@+id/login_button"
+        android:id="@+id/login_pc_button"
         android:layout_width="100dp"
         android:layout_height="50dp"
         android:text="登录"