From c96a3660d8257820c55bc3f1429c07adc364fe7d Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Tue, 05 Aug 2025 12:57:13 +0000
Subject: [PATCH] 加解密优化

---
 libmvi/src/main/java/com/runt/open/mvi/views/PublicViews.kt |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libmvi/src/main/java/com/runt/open/mvi/views/PublicViews.kt b/libmvi/src/main/java/com/runt/open/mvi/views/PublicViews.kt
index f13f6dc..6cf1b26 100644
--- a/libmvi/src/main/java/com/runt/open/mvi/views/PublicViews.kt
+++ b/libmvi/src/main/java/com/runt/open/mvi/views/PublicViews.kt
@@ -1,5 +1,6 @@
 package com.runt.open.mvi.views
 
+import android.util.Log
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -72,10 +73,13 @@
 fun MessageDialog(message : MessageState){
     if(message.isVisible){
         Dialog(onDismissRequest = {
-            if(message.cancelDissmiss){
+            //系统响应
+            Log.i("PublicViews" , "MessageDialog: onDismiss")
+            if(message.touchOutside){
                 message.setDismiss.invoke()
+                message.onCancelRequest.invoke()
+                message.onDismissRequest.invoke()
             }
-            message.onDismissRequest.invoke()
         }) {
             Card(
                 modifier = Modifier
@@ -104,10 +108,11 @@
                         if(!message.cancelText.equals("")){
                             Spacer(modifier = Modifier.weight(1f))
                             Button(onClick = {
+                                message.onCancelRequest.invoke()
                                 if(message.cancelDissmiss){
                                     message.setDismiss.invoke()
+                                    message.onDismissRequest.invoke()
                                 }
-                                message.onCancelRequest.invoke()
                             },
                                 colors = ButtonDefaults.buttonColors(
                                     containerColor = Color.Gray,      // 背景色
@@ -119,10 +124,11 @@
                         }
                         Spacer(modifier = Modifier.weight(1f))
                         Button(onClick = {
+                            message.onConfirmRequest.invoke()
                             if(message.confirmDissmiss){
                                 message.setDismiss.invoke()
+                                message.onDismissRequest.invoke()
                             }
-                            message.onConfirmRequest.invoke()
                         }) {
                             Text(text = message.confirmText)
                         }

--
Gitblit v1.9.1