绑定解绑功能调试;其它优化

This commit is contained in:
马增飞
2026-01-05 18:38:10 +08:00
parent 17d47a876f
commit 582be4e9b7
16 changed files with 170 additions and 108 deletions
@@ -6,7 +6,7 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo
* 错误信息 code == 200 成功
*/
data class ErrorInfo(
val code: String = "200",
val code: String = "00000",
val msg: String = "",
val equipmentUserInfo: EquipmentUserInfo? = null
) {
@@ -18,7 +18,7 @@ data class BindParam(
/**
* 设备编号
*/
var equipmentCode: String = "",
var equipmentCode: String? = "",
/**
*设备盒子编号
*/
@@ -28,6 +28,7 @@ data class BindParam(
* 会员Id
*/
val memberId: String? = null,
val faceId: String? = null,
/**
*餐盘编号
*/
@@ -17,7 +17,8 @@ data class LoginParam(
/**
* 会员信息
*/
val memberId: String? = null,
// val memberId: String? = null,
val faceId: String? = null,
/**
* 密码
*/
@@ -10,25 +10,27 @@ import kotlinx.parcelize.Parcelize
*/
@Parcelize
data class SearchParam(
/**
* app版本号
*/
var appVersion: String = "",
/**
* 设备ID
*/
@SerializedName("equipmentCode")
var equipmentCode: String = "",
@SerializedName("consumptionTime")
val consumptionTime: List<String?>? = listOf(),
@SerializedName("createTime")
val createTime: List<String?>? = listOf(),
@SerializedName("memberFrom")
val memberFrom: Int? = 0,
@SerializedName("pageNum")
val pageNum: Int? = 0,
@SerializedName("pageSize")
val pageSize: Int? = 0,
@SerializedName("param")
val `param`: String? = ""
// /**
// * app版本号
// */
// var appVersion: String = "",
// /**
// * 设备ID
// */
// @SerializedName("equipmentCode")
// var equipmentCode: String = "",
// @SerializedName("consumptionTime")
// val consumptionTime: List<String?>? = listOf(),
// @SerializedName("createTime")
// val createTime: List<String?>? = listOf(),
// @SerializedName("memberFrom")
// val memberFrom: Int? = 0,
// @SerializedName("pageNum")
var pageNum: Int? = 0,
// @SerializedName("pageSize")
var pageSize: Int? = 0,
// @SerializedName("param")
// val `param`: String? = "",
var name:String?=null,
var phone:String?=null
) : Parcelable
@@ -31,7 +31,7 @@ data class EquipmentUserInfo(
/**
* 会员Id
*/
val memberId: String? = "",
val faceId: String? = "",
/**
* 餐盘编号
*/
@@ -70,7 +70,7 @@ data class EquipmentUserInfo(
* 是否已绑定
*/
fun isBound(): Boolean {
return memberId != null
return faceId != null
}
/**
@@ -78,6 +78,7 @@ data class SearchResult(
// @SerializedName("topUpBalance")
// val topUpBalance: String? = ""
val id: String? = "",
val faceId: String? = "",
val name: String? = "",
val phone: String? = "",
) : Parcelable
@@ -25,6 +25,6 @@ data class UserFaceModel(
val userId: String? = "",
val faceFeatureStr: String? = "",
val faceUpdateTimestamp:Long?=null,
val faceDeleted: Boolean?=false
) : Parcelable