From 3671cf8661a8d397eff57f27ab3b7c134b18e51a Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Sun, 8 May 2022 15:54:56 +0800
Subject: [PATCH 1/4] 66

---
 .../com/mx/dialog/list/MXBaseListDialog.kt    |  2 +-
 .../java/com/mx/dialog/utils/MXButtonStyle.kt |  2 +-
 .../res/drawable/mx_dialog_btn_bg_upgrade.xml |  4 ++--
 .../src/main/res/layout/mx_content_tip.xml    |  2 +-
 .../src/main/res/layout/mx_dialog_list.xml    |  4 ++--
 .../main/res/layout/mx_dialog_list_item.xml   |  6 +++---
 .../src/main/res/layout/mx_dialog_upgrade.xml | 21 +++++++++----------
 LibDialog/src/main/res/values/dimens.xml      |  6 ++++--
 8 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt b/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
index 4ecbb67..cc2ba0b 100644
--- a/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
@@ -153,7 +153,7 @@ open class MXBaseListDialog(context: Context, fullScreen: Boolean) :
         var maxHeight = mxRootLay.height - mxRootLay.paddingTop - mxRootLay.paddingBottom
         if (cancelBtn?.visibility == View.VISIBLE) {
             maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_action_height)
-            maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_space)
+            maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_small)
         }
         if (titleLay?.visibility == View.VISIBLE) {
             maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_list_item_height)
