diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login.png b/app/src/main/res/mipmap-xxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login.png
Binary files differ

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login.png b/app/src/main/res/mipmap-xxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/login.png b/app/src/main/res/mipmap-xxxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/login.png
Binary files differ

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login.png b/app/src/main/res/mipmap-xxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/login.png b/app/src/main/res/mipmap-xxxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 513c513..d85f68a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,8 +4,8 @@
     <color name="white">#FFFFFFFF</color>
     <color name="cyan">#FF00FFFF</color>
 
-    <color name="themeColor">#FF071459</color>
-    <color name="themeOpacityColor">#80071459</color>
+    <color name="themeColor">#FF4696F9</color>
+    <color name="themeOpacityColor">#804696F9</color>
     <color name="dividerColor">#E0E0E0</color>
     <color name="backgroundColor">#F7F7F7</color>
     <color name="hintColor">#FFAAAAAA</color>

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login.png b/app/src/main/res/mipmap-xxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/login.png b/app/src/main/res/mipmap-xxxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 513c513..d85f68a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,8 +4,8 @@
     <color name="white">#FFFFFFFF</color>
     <color name="cyan">#FF00FFFF</color>
 
-    <color name="themeColor">#FF071459</color>
-    <color name="themeOpacityColor">#80071459</color>
+    <color name="themeColor">#FF4696F9</color>
+    <color name="themeOpacityColor">#804696F9</color>
     <color name="dividerColor">#E0E0E0</color>
     <color name="backgroundColor">#F7F7F7</color>
     <color name="hintColor">#FFAAAAAA</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6f18db..e02e62e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">安全生产辅助系统</string>
+    <string name="app_name">安全生产检查助手</string>
     <string name="group_name">中国航天科工集团二院二〇三所</string>
     <string name="loading_value">暂无数据</string>
     <string name="degree">°</string>

