优化
This commit is contained in:
@@ -317,8 +317,8 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
|||||||
open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
|
open fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
|
||||||
Timber.d("handleLoginSuccess isAdmin = $isAdmin")
|
Timber.d("handleLoginSuccess isAdmin = $isAdmin")
|
||||||
val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
|
val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
|
||||||
equipmentUserInfo.balanceIsNotEnough = cardBalance <= 0.toDouble()
|
val balanceIsNotEnough = cardBalance <= 0.toDouble()
|
||||||
if (equipmentUserInfo.balanceIsNotEnough) {
|
if (balanceIsNotEnough && equipmentUserInfo.showBalanceNotEnoughDialog) {
|
||||||
//提示余额不足弹窗
|
//提示余额不足弹窗
|
||||||
BalanceNotEnoughDialog(this).show()
|
BalanceNotEnoughDialog(this).show()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ data class EquipmentUserInfo(
|
|||||||
/**
|
/**
|
||||||
* 用于cardBalance后续拦截判断
|
* 用于cardBalance后续拦截判断
|
||||||
*/
|
*/
|
||||||
var balanceIsNotEnough: Boolean = false
|
var showBalanceNotEnoughDialog: Boolean = false
|
||||||
) : Parcelable {
|
) : Parcelable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -149,7 +149,9 @@ class SettingViewModel : BaseViewModel() {
|
|||||||
)
|
)
|
||||||
val response = repository.findByPlateNumber(bindParam)
|
val response = repository.findByPlateNumber(bindParam)
|
||||||
if (response.code == 200) {
|
if (response.code == 200) {
|
||||||
_searchUserInfo.value = response.data
|
_searchUserInfo.value = response.data.also {
|
||||||
|
it?.showBalanceNotEnoughDialog = true
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
_searchUserInfo.value = EquipmentUserInfo(
|
_searchUserInfo.value = EquipmentUserInfo(
|
||||||
plateNumber = plateNumber,
|
plateNumber = plateNumber,
|
||||||
|
|||||||
Reference in New Issue
Block a user