diff --git a/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt b/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
index fb67f6c..5c53e94 100644
--- a/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
@@ -36,7 +36,7 @@ enum class MXButtonStyle {
             when (style) {
                 Rounded -> {
                     val padding =
-                        context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_space)
+                        context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_small)
                     content.setPadding(padding, padding, padding, padding)
                     cancelBtn?.setBackgroundResource(R.drawable.mx_dialog_btn_bg_cancel_circular)
                     actionBtn?.setBackgroundResource(R.drawable.mx_dialog_btn_bg_action_circular)
diff --git a/LibDialog/src/main/res/drawable/mx_dialog_btn_bg_upgrade.xml b/LibDialog/src/main/res/drawable/mx_dialog_btn_bg_upgrade.xml
index 883b9e4..0756f93 100644
--- a/LibDialog/src/main/res/drawable/mx_dialog_btn_bg_upgrade.xml
+++ b/LibDialog/src/main/res/drawable/mx_dialog_btn_bg_upgrade.xml
@@ -2,13 +2,13 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
         <shape>
-            <corners android:radius="10dp" />
+            <corners android:radius="@dimen/mx_dialog_size_card_corner_radius" />
             <solid android:color="@color/mx_dialog_color_cancel" />
         </shape>
     </item>
     <item>
         <shape>
-            <corners android:radius="10dp" />
+            <corners android:radius="@dimen/mx_dialog_size_card_corner_radius" />
             <solid android:color="@color/mx_dialog_color_action" />
         </shape>
     </item>
diff --git a/LibDialog/src/main/res/layout/mx_content_tip.xml b/LibDialog/src/main/res/layout/mx_content_tip.xml
index c3afdc9..ead784b 100644
--- a/LibDialog/src/main/res/layout/mx_content_tip.xml
+++ b/LibDialog/src/main/res/layout/mx_content_tip.xml
@@ -65,7 +65,7 @@
         android:layout_width="match_parent"
         android:layout_height="65dp"
         android:gravity="center"
-        android:padding="@dimen/mx_dialog_size_divider_space">
+        android:padding="@dimen/mx_dialog_size_divider_small">
 
         <TextView
             android:id="@+id/cancelBtn"
diff --git a/LibDialog/src/main/res/layout/mx_dialog_list.xml b/LibDialog/src/main/res/layout/mx_dialog_list.xml
index c5868e9..8bf77e0 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_list.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_list.xml
@@ -63,7 +63,7 @@
         android:id="@+id/btnLay"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/mx_dialog_size_divider_space">
+        android:layout_marginTop="@dimen/mx_dialog_size_divider_small">
 
         <TextView
             android:id="@+id/cancelBtn"
@@ -74,7 +74,7 @@
 
         <View
             android:id="@+id/btnDivider"
-            android:layout_width="@dimen/mx_dialog_size_divider_space"
+            android:layout_width="@dimen/mx_dialog_size_divider_small"
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
diff --git a/LibDialog/src/main/res/layout/mx_dialog_list_item.xml b/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
index a80b5fd..45afc23 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
@@ -18,8 +18,8 @@
         android:focusableInTouchMode="false"
         android:gravity="center"
         android:minHeight="@dimen/mx_dialog_size_list_item_height"
-        android:paddingHorizontal="@dimen/mx_dialog_size_list_item_padding"
-        android:paddingVertical="@dimen/mx_dialog_size_divider_space"
+        android:paddingHorizontal="@dimen/mx_dialog_size_divider_normal"
+        android:paddingVertical="@dimen/mx_dialog_size_divider_small"
         android:singleLine="true"
         android:text="A"
         android:textColor="@color/mx_dialog_color_text"
@@ -30,7 +30,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="right|center_vertical"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_space"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_small"
         android:clickable="false"
         android:focusable="false"
         android:focusableInTouchMode="false"
diff --git a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
index ee91549..ed2e7ee 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
@@ -3,8 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/mx_dialog_size_divider_space">
+    android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -24,7 +23,7 @@
             android:layout_width="80dp"
             android:layout_height="80dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="@dimen/mx_dialog_size_divider_normal"
             android:src="@drawable/mx_dialog_icon_upgrade"
             android:tint="@color/mx_dialog_color_action" />
     </RelativeLayout>
@@ -33,8 +32,8 @@
         android:id="@+id/titleTxv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_space"
-        android:layout_marginTop="@dimen/mx_dialog_size_divider_space"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
+        android:layout_marginTop="@dimen/mx_dialog_size_divider_small"
         android:text="@string/mx_dialog_upgrade_title"
         android:textColor="@color/mx_dialog_color_text"
         android:textSize="@dimen/mx_dialog_text_size_title"
@@ -44,7 +43,8 @@
         android:id="@+id/msgTxv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/mx_dialog_size_divider_space"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
+        android:layout_marginVertical="@dimen/mx_dialog_size_divider_small"
         android:text="@string/mx_dialog_upgrade_title"
         android:textColor="@color/mx_dialog_color_text"
         android:textSize="@dimen/mx_dialog_text_size_content" />
@@ -54,7 +54,7 @@
         style="@android:style/Widget.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_space"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:max="1000"
@@ -67,12 +67,11 @@
     <TextView
         android:id="@+id/actionBtn"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_space"
-        android:layout_marginBottom="@dimen/mx_dialog_size_divider_space"
+        android:layout_height="@dimen/mx_dialog_size_action_height"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
+        android:layout_marginBottom="@dimen/mx_dialog_size_divider_normal"
         android:background="@drawable/mx_dialog_btn_bg_upgrade"
         android:gravity="center"
-        android:paddingVertical="14dp"
         android:text="立即更新"
         android:textColor="@color/mx_dialog_color_upgrade"
         android:textSize="@dimen/mx_dialog_text_size_button" />
diff --git a/LibDialog/src/main/res/values/dimens.xml b/LibDialog/src/main/res/values/dimens.xml
index 86aa57a..f7b3b3e 100644
--- a/LibDialog/src/main/res/values/dimens.xml
+++ b/LibDialog/src/main/res/values/dimens.xml
@@ -4,10 +4,12 @@
     <dimen name="mx_dialog_text_size_content">15sp</dimen>
     <dimen name="mx_dialog_text_size_button">15sp</dimen>
     <dimen name="mx_dialog_text_size_title">17sp</dimen>
+
+    <dimen name="mx_dialog_size_divider_small">12dp</dimen>
+    <dimen name="mx_dialog_size_divider_normal">20dp</dimen>
+
     <dimen name="mx_dialog_size_card_corner_radius">14dp</dimen>
     <dimen name="mx_dialog_size_progress_img">45dp</dimen>
-    <dimen name="mx_dialog_size_divider_space">12dp</dimen>
-    <dimen name="mx_dialog_size_list_item_padding">25dp</dimen>
     <dimen name="mx_dialog_size_list_item_height">50dp</dimen>
     <dimen name="mx_dialog_size_action_height">45dp</dimen>
 </resources>
\ No newline at end of file
-- 
Gitee


From ae4a17fc3d40d284a928d8d32a91b256544b0ebc Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Sun, 8 May 2022 16:27:25 +0800
Subject: [PATCH 2/4] 666

---
 .../src/main/java/com/mx/dialog/MXDialog.kt   | 25 +----
 .../com/mx/dialog/list/MXBaseListDialog.kt    |  2 +-
 .../com/mx/dialog/upgrade/MXUpgradeDialog.kt  |  9 +-
 .../java/com/mx/dialog/utils/MXButtonStyle.kt |  2 +-
 .../main/res/layout/mx_content_loading.xml    |  2 +-
 .../src/main/res/layout/mx_content_tip.xml    |  4 +-
 .../src/main/res/layout/mx_dialog_list.xml    |  4 +-
 .../main/res/layout/mx_dialog_list_item.xml   |  6 +-
 .../src/main/res/layout/mx_dialog_upgrade.xml | 93 +++++++++++--------
 LibDialog/src/main/res/values/dimens.xml      |  6 +-
 LibDialog/src/main/res/values/strings.xml     |  3 +
 .../main/java/com/mx/example/MainActivity.kt  |  2 +-
 12 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
index f628a53..4a42bce 100644
--- a/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/MXDialog.kt
@@ -48,45 +48,30 @@ object MXDialog {
     }
 
     /**
+     * 显示提示信息，不需要返回操作
      * @param message 内容
      * @param title 标题
      * @param actionButtonText 活动按钮文字
-     * @param cancelButtonText 取消按钮文字
      * @param dismissDelay x秒后弹窗消失
-     * @param cancelable 是否响应返回按钮、是否点击空白处消失
      * @param dialogType Icon类型
-     * @param onActionClick 按钮点击响应
      */
     fun tip(
         context: Context, message: CharSequence, title: CharSequence? = null,
         actionButtonText: CharSequence? = null,
-        onActionClick: ((confirm: Boolean) -> Unit)? = null,
-        cancelable: Boolean = true,
-        cancelButtonText: CharSequence? = null,
-        onCancelListener: (() -> Unit)? = null,
-        dismissDelay: Int? = null, dialogType: MXDialogType? = null
+        dismissDelay: Int? = null, dialogType: MXDialogType? = null,
     ) {
         val dialog = MXTipDialog(context)
         dialog.setTitle(title)
         dialog.setMessage(message)
-        dialog.setCancelable(cancelable)
+        dialog.setCancelable(true)
         dialog.setDismissDelay(dismissDelay)
-
-        if (cancelable) {
-            dialog.setCancelBtn(
-                visible = cancelButtonText != null,
-                text = cancelButtonText
-            ) { onActionClick?.invoke(false) }
-
-            dialog.setOnCancelListener(onCancelListener)
-        }
+        dialog.setCancelBtn(visible = false)
 
         dialog.setActionBtn(
             text = actionButtonText
                 ?: context.resources.getString(R.string.mx_dialog_button_action_text)
-        ) { onActionClick?.invoke(true) }
+        )
         dialog.setTipType(dialogType)
-
         dialog.show()
     }
 
