From af13a92ef447e7a0e6e226935c30c7a7e7659708 Mon Sep 17 00:00:00 2001 From: zhangmengxiong Date: Tue, 18 Oct 2022 14:27:59 +0800 Subject: [PATCH 1/2] 1.5.9 --- .../main/res/layout/mx_content_loading.xml | 1 - .../main/java/com/mx/example/MainActivity.kt | 30 ++++++++++--------- build.gradle | 4 +-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/LibDialog/src/main/res/layout/mx_content_loading.xml b/LibDialog/src/main/res/layout/mx_content_loading.xml index acd6477..e80d714 100644 --- a/LibDialog/src/main/res/layout/mx_content_loading.xml +++ b/LibDialog/src/main/res/layout/mx_content_loading.xml @@ -2,7 +2,6 @@ 2:xxx
3:xxx
1:xxx
2:xxx
3:xxx
1:xxx
2:xxx
3:xxx
4:xxx")) - setIUpgrade( - MXUpgradeImp( - "https://5a694755beae180ed219fdf5d2238691.rdt.tfogc.com:49156/dldir1.qq.com/weixin/android/weixin8022android2140_arm64.apk?mkey=6273e8db6676c7899fedb5fcebc4779b&arrive_key=302432739767&cip=175.10.24.12&proto=https", - this@MainActivity - ) - ) - -// setIndeterminateDrawable(resources.getDrawable(com.mx.dialog.R.drawable.mx_dialog_icon_error)) -// setMessage("我在加载中... ${MXProgressDialog.REPLACE_PROGRESS}") - }.show() +// MXUpgradeDialog(this).apply { +// setCancelable(true) +// setTitle("发现更新") +// setMessage(Html.fromHtml("1:xxx
2:xxx
3:xxx
1:xxx
2:xxx
3:xxx
1:xxx
2:xxx
3:xxx
4:xxx")) +// setIUpgrade( +// MXUpgradeImp( +// "https://5a694755beae180ed219fdf5d2238691.rdt.tfogc.com:49156/dldir1.qq.com/weixin/android/weixin8022android2140_arm64.apk?mkey=6273e8db6676c7899fedb5fcebc4779b&arrive_key=302432739767&cip=175.10.24.12&proto=https", +// this@MainActivity +// ) +// ) +// +//// setIndeterminateDrawable(resources.getDrawable(com.mx.dialog.R.drawable.mx_dialog_icon_error)) +//// setMessage("我在加载中... ${MXProgressDialog.REPLACE_PROGRESS}") +// }.show() + MXLoadingDialog(this).show() } fun showToast(view: View) { diff --git a/build.gradle b/build.gradle index f423acd..f3681b3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.7.10" + ext.kotlin_version = "1.7.20" repositories { maven { url 'https://maven.aliyun.com/repository/google' } maven { url 'https://maven.aliyun.com/repository/public' } @@ -34,5 +34,5 @@ ext { minSdkVersion = 19 versionCode = 1 - versionName = "1.5.8" + versionName = "1.5.9" } \ No newline at end of file -- Gitee From 2f75d2db02227f488288b3b212fc10e718c1455a Mon Sep 17 00:00:00 2001 From: zhangmengxiong Date: Tue, 18 Oct 2022 14:30:01 +0800 Subject: [PATCH 2/2] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f3681b3..47ca88f 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' -- Gitee