调整了餐盘在不同设备提示

This commit is contained in:
zxj
2025-07-24 08:40:36 +08:00
parent 7fd2ccb960
commit 082011a939
17 changed files with 198 additions and 35 deletions
@@ -1,5 +1,6 @@
package com.sw.platecabinet.viewmodel
import com.sw.inbound.utils.DateTimeUtils
import com.sw.plate.utils.ToastUtils
import com.sw.platecabinet.GlobalData
import com.sw.platecabinet.GlobalData.globalEquipmentCode
@@ -43,7 +44,7 @@ class SettingViewModel : BaseViewModel() {
EquipmentParam(appVersion = GlobalData.appVersion, equipmentCode = equipmentCode)
val response = repository.getEquipmentList(param)
if (parseResponse(response)) {
_equipmentList.value = response.data?.plus(response.data) ?: emptyList()
_equipmentList.value = response.data ?: emptyList()
}
}
}
@@ -94,6 +95,13 @@ class SettingViewModel : BaseViewModel() {
)
val response = repository.bindEquipment(bindParam)
if (parseResponse(response)) {
val userInfo = response.data
userInfo?.let {
if (it.isOtherEquipment()) {
ToastUtils.showToast("餐盘已在${it.equipmentName}绑定")
return@launchWithLoading
}
}
_bindStateChange.value = true to ErrorInfo()
} else {
_bindStateChange.value = true to ErrorInfo(response.code, response.msg.toString())
@@ -132,15 +140,20 @@ class SettingViewModel : BaseViewModel() {
)
val response = repository.findByPlateNumber(bindParam)
if (response.code == 200) {
if (response.data?.isOtherEquipment() == true) {
ToastUtils.showToast("")
return@launchWithLoading
val userInfo = response.data
userInfo?.let {
if (it.isOtherEquipment()) {
ToastUtils.showToast("餐盘已在${it.equipmentName}绑定")
return@launchWithLoading
}
}
_currentUserInfo.value = response.data
} else {
_currentUserInfo.value = EquipmentUserInfo(
plateNumber = plateNumber,
equipmentCode = equipmentCode
equipmentCode = equipmentCode,
updateTime = DateTimeUtils.getDateTimeString()
)
}
}