From 335b56eaea01b8c4561731967bb0de3831229b3f Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Fri, 22 May 2026 09:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dish/match/adapter/SeasoningAdapter.kt | 8 +-- .../dish/match/adapter/TextCellAdapter.kt | 4 ++ .../dish/match/ui/DeviceConfigActivity.kt | 52 ------------------- .../res/layout/activity_device_config.xml | 6 --- 4 files changed, 8 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningAdapter.kt index 51398fb..b833dc5 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/SeasoningAdapter.kt @@ -7,22 +7,22 @@ import androidx.core.view.updateLayoutParams import com.chad.library.adapter4.BaseQuickAdapter import com.chad.library.adapter4.viewholder.QuickViewHolder import com.shuwei.dish.match.databinding.ListItemCellBinding -import com.shuwei.dish.match.db.entity.SeasoningEntity +import com.shuwei.dish.match.model.GoodsItem import com.shuwei.dish.match.utils.ext.dp /** * 调料格子列表适配器，使用 list_item_cell 布局展示调料名称与用量 * 第4个格子（position=3）为大格，其余为标准格 */ -class SeasoningAdapter(list: MutableList) : - BaseQuickAdapter(list) { +class SeasoningAdapter(list: MutableList) : + BaseQuickAdapter(list) { override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH { val binding = ListItemCellBinding.inflate(LayoutInflater.from(context), parent, false) return VH(binding) } - override fun onBindViewHolder(holder: VH, position: Int, item: SeasoningEntity?) { + override fun onBindViewHolder(holder: VH, position: Int, item: GoodsItem?) { item ?: return // 第4个格子（index=3）使用大尺寸，其余使用标准尺寸 val isLarge = position == 3 diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/TextCellAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/TextCellAdapter.kt index 7f77e67..eec62f8 100644 --- a/app/src/main/java/com/shuwei/dish/match/adapter/TextCellAdapter.kt +++ b/app/src/main/java/com/shuwei/dish/match/adapter/TextCellAdapter.kt @@ -18,6 +18,7 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder import com.shuwei.dish.match.R import com.shuwei.dish.match.databinding.ListItemCellBinding import com.shuwei.dish.match.db.entity.SeasoningEntity +import com.shuwei.dish.match.model.GoodsItem import com.shuwei.dish.match.utils.ext.appendText import com.shuwei.dish.match.utils.ext.buildSpannableString import com.shuwei.dish.match.utils.ext.clickWithDebounce @@ -104,6 +105,9 @@ class TextCellAdapter(var list: MutableList) : // } // } + fun getTextSpan(item: GoodsItem): SpannableStringBuilder { + return getTextSpan(item.toSeasoningEntity()) + } fun getTextSpan(item: SeasoningEntity): SpannableStringBuilder { val endIndex = if (item.sort == 9) 10 else 6 var name = if (item.goodsName.isNullOrBlank()) "未配置" else item.goodsName!! diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt index c03e6aa..6cfdc0a 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt @@ -78,13 +78,6 @@ class DeviceConfigActivity : BaseActivity() { it.text = "设备配置" }, rightIconActon = { it.gone() -// it.alpha = 0.0F -// it.setImageResource(R.drawable.ic_setting) -// it.setOnClickListener {_-> -// detector.setOnDelayedMultiClickListener(it) { -// defaultDataSettingDialog() -// } -// } }) loadQualitySpan(isEnable = false) @@ -174,31 +167,11 @@ class DeviceConfigActivity : BaseActivity() { onLeftClick = { dismiss() } onRightClick = { dismiss() - resetList() } onDismiss = { hideStatusBar() } }.show() } - private fun resetList() { - runCatching { - val record = JsonAssetsLoader.parseJsonFromAssets( - this, - "default_seasoning_list.json" - ) -// val weightArray = WeightUtil.weightArray - appViewModel.clearAllSeasoning { - record?.list?.forEach { entity -> - entity.useWeight = weightArray[addressArray[entity.sort]].toDouble() - appViewModel.saveSeasoning(entity) { - updateGridData(entity) - } - } -// loadSeasoning() - } - }.onFailure { it.printStackTrace() } - } - private fun loadSeasoning() { appViewModel.loadSeasoning { seasoningItems.clear() @@ -208,31 +181,6 @@ class DeviceConfigActivity : BaseActivity() { } } - private fun initConfigData() { - repeat(12) { num -> - val firstOne = seasoningItems.firstOrNull { it.sort == num } - if (firstOne == null) { - seasoningItems.add(SeasoningEntity().also { it.sort = num }) - } - } - } - - private fun setGridData(list: MutableList) { - val gridLayout = binding.include.root - list.forEach { entity -> - val tag = entity.sort.toString() - val frameLayout = gridLayout.findViewWithTag(tag) - TextCellAdapter.loadLayout(frameLayout, entity) - } - } - - private fun updateGridData(entity: SeasoningEntity) { - val gridLayout = binding.include.root - val tag = entity.sort.toString() - val frameLayout = gridLayout.findViewWithTag(tag) - TextCellAdapter.loadLayout(frameLayout, entity) - } - private fun clickGridItem(sort: Int, entity: SeasoningEntity) { val currentAddress = AddressUtil.getWeighAddressArray().get(sort) // val seasoningEntity = list.first{it.sort == sort} diff --git a/app/src/main/res/layout/activity_device_config.xml b/app/src/main/res/layout/activity_device_config.xml index de4fc04..7a82c99 100644 --- a/app/src/main/res/layout/activity_device_config.xml +++ b/app/src/main/res/layout/activity_device_config.xml @@ -126,12 +126,6 @@ android:textColor="@color/gray_b4" android:textSize="28sp" /> - - - - - -