diff --git a/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt b/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt index 0189eec..47db891 100644 --- a/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt +++ b/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt @@ -47,6 +47,7 @@ import com.fankes.tsbattery.hook.factory.startModuleSettings import com.fankes.tsbattery.hook.helper.DexKitHelper import com.fankes.tsbattery.utils.factory.appVersionName import com.fankes.tsbattery.utils.factory.dp +import com.highcapable.kavaref.KavaRef.Companion.asResolver import com.highcapable.kavaref.KavaRef.Companion.resolve import com.highcapable.kavaref.extension.ArrayClass import com.highcapable.kavaref.extension.VariousClass @@ -150,7 +151,7 @@ object QQTIMHooker : YukiBaseHooker() { * @return [Activity] or null */ private fun Any.compatToActivity() = if (this !is Activity) - resolve().optional().firstMethodOrNull { name = "getActivity"; superclass() }?.invoke() + asResolver().optional().firstMethodOrNull { name = "getActivity"; superclass() }?.invoke() else this /** 使用 DexKit 进行搜索 */ @@ -496,13 +497,13 @@ object QQTIMHooker : YukiBaseHooker() { */ private fun hookQQSettingsUiLegacy(instance: Any?) { /** 当前的顶级 Item 实例 */ - val formItemRefRoot = instance?.resolve()?.optional()?.lastFieldOrNull { + val formItemRefRoot = instance?.asResolver()?.optional()?.lastFieldOrNull { type { it == FormSimpleItemClass || it == FormCommonSingleLineItemClass } }?.get() /** 创建一个新的 Item */ val item = FormSimpleItemClass?.createInstanceAsTypeOrNull(instance?.compatToActivity()) - item?.resolve()?.optional()?.apply { + item?.asResolver()?.optional()?.apply { firstMethodOrNull { name = "setLeftText" parameters(CharSequence::class) diff --git a/app/src/main/java/com/fankes/tsbattery/hook/entity/WeChatHooker.kt b/app/src/main/java/com/fankes/tsbattery/hook/entity/WeChatHooker.kt index 85af93a..d084685 100644 --- a/app/src/main/java/com/fankes/tsbattery/hook/entity/WeChatHooker.kt +++ b/app/src/main/java/com/fankes/tsbattery/hook/entity/WeChatHooker.kt @@ -42,6 +42,7 @@ import com.fankes.tsbattery.utils.factory.absoluteStatusBarHeight import com.fankes.tsbattery.utils.factory.appVersionCode import com.fankes.tsbattery.utils.factory.appVersionName import com.fankes.tsbattery.utils.factory.dp +import com.highcapable.kavaref.KavaRef.Companion.asResolver import com.highcapable.kavaref.KavaRef.Companion.resolve import com.highcapable.yukihookapi.hook.entity.YukiBaseHooker import com.highcapable.yukihookapi.hook.factory.injectModuleAppResources @@ -125,7 +126,7 @@ object WeChatHooker : YukiBaseHooker() { name = "get_fragment" emptyParameters() superclass() - }?.of(instance)?.invoke()?.resolve()?.optional()?.firstMethodOrNull { + }?.of(instance)?.invoke()?.asResolver()?.optional()?.firstMethodOrNull { name = "getView" emptyParameters() returnType = View::class diff --git a/app/src/main/java/com/fankes/tsbattery/hook/factory/BasicHookFactory.kt b/app/src/main/java/com/fankes/tsbattery/hook/factory/BasicHookFactory.kt index aa29591..690a8a7 100644 --- a/app/src/main/java/com/fankes/tsbattery/hook/factory/BasicHookFactory.kt +++ b/app/src/main/java/com/fankes/tsbattery/hook/factory/BasicHookFactory.kt @@ -30,6 +30,7 @@ import com.fankes.tsbattery.const.JumpEvent import com.fankes.tsbattery.const.PackageName import com.fankes.tsbattery.hook.entity.QQTIMHooker.toClass import com.fankes.tsbattery.ui.activity.parasitic.ConfigActivity +import com.highcapable.kavaref.KavaRef.Companion.asResolver import com.highcapable.kavaref.KavaRef.Companion.resolve import com.highcapable.kavaref.extension.VariousClass import com.highcapable.yukihookapi.YukiHookAPI @@ -53,7 +54,7 @@ fun Context.isQQNightMode(): Boolean { name = "sMobileQQ" superclass() }?.get() - val mAppRuntime = sMobileQQ?.resolve() + val mAppRuntime = sMobileQQ?.asResolver() ?.optional() ?.firstFieldOrNull { name = "mAppRuntime" diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index b5d67c2..55f41f7 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -48,9 +48,9 @@ libraries: version-ref: ::api com.highcapable.kavaref: kavaref-core: - version: 1.0.0 + version: 1.0.1 kavaref-extension: - version: 1.0.0 + version: 1.0.1 com.highcapable.hikage: hikage-core: version: 1.0.1