升级工具库

Author: chenhao

SmartCode/build.gradle

@@ -132,7 +132,7 @@ dependencies {
     }
 
     api 'com.qmuiteam:qmui:1.4.3'
-    api 'com.blankj:utilcodex:1.26.0'
+    api 'com.blankj:utilcodex:1.30.6'
     api 'me.jessyan:autosize:1.2.1'
     api 'me.jessyan:retrofit-url-manager:1.4.0'
     api 'com.tencent:mmkv-static:1.2.9'

SmartCode/src/main/java/ch/smart/code/util/UIExt.kt

@@ -37,8 +37,7 @@ import java.util.concurrent.TimeUnit
 fun showToast(msg: String, @DrawableRes iconId: Int? = null) {
     try {
         if (msg.isNotEmpty()) {
-            ToastUtils.setGravity(Gravity.CENTER, 0, 0)
-            val v: View = ToastUtils.showCustomLong(R.layout.public_layout_toast)
+            val v: View = View.inflate(Utils.getApp(), R.layout.public_layout_toast, null)
             val vIcon: ImageView = v.findViewById(R.id.public_toast_icon)
             val vTxt: TextView = v.findViewById(R.id.public_toast_txt)
             if (iconId != null) {
@@ -48,6 +47,9 @@ fun showToast(msg: String, @DrawableRes iconId: Int? = null) {
                 vIcon.visibility = View.GONE
             }
             vTxt.text = msg
+            ToastUtils.getDefaultMaker()
+                .setGravity(Gravity.CENTER, 0, 0)
+                .show(v)
         }
     } catch (e: Exception) {
         Timber.e(e)

SmartCode/src/main/java/ch/smart/code/util/VersionCheck.kt

@@ -25,7 +25,8 @@ class VersionCheck(
     private val nowVersionCode: Int,
     private val nowVersionName: String,
     private val buildVersionNum: Int = 0,
-    private val needForceUpdate: Boolean = false
+    private val needForceUpdate: Boolean = false,
+    private val needForceDescRule: String = "强制更新"
 ) {
 
     interface Api {
@@ -92,11 +93,12 @@ class VersionCheck(
                                     if ((versionNo > nowVersionCode || buildVersionNum in 1 until versionBB)
                                         && url?.isStartsWithHttp() == true
                                     ) {
+                                        val desc =
+                                            data.get("buildUpdateDescription")?.asString ?: ""
                                         map["url"] = url
                                         map["name"] = data.get("buildVersion")?.asString ?: ""
-                                        map["desc"] =
-                                            data.get("buildUpdateDescription")?.asString ?: ""
-                                        if (needForceUpdate || versionNo - nowVersionCode > 1) {
+                                        map["desc"] = desc
+                                        if (needForceUpdate || desc.contains(needForceDescRule)) {
                                             map["force"] = "true"
                                         }
                                     }