From fd6ac454cf68162446a3e9c90156b0a5cb8742f4 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Tue, 22 Mar 2022 23:55:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=B0=8F=E5=9B=BE=E6=A0=87=E8=A2=AB=E7=A0=B4?=
 =?UTF-8?q?=E5=9D=8F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fankes/coloros/notify/hook/HookEntry.kt   | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

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 0e908a3..15eed75 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
@@ -26,6 +26,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.Icon
 import android.graphics.drawable.VectorDrawable
@@ -223,13 +224,13 @@ class HookEntry : YukiHookXposedInitProxy {
      * @param isGrayscaleIcon 是否为灰度图标
      * @param packageName APP 包名
      * @param drawable 原始图标
-     * @return [Bitmap]
+     * @return [Pair] - ([Drawable] 图标,[Boolean] 是否替换)
      */
     private fun PackageParam.compatStatusIcon(context: Context, isGrayscaleIcon: Boolean, packageName: String, drawable: Drawable) =
         compatCustomIcon(isGrayscaleIcon, packageName).first.also {
             /** 打印日志 */
             printLogcat(tag = "StatusIcon", context, packageName, isCustom = it != null, isGrayscaleIcon)
-        } ?: drawable.toBitmap()
+        }?.let { Pair(BitmapDrawable(context.resources, it), true) } ?: Pair(drawable, false)
 
     /**
      * 自动适配通知栏小图标
@@ -376,24 +377,21 @@ class HookEntry : YukiHookXposedInitProxy {
                                             name = "getSbn"
                                         }.get(firstArgs).invoke<StatusBarNotification>()?.also { nf ->
                                             nf.notification.smallIcon.loadDrawable(context).also { iconDrawable ->
-                                                StatusBarIconClass.clazz.field {
-                                                    name = "icon"
-                                                    type = IconClass
-                                                }.get(result).set(
-                                                    Icon.createWithBitmap(
-                                                        compatStatusIcon(
-                                                            context = context,
-                                                            isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable),
-                                                            packageName = nf.packageName,
-                                                            drawable = iconDrawable
-                                                        )
-                                                    ).apply {
-                                                        /** 刷新图标缓存 */
-                                                        if (nf.packageName == MODULE_PACKAGE_NAME &&
-                                                            nf.notification.channelId == IconRuleManagerTool.NOTIFY_CHANNEL
-                                                        ) cachingIconDatas()
-                                                    }
-                                                )
+                                                compatStatusIcon(
+                                                    context = context,
+                                                    isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable),
+                                                    packageName = nf.packageName,
+                                                    drawable = iconDrawable
+                                                ).also { pair ->
+                                                    if (pair.second) StatusBarIconClass.clazz.field {
+                                                        name = "icon"
+                                                        type = IconClass
+                                                    }.get(result).set(Icon.createWithBitmap(pair.first.toBitmap()))
+                                                    /** 刷新图标缓存 */
+                                                    if (nf.packageName == MODULE_PACKAGE_NAME &&
+                                                        nf.notification.channelId == IconRuleManagerTool.NOTIFY_CHANNEL
+                                                    ) cachingIconDatas()
+                                                }
                                             }
                                         }
                                     }