diff --git a/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt b/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
index cc2ba0b..2a451b3 100644
--- a/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/list/MXBaseListDialog.kt
@@ -153,7 +153,7 @@ open class MXBaseListDialog(context: Context, fullScreen: Boolean) :
         var maxHeight = mxRootLay.height - mxRootLay.paddingTop - mxRootLay.paddingBottom
         if (cancelBtn?.visibility == View.VISIBLE) {
             maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_action_height)
-            maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_small)
+            maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_normal)
         }
         if (titleLay?.visibility == View.VISIBLE) {
             maxHeight -= context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_list_item_height)
diff --git a/LibDialog/src/main/java/com/mx/dialog/upgrade/MXUpgradeDialog.kt b/LibDialog/src/main/java/com/mx/dialog/upgrade/MXUpgradeDialog.kt
index 2a6cc40..3a015ea 100644
--- a/LibDialog/src/main/java/com/mx/dialog/upgrade/MXUpgradeDialog.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/upgrade/MXUpgradeDialog.kt
@@ -11,6 +11,7 @@ import android.widget.TextView
 import com.mx.dialog.R
 import com.mx.dialog.base.MXBaseCardDialog
 import com.mx.dialog.utils.MXUtils.asString
+import com.mx.dialog.views.MXRatioFrameLayout
 import kotlin.concurrent.thread
 
 open class MXUpgradeDialog(context: Context, fullScreen: Boolean = false) :
