设备联调

app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt

@@ -270,6 +270,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         lifecycleScope.launch {
             viewModel.currentUserInfo.collect {
                 if (it == null) return@collect
+                it.showBalanceNotEnoughDialog = true
                 handleLoginSuccess(it, false)
             }
         }
@@ -317,8 +318,8 @@ abstract class BaseActivity<VB : ViewBinding> : 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

app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt

@@ -30,7 +30,7 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
 
     override fun initialize() {
         var deviceId = AppUtil.getUDID(this)
-        deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212"
+        deviceId = "be154831-3466-3ba2-a2ea-57652c919fed"
         GlobalData.deviceId = deviceId
         val isSuccess = deviceViewModel.checkEquipmentInfo()
         if (isSuccess) {

app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt

@@ -45,9 +45,11 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
 
     override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         super.handleLoginSuccess(equipmentUserInfo, isAdmin)
-        if (equipmentUserInfo.balanceIsNotEnough) {
-            return
-        }
+//        val cardBalance = equipmentUserInfo.cardBalance?:0.toDouble()
+//        val balanceIsNotEnough = cardBalance <= 0.toDouble()
+//        if (balanceIsNotEnough) {
+//            return
+//        }
         LoginByFaceActivity.goInitActivity()
         finish()
     }