From 77371d188c0436617af1bf023fa38f320c2a6ad7 Mon Sep 17 00:00:00 2001
From: zhenghaoyuan20 <735827001@qq.com>
Date: Fri, 16 Jun 2023 20:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=99=BB=E9=99=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sixaunyi/.idea/misc.xml                   |  7 +++
 src/sixaunyi/app/.idea/vcs.xml                |  2 +-
 .../com/example/sixaunyi/LoginActivity.java   | 10 ++++
 .../src/main/res/layout/activity_login.xml    | 50 ++++++++++++++-----
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/sixaunyi/.idea/misc.xml b/src/sixaunyi/.idea/misc.xml
index cc4873f..e35879c 100644
--- a/src/sixaunyi/.idea/misc.xml
+++ b/src/sixaunyi/.idea/misc.xml
@@ -3,6 +3,13 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1095" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1095" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/drawable/icon_favorite_red.xml" value="0.1095" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/layout/activity_login.xml" value="0.25364583333333335" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/layout/activity_main.xml" value="0.2390625" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/layout/activity_video.xml" value="0.2390625" />
+        <entry key="..\:/AndroidTool/AndriodProject/shaobing/src/sixaunyi/app/src/main/res/layout/content_detect.xml" value="0.2390625" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/drawable/icon_favorite_red.xml" value="0.12" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/layout/activity_detect.xml" value="0.1" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/layout/activity_main.xml" value="0.1" />
diff --git a/src/sixaunyi/app/.idea/vcs.xml b/src/sixaunyi/app/.idea/vcs.xml
index f351d70..c2365ab 100644
--- a/src/sixaunyi/app/.idea/vcs.xml
+++ b/src/sixaunyi/app/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="" />
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
index d4c43b0..d15eed0 100644
--- a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
+++ b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
@@ -1,3 +1,13 @@
+package com.example.sixaunyi;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
+
 public class LoginActivity extends AppCompatActivity {
 
     private EditText mUsername;
diff --git a/src/sixaunyi/app/src/main/res/layout/activity_login.xml b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
index 207f5a5..e7d7696 100644
--- a/src/sixaunyi/app/src/main/res/layout/activity_login.xml
+++ b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
@@ -1,30 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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"
-    android:padding="16dp">
+    android:orientation="vertical"
+    android:background="@drawable/bg"
+    tools:context=".MainActivity">
 
+    <ImageView
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:background="@drawable/android"
+        android:layout_marginTop="200dp"
+        android:layout_gravity="center"/>
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="用户名"/>
-
+        android:hint="账号："
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"/>
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/username"
-        android:layout_marginTop="16dp"
-        android:hint="密码"
-        android:inputType="textPassword"/>
+        android:hint="密码："
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"/>
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="记住密码"
+        android:layout_marginLeft="280dp"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="10dp">
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/login"
-        android:layout_width="match_parent"
+        android:layout_width="310dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/password"
-        android:layout_marginTop="32dp"
-        android:text="登陆"/>
+        android:layout_marginLeft="50dp"
+        android:text="登录" />
 
-</RelativeLayout>
+</LinearLayout>