修改了配色，添加了解除绑定提示

app/src/main/java/com/sw/platecabinet/fragment/BaseFragment.kt

@@ -12,7 +12,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.platecabinet.R
-import com.sw.platecabinet.view.CustomDialog
+import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
 import kotlinx.coroutines.launch
 
@@ -21,7 +21,7 @@ abstract class BaseFragment<VB : ViewBinding>(
 ) : Fragment() {
     private var _binding: VB? = null
     protected val binding get() = _binding!!
-    private var mDialogWaiting: CustomDialog? = null
+    private var mDialogWaiting: CustomLoadingDialog? = null
     protected val viewModel by viewModels<SettingViewModel>()
 
     override fun onCreateView(
@@ -59,13 +59,12 @@ abstract class BaseFragment<VB : ViewBinding>(
         hideWaitingDialog()
         val view = View.inflate(requireContext(), R.layout.dialog_waiting, null)
         if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text = tip
-        mDialogWaiting = CustomDialog(requireContext(), view, R.style.MyDialog)
+        mDialogWaiting = CustomLoadingDialog(requireContext(), view, R.style.MyDialog)
         mDialogWaiting!!.show()
         mDialogWaiting!!.setCancelable(true)
         return mDialogWaiting
     }
 
-
     /**
      * 隐藏等待提示框
      */

app/src/main/java/com/sw/platecabinet/fragment/BindPlateFragment.kt

@@ -26,7 +26,6 @@ import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.SearchResult
 import com.sw.platecabinet.utils.Debouncer
 import com.sw.platecabinet.utils.KeyboardUtils
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -150,6 +149,17 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
                 false // 未处理其他动作
             }
         }
+        binding.ivSearch.setOnClickListener {
+            debouncer.debounce {
+                // 执行搜索操作
+                viewModel.getSearchMemberList(
+                    param = binding.etUserInfo.text.toString(),
+                    pageNum = 1
+                )
+                // 隐藏键盘
+                KeyboardUtils.hideKeyboard(requireActivity())
+            }
+        }
         binding.llBind.setOnClickListener {
             if (info == null || info!!.equipmentCode?.isEmpty() == true || info!!.equipmentBoxCode?.isEmpty() == true) {
                 ToastUtils.showToast("传入的设备信息异常")
@@ -186,12 +196,12 @@ class BindPlateFragment : BaseFragment<FragmentBindPlateBinding>(
     override fun registerDataChange() {
         super.registerDataChange()
         lifecycleScope.launch {
-            viewModel.searchMemberList.drop(1).collect {
+            viewModel.searchMemberList.collect {
                 adapter.updateData(it)
             }
         }
         lifecycleScope.launch {
-            viewModel.bindStateChange.drop(1).collect {
+            viewModel.bindStateChange.collect {
                 if (it.first == null) return@collect // 解绑状态过滤
                 val errorInfo = it.second
                 if (errorInfo.isSuccess()) {

app/src/main/java/com/sw/platecabinet/fragment/PlateOpenFragment.kt

@@ -30,7 +30,7 @@ class PlateOpenFragment :
         arguments?.let {
             info = it.getParcelable(KEY_ACTION_TYPE)
             info?.let {
-                if (!it.isBound()) {
+                if (!it.hasEquipmentBox()) {
                     binding.ivType.setImageResource(R.drawable.ic_tip_warn)
                     binding.tvTitle.text = "暂无餐盘信息"
                     binding.tvSubTitle.text = "请联系管理员"

app/src/main/java/com/sw/platecabinet/fragment/SettingListFragment.kt

@@ -25,7 +25,6 @@ import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.ListArrangementUtil
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -49,7 +48,7 @@ class SettingListFragment :
     override fun registerDataChange() {
         super.registerDataChange()
         lifecycleScope.launch {
-            viewModel.equipmentList.drop(1).collect { it ->
+            viewModel.equipmentList.collect { it ->
                 Timber.d("registerDateChange updateAdapter it = $it")
                 updateAdapter(it)
             }
@@ -128,7 +127,7 @@ class SettingListFragment :
                 )
             )
             this.llOpen.setBackgroundResource(R.drawable.grid_button_bind)
-            this.tvOpen.setTextColor(resources.getColor(R.color.bind_F0C8B4))
+            this.tvOpen.setTextColor(resources.getColor(R.color.bind_FFCC99))
             this.llBindInfo.visibility = View.VISIBLE
             this.tvUnbind.visibility = View.GONE
 
@@ -136,7 +135,7 @@ class SettingListFragment :
             this.tvLastTime.text = DateTimeUtils.getTimeAgo(date)
         } else {
             this.llRoot.setBackgroundResource(R.drawable.grid_item_unbind)
-            this.tvNum.setTextColor(resources.getColor(R.color.bind_F0C8B4))
+            this.tvNum.setTextColor(resources.getColor(R.color.bind_FFCC99))
             this.llOpen.setBackgroundResource(R.drawable.grid_button_unbind)
             this.tvOpen.setTextColor(resources.getColor(R.color.unbind_32283C))
             this.llBindInfo.visibility = View.GONE

app/src/main/java/com/sw/platecabinet/fragment/UnBindPlateFragment.kt

@@ -1,14 +1,18 @@
 package com.sw.platecabinet.fragment
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import com.sw.inbound.utils.DateTimeUtils
 import com.sw.plate.utils.ToastUtils
+import com.sw.platecabinet.GlobalKey
+import com.sw.platecabinet.activity.UnBindDialogActivity
 import com.sw.platecabinet.databinding.FragmentUnbindPlateBinding
 import com.sw.platecabinet.ext.maskName
 import com.sw.platecabinet.ext.maskPhone
 import com.sw.platecabinet.model.response.EquipmentUserInfo
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 
 /**
@@ -30,6 +34,17 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
             }
     }
 
+    private val dialogLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            viewModel.unbindPlate(
+                equipmentBoxCode = info!!.equipmentBoxCode!!,
+                equipmentCode = info!!.equipmentCode!!
+            )
+        }
+    }
+
     override fun initialize() {
         arguments?.let {
             info = it.getParcelable(ARG_PARAM1)
@@ -45,10 +60,11 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
         }
         binding.llUnbind.setOnClickListener {
             if (info == null) return@setOnClickListener
-            viewModel.unbindPlate(
-                equipmentBoxCode = info!!.equipmentBoxCode!!,
-                equipmentCode = info!!.equipmentCode!!
-            )
+            val intent = Intent(requireContext(), UnBindDialogActivity::class.java).apply {
+                putExtra(GlobalKey.PARAM_EQUIPMENT_INFO, info)
+            }
+            dialogLauncher.launch(intent)
+            requireActivity().overridePendingTransition(0, 0)
         }
         binding.tvBack.setOnClickListener {
             activity?.finish()
@@ -58,12 +74,15 @@ class UnBindPlateFragment private constructor() : BaseFragment<FragmentUnbindPla
     override fun registerDataChange() {
         super.registerDataChange()
         lifecycleScope.launch {
-            viewModel.bindStateChange.drop(1).collect {
+            viewModel.bindStateChange.collect {
                 if (it.first == null) return@collect // 绑定状态过滤
                 val errorInfo = it.second
                 if (errorInfo.isSuccess()) {
                     ToastUtils.showToast("解绑成功")
-                    activity?.finish()
+//                    activity?.finish()
+                    // 关闭宿主 Activity
+                    requireActivity().finish()
+                    requireActivity().overridePendingTransition(0, 0)
                 } else {
                     ToastUtils.showToast(errorInfo.msg)
                 }