From 7421c7cc502ba5a9d18a3c55774a2c158bc3e931 Mon Sep 17 00:00:00 2001
From: zhenghaoyuan20 <735827001@qq.com>
Date: Mon, 26 Jun 2023 11:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E9=A2=98=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sixaunyi/app/src/main/AndroidManifest.xml     |  7 ++++---
 .../app/src/main/res/layout/activity_login.xml    | 15 +++++++--------
 src/sixaunyi/app/src/main/res/values/styles.xml   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/sixaunyi/app/src/main/AndroidManifest.xml b/src/sixaunyi/app/src/main/AndroidManifest.xml
index 2cb0ecc..ca8e88d 100644
--- a/src/sixaunyi/app/src/main/AndroidManifest.xml
+++ b/src/sixaunyi/app/src/main/AndroidManifest.xml
@@ -19,10 +19,10 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="哨兵软件系统"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Sixaunyi"
+        android:theme="@style/Theme.Sixaunyi.NoActionBar"
         tools:targetApi="31">
         <activity
             android:name=".SettingActivity"
@@ -47,7 +47,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat">
+            android:theme="@style/Theme.AppCompat.NoActionBar">
         </activity>
         <activity
             android:name=".VideoActivity"
@@ -63,6 +63,7 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
         </activity>
     </application>
 
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 e79a365..ca7d5d3 100644
--- a/src/sixaunyi/app/src/main/res/layout/activity_login.xml
+++ b/src/sixaunyi/app/src/main/res/layout/activity_login.xml
@@ -29,8 +29,7 @@
         android:hint="密码："
         android:layout_marginTop="10dp"
         android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
-        android:maxLines="1"/>
+        android:layout_marginRight="30dp"/>
     <CheckBox
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,17 +39,17 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="vertical">
 
         <Button
             android:id="@+id/login"
-            android:layout_width="295dp"
+            android:layout_width="100dp"
             android:layout_height="57dp"
-            android:layout_marginLeft="175dp"
-            android:text="登录"
-            android:maxLines="1"/>
+            android:gravity="center"
+            android:layout_gravity="center_horizontal"
+            android:text="登录" />
 
     </LinearLayout>
 
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/sixaunyi/app/src/main/res/values/styles.xml b/src/sixaunyi/app/src/main/res/values/styles.xml
index 2a03351..9564c55 100644
--- a/src/sixaunyi/app/src/main/res/values/styles.xml
+++ b/src/sixaunyi/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
     <style name="AppTheme" parent="Theme.AppCompat.Light">
 
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="windowActionBar">false</item>
     </style>
 </resources>
\ No newline at end of file