From c85da002f58b2d6226172f7b5d1620f667e152e5 Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Mon, 4 Apr 2022 03:13:19 +0800 Subject: [PATCH] Update YukiHookAPI --- README.md | 2 +- app/build.gradle | 6 ++--- .../miui/notify/hook/entity/SystemUIHooker.kt | 22 +++++++++---------- .../utils/factory/DialogBuilderFactory.kt | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 36e96f6..dfa94c7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MIUI 原生通知图标 -[![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/MIUINativeNotifyIcon) +[![Blank](https://img.shields.io/badge/build-pending-dbab09)](https://github.com/fankes/MIUINativeNotifyIcon) [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/LICENSE) [![Blank](https://img.shields.io/badge/version-v2.3-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases) [![Blank](https://img.shields.io/github/downloads/fankes/MIUINativeNotifyIcon/total?label=Release)](https://github.com/fankes/MIUINativeNotifyIcon/releases) diff --git a/app/build.gradle b/app/build.gradle index f7a5a92..ec10491 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { buildTypes { release { - minifyEnabled true + minifyEnabled false signingConfig signingConfigs.debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } @@ -72,8 +72,8 @@ tasks.whenTaskAdded { dependencies { compileOnly 'de.robv.android.xposed:api:82' - implementation 'com.highcapable.yukihookapi:api:1.0.69' - ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.69' + implementation 'com.highcapable.yukihookapi:api:1.0.70' + ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.70' implementation "com.github.topjohnwu.libsu:core:3.1.2" implementation 'androidx.annotation:annotation:1.3.0' implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0' diff --git a/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt index 32fc501..304949c 100644 --- a/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt +++ b/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt @@ -268,7 +268,7 @@ class SystemUIHooker : YukiBaseHooker() { get() = safeOfFalse { NotificationUtilClass.clazz.hasMethod { name = "ignoreStatusBarIconColor" - param(ExpandedNotificationClass.clazz) + param(ExpandedNotificationClass) } } @@ -685,7 +685,7 @@ class SystemUIHooker : YukiBaseHooker() { injectMember { method { name = "shouldSubstituteSmallIcon" - param(ExpandedNotificationClass.clazz) + param(ExpandedNotificationClass) } /** * MIUI 12 在非原生样式下 MIPUSH 的图标着色异常 @@ -698,15 +698,15 @@ class SystemUIHooker : YukiBaseHooker() { var isUseLegacy = false method { name = "getSmallIcon" - param(ExpandedNotificationClass.clazz, IntType) + param(ExpandedNotificationClass, IntType) }.remedys { method { name = "getSmallIcon" - param(ExpandedNotificationClass.clazz) + param(ExpandedNotificationClass) } method { name = "getSmallIcon" - param(ContextClass, ExpandedNotificationClass.clazz) + param(ContextClass, ExpandedNotificationClass) }.onFind { isUseLegacy = true } } afterHook { @@ -757,7 +757,7 @@ class SystemUIHooker : YukiBaseHooker() { }.remedys { method { name = "setNotification" - param(ExpandedNotificationClass.clazz) + param(ExpandedNotificationClass) } } afterHook { @@ -845,7 +845,7 @@ class SystemUIHooker : YukiBaseHooker() { } /** 记录实例 */ injectMember { - constructor { param(ContextClass, ViewClass, ExpandableNotificationRowClass.clazz) } + constructor { param(ContextClass, ViewClass, ExpandableNotificationRowClass) } afterHook { notificationViewWrappers.add(instance) } } } @@ -867,7 +867,7 @@ class SystemUIHooker : YukiBaseHooker() { } /** 记录实例 */ injectMember { - constructor { param(ContextClass, ViewClass, ExpandableNotificationRowClass.clazz) } + constructor { param(ContextClass, ViewClass, ExpandableNotificationRowClass) } afterHook { miuiNotificationViewWrappers.add(instance) } } }.ignoredHookClassNotFoundFailure() @@ -899,11 +899,11 @@ class SystemUIHooker : YukiBaseHooker() { injectMember { method { name = "setAppIcon" - param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz) + param(ContextClass, ImageViewClass, ExpandedNotificationClass) }.remedys { method { name = "setAppIcon" - param(ImageViewClass, ExpandedNotificationClass.clazz) + param(ImageViewClass, ExpandedNotificationClass) } } intercept() @@ -911,7 +911,7 @@ class SystemUIHooker : YukiBaseHooker() { injectMember { method { name = "resetIconBgAndPaddings" - param(ImageViewClass, ExpandedNotificationClass.clazz) + param(ImageViewClass, ExpandedNotificationClass) } intercept() }.ignoredNoSuchMemberFailure() diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt index 29e0752..f93fc75 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt @@ -39,7 +39,7 @@ import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.viewbinding.ViewBinding import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.highcapable.yukihookapi.annotation.DoNotUseField +import com.highcapable.yukihookapi.annotation.CauseProblemsApi import com.highcapable.yukihookapi.hook.factory.method import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass @@ -71,7 +71,7 @@ class DialogBuilder(val context: Context, private val isUseBlackTheme: Boolean) private var dialogInstance: Dialog? = null // 对话框实例 - @DoNotUseField + @CauseProblemsApi var customLayoutView: View? = null // 自定义布局 /**