From 29c3a839f4882df9a6c0fff2449b664f3541073f Mon Sep 17 00:00:00 2001
From: hamjin <335908093@qq.com>
Date: Sat, 2 Dec 2023 21:06:08 +0800
Subject: [PATCH] Bugfix for ColorOS 14

Tested On OnePlus PHK110 14.0.0.200 with com.android.systemui 14.99.09

Signed-off-by: hamjin <jinham@qq.com>
---
 .../notify/hook/entity/SystemUIHooker.kt      | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
index 2ebb457..4ddc3e0 100644
--- a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
@@ -100,6 +100,9 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 原生存在的类 */
     private val NotificationUtilsClass by lazyClass("${PackageName.SYSTEMUI}.statusbar.notification.NotificationUtils")
 
+    /** 原生存在的类 */
+    private val NotificationIconAreaControllerClass by lazyClass("${PackageName.SYSTEMUI}.statusbar.phone.NotificationIconAreaController")
+
     /** 原生存在的类 */
     private val NotificationEntryClass by lazyClass("${PackageName.SYSTEMUI}.statusbar.notification.collection.NotificationEntry")
 
@@ -143,6 +146,7 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 根据多个版本存在不同的包名相同的类 */
     private val OplusNotificationIconAreaControllerClass by lazyClass(
         VariousClass(
+            "com.oplus.systemui.statusbar.phone.OplusNotificationIconAreaController",
             "com.oplusos.systemui.statusbar.phone.OplusNotificationIconAreaController",
             "com.oplusos.systemui.statusbar.policy.OplusNotificationIconAreaController",
             "com.coloros.systemui.statusbar.policy.ColorNotificationIconAreaController"
@@ -152,6 +156,7 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 根据多个版本存在不同的包名相同的类 */
     private val SystemPromptControllerClass by lazyClass(
         VariousClass(
+            "com.oplus.systemui.statusbar.controller.SystemPromptController",
             "com.oplusos.systemui.statusbar.policy.SystemPromptController",
             "com.coloros.systemui.statusbar.policy.ColorSystemPromptController"
         )
@@ -176,6 +181,7 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 根据多个版本存在不同的包名相同的类 */
     private val DndAlertHelperClass by lazyClass(
         VariousClass(
+            "com.oplus.systemui.statusbar.notification.helper.DndAlertHelper",
             "com.oplusos.systemui.notification.helper.DndAlertHelper",
             "com.coloros.systemui.notification.helper.DndAlertHelper"
         )
@@ -184,6 +190,7 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 根据多个版本存在不同的包名相同的类 */
     private val OplusPowerNotificationWarningsClass by lazyClass(
         VariousClass(
+            "com.oplus.systemui.statusbar.notification.power.OplusPowerNotificationWarnings",
             "com.oplusos.systemui.notification.power.OplusPowerNotificationWarnings",
             "com.coloros.systemui.notification.power.ColorosPowerNotificationWarnings"
         )
@@ -221,6 +228,14 @@ object SystemUIHooker : YukiBaseHooker() {
         )
     )
 
+    /** 根据多个版本存在不同的方法相同的类 */
+    private val StatusBarIconControllerClass by lazyClass(
+        VariousClass(
+            "${PackageName.SYSTEMUI}.statusbar.StatusBarIconView",
+            "com.oplus.systemui.statusbar.phone.StatusBarIconControllerExImpl"
+        )
+    )
+
     /** 缓存的彩色 APP 图标 */
     private var appIcons = ArrayMap<String, Drawable>()
 
@@ -306,8 +321,16 @@ object SystemUIHooker : YukiBaseHooker() {
     /** 刷新状态栏小图标 */
     private fun refreshStatusBarIcons() = runInSafe {
         val nfField = StatusBarIconViewClass.field { name = "mNotification" }
-        val sRadiusField = StatusBarIconViewClass.field { name = "sIconRadiusFraction" }
-        val sNfSizeField = StatusBarIconViewClass.field { name = "sNotificationRoundIconSize" }
+        val sRadiusField = StatusBarIconViewClass.field {
+            name = "sIconRadiusFraction"
+        }.remedys {
+            StatusBarIconControllerClass.field { name = "sIconRadiusFraction" }
+        }
+        val sNfSizeField = StatusBarIconViewClass.field {
+            name = "sNotificationRoundIconSize"
+        }.remedys {
+            StatusBarIconControllerClass.field { name = "sNotificationRoundIconSize" }
+        }
         val roundUtil = RoundRectDrawableUtil_CompanionClass.method {
             name = "getRoundRectDrawable"
             param(DrawableClass, FloatType, IntType, IntType, ContextClass)
@@ -731,6 +754,11 @@ object SystemUIHooker : YukiBaseHooker() {
                 name = "updateIconsForLayout"
                 paramCount = 10
             }.remedys {
+                /** ColorOS 14*/
+                method {
+                    name = "updateIconsForLayout"
+                    paramCount = 5
+                }
                 method {
                     name = "updateIconsForLayout"
                     paramCount = 1
@@ -742,6 +770,15 @@ object SystemUIHooker : YukiBaseHooker() {
                         .takeIf { it.isNotEmpty() }?.forEach { notificationIconInstances.add(it) }
                 } else notificationIconContainer = args(index = 1).cast()
             }
+            /** 注入状态栏通知图标容器实例 */
+            NotificationIconAreaControllerClass.apply {
+                method {
+                    name = "updateIconsForLayout"
+                    paramCount = 8
+                }.hook().after {
+                    notificationIconContainer = args(index = 1).cast()
+                }
+            }
         }
         /** 替换通知面板背景 - 新版本 */
         if (isOldNotificationBackground.not())