refactor(adapter): 新增 FoodListAdapter 合并 DishShowAdapter 与 SamplingAdapter

app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt

@@ -1,62 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import com.chad.library.adapter4.BaseQuickAdapter
-import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.databinding.ListItemDishBinding
-import com.shuwei.dish.match.utils.ext.gone
-import com.shuwei.dish.match.utils.ext.visible
-import java.text.DecimalFormat
-
-class DishShowAdapter(list: MutableList<FoodRecord>) :
-    BaseQuickAdapter<FoodRecord, DishShowAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemDishBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
-        holder.binding.run {
-            val isCooking = item!!.isCooking
-            val totalWeight = item.totalWeight ?: 0.toDouble()
-            tvDishName.text = item!!.foodName
-            if (isCooking) {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.black)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-                tvDishCount.visible()
-                tvDishCount.text = "制作统计：-kg"
-                tvShowState.text = "烹饪中"
-            } else if (totalWeight > 0.toDouble()) {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.dish_green)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-                tvDishCount.visible()
-                tvDishCount.text =
-                    "累计统计：${df.format(totalWeight / 1000.0F)}kg(${item.count}次)"
-                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
-            } else {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.black999)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_dash_15_corners)
-                tvDishCount.gone()
-                tvShowState.text = "-"
-            }
-        }
-    }
-
-    val df = DecimalFormat("0.000")
-
-}

app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt

@@ -0,0 +1,90 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.databinding.ListItemFoodListBinding
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+import java.text.DecimalFormat
+
+/**
+ * 菜品列表通用 Adapter，合并了 DishShowAdapter 与 SamplingAdapter 的功能。
+ *
+ * @param list 数据列表
+ * @param mode 显示模式：
+ *   - [DisplayMode.COOKING_MODE]：制作模式，支持空状态（虚线边框、隐藏统计行、灰色文字）
+ *   - [DisplayMode.SAMPLING_MODE]：采样模式，始终显示统计行，重量为零时显示 `-`
+ */
+class FoodListAdapter(
+    list: MutableList<FoodRecord>,
+    private val mode: DisplayMode = DisplayMode.COOKING_MODE
+) : BaseQuickAdapter<FoodRecord, FoodListAdapter.VH>(list) {
+
+    /** 显示模式枚举 */
+    enum class DisplayMode {
+        /** 制作模式（原 DishShowAdapter 逻辑） */
+        COOKING_MODE,
+        /** 采样模式（原 SamplingAdapter 逻辑） */
+        SAMPLING_MODE
+    }
+
+    inner class VH(var binding: ListItemFoodListBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemFoodListBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+    /**
+     * - 烹饪中：黑色文字、实线背景、显示"烹饪中"
+     * - 有累计重量：绿色文字、实线背景、显示累计统计
+     * - 空状态：灰色文字、虚线背景、隐藏统计行
+     */
+    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
+        holder.binding.run {
+            val isCooking = item!!.isCooking
+            val totalWeight = item.totalWeight ?: 0.0
+            val foodWeight = item.foodWeight ?: 0.0
+
+            tvDishName.text = item.foodName
+            //烹饪中
+            if (isCooking) {
+                tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.black))
+                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
+                tvDishCount.visible()
+                tvDishCount.text = "制作统计：-kg"
+                tvShowState.text = "烹饪中"
+                return@run
+            }
+            //非烹饪中，制作模式
+            if (mode == DisplayMode.COOKING_MODE) {
+                if (totalWeight > 0.0) {
+                    tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.dish_green))
+                    clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
+                    tvDishCount.visible()
+                    tvDishCount.text = "累计统计：${df.format(totalWeight / 1000.0F)}kg(${item.count}次)"
+                    tvShowState.text = "${df.format(foodWeight / 1000.0F)}kg"
+                } else {
+                    tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.black999))
+                    clBlock.setBackgroundResource(R.drawable.shape_white_dash_15_corners)
+                    tvDishCount.gone()
+                    tvShowState.text = "-"
+                }
+                return@run
+            }
+            //非烹饪中，采样模式
+            val realTotalWeight = if (totalWeight > 0.0) totalWeight else foodWeight
+            val showTotalWeight = if (realTotalWeight == 0.0) "-" else df.format(realTotalWeight / 1000.0F)
+            tvDishCount.text = "累计统计：${showTotalWeight}kg(${item.count ?: "-"}次)"
+            val showFoodWeight = if (foodWeight == 0.0) "-" else df.format(foodWeight / 1000.0F)
+            tvShowState.text = "${showFoodWeight}kg"
+        }
+    }
+
+    private val df = DecimalFormat("0.000")
+}

app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt

