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

app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt

@@ -26,13 +26,12 @@ import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.ext.setClickListeners
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.utils.PermissionHelper
-import com.sw.platecabinet.view.CustomDialog
+import com.sw.platecabinet.view.CustomLoadingDialog
 import com.sw.platecabinet.viewmodel.SettingViewModel
 import com.sw.platecabinet.viewmodel.UserViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -44,7 +43,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     private var headerBinding: ItemTitleTimeBinding? = null
     protected lateinit var context: Context
     private var timeJob: Job? = null
-    private var mDialogWaiting: CustomDialog? = null
+    private var mDialogWaiting: CustomLoadingDialog? = null
     private val permissionHelpers = mutableMapOf<Int, PermissionHelper>()
     protected var keyEventHelper: ScanGunKeyEventHelper? = null
 
@@ -181,7 +180,15 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         enforceImmersiveMode()
     }
 
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            disableSystemUICompletely()
+        }
+    }
+
     private fun disableSystemUICompletely() {
+        Timber.d("disableSystemUICompletely")
         // 禁用系统手势（Android 10+）
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             window.insetsController?.systemBarsBehavior =
@@ -206,6 +213,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
 
     private fun enforceImmersiveMode() {
+        Timber.d("enforceImmersiveMode")
         // 持续强制隐藏系统栏（防止手势触发）
         window.decorView.postDelayed({
             window.decorView.systemUiVisibility = (
@@ -223,7 +231,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         hideWaitingDialog()
         val view = View.inflate(this, R.layout.dialog_waiting, null)
         if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).setText(tip)
-        mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
+        mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
         mDialogWaiting!!.show()
         mDialogWaiting!!.setCancelable(true)
         return mDialogWaiting
@@ -259,7 +267,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             }
         }
         lifecycleScope.launch {
-            viewModel.currentUserInfo.drop(1).collect {
+            viewModel.currentUserInfo.collect {
                 if (it == null) return@collect
                 handleLoginSuccess(it, false)
             }
@@ -275,14 +283,14 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             }
         }
         lifecycleScope.launch {
-            settingViewModel.searchUserInfo.drop(1).collect {
+            settingViewModel.searchUserInfo.collect {
                 Timber.d("registerDataChange 管理员 currentUserInfo = $it")
                 if (it == null) return@collect
                 handleLoginSuccess(it, true)
             }
         }
         lifecycleScope.launch {
-            settingViewModel.equipmentList.drop(1).collect {
+            settingViewModel.equipmentList.collect {
                 if (it.isEmpty()) return@collect
                 val unbindList = it.filter { !it.isBound() }
                 if (unbindList.isEmpty()) {
@@ -343,7 +351,6 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     }
 
     override fun onDestroy() {
-        SerialApi.close()
         timeJob?.cancel()
         keyEventHelper?.onDestroy()
         super.onDestroy()

app/src/main/java/com/sw/platecabinet/activity/UnBindDialogActivity.kt

@@ -0,0 +1,54 @@
+package com.sw.platecabinet.activity
+
+import android.graphics.Color
+import android.view.Gravity
+import android.view.ViewGroup
+import androidx.core.graphics.drawable.toDrawable
+import androidx.core.view.WindowCompat
+import com.sw.platecabinet.GlobalKey
+import com.sw.platecabinet.databinding.ActivityUnbindDialogBinding
+import com.sw.platecabinet.databinding.ItemTitleTimeBinding
+import com.sw.platecabinet.ext.dp
+import com.sw.platecabinet.model.response.EquipmentUserInfo
+
+class UnBindDialogActivity : BaseActivity<ActivityUnbindDialogBinding>() {
+    private var equipmentUserInfo: EquipmentUserInfo? = null
+
+    override fun inflateViewBinding(): ActivityUnbindDialogBinding {
+        return ActivityUnbindDialogBinding.inflate(layoutInflater)
+    }
+
+    override fun inflateTitleBinding(): ItemTitleTimeBinding? {
+        return null
+    }
+
+    override fun initialize() {
+        window?.apply {
+            WindowCompat.setDecorFitsSystemWindows(this, false)
+            setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+
+            attributes = attributes.apply {
+                y = 314.dp
+                width = (context.resources.displayMetrics.widthPixels * 0.8).toInt()
+                height = ViewGroup.LayoutParams.MATCH_PARENT
+                gravity = Gravity.CENTER
+            }
+        }
+        equipmentUserInfo =
+            intent.getParcelableExtra<EquipmentUserInfo>(GlobalKey.PARAM_EQUIPMENT_INFO)
+        if (equipmentUserInfo == null) return
+        binding.tvTipInfo.text = "即将解除【${equipmentUserInfo!!.name}】的餐盘"
+        binding.tvCancel.setOnClickListener {
+            finish()
+        }
+        binding.tvConfirm.setOnClickListener {
+            setResult(RESULT_OK)
+            finish()
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(0, 0) // 确保退出也无动画
+    }
+}