From 0a0c3ff28cfc9b032377cff2e1da1208b0caa331 Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 27 Jan 2023 00:55:06 +0800 Subject: [PATCH] Modify remove some method's param name statement --- .../main/java/com/fankes/miui/notify/params/IconPackParams.kt | 4 ++-- .../com/fankes/miui/notify/utils/factory/FunctionFactory.kt | 4 ++-- .../com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt b/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt index a3475dc..8641e17 100644 --- a/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt +++ b/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt @@ -92,7 +92,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa * @return [String] 拼接后的数据 */ fun splicingJsonArray(dataJson1: String, dataJson2: String) = safeOf(default = "[]") { - dataJson1.replace(oldValue = "]", newValue = "") + "," + dataJson2.replace(oldValue = "[", newValue = "") + dataJson1.replace("]", "") + "," + dataJson2.replace("[", "") } /** @@ -121,7 +121,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa * @param json 数据 * @return [Boolean] */ - fun isHackString(json: String) = json.contains(other = "Checking your browser before accessing") + fun isHackString(json: String) = json.contains("Checking your browser before accessing") /** * 比较图标数据不相等 diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt index 697f710..8a07519 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt @@ -146,7 +146,7 @@ inline val isNotSupportMiuiVersion get() = !isSupportMiuiVersion */ val miuiVersion get() = if (isMIUI) - findPropString(key = "ro.miui.ui.version.name", default = "V无法获取").let { + findPropString("ro.miui.ui.version.name", "V无法获取").let { when (it) { "V110" -> "11" "V11" -> "11" @@ -170,7 +170,7 @@ val miuiVersionCode get() = safeOf(default = 0f) { miuiVersion.toFloat() } * 获取 MIUI 次版本号 * @return [String] */ -val miuiIncrementalVersion get() = findPropString(key = "ro.system.build.version.incremental").trim() +val miuiIncrementalVersion get() = findPropString("ro.system.build.version.incremental").trim() /** * 获取 MIUI 完全版本 diff --git a/app/src/main/java/com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt b/app/src/main/java/com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt index 53d9aa2..3b17faa 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt @@ -120,7 +120,7 @@ object GithubReleaseTool { * 格式化时间为本地时区 * @return [String] 本地时区时间 */ - private fun String.localTime() = replace(oldValue = "T", newValue = " ").replace(oldValue = "Z", newValue = "").let { + private fun String.localTime() = replace("T", " ").replace("Z", "").let { runCatching { val local = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ROOT).apply { timeZone = Calendar.getInstance().timeZone } val current = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ROOT).apply { timeZone = TimeZone.getTimeZone("GMT") }