From 6f18245c4fc8c754c161ec0ddd16e64435b3be17 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Mon, 28 Jul 2025 18:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E5=90=8E?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=AF=86=E7=A0=81=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sw/platecabinet/activity/BaseActivity.kt  | 2 +-
 .../java/com/sw/platecabinet/activity/LoginByPwdActivity.kt | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
index 00ac3ab..5026c93 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt
@@ -305,7 +305,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
      * 处理登录成功操作
      * @param isAdmin  true 管理员 执行绑盘此操作   false 用户，提示错误
      */
-    fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
+    open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         Timber.d("handleLoginSuccess isAdmin = $isAdmin")
         viewModel.resetUserInfo()
         if (equipmentUserInfo.isOtherEquipment()) {
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
index ca2e762..dd35e3c 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import com.sw.plate.utils.ToastUtils
 import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.KeyboardUtils
 
 class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
@@ -37,4 +38,9 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
         super.onResume()
         viewModel.resetUserInfo()
     }
+
+    override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
+        super.handleLoginSuccess(equipmentUserInfo, isAdmin)
+        finish()
+    }
 }
\ No newline at end of file