调整了部分问题

This commit is contained in:
zxj
2025-07-23 14:22:11 +08:00
parent 5ad82eb224
commit 7fd2ccb960
28 changed files with 486 additions and 210 deletions
@@ -11,16 +11,20 @@ import kotlinx.parcelize.Parcelize
*/
@Parcelize
data class BindParam(
/**
* app版本号
*/
var appVersion: String = "",
/**
* 设备ID
*/
@SerializedName("equipmentCode")
var equipmentCode: String = "",
/**
*设备盒子编号
*/
@SerializedName("equipmentBoxCode")
val equipmentBoxCode: String? = "",
/**
*设备编号
*/
@SerializedName("equipmentCode")
val equipmentCode: String? = "",
val equipmentBoxCode: String? = null,
/**
*
* 会员Id
@@ -1,6 +1,7 @@
package com.sw.platecabinet.model.request
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
@@ -8,8 +9,13 @@ import kotlinx.parcelize.Parcelize
*/
@Parcelize
data class EquipmentParam(
/**
* app版本号
*/
var appVersion: String = "",
/**
* 设备ID
*/
var equipmentCode: String = ""
@SerializedName("equipmentCode")
var equipmentCode: String = "",
) : Parcelable
@@ -10,11 +10,15 @@ import kotlinx.parcelize.Parcelize
*/
@Parcelize
data class LoginParam(
/**
* app版本号
*/
var appVersion: String = "",
/**
* 设备ID
*/
@SerializedName("equipmentCode")
val equipmentCode: String? = "",
var equipmentCode: String = "",
/**
* 会员信息
*/
@@ -10,6 +10,15 @@ 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")
@@ -3,6 +3,7 @@ package com.sw.platecabinet.model.response
import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import com.sw.platecabinet.GlobalData
import kotlinx.parcelize.Parcelize
/**
@@ -50,7 +51,7 @@ data class EquipmentUserInfo(
* 餐盘编号
*/
@SerializedName("plateNumber")
val plateNumber: String? = "",
var plateNumber: String? = "",
/**
*
* 更新时间
@@ -59,7 +60,17 @@ data class EquipmentUserInfo(
val updateTime: String? = ""
) : Parcelable {
/**
* 是否已绑定
*/
fun isBound(): Boolean {
return memberId != null
}
/**
* 是否是其他设备
*/
fun isOtherEquipment(): Boolean {
return GlobalData.globalEquipmentCode != equipmentCode
}
}
@@ -5,6 +5,9 @@ import android.os.Parcelable
import com.google.gson.annotations.SerializedName
import kotlinx.parcelize.Parcelize
/**
* 搜索会员信息结果
*/
@Parcelize
data class SearchResult(
@SerializedName("endRow")