diff --git a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
index 971d3a9..9222751 100644
--- a/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/br/app/view/LoginActivity.kt
@@ -104,7 +104,7 @@
     }
 
     override fun setupTopBarLayout() {
-        ImmersionBar.with(this).statusBarDarkFont(false).init()
+        ImmersionBar.with(this).statusBarDarkFont(true).statusBarColor(R.color.white).init()
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index e019da0..fe2dd30 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -4,7 +4,7 @@
     <item android:state_pressed="false">
         <shape>
             <corners android:radius="@dimen/dp_3" />
-            <solid android:color="#309CCC" />
+            <solid android:color="@color/themeColor" />
         </shape>
     </item>
 
@@ -12,7 +12,7 @@
         <shape>
             <corners android:radius="@dimen/dp_3" />
             <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="#80309CCC" />
+            <solid android:color="@color/themeOpacityColor" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 0000000..4e452b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M768,416h-32v-96c0,-59.6 -23.4,-115.8 -65.8,-158.2S571.6,96 512,96s-115.8,23.4 -158.2,65.8S288,260.4 288,320v96h-32c-70.4,0 -128,57.6 -128,128v256c0,70.4 57.6,128 128,128h512c70.4,0 128,-57.6 128,-128L896,544c0,-70.4 -57.6,-128 -128,-128zM352,320c0,-42.5 16.7,-82.6 47,-113s70.4,-47 113,-47 82.6,16.7 113,47 47,70.4 47,113v96L352,416v-96zM832,800c0,17 -6.7,33 -18.9,45.1S785,864 768,864L256,864c-17,0 -33,-6.7 -45.1,-18.9S192,817 192,800L192,544c0,-17 6.7,-33 18.9,-45.1S239,480 256,480h512c17,0 33,6.7 45.1,18.9S832,527 832,544v256z" />
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M512,576c-26.5,0 -48,21.5 -48,48 0,14.2 6.2,27 16,35.8V736c0,17.6 14.4,32 32,32s32,-14.4 32,-32v-76.2c9.8,-8.8 16,-21.6 16,-35.8 0,-26.5 -21.5,-48 -48,-48z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..73fe65d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64px"
+    android:height="64px"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/hintColor"
+        android:pathData="M865.8,746.5c-19.3,-45.7 -47,-86.8 -82.3,-122 -35.3,-35.3 -76.3,-62.9 -122,-82.3 -4.4,-1.9 -8.9,-3.7 -13.4,-5.4C720.1,491.5 768,411.4 768,320c0,-141.4 -114.6,-256 -256,-256S256,178.6 256,320c0,91.4 47.9,171.5 119.9,216.8 -4.5,1.7 -8.9,3.5 -13.4,5.4 -45.7,19.3 -86.8,47 -122,82.3 -35.3,35.3 -62.9,76.3 -82.3,122 -20,47.4 -30.2,97.7 -30.2,149.5 0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-85.5 33.3,-165.8 93.7,-226.3C346.2,609.3 426.5,576 512,576s165.8,33.3 226.3,93.7C798.7,730.2 832,810.5 832,896c0,17.7 14.3,32 32,32s32,-14.3 32,-32c0,-51.8 -10.2,-102.1 -30.2,-149.5zM376.2,455.8C340,419.5 320,371.3 320,320s20,-99.5 56.2,-135.8C412.5,148 460.7,128 512,128s99.5,20 135.8,56.2C684,220.5 704,268.7 704,320s-20,99.5 -56.2,135.8C611.5,492 563.3,512 512,512s-99.5,-20 -135.8,-56.2z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 102cf4b..ae2aac3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,70 +1,114 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/themeColor">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="@dimen/dp_45"
-        android:src="@mipmap/ic_launcher_foreground" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="@mipmap/login">
+
+        <ImageView
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:src="@mipmap/ic_launcher_foreground" />
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2.5"
         android:orientation="vertical">
 
         <TextView
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_50"
-            android:paddingHorizontal="@dimen/dp_10"
-            android:text="安全生产辅助系统"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:layout_marginVertical="@dimen/dp_20"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/black"
+            android:textSize="22sp" />
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/userNameView"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="#446DB4"
-            android:hint="请输入用户名"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="@dimen/dp_50"
+            android:paddingVertical="@dimen/dp_20">
 
-        <com.pengxh.kt.lite.widget.DeleteEditText
-            android:id="@+id/passwordView"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:layout_marginTop="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_30"
-            android:background="#446DB4"
-            android:hint="请输入密码"
-            android:inputType="textPassword"
-            android:maxLength="18"
-            android:paddingHorizontal="@dimen/dp_15"
-            android:singleLine="true"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textSize="@dimen/sp_18" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/loginButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_50"
-            android:background="@drawable/button_login_selector"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_18" />
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_user" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/userNameView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入用户名"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/titleViewHeight"
+                android:layout_marginTop="@dimen/dp_20"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_lock" />
+
+                <com.pengxh.kt.lite.widget.DeleteEditText
+                    android:id="@+id/passwordView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:hint="请输入密码"
+                    android:inputType="textPassword"
+                    android:maxLength="18"
+                    android:paddingHorizontal="@dimen/dp_10"
+                    android:singleLine="true"
+                    android:textSize="@dimen/sp_16"
+                    android:theme="@style/EditTextTheme" />
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/borderThickness"
+                android:background="@color/hintColor" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginTop="@dimen/dp_80"
+                android:background="@drawable/button_login_selector"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_16" />
+        </LinearLayout>
     </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/login.png b/app/src/main/res/mipmap-hdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-hdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-mdpi/login.png b/app/src/main/res/mipmap-mdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-mdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/login.png b/app/src/main/res/mipmap-xhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/login.png b/app/src/main/res/mipmap-xxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/login.png b/app/src/main/res/mipmap-xxxhdpi/login.png
new file mode 100644
index 0000000..6e4110d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxxhdpi/login.png
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 513c513..d85f68a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,8 +4,8 @@
     <color name="white">#FFFFFFFF</color>
     <color name="cyan">#FF00FFFF</color>
 
-    <color name="themeColor">#FF071459</color>
-    <color name="themeOpacityColor">#80071459</color>
+    <color name="themeColor">#FF4696F9</color>
+    <color name="themeOpacityColor">#804696F9</color>
     <color name="dividerColor">#E0E0E0</color>
     <color name="backgroundColor">#F7F7F7</color>
     <color name="hintColor">#FFAAAAAA</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6f18db..e02e62e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">安全生产辅助系统</string>
+    <string name="app_name">安全生产检查助手</string>
     <string name="group_name">中国航天科工集团二院二〇三所</string>
     <string name="loading_value">暂无数据</string>
     <string name="degree">°</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5d51a10..b3df5dc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -37,4 +37,9 @@
         <!--背景是否模糊显示-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
+
+    <style name="EditTextTheme" parent="Theme.AppCompat.Light">
+        <item name="colorControlNormal">@color/hintColor</item>
+        <item name="colorControlActivated">@color/themeColor</item>
+    </style>
 </resources>
\ No newline at end of file