From a6ce3a1ed3806ff2bda315c78f975069b2970b9b Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Tue, 19 May 2026 14:41:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B6=85=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=87=8F=E7=A8=8B=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt | 2 +- .../com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt | 2 +- .../com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt index c02ed4d..9c5035d 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt @@ -43,7 +43,7 @@ class ScaleRowAdapter : BaseQuickAdapter "稳定" WeightUtil.STATE_UNSTABLE -> "不稳定" - WeightUtil.STATE_OVER_WEIGHT -> "超量" + WeightUtil.STATE_OVER_WEIGHT -> "量程溢出" else -> "${item.state}" } // 点击时通过 bindingAdapterPosition 取最新数据，避免闭包捕获过期 item diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt index 2984145..31614a5 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt @@ -168,7 +168,7 @@ class Seasoning18GridAdapter( private fun stateStr(state: Int) = when (state) { WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_UNSTABLE -> "不稳定" - WeightUtil.STATE_OVER_WEIGHT -> "超量" + WeightUtil.STATE_OVER_WEIGHT -> "量程溢出" else -> "" } } diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt index 6b3b35a..391641e 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt @@ -174,7 +174,7 @@ class Seasoning22GridAdapter( private fun stateStr(state: Int) = when (state) { WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_UNSTABLE -> "不稳定" - WeightUtil.STATE_OVER_WEIGHT -> "超量" + WeightUtil.STATE_OVER_WEIGHT -> "量程溢出" else -> "" } } From dc91cdfa2ec15ef7024c7b028bdc0ececbbe12a0 Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Tue, 19 May 2026 14:42:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B6=85=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=87=8F=E7=A8=8B=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt index aa142f0..90c5dcf 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt @@ -459,7 +459,7 @@ class MasterScaleActivity : BaseActivity() { private fun stateStr(state: Int?) = when (state) { WeightUtil.STATE_STABLE -> "稳定" WeightUtil.STATE_UNSTABLE -> "不稳定" - WeightUtil.STATE_OVER_WEIGHT -> "超量" + WeightUtil.STATE_OVER_WEIGHT -> "量程溢出" null -> "" else -> "$state" }