@@ -1,58 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import com.chad.library.adapter4.BaseQuickAdapter
-import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.databinding.ListItemDishBinding
-import com.shuwei.dish.match.utils.ext.visible
-import java.text.DecimalFormat
-
-class SamplingAdapter(list: MutableList<FoodRecord>) :
-    BaseQuickAdapter<FoodRecord, SamplingAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemDishBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
-        holder.binding.run {
-            val isCooking = item!!.isCooking
-            clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-            val totalWeight = item.totalWeight ?: 0.toDouble()
-            tvDishName.run {
-                text = (item.foodName?:"").ifBlank { "--" }
-                setTextColor(
-                    ContextCompat.getColor(
-                        holder.itemView.context,
-                        if (isCooking) R.color.black else R.color.dish_green
-                    )
-                )
-            }
-            tvDishCount.visible()
-            if (isCooking) {
-                tvDishCount.text = "制作统计：-kg"
-                tvShowState.text = "烹饪中"
-            } else {
-                val realTotalWeight = if (totalWeight > 0.toDouble()) totalWeight else (item.foodWeight
-                    ?: 0.toDouble())
-                val showTotalWeight =
-                    if (realTotalWeight == 0.toDouble()) "-" else df.format(realTotalWeight / 1000.0F)
-                tvDishCount.text = "累计统计：${showTotalWeight}kg(${item.count ?: "-"}次)"
-                val foodWeight = item.foodWeight ?: 0.toDouble()
-                val showFoodWeight = if (foodWeight == 0.toDouble()) "-" else df.format(foodWeight / 1000.0F)
-                tvShowState.text = "${showFoodWeight}kg"
-            }
-        }
-    }
-
-    val df = DecimalFormat("0.000")
-}

app/src/main/java/com/shuwei/dish/match/entity/DishEntity.kt

@@ -1,25 +0,0 @@
-package com.shuwei.dish.match.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.shuwei.dish.match.db.BaseEntity
-
-//@Entity(tableName = "dm_dish")
-//data class DishEntity (
-//    /**
-//     * 菜品id
-//     */
-//    @PrimaryKey var id: Long,
-//    /**
-//     * 菜品名称
-//     */
-//    var name: String? = "",
-//    /**
-//     * 菜品重量
-//     */
-//    var weight: Int? = 0,
-//
-//    var sort: Int = 0,
-//    @ColumnInfo(name = "create_time") val createTime: Long = System.currentTimeMillis()
-//): BaseEntity

app/src/main/java/com/shuwei/dish/match/entity/GoodsInfoEntity.kt

@@ -1,38 +0,0 @@
-//package com.shuwei.dish.match.entity
-//
-//import androidx.room.Ignore
-//import androidx.room.PrimaryKey
-//import com.shuwei.dish.match.db.BaseEntity
-//
-//data class GoodsInfoEntity(
-//    @PrimaryKey(autoGenerate = true) var id: Long = 0,
-//    var goodsId: Int,
-//    var goodsName: String? = "",
-//    var popularName: String? = "",
-//    var canteenId: String? = "",
-//    var goodsOrRelationCode: String? = "",
-//    var relateionType: Int? = -1,
-//    var relateionType_dictText: String? = "",
-//
-//    var sort: Int = 0,
-//
-//    var swMaterBaseMaterial: String? = "",
-//    var preMaterClass: String? = "",
-//    var preUseWeight: Int? = 0,
-//    var preWeight: Int? = 0,
-//    var oil: String? = "",
-//    var sugar: String? = "",
-//    /**
-//     * isDel表示数据是否已删除，1-已删除，为无效数据，0-正常使用，有效数据
-//     */
-//    var isDel: Int = 0,
-//    val createTime: Long = System.currentTimeMillis()
-//) : BaseEntity {
-//    @Ignore
-//    var pageType: Int = 0
-//
-//    @Ignore
-//    var isClicked: Boolean = false
-//
-//    constructor() : this(id = -1, goodsId = -1) // 必需的空构造
-//}

app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt

