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 8bf3b4b..8d9427c 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt @@ -317,8 +317,8 @@ abstract class BaseActivity : AppCompatActivity() { open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) { Timber.d("handleLoginSuccess isAdmin = $isAdmin") val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble() - equipmentUserInfo.balanceIsNotEnough = cardBalance <= 0.toDouble() - if (equipmentUserInfo.balanceIsNotEnough) { + val balanceIsNotEnough = cardBalance <= 0.toDouble() + if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) { //提示余额不足弹窗 BalanceNotEnoughDialog(this).show() return diff --git a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt index 1a5f296..dfc695b 100644 --- a/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt +++ b/app/src/main/java/com/sw/platecabinet/model/response/EquipmentUserInfo.kt @@ -67,7 +67,7 @@ data class EquipmentUserInfo( /** * 用于cardBalance后续拦截判断 */ - var balanceIsNotEnough: Boolean = false + var showBalanceNotEnoughDialog: Boolean = false ) : Parcelable { /** diff --git a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt index da8fef2..a18d6b8 100644 --- a/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt +++ b/app/src/main/java/com/sw/platecabinet/viewmodel/SettingViewModel.kt @@ -149,7 +149,9 @@ class SettingViewModel : BaseViewModel() { ) val response = repository.findByPlateNumber(bindParam) if (response.code == 200) { - _searchUserInfo.value = response.data + _searchUserInfo.value = response.data.also { + it?.showBalanceNotEnoughDialog = true + } } else { _searchUserInfo.value = EquipmentUserInfo( plateNumber = plateNumber,