From 1f60ac8f806bef9d29befb28c2adc86f7fa766f4 Mon Sep 17 00:00:00 2001
From: wjdaima <66901640+wjdaima@users.noreply.github.com>
Date: Mon, 8 Nov 2021 17:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E7=AC=AC=E4=B8=89=E6=AC=A1?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/Story/.idea/jarRepositories.xml          |  5 ++
 code/Story/app/build.gradle                   |  8 +-
 code/Story/app/src/main/AndroidManifest.xml   |  3 +-
 .../java/com/example/story/MainActivity.java  | 14 ----
 .../story/view/activity/MainActivity.java     | 80 +++++++++++++++++++
 .../app/src/main/res/layout/activity_main.xml | 61 +++++++++++---
 6 files changed, 145 insertions(+), 26 deletions(-)
 delete mode 100644 code/Story/app/src/main/java/com/example/story/MainActivity.java
 create mode 100644 code/Story/app/src/main/java/com/example/story/view/activity/MainActivity.java

diff --git a/code/Story/.idea/jarRepositories.xml b/code/Story/.idea/jarRepositories.xml
index 0380d8d..0a78fa4 100644
--- a/code/Story/.idea/jarRepositories.xml
+++ b/code/Story/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.google.com" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/code/Story/app/build.gradle b/code/Story/app/build.gradle
index 43e9f63..294a095 100644
--- a/code/Story/app/build.gradle
+++ b/code/Story/app/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
 }
-
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.3"
@@ -36,4 +35,11 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    // https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-viewmodel
+    runtimeOnly group: 'androidx.lifecycle', name: 'lifecycle-viewmodel', version: '2.4.0'
+    // https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-extensions
+    runtimeOnly group: 'androidx.lifecycle', name: 'lifecycle-extensions', version: '2.2.0'
+// https://mvnrepository.com/artifact/androidx.lifecycle/lifecycle-livedata
+    runtimeOnly group: 'androidx.lifecycle', name: 'lifecycle-livedata', version: '2.4.0'
+
 }
\ No newline at end of file
diff --git a/code/Story/app/src/main/AndroidManifest.xml b/code/Story/app/src/main/AndroidManifest.xml
index cef9894..dce861d 100644
--- a/code/Story/app/src/main/AndroidManifest.xml
+++ b/code/Story/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Story">
-        <activity android:name=".MainActivity">
+        <activity android:name=".view.activity.HomeActivity"></activity>
+        <activity android:name=".view.activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/code/Story/app/src/main/java/com/example/story/MainActivity.java b/code/Story/app/src/main/java/com/example/story/MainActivity.java
deleted file mode 100644
index 25f47b5..0000000
--- a/code/Story/app/src/main/java/com/example/story/MainActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.story;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-}
\ No newline at end of file
diff --git a/code/Story/app/src/main/java/com/example/story/view/activity/MainActivity.java b/code/Story/app/src/main/java/com/example/story/view/activity/MainActivity.java
new file mode 100644
index 0000000..5924725
--- /dev/null
+++ b/code/Story/app/src/main/java/com/example/story/view/activity/MainActivity.java
@@ -0,0 +1,80 @@
+package com.example.story.view.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.example.story.R;
+
+public class MainActivity extends AppCompatActivity {
+    Button login_btn;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        login_btn=(Button)findViewById(R.id.btn_login);
+        login_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent =new Intent(MainActivity.this,HomeActivity.class);
+                startActivity(intent);
+            }
+        });
+
+    }
+}
+//public class MainActivity extends AppCompatActivity {
+//    private SharedPreferences preferences;
+//    private SharedPreferences .Editor editor;
+//    private EditText NameEdit;
+//    private EditText PasswordEdit;
+//    private Button login;
+//    private CheckBox remember;
+//    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_main);
+//
+//        preferences = PreferenceManager.getDefaultSharedPreferences(this);
+//        NameEdit = (EditText) findViewById(R.id.Name);
+//        PasswordEdit = (EditText) findViewById(R.id.Password);
+//        remember = (CheckBox) findViewById(R.id.remember);
+//        login = (Button) findViewById(R.id.login);
+//        boolean isRemember = preferences.getBoolean("remember_password",false);
+//        if (isRemember){
+//            String Name = preferences.getString("Name","");
+//            String Password = preferences.getString("Password","");
+//            NameEdit.setText(Name);
+//            PasswordEdit.setText(Password);
+//            remember.setChecked(true);
+//        }
+//        login.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                String Name = NameEdit.getText().toString();
+//                String Password = PasswordEdit.getText().toString();
+//                if (TextUtils.isEmpty(NameEdit.getText().toString()) || TextUtils.isEmpty(PasswordEdit.getText().toString())) {
+//                    Toast.makeText(MainActivity.this, "用户名或者密码不能为空", Toast.LENGTH_SHORT).show();
+//                } else
+//                if(Name.equals("CSDN")&&Password.equals("12345678")){
+//                    editor = preferences.edit();
+//                    if(remember.isChecked()){
+//                        editor.putBoolean("remember_password",true);
+//                        editor.putString("Name",Name);
+//                        editor.putString("Password",Password);
+//                    }else{editor.clear();}
+//                    editor.apply();
+//                    Intent intent = new Intent(MainActivity.this,Receiver.class);
+//                    intent.putExtra("Name",Name);
+//                    intent.putExtra("Password",Password);
+//                    startActivity(intent);
+//                    Toast.makeText(MainActivity.this,"登录成功",Toast.LENGTH_SHORT).show();
+//                    finish();
+//                }else {Toast.makeText(MainActivity.this,"账号密码错误",Toast.LENGTH_SHORT).show();}
+//            }
+//        });
+//    }
+//}
\ No newline at end of file
diff --git a/code/Story/app/src/main/res/layout/activity_main.xml b/code/Story/app/src/main/res/layout/activity_main.xml
index 88fb8ba..01a174b 100644
--- a/code/Story/app/src/main/res/layout/activity_main.xml
+++ b/code/Story/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
+    android:orientation="vertical"
+    tools:context=".view.activity.MainActivity">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="35dp">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/symbol">
+        </ImageView>
+    </LinearLayout>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="wz!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:text="宝宝巴逝登入界面"
+        android:layout_marginTop="20dp"
+        android:textSize="20sp"></TextView>
+    <EditText
+        android:id="@+id/et_user_name"
+        android:layout_width="350dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:layout_marginLeft="20dp"
+        android:hint="账号">
+    </EditText>
+    <EditText
+        android:id="@+id/et_psw"
+        android:layout_width="350dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="20dp"
+        android:hint="密码">
+    </EditText>
+    <Button
+        android:layout_width="350dp"
+        android:layout_height="wrap_content"
+        android:text="登入"
+        android:layout_marginLeft="20dp"
+        android:id="@+id/btn_login"
+        android:background="#1E90FF"
+        android:layout_marginTop="20dp"
+        android:textSize="24sp">
+    </Button>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="80dp"
+        android:text="欢迎来到猛男网咖">
+    </TextView>
+</LinearLayout>
\ No newline at end of file