refactor(dialog): 移除食材搜索对话框中的测试代码

- 删除 buildMockGoodsList 扩展函数及相关导入
- 移除 FoodSearchDialog 中的假数据点击事件监听器
- 移除 VectorCollectionFragment 中的假数据填充逻辑
- 优化 RawMaterialsDialogUtils 中的 Chip 样式配置
- 清理相关文件的无用导入声明
This commit is contained in:
2026-05-15 14:28:36 +08:00
parent ada83b64e6
commit e38f19ac1b
3 changed files with 11 additions and 19 deletions
@@ -10,14 +10,12 @@ import android.view.MotionEvent
import android.view.View
import android.view.Window
import android.widget.FrameLayout
import androidx.core.view.isEmpty
import androidx.core.widget.addTextChangedListener
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter4.util.setOnDebouncedItemClick
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.shuwei.dish.match.R
@@ -25,11 +23,9 @@ import com.shuwei.dish.match.adapter.FoodAdapter
import com.shuwei.dish.match.base.BaseActivity
import com.shuwei.dish.match.databinding.DialogFoodSearchBinding
import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
import com.shuwei.dish.match.dialog.SeasoningSelectDialog.Companion.PAGE_SIZE
import com.shuwei.dish.match.model.GoodsItem
import com.shuwei.dish.match.net.UiState
import com.shuwei.dish.match.utils.KeyboardUtil
import com.shuwei.dish.match.utils.buildMockGoodsList
import com.shuwei.dish.match.utils.showRawMaterialsDialog
import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
import com.shuwei.dish.match.utils.ext.toast
@@ -277,7 +273,7 @@ class FoodSearchDialog(
emptyViewBinding?.let {
it.tvContent.text = "暂无数据"
it.tvSubContent.text = "未查询到食材信息,请联系管理员添加"
it.root.setOnClickListener { loadGoodsList(buildMockGoodsList().toMutableList()) }
// it.root.setOnClickListener { loadGoodsList(buildMockGoodsList().toMutableList()) }
it.root.layoutParams = FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT,
FrameLayout.LayoutParams.MATCH_PARENT
@@ -46,12 +46,9 @@ import com.shuwei.dish.match.utils.Debouncer
import com.shuwei.dish.match.utils.ImageUploader
import com.shuwei.dish.match.utils.ImageUtil
import com.shuwei.dish.match.utils.LogSaveUtil
import com.shuwei.dish.match.utils.buildSingleChoiceChipGroup
import com.shuwei.dish.match.utils.buildMockGoodsList
import com.shuwei.dish.match.utils.showRawMaterialsDialog
import com.shuwei.dish.match.utils.ext.clickWithDebounce
import com.shuwei.dish.match.utils.ext.dp
import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.toast
import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.toRequestBody
@@ -441,9 +438,7 @@ class VectorCollectionFragment : BaseFragment<FragmentVectorCollectionBinding>()
it.tvContent.text = "暂无数据"
it.tvSubContent.text = "点击此处重新查询"
// 点击空布局填充本地假数据,便于 UI 效果测试
it.root.setOnClickListener {
fillSearchList(buildMockGoodsList())
}
// it.root.setOnClickListener { fillSearchList(buildMockGoodsList()) }
binding.rvSearchFood.post {
it.root.minimumHeight = binding.rvSearchFood.height
searchAdapter.stateView = it.root
@@ -13,11 +13,11 @@ import com.shuwei.dish.match.utils.ext.dp
import com.shuwei.dish.match.utils.ext.gone
import com.shuwei.dish.match.utils.ext.toast
/**
* 构造用于效果测试的食材假数据
* TODO: 联调完成后删除
*/
fun buildMockGoodsList(): List<GoodsItem> = mutableListOf(
///**
// * 构造用于效果测试的食材假数据
// * TODO: 联调完成后删除
// */
//fun buildMockGoodsList(): List<GoodsItem> = mutableListOf(
// GoodsItem(goodsId = "1", goodsName = "土豆", rawMaterialsType = "土豆丝,土豆条,土豆片,土豆丁"),
// GoodsItem(goodsId = "2", goodsName = "胡萝卜", rawMaterialsType = "胡萝卜丝,胡萝卜片,胡萝卜丁"),
// GoodsItem(goodsId = "3", goodsName = "黄瓜", rawMaterialsType = "黄瓜丝,黄瓜片,黄瓜丁,黄瓜块"),
@@ -39,7 +39,7 @@ fun buildMockGoodsList(): List<GoodsItem> = mutableListOf(
// GoodsItem(goodsId = "18", goodsName = "香菇"),
// GoodsItem(goodsId = "19", goodsName = "木耳"),
// GoodsItem(goodsId = "20", goodsName = "豆芽"),
)
//)
/**
* 弹出净材种类单选弹窗
@@ -111,8 +111,9 @@ fun buildSingleChoiceChipGroup(
text = typeName
textSize = 22f
isCheckable = true
chipStartPadding = 20.dp.toFloat()
chipEndPadding = 20.dp.toFloat()
minWidth = 120.dp
chipStartPadding = 15.dp.toFloat()
chipEndPadding = 15.dp.toFloat()
chipMinHeight = (textSize + 15.dp * 2).toFloat()
// 选中/未选中态背景色:主题绿 / 浅灰
chipBackgroundColor = ColorStateList(