restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_260316_新设备' into dev_260316_新设备

Browse Source
This commit is contained in:
lvmeng
2026-05-19 14:55:18 +08:00
parent 292fdade81 dc91cdfa2e
commit f3dbb3fe68
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt
+1 -1
View File
@@ -43,7 +43,7 @@ class ScaleRowAdapter : BaseQuickAdapter<ScaleRowAdapter.ScaleItem, ScaleRowAdap
holder.b.tvState.text = when (item.state) { holder.b.tvState.text = when (item.state) {
WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_STABLE -> "稳定"
WeightUtil.STATE_UNSTABLE -> "不稳定" WeightUtil.STATE_UNSTABLE -> "不稳定"
WeightUtil.STATE_OVER_WEIGHT -> "超量" WeightUtil.STATE_OVER_WEIGHT -> "量程溢出"
else -> "${item.state}" else -> "${item.state}"
} }
// 点击时通过 bindingAdapterPosition 取最新数据，避免闭包捕获过期 item // 点击时通过 bindingAdapterPosition 取最新数据，避免闭包捕获过期 item
app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt
+1 -1
View File
@@ -168,7 +168,7 @@ class Seasoning18GridAdapter(
private fun stateStr(state: Int) = when (state) { private fun stateStr(state: Int) = when (state) {
WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_STABLE -> "稳定"
WeightUtil.STATE_UNSTABLE -> "不稳定" WeightUtil.STATE_UNSTABLE -> "不稳定"
WeightUtil.STATE_OVER_WEIGHT -> "超量" WeightUtil.STATE_OVER_WEIGHT -> "量程溢出"
else -> "" else -> ""
} }
} }
app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt
+1 -1
View File
@@ -174,7 +174,7 @@ class Seasoning22GridAdapter(
private fun stateStr(state: Int) = when (state) { private fun stateStr(state: Int) = when (state) {
WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_STABLE -> "稳定"
WeightUtil.STATE_UNSTABLE -> "不稳定" WeightUtil.STATE_UNSTABLE -> "不稳定"
WeightUtil.STATE_OVER_WEIGHT -> "超量" WeightUtil.STATE_OVER_WEIGHT -> "量程溢出"
else -> "" else -> ""
} }
} }
app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt
+1 -1
View File
@@ -459,7 +459,7 @@ class MasterScaleActivity : BaseActivity() {
private fun stateStr(state: Int?) = when (state) { private fun stateStr(state: Int?) = when (state) {
WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_STABLE -> "稳定"
WeightUtil.STATE_UNSTABLE -> "不稳定" WeightUtil.STATE_UNSTABLE -> "不稳定"
WeightUtil.STATE_OVER_WEIGHT -> "超量" WeightUtil.STATE_OVER_WEIGHT -> "量程溢出"
null -> "" null -> ""
else -> "$state" else -> "$state"
} }