From 492073f7915a0e944ee9ab24d74e283d2f1f01a8 Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Tue, 12 Sep 2023 10:50:39 +0800
Subject: [PATCH 1/2] 1.6.2

---
 .idea/gradle.xml                                  |  1 +
 .idea/kotlinc.xml                                 |  6 ++++++
 .idea/misc.xml                                    |  2 +-
 LibDialog/src/main/java/com/mx/dialog/MXDialog.kt | 13 ++++++-------
 app/build.gradle                                  | 10 +++++-----
 build.gradle                                      |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 920ef7e..a4029a3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..e1eea1d
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.7.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8b6e409..d87ec42 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -49,7 +49,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index cca12fd..37e51be 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -9,7 +9,6 @@ import com.mx.dialog.tip.MXTipDialog
 import com.mx.dialog.utils.IMXLifecycle
 import com.mx.dialog.utils.MXUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 
 object MXDialog {
@@ -46,6 +45,7 @@ object MXDialog {
         actionButtonText: CharSequence? = null,
         cancelButtonText: CharSequence? = null,
         cancelable: Boolean = true,
+        cancelableOnTouchOutside: Boolean = true,
         maxContentRatio: Float = 1f,
         onActionClick: ((confirm: Boolean) -> Unit)? = null
     ): MXTipDialog {
@@ -54,6 +54,7 @@ object MXDialog {
         dialog.setMessage(message)
         dialog.setMaxContentRatio(maxContentRatio)
         dialog.setCancelable(cancelable)
+        dialog.setCanceledOnTouchOutside(cancelableOnTouchOutside)
         dialog.setActionBtn(text = actionButtonText) { onActionClick?.invoke(true) }
         if (cancelable) {
             dialog.setCancelBtn(text = cancelButtonText) {
@@ -75,17 +76,15 @@ object MXDialog {
         actionButtonText: CharSequence? = null,
         cancelButtonText: CharSequence? = null,
         cancelable: Boolean = true,
+        cancelableOnTouchOutside: Boolean = true,
         maxContentRatio: Float = 1f
     ): Boolean = withContext(Dispatchers.Main) {
         var hasConfirm = false
         val lock = Object()
         confirm(
-            context,
-            message,
-            title,
-            actionButtonText,
-            cancelButtonText,
-            cancelable,
+            context, message, title,
+            actionButtonText, cancelButtonText,
+            cancelable, cancelableOnTouchOutside,
             maxContentRatio
         ) { confirm ->
             hasConfirm = confirm
diff --git a/app/build.gradle b/app/build.gradle
index 353793e..e1048aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,12 +36,12 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
 
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0'
 
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.squareup.okio:okio:2.10.0'
diff --git a/build.gradle b/build.gradle
index e8634cb..db7e90f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,5 +32,5 @@ ext {
     minSdkVersion = 19
 
     versionCode = 1
-    versionName = "1.6.1"
+    versionName = "1.6.2"
 }
\ No newline at end of file
-- 
Gitee


From ff1ae1a2e7a800c2a3b1a237d18f52ed2b69e43b Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Tue, 12 Sep 2023 10:50:53 +0800
Subject: [PATCH 2/2] Update build.gradle

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e1048aa..1d9176f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
 
-- 
Gitee