From 9880870c98fa5bf2f2ae21058070d09369b6b01c Mon Sep 17 00:00:00 2001
From: zhenghaoyuan20 <735827001@qq.com>
Date: Fri, 16 Jun 2023 19:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sixaunyi/app/.idea/vcs.xml                |  2 +-
 .../src/main/res/layout/activity_login.xml    | 66 ++++---------------
 .../app/src/main/res/layout/bg_button.xml     | 21 ------
 .../app/src/main/res/layout/bg_edittext.xml   |  6 --
 4 files changed, 14 insertions(+), 81 deletions(-)
 delete mode 100644 src/sixaunyi/app/src/main/res/layout/bg_button.xml
 delete mode 100644 src/sixaunyi/app/src/main/res/layout/bg_edittext.xml

diff --git a/src/sixaunyi/app/.idea/vcs.xml b/src/sixaunyi/app/.idea/vcs.xml
index c2365ab..f351d70 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="Git" />
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="" />
   </component>
 </project>
\ No newline at end of file
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 73e9821..207f5a5 100644
--- a/src/sixaunyi/app/src/main/res/layout/activity_login.xml
+++ b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:padding="16dp">
 
-    <!--添加背景图-->
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="@drawable/bg_login"/>
-
-    <!--顶部Logo-->
-    <ImageView
-        android:id="@+id/logo"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="60dp"
-        android:src="@mipmap/ic_launcher"/>
-
-    <!--用户名输入框-->
     <EditText
         android:id="@+id/username"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_below="@+id/iv_logo"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="45dp"
-        android:layout_marginRight="45dp"
-        android:background="@drawable/bg_edittext"
-        android:drawableLeft="@drawable/ic_username"
-        android:drawablePadding="10dp"
-        android:hint="请输入用户名"
-        android:paddingLeft="10dp"
-        android:textColorHint="#d5d5d5"
-        android:textSize="16sp"/>
+        android:layout_height="wrap_content"
+        android:hint="用户名"/>
 
-    <!--密码输入框-->
     <EditText
         android:id="@+id/password"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_below="@+id/et_username"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="45dp"
-        android:layout_marginRight="45dp"
-        android:background="@drawable/bg_edittext"
-        android:drawableLeft="@drawable/ic_password"
-        android:drawablePadding="10dp"
-        android:hint="请输入密码"
-        android:paddingLeft="10dp"
-        android:inputType="textPassword"
-        android:textColorHint="#d5d5d5"
-        android:textSize="16sp"/>
+        android:layout_height="wrap_content"
+        android:layout_below="@id/username"
+        android:layout_marginTop="16dp"
+        android:hint="密码"
+        android:inputType="textPassword"/>
 
-    <!--登录按钮-->
     <Button
         android:id="@+id/login"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_below="@+id/et_password"
-        android:layout_marginTop="30dp"
-        android:layout_marginLeft="45dp"
-        android:layout_marginRight="45dp"
-        android:background="@drawable/bg_button"
-        android:text="登录"
-        android:textColor="#ffffff"
-        android:textSize="18sp"/>
+        android:layout_height="wrap_content"
+        android:layout_below="@id/password"
+        android:layout_marginTop="32dp"
+        android:text="登陆"/>
 
 </RelativeLayout>
diff --git a/src/sixaunyi/app/src/main/res/layout/bg_button.xml b/src/sixaunyi/app/src/main/res/layout/bg_button.xml
deleted file mode 100644
index efcc6af..0000000
--- a/src/sixaunyi/app/src/main/res/layout/bg_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <gradient android:startColor="#FF6F00"
-                android:endColor="#FFAB40"
-                android:angle="270"/>
-            <corners android:radius="25dp"/>
-            <stroke android:width="1dp" android:color="#FF6F00" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <gradient android:startColor="#FF9800"
-                android:endColor="#FFC107"
-                android:angle="270"/>
-            <corners android:radius="25dp"/>
-            <stroke android:width="1dp" android:color="#FF9800" />
-        </shape>
-    </item>
-</selector>
diff --git a/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml b/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml
deleted file mode 100644
index 376a424..0000000
--- a/src/sixaunyi/app/src/main/res/layout/bg_edittext.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ffffff"/>
-    <corners android:radius="25dp"/>
-    <stroke android:width="1dp" android:color="#d5d5d5"/>
-</shape>