@@ -18,6 +19,7 @@ open class MXUpgradeDialog(context: Context, fullScreen: Boolean = false) :
     private val mHandler = Handler(Looper.getMainLooper())
     private var closeBtn: ImageView? = null
     private var titleTxv: TextView? = null
+    private var contentLay: MXRatioFrameLayout? = null
     private var msgTxv: TextView? = null
     private var progressBar: ProgressBar? = null
     private var actionBtn: TextView? = null
@@ -38,9 +40,12 @@ open class MXUpgradeDialog(context: Context, fullScreen: Boolean = false) :
         setCardBackgroundRadius(16f)
         closeBtn = findViewById(R.id.closeBtn)
         titleTxv = findViewById(R.id.titleTxv)
+        contentLay = findViewById(R.id.contentLay)
         msgTxv = findViewById(R.id.msgTxv)
         progressBar = findViewById(R.id.progressBar)
         actionBtn = findViewById(R.id.actionBtn)
+
+        contentLay?.setMaxHeightRatio(0.5f)
         processInitStage()
     }
 
@@ -119,14 +124,14 @@ open class MXUpgradeDialog(context: Context, fullScreen: Boolean = false) :
     }
 
     private fun processInitStage() {
-        actionBtn?.text = "下载安装"
+        actionBtn?.text = context.getString(R.string.mx_dialog_upgrade_download)
         progressBar?.visibility = View.INVISIBLE
         actionBtn?.isEnabled = true
         actionBtn?.setOnClickListener(downloadClickListener)
     }
 
     private fun processInstallStage() {
-        actionBtn?.text = "下载完成，去安装"
+        actionBtn?.text = context.getString(R.string.mx_dialog_upgrade_install)
         progressBar?.visibility = View.INVISIBLE
         actionBtn?.isEnabled = true
         actionBtn?.setOnClickListener(installClickListener)
diff --git a/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt b/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
index 5c53e94..610d6df 100644
--- a/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
+++ b/LibDialog/src/main/java/com/mx/dialog/utils/MXButtonStyle.kt
@@ -36,7 +36,7 @@ enum class MXButtonStyle {
             when (style) {
                 Rounded -> {
                     val padding =
-                        context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_small)
+                        context.resources.getDimensionPixelOffset(R.dimen.mx_dialog_size_divider_normal)
                     content.setPadding(padding, padding, padding, padding)
                     cancelBtn?.setBackgroundResource(R.drawable.mx_dialog_btn_bg_cancel_circular)
                     actionBtn?.setBackgroundResource(R.drawable.mx_dialog_btn_bg_action_circular)
diff --git a/LibDialog/src/main/res/layout/mx_content_loading.xml b/LibDialog/src/main/res/layout/mx_content_loading.xml
index 9400925..948f746 100644
--- a/LibDialog/src/main/res/layout/mx_content_loading.xml
+++ b/LibDialog/src/main/res/layout/mx_content_loading.xml
@@ -20,7 +20,7 @@
         android:id="@+id/loadingTxv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="@dimen/mx_dialog_size_divider_normal"
         android:gravity="center"
         android:minEms="5"
         android:singleLine="true"
diff --git a/LibDialog/src/main/res/layout/mx_content_tip.xml b/LibDialog/src/main/res/layout/mx_content_tip.xml
index ead784b..35bde1e 100644
--- a/LibDialog/src/main/res/layout/mx_content_tip.xml
+++ b/LibDialog/src/main/res/layout/mx_content_tip.xml
@@ -10,7 +10,7 @@
     <LinearLayout
         android:id="@+id/titleLay"
         android:layout_width="match_parent"
-        android:layout_height="55dp"
+        android:layout_height="@dimen/mx_dialog_size_title_layout_height"
         android:gravity="center_vertical"
         android:paddingHorizontal="15dp">
 
@@ -65,7 +65,7 @@
         android:layout_width="match_parent"
         android:layout_height="65dp"
         android:gravity="center"
-        android:padding="@dimen/mx_dialog_size_divider_small">
+        android:padding="@dimen/mx_dialog_size_divider_normal">
 
         <TextView
             android:id="@+id/cancelBtn"
diff --git a/LibDialog/src/main/res/layout/mx_dialog_list.xml b/LibDialog/src/main/res/layout/mx_dialog_list.xml
index 8bf77e0..38d9141 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_list.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_list.xml
@@ -63,7 +63,7 @@
         android:id="@+id/btnLay"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/mx_dialog_size_divider_small">
+        android:layout_marginTop="@dimen/mx_dialog_size_divider_normal">
 
         <TextView
             android:id="@+id/cancelBtn"
@@ -74,7 +74,7 @@
 
         <View
             android:id="@+id/btnDivider"
-            android:layout_width="@dimen/mx_dialog_size_divider_small"
+            android:layout_width="@dimen/mx_dialog_size_divider_normal"
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
diff --git a/LibDialog/src/main/res/layout/mx_dialog_list_item.xml b/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
index 45afc23..f194534 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_list_item.xml
@@ -18,8 +18,8 @@
         android:focusableInTouchMode="false"
         android:gravity="center"
         android:minHeight="@dimen/mx_dialog_size_list_item_height"
-        android:paddingHorizontal="@dimen/mx_dialog_size_divider_normal"
-        android:paddingVertical="@dimen/mx_dialog_size_divider_small"
+        android:paddingHorizontal="@dimen/mx_dialog_size_divider_large"
+        android:paddingVertical="@dimen/mx_dialog_size_divider_normal"
         android:singleLine="true"
         android:text="A"
         android:textColor="@color/mx_dialog_color_text"
@@ -30,7 +30,7 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_gravity="right|center_vertical"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_small"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
         android:clickable="false"
         android:focusable="false"
         android:focusableInTouchMode="false"
diff --git a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
index ed2e7ee..aaf9e21 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
@@ -5,56 +5,73 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <LinearLayout
+        android:id="@+id/titleLay"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="@dimen/mx_dialog_size_title_layout_height"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:layout_marginLeft="@dimen/mx_dialog_size_divider_normal"
+            android:layout_marginRight="3dp"
+            android:src="@drawable/mx_dialog_icon_upgrade"
+            android:tint="@color/mx_dialog_color_action" />
+
+        <TextView
+            android:id="@+id/titleTxv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/mx_dialog_upgrade_title"
+            android:textColor="@color/mx_dialog_color_text"
+            android:textSize="@dimen/mx_dialog_text_size_title"
+            android:textStyle="bold" />
 
         <ImageView
             android:id="@+id/closeBtn"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="@dimen/mx_dialog_size_title_layout_height"
+            android:layout_height="@dimen/mx_dialog_size_title_layout_height"
             android:layout_alignParentRight="true"
-            android:padding="8dp"
+            android:padding="15dp"
             android:src="@drawable/mx_dialog_icon_close" />
+    </LinearLayout>
 
-        <ImageView
-            android:id="@+id/upgradeImg"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/mx_dialog_size_divider_normal"
-            android:src="@drawable/mx_dialog_icon_upgrade"
-            android:tint="@color/mx_dialog_color_action" />
-    </RelativeLayout>
-
-    <TextView
-        android:id="@+id/titleTxv"
-        android:layout_width="wrap_content"
+    <com.mx.dialog.views.MXRatioFrameLayout
+        android:id="@+id/contentLay"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
-        android:layout_marginTop="@dimen/mx_dialog_size_divider_small"
-        android:text="@string/mx_dialog_upgrade_title"
-        android:textColor="@color/mx_dialog_color_text"
-        android:textSize="@dimen/mx_dialog_text_size_title"
-        android:textStyle="bold" />
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/msgTxv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
-        android:layout_marginVertical="@dimen/mx_dialog_size_divider_small"
-        android:text="@string/mx_dialog_upgrade_title"
-        android:textColor="@color/mx_dialog_color_text"
-        android:textSize="@dimen/mx_dialog_text_size_content" />
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none">
+
+            <TextView
+                android:id="@+id/msgTxv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:paddingHorizontal="@dimen/mx_dialog_size_divider_large"
+                android:paddingVertical="@dimen/mx_dialog_size_divider_normal"
+                android:text="@string/mx_dialog_upgrade_title"
+                android:textColor="@color/mx_dialog_color_text"
+                android:textSize="@dimen/mx_dialog_text_size_content" />
+
+        </ScrollView>
+    </com.mx.dialog.views.MXRatioFrameLayout>
 
     <ProgressBar
         android:id="@+id/progressBar"
         style="@android:style/Widget.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_large"
+        android:layout_marginTop="@dimen/mx_dialog_size_divider_small"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:max="1000"
@@ -68,11 +85,11 @@
         android:id="@+id/actionBtn"
         android:layout_width="match_parent"
         android:layout_height="@dimen/mx_dialog_size_action_height"
-        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_normal"
-        android:layout_marginBottom="@dimen/mx_dialog_size_divider_normal"
+        android:layout_marginHorizontal="@dimen/mx_dialog_size_divider_large"
+        android:layout_marginBottom="@dimen/mx_dialog_size_divider_large"
         android:background="@drawable/mx_dialog_btn_bg_upgrade"
         android:gravity="center"
-        android:text="立即更新"
+        android:text="@string/mx_dialog_upgrade_action"
         android:textColor="@color/mx_dialog_color_upgrade"
         android:textSize="@dimen/mx_dialog_text_size_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/LibDialog/src/main/res/values/dimens.xml b/LibDialog/src/main/res/values/dimens.xml
index f7b3b3e..feda271 100644
--- a/LibDialog/src/main/res/values/dimens.xml
+++ b/LibDialog/src/main/res/values/dimens.xml
@@ -5,11 +5,13 @@
     <dimen name="mx_dialog_text_size_button">15sp</dimen>
     <dimen name="mx_dialog_text_size_title">17sp</dimen>
 
-    <dimen name="mx_dialog_size_divider_small">12dp</dimen>
-    <dimen name="mx_dialog_size_divider_normal">20dp</dimen>
+    <dimen name="mx_dialog_size_divider_small">8dp</dimen>
+    <dimen name="mx_dialog_size_divider_normal">12dp</dimen>
+    <dimen name="mx_dialog_size_divider_large">20dp</dimen>
 
     <dimen name="mx_dialog_size_card_corner_radius">14dp</dimen>
     <dimen name="mx_dialog_size_progress_img">45dp</dimen>
     <dimen name="mx_dialog_size_list_item_height">50dp</dimen>
     <dimen name="mx_dialog_size_action_height">45dp</dimen>
+    <dimen name="mx_dialog_size_title_layout_height">55dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/LibDialog/src/main/res/values/strings.xml b/LibDialog/src/main/res/values/strings.xml
index 226b89d..467eee7 100644
--- a/LibDialog/src/main/res/values/strings.xml
+++ b/LibDialog/src/main/res/values/strings.xml
@@ -3,4 +3,7 @@
     <string name="mx_dialog_button_action_text">确认</string>
     <string name="mx_dialog_button_cancel_text">取消</string>
     <string name="mx_dialog_upgrade_title">发现有新版本</string>
+    <string name="mx_dialog_upgrade_action">立即更新</string>
+    <string name="mx_dialog_upgrade_download">开始下载</string>
+    <string name="mx_dialog_upgrade_install">下载完成，去安装</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/mx/example/MainActivity.kt b/app/src/main/java/com/mx/example/MainActivity.kt
index 285ccf1..b0c7009 100644
--- a/app/src/main/java/com/mx/example/MainActivity.kt
+++ b/app/src/main/java/com/mx/example/MainActivity.kt
@@ -49,7 +49,7 @@ class MainActivity : AppCompatActivity() {
     fun showLoading(view: View) {
         MXUpgradeDialog(this).apply {
             setCancelable(true)
-            setMessage(Html.fromHtml("1:xxx<br />2:xxx<br />3:xxx<br />4:xxx"))
+            setMessage(Html.fromHtml("1:xxx<br />2:xxx<br />3:xxx<br />1:xxx<br />2:xxx<br />3:xxx<br />1:xxx<br />2:xxx<br />3:xxx<br />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",
-- 
Gitee


From 82baef42f1ef2dd0937a9d08d475affcd34ef4db Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Sun, 8 May 2022 16:34:56 +0800
Subject: [PATCH 3/4] 666

---
 .idea/misc.xml                                      | 1 +
 LibDialog/src/main/res/layout/mx_dialog_upgrade.xml | 5 +++++
 app/src/main/java/com/mx/example/MainActivity.kt    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 35de37e..d89d883 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -18,6 +18,7 @@
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_card_bg.xml" value="0.362962962962963" />
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_divider.xml" value="0.118" />
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_divider_space.xml" value="0.38229166666666664" />
+        <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_icon_close.xml" value="0.2465" />
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_icon_error.xml" value="0.4553846153846154" />
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_icon_loading.xml" value="0.4553846153846154" />
         <entry key="..\:/DevProjects/MXDialog/LibDialog/src/main/res/drawable/mx_dialog_icon_select.xml" value="0.18" />
diff --git a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
index aaf9e21..b10b59b 100644
--- a/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
+++ b/LibDialog/src/main/res/layout/mx_dialog_upgrade.xml
@@ -40,6 +40,11 @@
             android:src="@drawable/mx_dialog_icon_close" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/mx_dialog_color_divider" />
+
     <com.mx.dialog.views.MXRatioFrameLayout
         android:id="@+id/contentLay"
         android:layout_width="match_parent"
diff --git a/app/src/main/java/com/mx/example/MainActivity.kt b/app/src/main/java/com/mx/example/MainActivity.kt
index b0c7009..311ef5c 100644
--- a/app/src/main/java/com/mx/example/MainActivity.kt
+++ b/app/src/main/java/com/mx/example/MainActivity.kt
@@ -49,6 +49,7 @@ class MainActivity : AppCompatActivity() {
     fun showLoading(view: View) {
         MXUpgradeDialog(this).apply {
             setCancelable(true)
+            setTitle("发现更新")
             setMessage(Html.fromHtml("1:xxx<br />2:xxx<br />3:xxx<br />1:xxx<br />2:xxx<br />3:xxx<br />1:xxx<br />2:xxx<br />3:xxx<br />4:xxx"))
             setIUpgrade(
                 MXUpgradeImp(
-- 
Gitee


From 534d4435e2b5d2d796b6230e55b34736e7e52f3d Mon Sep 17 00:00:00 2001
From: zhangmengxiong <zmx_final@163.com>
Date: Sun, 8 May 2022 17:17:52 +0800
Subject: [PATCH 4/4] 666

---
 app/src/main/AndroidManifest.xml        | 2 ++
 app/src/main/res/xml/provider_paths.xml | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4293c21..7c87027 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,8 @@
     package="com.mx.example">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
index bf6c7e5..0df7f0e 100644
--- a/app/src/main/res/xml/provider_paths.xml
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <paths>
     <cache-path
-        name="cache"
-        path="download" />
+        name="private_cache"
+        path="/" />
+    
 </paths>
+
-- 
Gitee