From 4ec02ac2bc4cc90de8ad06227439e6e3607aa361 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 22 Apr 2026 09:34:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(MasterScaleActivity):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=A4=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在UI界面上增加tvName文本视图用于显示秤的名称
- 当秤名称不为空时显示实际名称，否则显示默认值"-"
- 优化了秤信息展示的完整性，补充了名称字段的显示逻辑
---
 .../main/java/com/shuwei/dish/match/ui/MasterScaleActivity.kt    | 1 +
 1 file changed, 1 insertion(+)

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 b027bbf..3640459 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
@@ -451,6 +451,7 @@ class MasterScaleActivity : BaseActivity() {
             val scale = scales.firstOrNull()
             b.llScaleContainer.tag = scale
             b.tvAddr.text = scale?.let { "秤 ${it.address}" } ?: ""
+            b.tvName.text = scale?.name?.takeIf { it.isNotBlank() } ?: "-"
             b.tvWeight.text = scale?.let { "${it.weight} g" } ?: ""
             b.tvState.text = stateStr(scale?.state)
         }