diff --git a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
index 7c144a3..0d8062e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
@@ -1,11 +1,5 @@
 package com.casic.qd.smartwell.view
 
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import android.widget.TextView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.utils.*
@@ -26,24 +20,6 @@
     private lateinit var loginViewModel: LoginViewModel
     private lateinit var userDetailViewModel: UserDetailViewModel
 
-    private val textWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
-
-        }
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-
-        }
-
-        override fun afterTextChanged(s: Editable) {
-            if (s.toString().trim { it <= ' ' }.length > 16) {
-                inputLayout.error = "密码长度超出限制"
-            } else {
-                inputLayout.error = null
-            }
-        }
-    }
-
     override fun initLayoutView(): Int = R.layout.activity_login
 
     override fun setupTopBarLayout() {
@@ -60,17 +36,6 @@
     }
 
     override fun initEvent() {
-        val editText: EditText? = inputLayout.editText
-        editText?.addTextChangedListener(textWatcher)
-        //点击输入法键盘"完成"
-        editText?.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                authenticateViewModel.obtainPublicKey()
-                return@setOnEditorActionListener true
-            }
-            false
-        }
-
         loginButton.setOnClickListener {
             val account = userNameView.text.toString().trim()
             val userPassword = userPasswordView.text.toString().trim()

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
index 7c144a3..0d8062e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
@@ -1,11 +1,5 @@
 package com.casic.qd.smartwell.view
 
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import android.widget.TextView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.utils.*
@@ -26,24 +20,6 @@
     private lateinit var loginViewModel: LoginViewModel
     private lateinit var userDetailViewModel: UserDetailViewModel
 
-    private val textWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
-
-        }
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-
-        }
-
-        override fun afterTextChanged(s: Editable) {
-            if (s.toString().trim { it <= ' ' }.length > 16) {
-                inputLayout.error = "密码长度超出限制"
-            } else {
-                inputLayout.error = null
-            }
-        }
-    }
-
     override fun initLayoutView(): Int = R.layout.activity_login
 
     override fun setupTopBarLayout() {
@@ -60,17 +36,6 @@
     }
 
     override fun initEvent() {
-        val editText: EditText? = inputLayout.editText
-        editText?.addTextChangedListener(textWatcher)
-        //点击输入法键盘"完成"
-        editText?.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                authenticateViewModel.obtainPublicKey()
-                return@setOnEditorActionListener true
-            }
-            false
-        }
-
         loginButton.setOnClickListener {
             val account = userNameView.text.toString().trim()
             val userPassword = userPasswordView.text.toString().trim()
diff --git a/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
new file mode 100644
index 0000000..96eb93e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
index 7c144a3..0d8062e 100644
--- a/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
+++ b/app/src/main/java/com/casic/qd/smartwell/view/LoginActivity.kt
@@ -1,11 +1,5 @@
 package com.casic.qd.smartwell.view
 
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.inputmethod.EditorInfo
-import android.widget.EditText
-import android.widget.TextView
 import androidx.lifecycle.ViewModelProvider
 import com.casic.qd.smartwell.R
 import com.casic.qd.smartwell.utils.*
@@ -26,24 +20,6 @@
     private lateinit var loginViewModel: LoginViewModel
     private lateinit var userDetailViewModel: UserDetailViewModel
 
-    private val textWatcher = object : TextWatcher {
-        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
-
-        }
-
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-
-        }
-
-        override fun afterTextChanged(s: Editable) {
-            if (s.toString().trim { it <= ' ' }.length > 16) {
-                inputLayout.error = "密码长度超出限制"
-            } else {
-                inputLayout.error = null
-            }
-        }
-    }
-
     override fun initLayoutView(): Int = R.layout.activity_login
 
     override fun setupTopBarLayout() {
@@ -60,17 +36,6 @@
     }
 
     override fun initEvent() {
-        val editText: EditText? = inputLayout.editText
-        editText?.addTextChangedListener(textWatcher)
-        //点击输入法键盘"完成"
-        editText?.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                authenticateViewModel.obtainPublicKey()
-                return@setOnEditorActionListener true
-            }
-            false
-        }
-
         loginButton.setOnClickListener {
             val account = userNameView.text.toString().trim()
             val userPassword = userPasswordView.text.toString().trim()
diff --git a/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
new file mode 100644
index 0000000..96eb93e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_solid_layout_gray_radius_5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/mainBackColor" />
+
+    <corners android:radius="@dimen/dp_5" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c04136f..5668475 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,62 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
 
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_100"
-        android:src="@mipmap/login_casic" />
-
-    <com.google.android.material.textfield.TextInputLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/inputLayout"
+        android:layout_height="match_parent"
+        android:layout_above="@id/userNameLayout">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:src="@mipmap/login_casic" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/userNameLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/titleViewHeight"
+        android:layout_above="@id/userPasswordLayout"
         android:layout_marginHorizontal="@dimen/dp_50"
-        android:layout_marginBottom="@dimen/dp_5">
+        android:layout_marginBottom="@dimen/dp_5"
+        android:background="@drawable/bg_solid_layout_gray_radius_5"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-        <EditText
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_user" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
             android:id="@+id/userNameView"
-            style="@style/inputEditTextStyle"
-            android:drawableStart="@drawable/ic_user"
-            android:drawablePadding="5dp"
-            android:hint="请输入手机号/用户名"
-            android:imeOptions="actionNext"
-            android:paddingHorizontal="@dimen/dp_5"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
+            android:hint="请输入账号"
             android:singleLine="true"
-            android:textSize="@dimen/titleFontSize"
+            android:textSize="@dimen/textFontSize"
             android:theme="@style/EditTextTheme" />
-    </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/inputLayout"
+    <LinearLayout
+        android:id="@+id/userPasswordLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/titleViewHeight"
         android:layout_above="@id/anchorView"
         android:layout_marginHorizontal="@dimen/dp_50"
-        app:counterEnabled="true"
-        app:counterMaxLength="16"
-        app:endIconMode="password_toggle"
-        app:errorEnabled="true">
+        android:layout_marginTop="@dimen/dp_5"
+        android:background="@drawable/bg_solid_layout_gray_radius_5"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-        <EditText
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            android:src="@drawable/ic_lock" />
+
+        <com.pengxh.kt.lite.widget.DeleteEditText
             android:id="@+id/userPasswordView"
-            style="@style/inputEditTextStyle"
-            android:layout_marginTop="@dimen/dp_5"
-            android:drawableStart="@drawable/ic_lock"
-            android:drawablePadding="@dimen/dp_5"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@null"
             android:hint="请输入密码"
-            android:imeOptions="actionDone"
             android:inputType="textPassword"
-            android:paddingHorizontal="5dp"
             android:singleLine="true"
-            android:textSize="@dimen/titleFontSize"
+            android:textSize="@dimen/textFontSize"
             android:theme="@style/EditTextTheme" />
-    </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
 
     <View
         android:id="@+id/anchorView"