restaurant/SmartPlateCabinet
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

餐盘柜优化-绑定临时用户

Browse Source
This commit is contained in:
mazengfei
2026-01-16 16:14:38 +08:00
parent 8337b3fabb
commit cf2d2db42f
10 changed files with 267 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt
+42 -27
View File
@@ -15,46 +15,61 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo
class PlateOpenFragment :
BaseFragment<FragmentPlateOpenBinding>(FragmentPlateOpenBinding::inflate) {
private var totalTimeInMillis: Long = Constants.AUTO_CLOSE_TIME * 1000
internal val KEY_ACTION_TYPE = "actionType"
internal val PARAM_IS_ADMIN = "isAdmin"
private var info: EquipmentUserInfo? = null
private var isAdmin: Boolean = false
// internal val KEY_ACTION_TYPE = "actionType"
// internal val PARAM_IS_ADMIN = "isAdmin"
// private var info: EquipmentUserInfo? = null
// private var isAdmin: Boolean = false
private var isScanCode = false
companion object {
const val IS_SCAN_CODE = "isScanCode"
// @JvmStatic
// fun newInstance(userInfo: EquipmentUserInfo?, isAdmin: Boolean) =
// PlateOpenFragment().apply {
// arguments = Bundle().apply {
//// putParcelable(KEY_ACTION_TYPE, userInfo)
//// putBoolean(PARAM_IS_ADMIN, isAdmin)
// }
// }
@JvmStatic
fun newInstance(userInfo: EquipmentUserInfo?, isAdmin: Boolean) =
fun newInstance(isScanCode: Boolean) =
PlateOpenFragment().apply {
arguments = Bundle().apply {
putParcelable(KEY_ACTION_TYPE, userInfo)
putBoolean(PARAM_IS_ADMIN, isAdmin)
putBoolean(IS_SCAN_CODE, isScanCode)
}
}
}
override fun initialize() {
arguments?.let {
info = it.getParcelable(KEY_ACTION_TYPE)
isAdmin = it.getBoolean(PARAM_IS_ADMIN)
info?.let {
if (!it.hasEquipmentBox()) {
binding.ivType.setImageResource(R.drawable.ic_tip_warn)
binding.tvTitle.text = "暂无餐盘信息"
binding.tvSubTitle.text = "请联系管理员"
binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_fail))
}
// else if (it.isOtherEquipment()) {
// info = it.getParcelable(KEY_ACTION_TYPE)
// isAdmin = it.getBoolean(PARAM_IS_ADMIN)
// info?.let {
// if (!it.hasEquipmentBox()) {
// binding.ivType.setImageResource(R.drawable.ic_tip_warn)
// binding.tvTitle.text = "暂无餐盘信息"
// binding.tvSubTitle.text = "您的餐盘绑定在${it.equipmentName ?: " "}号柜上"
// binding.tvSubTitle.text = "请联系管理员"
// binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_fail))
// }
else {
binding.ivType.setImageResource(R.drawable.ic_tip_success)
binding.tvTitle.text = "柜门开启"
binding.tvSubTitle.text = "餐盘取出后请关闭柜门"
binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_success))
}
}
//// else if (it.isOtherEquipment()) {
//// binding.ivType.setImageResource(R.drawable.ic_tip_warn)
//// binding.tvTitle.text = "暂无餐盘信息"
//// binding.tvSubTitle.text = "您的餐盘绑定在${it.equipmentName ?: " "}号柜上"
//// binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_fail))
//// }
// else {
// binding.ivType.setImageResource(R.drawable.ic_tip_success)
// binding.tvTitle.text = "柜门开启"
// binding.tvSubTitle.text = "餐盘取出后请关闭柜门"
// binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_success))
// }
// }
isScanCode = it.getBoolean(IS_SCAN_CODE, false)
binding.ivType.setImageResource(R.drawable.ic_tip_success)
binding.tvTitle.text = "柜门开启"
binding.tvSubTitle.text = if (isScanCode) "餐盘放入后请关闭柜门" else "餐盘取出后请关闭柜门"
binding.tvTitle.setTextColor(requireContext().getColor(R.color.tip_title_success))
}
initCountTime()
@@ -69,8 +84,8 @@ class PlateOpenFragment :
override fun onFinish() {
activity?.finish()
// if (!isAdmin) {
val intent = Intent(context, InitActivity::class.java)
startActivity(intent)
val intent = Intent(context, InitActivity::class.java)
startActivity(intent)
// }
}
app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt
+7 -1
View File
@@ -160,6 +160,7 @@ class SettingListFragment :
this.tvOpen.setTextColor(resources.getColor(R.color.unbind_32283C))
this.llBindInfo.visibility = View.GONE
this.tvUnbind.visibility = View.VISIBLE
this.tvUnbind.text = if (item.plateNumber.isNullOrBlank()) "未绑定" else "未绑定(${item.plateNumber})"
}
// this.llRoot.setOnClickListener {
//// Timber.d("itemClick llRoot ${item.name}, position = $position")
@@ -179,7 +180,12 @@ class SettingListFragment :
// }
this.llOpen.setOnClickListener {
// item.faceId = null
PlateUtils.open(requireActivity(), item.equipmentBoxCode)
PlateUtils.open(
fragmentActivity = requireActivity(),
code = item.equipmentBoxCode,
isScanCode = false,
isSetting = true
)
}
}