@@ -11,7 +11,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.SamplingAdapter
+import com.shuwei.dish.match.adapter.FoodListAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySamplingModeBinding
@@ -160,7 +160,7 @@ class SamplingModeActivity : BaseActivity() {
 
     private var list: MutableList<FoodRecord> = mutableListOf()
     private val dishAdapter by lazy {
-        SamplingAdapter(list = list).apply {
+        FoodListAdapter(list = list, mode = FoodListAdapter.DisplayMode.SAMPLING_MODE).apply {
             isStateViewEnable = true
             setOnItemClickListener { adapter, view, position ->
                 judgeDeviceConfig {

app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt

@@ -10,7 +10,7 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.chad.library.adapter4.util.setOnDebouncedItemClick
-import com.shuwei.dish.match.adapter.DishShowAdapter
+import com.shuwei.dish.match.adapter.FoodListAdapter
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.base.BaseFragment
 import com.shuwei.dish.match.databinding.FragmentDishListBinding
@@ -52,7 +52,7 @@ class DishListFragment : BaseFragment<FragmentDishListBinding>() {
 
     private var list: MutableList<FoodRecord> = mutableListOf()
     private val dishAdapter by lazy {
-        DishShowAdapter(list = list).apply {
+        FoodListAdapter(list = list).apply {
             isStateViewEnable = true
             setOnDebouncedItemClick { adapter, view, position ->
                 if (isAdded.not() || isVisible.not()) {

app/src/main/java/com/shuwei/dish/match/utils/SwipeCallback.kt

@@ -5,9 +5,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.adapter.DishPartAdapter
-import com.shuwei.dish.match.adapter.DishShowAdapter
-import com.shuwei.dish.match.adapter.SamplingAdapter
-import androidx.core.view.isEmpty
+import com.shuwei.dish.match.adapter.FoodListAdapter
 
 class SwipeCallback(
     private val adapter: BaseQuickAdapter<*,*>,
@@ -40,14 +38,7 @@ class SwipeCallback(
         // ItemTouchHelper.UP or ItemTouchHelper.DOWN
         var swipeFlags = ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
 
-        if (adapter is SamplingAdapter) {
-            if (adapter.items.isEmpty()) {
-                return makeMovementFlags(0, 0)
-            }
-            if (!adapter.items[position].isCooking) {
-                swipeFlags = 0
-            }
-        } else if (adapter is DishShowAdapter) {
+        if (adapter is FoodListAdapter) {
             if (adapter.items.isEmpty()) {
                 return makeMovementFlags(0, 0)
             }

app/src/main/res/layout/activity_sampling_mode.xml

@@ -81,7 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:overScrollMode="never"
-                tools:listitem="@layout/list_item_dish" />
+                tools:listitem="@layout/list_item_food_list" />
 
             <com.scwang.smart.refresh.footer.ClassicsFooter
                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_dish_list.xml

@@ -31,7 +31,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:overScrollMode="never"
-            tools:listitem="@layout/list_item_dish" />
+            tools:listitem="@layout/list_item_food_list" />
 
         <com.scwang.smart.refresh.footer.ClassicsFooter
             android:layout_width="match_parent"

app/src/main/res/layout/list_item_dish.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/clBlock"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:layout_marginStart="15dp"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="15dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/shape_white_fb_15_corners"
-        android:paddingStart="30dp"
-        android:paddingEnd="30dp">
-
-        <TextView
-            android:id="@+id/tvShowState"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black999"
-            android:textSize="32sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="烹饪中" />
-
-        <TextView
-            android:id="@+id/tvDishName"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/dish_green"
-            android:textSize="32sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/tvDishCount"
-            app:layout_constraintEnd_toStartOf="@id/tvShowState"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="冬虫夏草炝拌芥兰苗" />
-
-        <TextView
-            android:id="@+id/tvDishCount"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textColor="@color/black999"
-            android:textSize="26sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/tvDishName"
-            app:layout_constraintStart_toStartOf="@id/tvDishName"
-            app:layout_constraintTop_toBottomOf="@id/tvDishName"
-            tools:text="累计统计：2.3kg(2次)" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout/list_item_food_list.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/clBlock"
+    android:layout_width="match_parent"
+    android:layout_height="150dp"
+    android:layout_marginStart="15dp"
+    android:layout_marginTop="7dp"
+    android:layout_marginEnd="15dp"
+    android:layout_marginBottom="8dp"
+    android:background="@drawable/shape_white_fb_15_corners"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:paddingStart="30dp"
+    android:paddingEnd="30dp">
+
+    <TextView
+        android:id="@+id/tvShowState"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black999"
+        android:textSize="32sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="烹饪中" />
+
+    <TextView
+        android:id="@+id/tvDishName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/dish_green"
+        android:textSize="32sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/tvDishCount"
+        app:layout_constraintEnd_toStartOf="@id/tvShowState"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="冬虫夏草炝拌芥兰苗" />
+
+    <TextView
+        android:id="@+id/tvDishCount"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="@color/black999"
+        android:textSize="26sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/tvDishName"
+        app:layout_constraintStart_toStartOf="@id/tvDishName"
+        app:layout_constraintTop_toBottomOf="@id/tvDishName"
+        tools:text="累计统计：2.3kg(2次)" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>