refactor(adapter): 合并 Scale18/22GridAdapter 为 Seasoning18/22GridAdapter，统一支持调料配置和秤总览双模式

- ScaleData 新增可空 name 字段，用于承载调料名称
- Seasoning18/22GridAdapter 改用 ScaleData，新增 showNameOnly 参数区分页面模式
- showNameOnly=true（调料配置）：仅显示名称，无名称显示"-"
- showNameOnly=false（秤总览）：显示名称+重量+状态，无名称显示秤地址编号
- update() 恢复差量更新逻辑，避免 submitList 动画期间点击失效
- MasterScaleActivity、SlaveActivity 改用新 Adapter，删除旧 Scale18/22GridAdapter
- 删除 Scale22GridActivity 及其布局和 Manifest 注册
- list_item_scale22_row.xml 中 tvAddr 重命名为 tvName

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

This commit is contained in:

lvmeng

2026-04-21 11:59:59 +08:00

co-authored by

Claude Sonnet 4.6

parent ffdf364ee8

commit a81e914b63

12 changed files with 197 additions and 563 deletions

									
										app/src/main/java/com/shuwei/dish/match/scale/ScaleData.kt
									
		+2
		-1
	
												View File
												
				@@ -15,5 +15,6 @@ data class ScaleData(

				    val weight: Double,

				    val state: Int,

				    val ts: Long,

				    val ip: String = ""

				    val ip: String = "",

				    val name: String? = null

				)