diff --git a/doc/“哨兵”软件系统软件设计规格说明书.doc b/doc/“哨兵”软件系统软件设计规格说明书.doc
index 40f611b..492d53f 100644
Binary files a/doc/“哨兵”软件系统软件设计规格说明书.doc and b/doc/“哨兵”软件系统软件设计规格说明书.doc differ
diff --git a/src/sixaunyi/.idea/misc.xml b/src/sixaunyi/.idea/misc.xml
index cc4873f..3a424eb 100644
--- a/src/sixaunyi/.idea/misc.xml
+++ b/src/sixaunyi/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/AndroidTool/AndriodProject/Shaobing/src/sixaunyi/app/src/main/res/layout/activity_main.xml" value="0.25364583333333335" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/drawable/icon_favorite_red.xml" value="0.12" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/layout/activity_detect.xml" value="0.1" />
         <entry key="..\:/MiNote_maintain/new_MiCode/src/sixaunyi/app/src/main/res/layout/activity_main.xml" value="0.1" />
diff --git a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
index 5f6292d..7b10a79 100644
--- a/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
+++ b/src/sixaunyi/app/src/main/java/com/example/sixaunyi/LoginActivity.java
@@ -29,7 +29,6 @@ public class LoginActivity extends AppCompatActivity {
         mLoginButton = findViewById(R.id.login);
         // 设置登录按钮的点击事件
         mLoginButton.setOnClickListener(v -> {
-
             attemptLogin();
         });
     }
@@ -37,19 +36,23 @@ public class LoginActivity extends AppCompatActivity {
         String username = mUsername.getText().toString();
         String password = mPassword.getText().toString();
         boolean if_correct = verifyUser(username,password);
-        if (!isInputUsernameValid(username)){
-            Toast.makeText(this, "用户名非法", Toast.LENGTH_SHORT).show();
-        }
-        if (!isInputPasswordValid(password)){
-            Toast.makeText(this, "密码非法", Toast.LENGTH_SHORT).show();
-        }
-        if (if_correct) {
-            Toast.makeText(this, "登录成功", Toast.LENGTH_SHORT).show();
-            Intent intent = new Intent(LoginActivity.this, MainActivity.class);
-            startActivity(intent);
-            finish(); // 关闭登录界面
-        } else {
-            Toast.makeText(this, "用户名或密码错误", Toast.LENGTH_SHORT).show();
+        if (!isInputUsernameValid(username) || !isInputPasswordValid(password)){
+            if (!isInputUsernameValid(username) && !isInputPasswordValid(password)) {
+                Toast.makeText(this, "用户名和密码非法", Toast.LENGTH_SHORT).show();
+            }
+            else if (!isInputPasswordValid(password)){
+                Toast.makeText(this, "密码非法", Toast.LENGTH_SHORT).show();
+            }
+            else {Toast.makeText(this, "用户名非法", Toast.LENGTH_SHORT).show();}
+        }else {
+            if (if_correct) {
+                Toast.makeText(this, "登录成功", Toast.LENGTH_SHORT).show();
+                Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+                startActivity(intent);
+                finish(); // 关闭登录界面
+            } else {
+                Toast.makeText(this, "用户名或密码错误", Toast.LENGTH_SHORT).show();
+            }
         }
     }
 
@@ -93,4 +96,5 @@ public class LoginActivity extends AppCompatActivity {
             return false;
         }
     }
+
 }