提交昨天的修改：优化多个模块和UI效果

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

@@ -10,6 +10,7 @@ import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityInitBinding
 import com.shuwei.dish.match.db.AppRepository
 import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.objbox.FoodModule
 import com.shuwei.dish.match.utils.AppUtil
 import com.shuwei.dish.match.utils.QRCodeUtil
 import com.shuwei.dish.match.utils.SpTool
@@ -38,7 +39,9 @@ class InitActivity : BaseActivity() {
 //        useBackground(false)
         binding = ActivityInitBinding.inflate(layoutInflater)
         setContentView(binding.root)
-
+        lifecycleScope.launch {
+            FoodModule.init(this@InitActivity)
+        }
 //        setHeaderBackground(isHomePage = true)
         setHeaderBgVisible(false)
         BaseApp.appVersion = AppUtil.getAppVersionCode(this).toString()

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

@@ -59,9 +59,7 @@ class SamplingListActivity : BaseActivity() {
             it.visible()
             it.setImageResource(R.drawable.ic_setting)
             it.setOnClickListener {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 2)
-                }
+                startActivity<SettingActivity>()
             }
         }, backAction = {
             it.gone()
@@ -86,7 +84,7 @@ class SamplingListActivity : BaseActivity() {
         appViewModel.deleteCookFoodAndGoods(cookMode = 1, foodId = foodId, onFinish = action)
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
         if (isConfigPage) {
@@ -394,9 +392,7 @@ class SamplingListActivity : BaseActivity() {
             rightBtnText = "去设置",
             leftBtnClick = {},
             rightBtnClick = {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 2)
-                }
+                startActivity<SettingActivity>()
             })
     }
 

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

@@ -59,9 +59,7 @@ class SelectDishActivity : BaseActivity() {
             it.visible()
             it.setImageResource(R.drawable.ic_setting)
             it.setOnClickListener {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
+                startActivity<SettingActivity>()
             }
         }, backAction = {
             it.gone()
@@ -107,9 +105,7 @@ class SelectDishActivity : BaseActivity() {
             rightBtnText = "去设置",
             leftBtnClick = {},
             rightBtnClick = {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
+                startActivity<SettingActivity>()
             }
         )
     }
