增加人脸采集功能;
识别人脸成功后打开有餐盘的第一个柜子; 扫码打开已绑定的柜子,无则打开第一个空柜子并放入餐盘; 设置页面问题优化;
This commit is contained in:
@@ -61,15 +61,15 @@ class SettingViewModel : BaseViewModel() {
|
||||
//// }
|
||||
//// _equipmentList.value = list
|
||||
// }
|
||||
fun getEquipmentList(block: (List<EquipmentUserInfo>) -> Unit) {
|
||||
launchWithLoading {
|
||||
val response = repository.getEquipmentList()
|
||||
if (parseResponse(response)) {
|
||||
val list = response.data ?: emptyList()
|
||||
block(list)
|
||||
}
|
||||
}
|
||||
}
|
||||
// fun getEquipmentList(block: (List<EquipmentUserInfo>) -> Unit) {
|
||||
// launchWithLoading {
|
||||
// val response = repository.getEquipmentList()
|
||||
// if (parseResponse(response)) {
|
||||
// val list = response.data ?: emptyList()
|
||||
// block(list)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
/**
|
||||
* 搜索会员信息列表
|
||||
@@ -172,19 +172,19 @@ class SettingViewModel : BaseViewModel() {
|
||||
|
||||
fun bindPlate(bindParam: BindParam, block:(Pair<Boolean?, ErrorInfo>)-> Unit) {
|
||||
launchWithLoading {
|
||||
val response = repository.plateBind(bindParam)
|
||||
if (parseResponse(response)) {
|
||||
var userInfo = response.data
|
||||
if (userInfo == null) {
|
||||
userInfo = EquipmentUserInfo()
|
||||
userInfo.equipmentBoxCode = bindParam.equipmentBoxCode
|
||||
userInfo.plateNumber = bindParam.plateNumber
|
||||
userInfo.equipmentCode = bindParam.equipmentCode
|
||||
}
|
||||
block(true to ErrorInfo(equipmentUserInfo = userInfo))
|
||||
} else {
|
||||
block(true to ErrorInfo(response.code, response.msg.toString()))
|
||||
}
|
||||
// val response = repository.plateBind(bindParam)
|
||||
// if (parseResponse(response)) {
|
||||
// var userInfo = response.data
|
||||
// if (userInfo == null) {
|
||||
// userInfo = EquipmentUserInfo()
|
||||
// userInfo.equipmentBoxCode = bindParam.equipmentBoxCode
|
||||
// userInfo.plateNumber = bindParam.plateNumber
|
||||
// userInfo.equipmentCode = bindParam.equipmentCode
|
||||
// }
|
||||
// block(true to ErrorInfo(equipmentUserInfo = userInfo))
|
||||
// } else {
|
||||
// block(true to ErrorInfo(response.code, response.msg.toString()))
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -192,20 +192,20 @@ class SettingViewModel : BaseViewModel() {
|
||||
plateNumber: String,
|
||||
equipmentCode: String = globalEquipmentCode
|
||||
) {
|
||||
_searchUserInfo.value = null
|
||||
launchWithLoading {
|
||||
// val bindParam = BindParam(plateNumber = plateNumber)
|
||||
val response = repository.findByPlateNumber(plateNumber)
|
||||
if (response.code == "00000") {
|
||||
_searchUserInfo.value = response.data
|
||||
} else {
|
||||
_searchUserInfo.value = EquipmentUserInfo(
|
||||
plateNumber = plateNumber,
|
||||
equipmentCode = equipmentCode,
|
||||
updateTime = DateTimeUtils.getDateTimeString()
|
||||
)
|
||||
}
|
||||
}
|
||||
// _searchUserInfo.value = null
|
||||
// launchWithLoading {
|
||||
//// val bindParam = BindParam(plateNumber = plateNumber)
|
||||
// val response = repository.findByPlateNumber(plateNumber)
|
||||
// if (response.code == "00000") {
|
||||
// _searchUserInfo.value = response.data
|
||||
// } else {
|
||||
// _searchUserInfo.value = EquipmentUserInfo(
|
||||
// plateNumber = plateNumber,
|
||||
// equipmentCode = equipmentCode,
|
||||
// updateTime = DateTimeUtils.getDateTimeString()
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
val PAGE_SIZE = 100
|
||||
|
||||
@@ -83,7 +83,7 @@ class UserViewModel : BaseViewModel() {
|
||||
if (list.isNotEmpty()) {
|
||||
faceTimestamp = list.last().faceUpdateTimestamp?:0
|
||||
}
|
||||
SpTool.setLastFaceTimestamp(faceTimestamp)
|
||||
SpTool.lastFaceTimestamp = faceTimestamp
|
||||
//activeEngine()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user