From 889092dd3dc7969481f8842af428f50ae48010da Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Fri, 27 Jan 2023 01:03:09 +0800 Subject: [PATCH] Modify remove some method's param name statement --- .../com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt | 2 +- .../java/com/fankes/coloros/notify/param/IconPackParams.kt | 4 ++-- .../fankes/coloros/notify/utils/factory/FunctionFactory.kt | 4 +--- .../com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt index 1dee83b..502afbd 100644 --- a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt +++ b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt @@ -498,7 +498,7 @@ object SystemUIHooker : YukiBaseHooker() { if (isTint) view?.backgroundTintList = ColorStateList.valueOf(currendColor) else drawable?.setTint(currendColor) } - isTint.not() && view?.parent?.parent?.javaClass?.name?.contains(other = "ChildrenContainer") == true -> drawable?.alpha = 0 + isTint.not() && view?.parent?.parent?.javaClass?.name?.contains("ChildrenContainer") == true -> drawable?.alpha = 0 else -> { currendColor.colorAlphaOf(currentAlpha / 100f).also { if (isTint) view?.backgroundTintList = ColorStateList.valueOf(it) diff --git a/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt b/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt index 202f27f..768e840 100644 --- a/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt +++ b/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt @@ -146,7 +146,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("[", "") } /** @@ -175,7 +175,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/coloros/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt index 965ad7f..6717bbb 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt @@ -157,9 +157,7 @@ val colorOSNumberVersion "com.oplus.os.OplusBuild".toClassOrNull()?.let { it.field { name = "VERSIONS" }.ignored().get().array().takeIf { e -> e.isNotEmpty() } ?.get(it.method { name = "getOplusOSVERSION" }.ignored().get().int() - 1) - } ?: findPropString( - key = "ro.system.build.fingerprint", default = "无法获取" - ).split("ssi:")[1].split("/")[0].trim() + } ?: findPropString("ro.system.build.fingerprint", "无法获取").split("ssi:")[1].split("/")[0].trim() } /** diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt b/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt index 1dbf9f2..a62239a 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/tool/GithubReleaseTool.kt +++ b/app/src/main/java/com/fankes/coloros/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") }