@@ -167,7 +163,7 @@ class SelectDishActivity : BaseActivity() {
         appViewModel.deleteCookFoodAndGoods(cookMode = 0, foodId = foodId, onFinish = action)
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         runCatching {
             val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false

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

@@ -1,4 +1,4 @@
-package com.sw.dualscreen.activity.fragment
+package com.shuwei.dish.match.ui.fragment
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -7,38 +7,27 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
-import androidx.camera.view.PreviewView
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
-import com.sw.dualscreen.GlobalData
-import com.sw.dualscreen.R
-import com.sw.dualscreen.activity.CollectedFoodActivity
-import com.sw.dualscreen.activity.SettingActivity
-import com.sw.dualscreen.adapter.CollectFoodListAdapter
-import com.sw.dualscreen.adapter.FoodCollectionAdapter
-import com.sw.dualscreen.databinding.FragmentCollectBinding
-import com.sw.dualscreen.databinding.LayoutCameraPreviewBinding
-import com.sw.dualscreen.ext.clickWithDebounce
-import com.sw.dualscreen.ext.dp
-import com.sw.dualscreen.model.response.FoodInfo
-import com.sw.dualscreen.objbox.Food
-import com.sw.dualscreen.objbox.FoodCollectionBean
-import com.sw.dualscreen.objbox.FoodModule
-import com.sw.dualscreen.objbox.ObjectBox
-import com.sw.dualscreen.utils.BitmapSaver
-import com.sw.dualscreen.utils.CameraUtils
-import com.sw.dualscreen.utils.Debouncer
-import com.sw.dualscreen.utils.ImageUploader
-import com.sw.dualscreen.utils.ImageUtil
-import com.sw.plate.utils.ToastUtils
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.FoodCollectionAdapter
+import com.shuwei.dish.match.base.BaseFragment
+import com.shuwei.dish.match.databinding.FragmentCollectBinding
+import com.shuwei.dish.match.objbox.FoodCollectionBean
+import com.shuwei.dish.match.objbox.FoodModule
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.ui.SettingActivity
+import com.shuwei.dish.match.utils.BitmapSaver
+import com.shuwei.dish.match.utils.Debouncer
+import com.shuwei.dish.match.utils.ImageUtil
+import com.shuwei.dish.match.utils.ext.clickWithDebounce
+import com.shuwei.dish.match.utils.ext.toast
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
-import timber.log.Timber
 
 @SuppressLint("NotifyDataSetChanged")
 class CollectFragment : BaseFragment<FragmentCollectBinding>() {
@@ -57,25 +46,22 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         }
     }
 
-    private val searchFoodList = mutableListOf<FoodInfo>()
-    private var settingActivity: SettingActivity? = null
-    private var checkedItem: FoodInfo? = null
-    private val searchFoodAdapter by lazy {
-        CollectFoodListAdapter(searchFoodList).apply {
-            setOnItemClickListener { adapter, view, position ->
-                searchFoodList.forEachIndexed { index, item -> item.isChecked = index == position }
-                checkedItem = searchFoodList[position]
-                notifyDataSetChanged()
-                selectedFoodId = checkedItem!!.foodId
-                selectedFoodName = checkedItem!!.foodName
-            }
-        }
-    }
+//    private val searchFoodList = mutableListOf<FoodInfo>()
+//    private var settingActivity: SettingActivity? = null
+//    private var checkedItem: FoodInfo? = null
+//    private val searchFoodAdapter by lazy {
+//        CollectFoodListAdapter(searchFoodList).apply {
+//            setOnItemClickListener { adapter, view, position ->
+//                searchFoodList.forEachIndexed { index, item -> item.isChecked = index == position }
+//                checkedItem = searchFoodList[position]
+//                notifyDataSetChanged()
+//                selectedFoodId = checkedItem!!.foodId
+//                selectedFoodName = checkedItem!!.foodName
+//            }
+//        }
+//    }
     private val debouncer = Debouncer(2000)
-    private lateinit var previewView: PreviewView
-    private val cameraUtils: CameraUtils by lazy {
-        CameraUtils(requireActivity())
-    }
+    private lateinit var settingActivity: SettingActivity
 
     private val collectionAdapter: FoodCollectionAdapter by lazy {
         FoodCollectionAdapter(foodCollectionList).apply {
@@ -94,18 +80,23 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         }
     }
 
-    override fun inflateViewBinding(): FragmentCollectBinding {
+
+    override fun inflateBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentCollectBinding {
         return FragmentCollectBinding.inflate(LayoutInflater.from(context))
     }
 
+    //typealias CameraCallback = (Uri) -> Unit
 
     private val cameraCallback: (Uri) -> Unit = { uri ->
         try {
             val index = foodCollectionList.indexOfFirst { it.imageFile == null }
             if (index == -1) {
-                ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
-                settingActivity?.hideWaitingDialog()
-                rerurn@ cameraCallback
+                toast("每次只允许保存${MAX_COUNT}条数据")
+                hideWaitingDialog()
+                rerurn@cameraCallback
             }
             activity?.runOnUiThread {
                 foodCollectionList[index].let {
@@ -117,7 +108,7 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
                 }
                 collectionAdapter.notifyItemChanged(index)
             }
-//            settingActivity?.hideWaitingDialog()
+//            hideWaitingDialog()
             Thread {
                 ImageUtil.uriToBitmap(requireActivity(), uri)?.let { bitmap ->
                     getImageVector(index, bitmap)
@@ -125,9 +116,9 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
             }.start()
         } catch (e: Exception) {
             e.printStackTrace()
-            settingActivity?.hideWaitingDialog()
-            ToastUtils.showToast("程序异常${e.message}")
-            settingActivity?.log("程序异常${e.message}")
+            hideWaitingDialog()
+            toast("程序异常${e.message}")
+            log("程序异常${e.message}")
         }
     }
 
@@ -141,15 +132,15 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
             FoodModule.bitmap2FloatArray(bitmap, false)
         } catch (e: Exception) {
             e.printStackTrace()
-            ToastUtils.showToast("操作失败")
-            settingActivity?.log("操作失败:${e.message}")
-            settingActivity?.hideWaitingDialog()
+            toast("操作失败")
+            log("操作失败:${e.message}")
+            hideWaitingDialog()
             return
         }
         val file = BitmapSaver.saveToAppFilesDir(
             bitmap, requireActivity(), "IMG_CROP_${System.currentTimeMillis()}.jpg"
         )
-        settingActivity?.log("${this.javaClass.simpleName}-cameraCallback-裁剪bitmap保存文件路径：${file?.absolutePath}")
+        log("${this.javaClass.simpleName}-cameraCallback-裁剪bitmap保存文件路径：${file?.absolutePath}")
 
         activity?.runOnUiThread {
             foodCollectionList[index].let {
@@ -163,45 +154,35 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         if (bitmap.isRecycled.not()) {
             bitmap.recycle()
         }
-        settingActivity?.hideWaitingDialog()
+        hideWaitingDialog()
     }
 
     @SuppressLint("NotifyDataSetChanged")
     private fun takePhoto() {
         val count = foodCollectionList.count { it.bitmap != null }
         if (count >= MAX_COUNT) {
-            ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+            toast("每次只允许保存${MAX_COUNT}条数据")
             return
         }
-        settingActivity?.showWaitingDialog("采集中……")
-        cameraUtils.takePhoto(cameraCallback) { errMsg ->
-            settingActivity?.hideWaitingDialog()
-//            ToastUtils.showToast("拍照异常，请重新操作")
+        showWaitingDialog("采集中……")
+        settingActivity.takePhoto(succCallback = cameraCallback, failCallback = { errMsg ->
+            hideWaitingDialog()
+//            toast("拍照异常，请重新操作")
 //            if (cameraErrorCount >= 10) {
-//                ToastUtils.showToast("拍照异常，请重新操作")
-//                settingActivity?.log("拍照异常，请重新操作:$errMsg")
+//                toast("拍照异常，请重新操作")
+//                log("拍照异常，请重新操作:$errMsg")
 //                cameraErrorCount = 0
 //                return@takePhoto
 //            }
 //            cameraErrorCount++
 //            takePhoto()
-        }
+        })
     }
 
-    private var cameraErrorCount = 0
-
     override fun initialize() {
         settingActivity = activity as SettingActivity
-        cameraUtils.initCamera()
-        val previewBinding =
-            LayoutCameraPreviewBinding.inflate(layoutInflater, binding.flCameraPreview)
-        previewView = previewBinding.previewView.also {
-            it.updateLayoutParams {
-                width = 456.dp
-                height = 342.dp
-            }
-        }
-        cameraUtils.setPreviewController(previewView)
+        // 首次显示 CollectFragment 时初始化相机
+        settingActivity.initCamera(binding.flCameraPreview)
 
         binding.rvFoodList.let {
             it.layoutManager =
@@ -214,16 +195,16 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         }
 
         binding.btnSave.setOnClickListener {
-            if (checkedItem == null || checkedItem!!.isChecked.not()) {
-                ToastUtils.showToast("请选择菜品名称")
-                return@setOnClickListener
-            }
-            val count = foodCollectionList.count { it.imageFile != null }
-            if (count == 0) {
-                ToastUtils.showToast("请拍摄菜品照片")
-                return@setOnClickListener
-            }
-            upload()
+//            if (checkedItem == null || checkedItem!!.isChecked.not()) {
+//                toast("请选择菜品名称")
+//                return@setOnClickListener
+//            }
+//            val count = foodCollectionList.count { it.imageFile != null }
+//            if (count == 0) {
+//                toast("请拍摄菜品照片")
+//                return@setOnClickListener
+//            }
+//            upload()
         }
 
         binding.editFoodName.setOnEditorActionListener { v, actionId, event ->
@@ -239,173 +220,103 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         }
 
         binding.btnCollectedFood.setOnClickListener {
-            startActivity(Intent(requireActivity(), CollectedFoodActivity::class.java))
+//            startActivity(Intent(requireActivity(), CollectedFoodActivity::class.java))
         }
         binding.btnTakePhoto.clickWithDebounce {
             val count = foodCollectionList.count { it.bitmap != null }
             if (count >= MAX_COUNT) {
-                ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+                toast("每次只允许保存${MAX_COUNT}条数据")
                 return@clickWithDebounce
             }
             takePhoto()
         }
         binding.btnClearData.setOnClickListener { clearData() }
-        binding.rvSearchFood.let {
-            it.layoutManager = GridLayoutManager(context, 2)
-            it.adapter = searchFoodAdapter
-        }
+//        binding.rvSearchFood.let {
+//            it.layoutManager = GridLayoutManager(context, 2)
+//            it.adapter = searchFoodAdapter
+//        }
 
         searchFood()
     }
 
     @SuppressLint("NotifyDataSetChanged")
     private fun upload() {
-        lifecycleScope.launch {
-            val totalFileCount = foodCollectionList.count { it.imageFile != null }
-            settingActivity?.showWaitingDialog2("图片上传中0/$totalFileCount")
-            val params = HashMap<String, RequestBody>()
-            //params["placeId"] = restId.toRequestBody()
-            params["foodId"] = checkedItem!!.foodId.toRequestBody()
-            params["foodName"] = checkedItem!!.foodName!!.toRequestBody()
-            params["version"] = GlobalData.foodModelVersion.toRequestBody()
-
-            ImageUploader(totalList = foodCollectionList, uploadImage = { batch ->
-                val files = batch.map { it.imageFile }
-                val foodVectorList = batch.filter { it.imageVector != null }.map {
-                    it.imageVector!!.joinToString(
-                        separator = ",", prefix = "[", postfix = "]"
-                    )
-                }
-                val foodVectorJson =
-                    foodVectorList.joinToString(separator = ",", prefix = "[", postfix = "]")
-                Timber.tag(TAG).d("json=$foodVectorJson")
-                params["foodVector"] = foodVectorJson.toRequestBody()
-                settingActivity?.viewModel?.uploadCollectFoodPics(files, params)
-            }, onProgress = { count, batch, idList ->
-                //batch.forEach {
-                //    it.uploadSuccess = true
-                //}
-                runBlocking {
-                    activity?.runOnUiThread {
-                        settingActivity?.showWaitingDialog2("图片上传中$count/$totalFileCount")
-                    }
-                    val foodList = batch.mapIndexed { index, it ->
-                        Food(
-                            collectId = if (index < idList.size) idList[index] else null,
-                            foodId = checkedItem!!.foodId,
-                            foodName = checkedItem!!.foodName,
-                            foodVector = it.imageVector,
-                            version = GlobalData.foodModelVersion
-                        )
-                    }
-                    ObjectBox.putAll(foodList)
-                    activity?.runOnUiThread {
-                        batch.forEach { it.isFinish = true }
-                        collectionAdapter.notifyDataSetChanged()
-                    }
-                }
-            }, onError = {
-                activity?.runOnUiThread {
-                    binding.root.postDelayed({
-                        settingActivity?.hideWaitingDialog()
-                        ToastUtils.showToast("上传失败，请稍后重试")
-                    }, 1000)
-                }
-            }, onComplete = {
-                //vectorThread()
-                binding.root.postDelayed({
-                    settingActivity?.hideWaitingDialog()
-                    ToastUtils.showToast("上传成功")
-                }, 1000)
-            }).processUploads()
-        }
-
-
-//        for (index in foodCollectionList.indices step 5) {
-//            val end = if(index + 5 < foodCollectionList.size - 1) index + 5 else foodCollectionList.size - 1
-//            val subList = foodCollectionList.subList(index, end)
-//            val subFiles = subList.map { it.imageFile }
-//            uploadCollectFoodPics(subFiles, params) { isSuccess->
-//                Timber.tag(TAG).d("uploadMultipleImages: ${isSuccess}")
-//                subList.filter { it.imageFile!=null }.forEach { it.uploadSuccess = isSuccess }
+//        lifecycleScope.launch {
+//            val totalFileCount = foodCollectionList.count { it.imageFile != null }
+//            showWaitingDialog2("图片上传中0/$totalFileCount")
+//            val params = HashMap<String, RequestBody>()
+//            //params["placeId"] = restId.toRequestBody()
+//            params["foodId"] = checkedItem!!.foodId.toRequestBody()
+//            params["foodName"] = checkedItem!!.foodName!!.toRequestBody()
+//            params["version"] = GlobalData.foodModelVersion.toRequestBody()
 //
-////                val count = collectList.count { it.imageFile!=null && it.uploadSuccess.not() }
-////                runOnUiThread {
-////                    binding.btnUploadImage.text = "待上传图片${count}张"
-////                    if (count == 0) {
-////                        Loading.dismiss()
-////                    }
-////                }
-//            }
+//            ImageUploader(totalList = foodCollectionList, uploadImage = { batch ->
+//                val files = batch.map { it.imageFile }
+//                val foodVectorList = batch.filter { it.imageVector != null }.map {
+//                    it.imageVector!!.joinToString(
+//                        separator = ",", prefix = "[", postfix = "]"
+//                    )
+//                }
+//                val foodVectorJson =
+//                    foodVectorList.joinToString(separator = ",", prefix = "[", postfix = "]")
+//                log("json=$foodVectorJson")
+//                params["foodVector"] = foodVectorJson.toRequestBody()
+//                viewModel?.uploadCollectFoodPics(files, params)
+//            }, onProgress = { count, batch, idList ->
+//                //batch.forEach {
+//                //    it.uploadSuccess = true
+//                //}
+//                runBlocking {
+//                    activity?.runOnUiThread {
+//                        showWaitingDialog2("图片上传中$count/$totalFileCount")
+//                    }
+//                    val foodList = batch.mapIndexed { index, it ->
+//                        Food(
+//                            collectId = if (index < idList.size) idList[index] else null,
+//                            foodId = checkedItem!!.foodId,
+//                            foodName = checkedItem!!.foodName,
+//                            foodVector = it.imageVector,
+//                            version = GlobalData.foodModelVersion
+//                        )
+//                    }
+//                    ObjectBox.putAll(foodList)
+//                    activity?.runOnUiThread {
+//                        batch.forEach { it.isFinish = true }
+//                        collectionAdapter.notifyDataSetChanged()
+//                    }
+//                }
+//            }, onError = {
+//                activity?.runOnUiThread {
+//                    binding.root.postDelayed({
+//                        hideWaitingDialog()
+//                        toast("上传失败，请稍后重试")
+//                    }, 1000)
+//                }
+//            }, onComplete = {
+//                //vectorThread()
+//                binding.root.postDelayed({
+//                    hideWaitingDialog()
+//                    toast("上传成功")
+//                }, 1000)
+//            }).processUploads()
 //        }
     }
 
-//    private fun vectorThread() {
-//        settingActivity?.showWaitingDialog("加载中……")
-//        Thread {
-//            foodCollectionList
-////                .filter { it.bitmap != null }
-////                .filter { it.imageVector != null }
-//                .forEachIndexed { index, it ->
-//                    if (it.imageVector == null) {
-//                        return@forEachIndexed
-//                    }
-//                    image2VectorTask(imageVector = it.imageVector!!, index)
-//                }
-//            activity?.runOnUiThread {
-//                binding.root.postDelayed({
-//                    settingActivity?.hideWaitingDialog()
-//                }, 1000)
-//            }
-//        }.start()
-//    }
-
-//    private fun image2VectorTask(imageVector: FloatArray?, position: Int) {
-//        if (imageVector == null) return
-//////        val imageVector = FoodModule.bitmap2FloatArray(item.bitmap!!)
-//////
-////////        val base64Str = FloatBase64Utils.floatArrayToBase64(imageVector)
-////////        Timber.tag("mzf1").e(base64Str)
-//////////        viewModel.postImageData(
-//////////            context,
-//////////            foodId = selectedFoodId.toString(),
-//////////            foodName = selectedFoodName.toString(),
-//////////            foodVector = base64Str,
-//////////            uri = item.imageUri!!
-//////////        )
-////        box.put(
-////            Food(
-////                collectId = null,
-////                foodId = checkedItem!!.foodId,
-////                foodName = checkedItem!!.foodName,
-////                foodVector = imageVector,
-////                version = "1.0.0"
-////            )
-////        )
-////        if (position > -1) {
-////            foodCollectionList[position].isFinish = true
-////            activity?.runOnUiThread {
-////                collectionAdapter.notifyItemChanged(position)
-////            }
-////        }
-//    }
-
-
     @SuppressLint("NotifyDataSetChanged")
-    private fun searchFood() {
+    fun searchFood() {
         debouncer.debounce {
-            settingActivity?.searchByFoodName(binding.editFoodName.text.toString()) {
-                searchFoodList.clear()
-                searchFoodList.addAll(it)
-                searchFoodAdapter.notifyDataSetChanged()
+            searchByFoodName(binding.editFoodName.text.toString()) {
+//                searchFoodList.clear()
+//                searchFoodList.addAll(it)
+//                searchFoodAdapter.notifyDataSetChanged()
             }
         }
     }
 
-    private var clickIndex = -1
+    var clickIndex = -1
 
     @SuppressLint("NotifyDataSetChanged")
-    private fun clearData() {
+    fun clearData() {
         foodCollectionList.forEach {
             it.bitmap = null
             it.imageVector = null
@@ -422,20 +333,27 @@ class CollectFragment : BaseFragment<FragmentCollectBinding>() {
         searchFood()
     }
 
+    private var isFirstOpen = true
+
     override fun onResume() {
         super.onResume()
-        cameraUtils.bind()
+        if (isVisible.not()) return
         binding.llCameraFlag.run {
             visibility = View.VISIBLE
             postDelayed({
                 visibility = View.GONE
-            }, 3000)
+            }, 1000)
         }
     }
 
     override fun onPause() {
         super.onPause()
-        cameraUtils.unbind()
         binding.llCameraFlag.visibility = View.VISIBLE
     }
+
+    private fun log(msg: String) {}
+    private fun searchByFoodName(name: String, block:(String)-> Unit) {}
+    private fun hideWaitingDialog() {}
+    private fun showWaitingDialog(msg: String) {}
+    private fun showWaitingDialog2(msg: String) {}
 }

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

@@ -0,0 +1,365 @@
+package com.shuwei.dish.match.ui.fragment
+
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.style.AbsoluteSizeSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.LineHeightSpan
+import android.text.style.StyleSpan
+import android.util.Log
+import android.util.SparseArray
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.graphics.toColorInt
+import androidx.core.view.forEach
+import androidx.lifecycle.ViewModelProvider
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.base.BaseFragment
+import com.shuwei.dish.match.databinding.FragmentDeviceConfigBinding
+import com.shuwei.dish.match.db.AppRepository
+import com.shuwei.dish.match.dialog.CommonDialog
+import com.shuwei.dish.match.dialog.SeasoningSearchDialog
+import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.entity.ResetReasoningRecord
+import com.shuwei.dish.match.adapter.TextCellAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.utils.AddressUtil
+import com.shuwei.dish.match.utils.JsonAssetsLoader
+import com.shuwei.dish.match.utils.MultiClickDetector
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.appendText
+import com.shuwei.dish.match.utils.ext.buildSpannableString
+import com.shuwei.dish.match.utils.ext.dp
+import com.shuwei.dish.match.utils.ext.clickWithDebounce
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.toast
+import com.shuwei.dish.match.utils.ext.visible
+import com.shuwei.dish.match.viewmodel.AppViewModel
+import com.shuwei.dish.match.viewmodel.factory.AppFactory
+import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
+import com.shuwei.dish.match.ui.SamplingListActivity
+import com.shuwei.dish.match.ui.SelectDishActivity
+import com.shuwei.dish.match.utils.SpTool
+import com.shuwei.dish.match.utils.ext.startActivity
+
+/**
+ * 设备配置Fragment
+ * 功能：支持三种模式选择（制作、采样、品控），调料网格配置管理
+ */
+class DeviceConfigFragment : BaseFragment<FragmentDeviceConfigBinding>() {
+
+    companion object {
+        const val TAG = "DeviceConfigFragment"
+        const val COOK_MODE = "cookMode"
+
+        val modeList = listOf<ModeBean>(
+            ModeBean("制作模式", "菜品快速制作，记录熟重"),
+            ModeBean("采样模式", "菜品快速制作，记录熟重"),
+            ModeBean("品控模式", "菜品快速制作，记录熟重")
+        )
+
+        fun newInstance(cookMode: Int = 0): DeviceConfigFragment {
+            return DeviceConfigFragment().apply {
+                arguments = Bundle().apply {
+                    putInt(COOK_MODE, cookMode)
+                }
+            }
+        }
+    }
+
+    data class ModeBean(
+        var modeName: String,
+        var modeDesc: String
+    )
+
+    private lateinit var appViewModel: AppViewModel
+
+    private var cookMode: Int = 0
+    private val weightArray = SparseArray<Double>()
+    private val addressArray = AddressUtil.getWeighAddressArray()
+    private var seasoningItems = mutableListOf<SeasoningEntity>()
+    private val detector = MultiClickDetector(targetCount = 10, intervalMs = 800)
+
+    override fun inflateBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?
+    ): FragmentDeviceConfigBinding {
+        return FragmentDeviceConfigBinding.inflate(inflater, container, false)
+    }
+
+    override fun initialize(){
+        cookMode = arguments?.getInt(COOK_MODE, 0) ?: 0
+        initViewModel()
+        initUI()
+        addWeighListener()
+        addGridItemListener()
+        loadSeasoning()
+    }
+
+    /**
+     * 初始化ViewModel
+     */
+    private fun initViewModel() {
+        val db = BaseApp.instance!!.database
+        val factory = AppFactory(AppRepository(db.appDao()))
+        appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java]
+    }
+
+    /**
+     * 初始化UI
+     */
+    private fun initUI() {
+        loadQualitySpan(isEnable = false)
+        when (cookMode) {
+            1 -> {
+                binding.rbModeCook.isChecked = true
+                binding.rbModeSampling.isChecked = false
+                loadCookSpan(isClicked = true)
+                loadSamplingSpan()
+            }
+
+            2 -> {
+                binding.rbModeCook.isChecked = false
+                binding.rbModeSampling.isChecked = true
+                loadCookSpan()
+                loadSamplingSpan(isClicked = true)
+            }
+
+            else -> {
+                binding.rbModeCook.isChecked = true
+                binding.rbModeSampling.isChecked = false
+                loadCookSpan(isClicked = true)
+                loadSamplingSpan()
+            }
+        }
+
+        binding.rbModeCook.setOnClickListener {
+            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
+            binding.rbModeCook.isChecked = true
+            binding.rbModeSampling.isChecked = false
+            loadCookSpan(isClicked = true)
+            loadSamplingSpan()
+            activity?.startActivity<SelectDishActivity> {
+                putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
+            }
+            activity?.finish()
+        }
+        binding.rbModeSampling.setOnClickListener {
+            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
+            binding.rbModeCook.isChecked = false
+            binding.rbModeSampling.isChecked = true
+            loadCookSpan()
+            loadSamplingSpan(isClicked = true)
+            activity?.startActivity<SamplingListActivity> {
+                putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
+            activity?.finish()
+        }
+    }
+
+    /**
+     * 添加称重监听
+     */
+    private fun addWeighListener() {
+        WeightUtil.addWeightListener(
+            weightKey = TAG,
+            getWeight = { address, state, weight ->
+                Log.d(TAG, "addWeighListener: address=$address,stat=$state,weight=$weight")
+                weightArray.put(address, weight)
+                val item = seasoningItems.firstOrNull { address == addressArray[it.sort] }
+                item?.let {
+                    it.useWeight = weight.toDouble()
+                    updateGridData(it)
+                }
+                Log.d(TAG, "addWeighListener: update-----------------------")
+            })
+    }
+
+    /**
+     * 添加网格项点击监听
+     */
+    private fun addGridItemListener() {
+        binding.include.root.forEach { child ->
+            child.clickWithDebounce {
+                val sort = child.tag.toString().toInt()
+                val entity = seasoningItems.firstOrNull { it.sort == sort } ?: SeasoningEntity()
+                clickGridItem(sort, entity)
+            }
+        }
+    }
+
+    /**
+     * 加载调料数据
+     */
+    private fun loadSeasoning() {
+        appViewModel.loadSeasoning {
+            seasoningItems.clear()
+            seasoningItems.addAll(it)
+            initConfigData()
+            setGridData(seasoningItems)
+        }
+    }
+
+    /**
+     * 初始化配置数据，确保有12个调料位置
+     */
+    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<SeasoningEntity>) {
+        val gridLayout = binding.include.root
+        list.forEach { entity ->
+            val tag = entity.sort.toString()
+            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+            TextCellAdapter.loadLayout(frameLayout, entity)
+        }
+    }
+
+    /**
+     * 更新网格数据
+     */
+    private fun updateGridData(entity: SeasoningEntity) {
+        val gridLayout = binding.include.root
+        val tag = entity.sort.toString()
+        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+        TextCellAdapter.loadLayout(frameLayout, entity)
+    }
+
+    /**
+     * 点击网格项，打开调料搜索对话框
+     */
+    private fun clickGridItem(sort: Int, entity: SeasoningEntity) {
+        val currentAddress = AddressUtil.getWeighAddressArray().get(sort)
+        SeasoningSearchDialog(
+            weighIndex = sort,
+            weighAddress = currentAddress,
+            clickName = entity.goodsName
+        ).show(requireActivity() as BaseActivity) { item ->
+            syncItem(entity, item)
+            // 3-调料
+            entity.materialType = 3
+            entity.sort = sort
+            saveSeasoning(entity) {
+                val tag = sort.toString()
+                val gridLayout = binding.include.root
+                val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+                TextCellAdapter.loadLayout(frameLayout, entity)
+            }
+        }
+    }
+
+    /**
+     * 同步调料项数据
+     */
+    private fun syncItem(oldItem: SeasoningEntity, newItem: SeasoningEntity) {
+        oldItem.run {
+            goodsId = newItem.goodsId
+            goodsName = newItem.goodsName
+            goodsOrRelationCode = newItem.goodsOrRelationCode
+            relateionType = newItem.relateionType
+            materialType = newItem.materialType
+            allEdible = newItem.allEdible
+            useWeight = newItem.useWeight
+            popularName = newItem.popularName
+            canteenId = newItem.canteenId
+            relateionType_dictText = newItem.relateionType_dictText
+
+            foodId = newItem.foodId
+            sort = newItem.sort
+        }
+    }
+
+    /**
+     * 保存调料数据
+     */
+    fun saveSeasoning(entity: SeasoningEntity, action: () -> Unit = {}) {
+        appViewModel.saveSeasoning(entity) {
+            action()
+            toast("保存成功")
+        }
+    }
+
+    /**
+     * 加载品控模式文本样式
+     */
+    private fun loadQualitySpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+        binding.rbModeQuality.text =
+            getModeTextSpan(
+                topText = modeList[2].modeName,
+                bottomText = modeList[2].modeDesc,
+                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+            )
+    }
+
+    /**
+     * 加载采样模式文本样式
+     */
+    private fun loadSamplingSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+        binding.rbModeSampling.text =
+            getModeTextSpan(
+                topText = modeList[1].modeName,
+                bottomText = modeList[1].modeDesc,
+                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+            )
+    }
+
+    /**
+     * 加载制作模式文本样式
+     */
+    private fun loadCookSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+        binding.rbModeCook.text =
+            getModeTextSpan(
+                topText = modeList[0].modeName,
+                bottomText = modeList[0].modeDesc,
+                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+            )
+    }
+
+    /**
+     * 生成模式文本样式
+     */
+    private fun getModeTextSpan(
+        topText: String,
+        topColor: String,
+        bottomText: String,
+        bottomColor: String
+    ): SpannableStringBuilder {
+        return buildSpannableString {
+            appendText(
+                topText,
+                ForegroundColorSpan(topColor.toColorInt()),
+                StyleSpan(Typeface.BOLD),
+                AbsoluteSizeSpan(36, true),
+                LineHeightSpan { text, start, end, spanstartv, v, fm ->
+                    fm.descent += 10.dp // 增加行间距
+                }
+            )
+            append("\n")
+            appendText(
+                bottomText,
+                ForegroundColorSpan(bottomColor.toColorInt()),
+                AbsoluteSizeSpan(26, true)
+            )
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        // 移除称重监听
+        WeightUtil.removeWeightListener(TAG)
+    }
+}

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

@@ -87,8 +87,7 @@ class DishListFragment : BaseFragment<FragmentDishListBinding>() {
         return FragmentDishListBinding.inflate(inflater, container, false)
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+    override fun initialize() {
         activity = requireActivity() as SelectDishActivity
         dinnerType = arguments?.getString(DINNER_TYPE, "0") ?: "0"
         binding.rvDishList.run {