添加init界面,调整了认证后逻辑,调整了扫描枪扫描处理
This commit is contained in:
@@ -15,12 +15,12 @@ data class EquipmentUserInfo(
|
||||
* 设备盒子编号
|
||||
*/
|
||||
@SerializedName("equipmentBoxCode")
|
||||
val equipmentBoxCode: String? = "",
|
||||
var equipmentBoxCode: String? = "",
|
||||
/**
|
||||
* 设备编号
|
||||
*/
|
||||
@SerializedName("equipmentCode")
|
||||
val equipmentCode: String? = "",
|
||||
var equipmentCode: String? = "",
|
||||
/**
|
||||
*
|
||||
* 设备Id
|
||||
@@ -71,7 +71,7 @@ data class EquipmentUserInfo(
|
||||
* 是否是其他设备
|
||||
*/
|
||||
fun isOtherEquipment(): Boolean {
|
||||
return GlobalData.globalEquipmentCode != equipmentCode
|
||||
return equipmentCode != null && equipmentCode != "" && GlobalData.globalEquipmentCode != equipmentCode
|
||||
}
|
||||
|
||||
fun isPlaceholder(): Boolean {
|
||||
|
||||
Reference in New Issue
Block a user