完善还钥匙弹框逻辑

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -382,12 +382,21 @@ object BusinessManager {
         val ctx = ActivityUtils.currentActivity() as BaseActivity<*>
         val dlg = TipDialog(ctx)
         dlg.setTip(ctx.getString(R.string.key_return_tip))
+        // 加个选择判断，如果是直接取消弹框而不是点击“取消”，当成取消
+        var state = 0
         dlg.setConfirmListener {
+            state = 1
             onConfirm.invoke()
         }
         dlg.setCancelListener {
+            state = 2
             onCancel.invoke()
         }
+        dlg.setOnDismissListener {
+            if (state == 0) {
+                onCancel.invoke()
+            }
+        }
         dlg.show()
     }
 

app/src/main/java/com/grkj/iscs/view/dialog/TipDialog.kt

@@ -28,13 +28,13 @@ class TipDialog(ctx: Context) : BaseDialog<DialogTipBinding>(ctx) {
 
     override fun initView() {
         mBinding?.btnConfirm?.setOnClickListener {
-            dismiss()
             confirmListener?.invoke()
+            dismiss()
         }
 
         mBinding?.btnCancel?.setOnClickListener {
-            dismiss()
             cancelListener?.invoke()
+            dismiss()
         }
     }