增加人脸采集功能;
识别人脸成功后打开有餐盘的第一个柜子; 扫码打开已绑定的柜子,无则打开第一个空柜子并放入餐盘; 设置页面问题优化;
This commit is contained in:
@@ -11,19 +11,19 @@ import kotlinx.parcelize.Parcelize
|
||||
*/
|
||||
@Parcelize
|
||||
data class EquipmentUserInfo(
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
val id: Long? = 0,
|
||||
/**
|
||||
*
|
||||
* 设备Id
|
||||
*/
|
||||
val equipmentId: String? = "",
|
||||
/**
|
||||
* 设备编号
|
||||
*/
|
||||
var equipmentCode: String? = "",
|
||||
// /**
|
||||
// * 主键
|
||||
// */
|
||||
// val id: Long? = 0,
|
||||
// /**
|
||||
// *
|
||||
// * 设备Id
|
||||
// */
|
||||
// val equipmentId: String? = "",
|
||||
// /**
|
||||
// * 设备编号
|
||||
// */
|
||||
// var equipmentCode: String? = "",
|
||||
/**
|
||||
* 设备盒子编号
|
||||
*/
|
||||
@@ -31,60 +31,60 @@ data class EquipmentUserInfo(
|
||||
/**
|
||||
* 会员Id
|
||||
*/
|
||||
val faceId: String? = "",
|
||||
var faceId: String? = "",
|
||||
/**
|
||||
* 餐盘编号
|
||||
*/
|
||||
var plateNumber: String? = "",
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
val equipmentName: String? = "",
|
||||
// /**
|
||||
// * 设备名称
|
||||
// */
|
||||
// val equipmentName: String? = "",
|
||||
|
||||
val orderNo: String? = "",
|
||||
// val orderNo: String? = "",
|
||||
/**
|
||||
*
|
||||
* 更新时间
|
||||
*/
|
||||
val updateTime: String? = "",
|
||||
var updateTime: String? = "",
|
||||
|
||||
val name: String? = "",
|
||||
val phone: String? = "",
|
||||
val faceUrl: String? = "",
|
||||
val mealTime: String? = "",
|
||||
val mealTimeInterval: String? = "",
|
||||
val openTime: String? = "",
|
||||
val openTimeInterval: String? = "",
|
||||
val eatCount: Int? = 0,
|
||||
// val name: String? = "",
|
||||
// val phone: String? = "",
|
||||
// val faceUrl: String? = "",
|
||||
// val mealTime: String? = "",
|
||||
// val mealTimeInterval: String? = "",
|
||||
// val openTime: String? = "",
|
||||
// val openTimeInterval: String? = "",
|
||||
// val eatCount: Int? = 0,
|
||||
//
|
||||
// var cardBalance: Double? = 0.toDouble(),
|
||||
|
||||
var cardBalance: Double? = 0.toDouble(),
|
||||
|
||||
/**
|
||||
* 用于cardBalance后续拦截判断
|
||||
*/
|
||||
var showBalanceNotEnoughDialog: Boolean = false,
|
||||
var isIntercept: Boolean = false
|
||||
// /**
|
||||
// * 用于cardBalance后续拦截判断
|
||||
// */
|
||||
// var showBalanceNotEnoughDialog: Boolean = false,
|
||||
// var isIntercept: Boolean = false
|
||||
) : Parcelable {
|
||||
|
||||
/**
|
||||
* 是否已绑定
|
||||
*/
|
||||
fun isBound(): Boolean {
|
||||
return faceId != null
|
||||
return faceId.isNullOrBlank().not()
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否是其他设备
|
||||
*/
|
||||
fun isOtherEquipment(): Boolean {
|
||||
return equipmentCode != null && equipmentCode != "" && GlobalData.globalEquipmentCode != equipmentCode
|
||||
}
|
||||
// /**
|
||||
// * 是否是其他设备
|
||||
// */
|
||||
// fun isOtherEquipment(): Boolean {
|
||||
// return equipmentCode != null && equipmentCode != "" && GlobalData.globalEquipmentCode != equipmentCode
|
||||
// }
|
||||
|
||||
fun hasEquipmentBox(): Boolean {
|
||||
return !TextUtils.isEmpty(equipmentBoxCode)
|
||||
}
|
||||
|
||||
fun isPlaceholder(): Boolean {
|
||||
return equipmentBoxCode == null || equipmentBoxCode == ""
|
||||
return equipmentBoxCode.isNullOrBlank()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user