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 : 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() { @@ -37,4 +38,9 @@ class LoginByPwdActivity : BaseActivity() { super.onResume() viewModel.resetUserInfo() } + + override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) { + super.handleLoginSuccess(equipmentUserInfo, isAdmin) + finish() + } } \ No newline at end of file