diff --git a/app/build.gradle b/app/build.gradle index efe4fdc..45a75a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,8 +72,8 @@ tasks.whenTaskAdded { dependencies { compileOnly 'de.robv.android.xposed:api:82' - implementation 'com.highcapable.yukihookapi:api:1.0.6' - ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.6' + implementation 'com.highcapable.yukihookapi:api:1.0.65' + ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.65' implementation 'com.github.tiann:FreeReflection:3.1.0' implementation "com.github.topjohnwu.libsu:core:3.1.2" implementation 'androidx.annotation:annotation:1.3.0' diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt index f3a26f7..630f413 100644 --- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt +++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt @@ -271,10 +271,10 @@ class HookEntry : YukiHookXposedInitProxy { drawable = iconDrawable ).also { pair -> /** 得到图标圆角 */ - val sRadius = sRadiusField.of(it) + val sRadius = sRadiusField.ofFloat(it) /** 得到缩放大小 */ - val sNfSize = sNfSizeField.of(it) + val sNfSize = sNfSizeField.ofInt(it) /** 在主线程设置图标 */ it.post { it.setImageDrawable(roundUtil.invoke(pair.first, sRadius, sNfSize, sNfSize, it.context)) } } @@ -306,7 +306,7 @@ class HookEntry : YukiHookXposedInitProxy { }.get(it.method { name = "getInstance" param(ContextClass) - }.get().invoke(context)).invoke(drawable) ?: false + }.get().invoke(context)).callBoolean(drawable) } /** 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 9d207ef..f6730d2 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 @@ -137,7 +137,7 @@ val colorOSVersion get() = safeOf(default = "无法获取") { (classOf(name = "com.oplus.os.OplusBuild").let { it.field { name = "VERSIONS" }.ignoredError().of>() - ?.get((it.method { name = "getOplusOSVERSION" }.ignoredError().get().invoke() ?: 23) - 1) + ?.get(it.method { name = "getOplusOSVERSION" }.ignoredError().get().callInt() - 1) } ?: findPropString( key = "ro.system.build.fingerprint", default = "无法获取" ).split("ssi:")[1].split("/")[0].trim()) + " ${Build.DISPLAY}"