优化

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

@@ -1,11 +1,11 @@
 package com.sw.dualscreen.activity
 
-import android.app.Dialog
 import android.content.Context
+import android.graphics.drawable.ColorDrawable
 import android.hardware.display.DisplayManager
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.Display
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
@@ -13,19 +13,17 @@ import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.lifecycleScope
 import androidx.viewbinding.ViewBinding
 import com.sw.dualscreen.R
+import com.sw.dualscreen.databinding.DialogWaitingBinding
 import com.sw.dualscreen.model.IActivityResult
 import com.sw.dualscreen.model.response.PostEvent
 import com.sw.dualscreen.view.CustomDialog
 import com.sw.dualscreen.viewmodel.BaseViewModel
-import kotlinx.coroutines.launch
+import com.sw.plate.utils.ToastUtils
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import timber.log.Timber
-
 
 abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
 
@@ -84,17 +82,14 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
     /**
      * 显示等待提示框
      */
-    fun showWaitingDialog(tip: String?){
+    fun showWaitingDialog(tip: String?) {
         runOnUiThread {
             hideWaitingDialog()
-            val view = View.inflate(this, R.layout.dialog_waiting, null)
-            if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).text =
-                tip
-            mDialogWaiting = CustomDialog(this, view, R.style.MyDialog).apply {
-                setCancelable(true)
-                setCanceledOnTouchOutside(true)
-                show()
-            }
+            //val view = View.inflate(this, R.layout.dialog_waiting, null)
+            val dialogBinding = DialogWaitingBinding.inflate(LayoutInflater.from(this))
+            dialogBinding.tvTip.text = tip
+            mDialogWaiting = CustomDialog(this, dialogBinding.root)
+            mDialogWaiting?.show()
         }
     }
 
@@ -113,8 +108,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
             hideWaitingDialog()
             val view = View.inflate(this, R.layout.dialog_waiting, null)
             mDialogWaiting = CustomDialog(this, view, R.style.MyDialog)
-            mDialogWaiting!!.show()
-            mDialogWaiting!!.setCancelable(true)
+            mDialogWaiting?.show()
         }
         val contentView = mDialogWaiting?.findViewById<ViewGroup>(android.R.id.content)
         val tvTip = contentView?.findViewById<TextView>(R.id.tvTip)