desc:按键取消dialog

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt

@@ -53,8 +53,6 @@ abstract class BaseActivity : AppCompatActivity() {
 
     var lastFocusView: View? = null
 
-    var lastDialogCancelable = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         setViewFactory()
         super.onCreate(null)
@@ -143,7 +141,6 @@ abstract class BaseActivity : AppCompatActivity() {
             loadingDialog = CommonDialog(resId)
             loadingDialog!!.isCancelable = cancelable
             loadingDialog!!.show(supportFragmentManager, "loading")
-            lastDialogCancelable = cancelable
         }
     }
 
@@ -156,7 +153,6 @@ abstract class BaseActivity : AppCompatActivity() {
         lifecycleScope.launchWhenResumed {
             loadingDialog?.dismiss()
             loadingDialog = null
-            lastDialogCancelable = false
         }
     }
 
@@ -238,9 +234,6 @@ abstract class BaseActivity : AppCompatActivity() {
     var isLeftRightLongPress = false
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
 //        LogUtils.w("cyy dispatchKeyEvent keyCode = ${event?.keyCode} count = ${event?.repeatCount} acton = ${event?.action}")
-        if (lastDialogCancelable){
-            closeLoadingDialog()
-        }
         val action = event.action
         if (KeyEvent.ACTION_DOWN == action) {
             return dealActionDown(event)

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonDialog.kt

@@ -25,6 +25,13 @@ class CommonDialog(private val tipResID:Int = R.string.sync_data_tip) : DialogFr
     ): View? {
         dialogBinding = LayoutSyncDialogBinding.inflate(inflater, container, false)
         dialogBinding!!.tip.text = getString(tipResID)
+        this.dialog?.setOnKeyListener { dialog, keyCode, event ->
+            if (isCancelable) {
+                dialog.dismiss()
+                return@setOnKeyListener true
+            }
+            return@setOnKeyListener false
+        }
         return dialogBinding!!.root
     }