Modify merge to YukiHookAPI new usage

This commit is contained in:
2023-01-27 00:51:21 +08:00
parent 3b174899bc
commit de25660879
5 changed files with 8 additions and 7 deletions

View File

@@ -36,7 +36,7 @@ import com.highcapable.yukihookapi.hook.log.loggerW
import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit
@InjectYukiHookWithXposed(isUsingResourcesHook = false) @InjectYukiHookWithXposed(isUsingResourcesHook = false)
class HookEntry : IYukiHookXposedInit { object HookEntry : IYukiHookXposedInit {
override fun onInit() = configs { override fun onInit() = configs {
debugLog { tag = "MIUINativeNotifyIcon" } debugLog { tag = "MIUINativeNotifyIcon" }

View File

@@ -641,7 +641,7 @@ object SystemUIHooker : YukiBaseHooker() {
/** 必要的延迟防止 Sp 存储不刷新 */ /** 必要的延迟防止 Sp 存储不刷新 */
SystemClock.sleep(100) SystemClock.sleep(100)
/** 获取可读写状态 */ /** 获取可读写状态 */
return prefs.isXSharePrefsReadable.also { return prefs.isPreferencesAvailable.also {
isUsingCachingMethod = true isUsingCachingMethod = true
prefs.clearCache() prefs.clearCache()
cachingIconDatas() cachingIconDatas()
@@ -907,7 +907,7 @@ object SystemUIHooker : YukiBaseHooker() {
/** 自动检查通知图标优化更新的注入监听 */ /** 自动检查通知图标优化更新的注入监听 */
MiuiClockClass.hook { MiuiClockClass.hook {
injectMember { injectMember {
method { name = "updateTime" }.remedys { method { name = "updateClock" } } method { name { it == "updateTime" || it == "updateClock" } }
afterHook { afterHook {
instance<View>().context.also { instance<View>().context.also {
/** 注册定时监听 */ /** 注册定时监听 */

View File

@@ -336,7 +336,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
else -> "模块未激活" else -> "模块未激活"
} }
binding.mainTextApiWay.isVisible = YukiHookAPI.Status.isXposedModuleActive binding.mainTextApiWay.isVisible = YukiHookAPI.Status.isXposedModuleActive
binding.mainTextApiWay.text = "Activated by ${YukiHookAPI.Status.executorName} API ${YukiHookAPI.Status.executorVersion}" binding.mainTextApiWay.text = "Activated by ${YukiHookAPI.Status.Executor.name} API ${YukiHookAPI.Status.Executor.apiLevel}"
} }
override fun onResume() { override fun onResume() {

View File

@@ -55,7 +55,7 @@ import com.google.android.material.snackbar.Snackbar
import com.highcapable.yukihookapi.hook.factory.hasClass import com.highcapable.yukihookapi.hook.factory.hasClass
import com.highcapable.yukihookapi.hook.factory.method import com.highcapable.yukihookapi.hook.factory.method
import com.highcapable.yukihookapi.hook.factory.toClassOrNull import com.highcapable.yukihookapi.hook.factory.toClassOrNull
import com.highcapable.yukihookapi.hook.type.java.StringType import com.highcapable.yukihookapi.hook.type.java.StringClass
import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication.Companion.appContext import com.highcapable.yukihookapi.hook.xposed.application.ModuleApplication.Companion.appContext
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
@@ -447,7 +447,7 @@ fun Bitmap.round(radius: Float): Bitmap = safeOf(default = this) {
fun findPropString(key: String, default: String = "") = safeOf(default) { fun findPropString(key: String, default: String = "") = safeOf(default) {
"android.os.SystemProperties".toClassOrNull()?.method { "android.os.SystemProperties".toClassOrNull()?.method {
name = "get" name = "get"
param(StringType, StringType) param(StringClass, StringClass)
}?.get()?.invoke(key, default) ?: default }?.get()?.invoke(key, default) ?: default
} }

View File

@@ -59,7 +59,8 @@ object SystemUITool {
* @param context 实例 * @param context 实例
* @param result 成功后回调 * @param result 成功后回调
*/ */
fun checkingActivated(context: Context, result: (Boolean) -> Unit) = context.dataChannel(SYSTEMUI_PACKAGE_NAME).checkingVersionEquals(result) fun checkingActivated(context: Context, result: (Boolean) -> Unit) =
context.dataChannel(SYSTEMUI_PACKAGE_NAME).checkingVersionEquals(result = result)
/** /**
* 重启系统界面 * 重启系统界面