Update version to 1.1,fix more bugs.

Merge code
替换系统的彩色图标为 Android 原生样式
2025-09-07 19:14:20 +08:00 · 2022-03-01 00:35:04 +08:00 · 2022-03-01 00:27:20 +08:00 · 2022-03-01 00:26:27 +08:00 · 2022-02-28 22:07:34 +08:00 · 2022-02-28 20:31:30 +08:00
7 changed files with 102 additions and 28 deletions
--- a/README.md
+++ b/README.md
@@ -2,17 +2,17 @@

 ![Eclipse Marketplace](https://img.shields.io/badge/build-passing-brightgreen)
 ![Eclipse Marketplace](https://img.shields.io/badge/license-AGPL3.0-blue)
-![Eclipse Marketplace](https://img.shields.io/badge/version-v1.0-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.1-green)
 <br/><br/>
 <img src="https://github.com/fankes/ColorOSNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
 <br/>
 Optimize notification icons for ColorOS and adapt to native notification icon specifications.<br/>
-为 ColorOS 优化通知图标以及适配原生通知图标规范，理论支持 OxygenOS 和 RealmeOS。
+为 ColorOS 优化通知图标以及适配原生通知图标规范，理论支持 OxygenOS 和 RealmeUI。

 # 开始使用

 点击下载最新版本
-<a href='https://github.com/fankes/ColorOSNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.0-green)</a>
+<a href='https://github.com/fankes/ColorOSNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.1-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
            android:value="true" />
        <meta-data
            android:name="xposeddescription"
-            android:value="为 ColorOS 优化通知图标以及适配原生通知图标规范，理论支持 OxygenOS 和 RealmeOS\n开发者：酷安 @星夜不荟" />
+            android:value="为 ColorOS 优化通知图标以及适配原生通知图标规范，理论支持 OxygenOS 和 RealmeUI\n开发者：酷安 @星夜不荟" />
        <meta-data
            android:name="xposedminversion"
            android:value="93" />
--- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
@@ -44,6 +44,7 @@ import com.fankes.coloros.notify.hook.factory.isAppNotifyHookOf
 import com.fankes.coloros.notify.param.IconPackParams
 import com.fankes.coloros.notify.utils.*
 import com.fankes.coloros.notify.utils.drawable.drawabletoolbox.DrawableBuilder
+import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.hook.bean.VariousClass
 import com.highcapable.yukihookapi.hook.factory.configs
@@ -84,16 +85,18 @@ class HookEntry : YukiHookXposedInitProxy {
        /** 原生存在的类 */
        private const val IconManagerClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.icon.IconManager"

-        /** ColorOS 存在的类 */
+        /** ColorOS 存在的类 - 旧版本不存在 */
        private const val OplusContrastColorUtilClass = "com.oplusos.util.OplusContrastColorUtil"

-        /** ColorOS 存在的类 */
-        private const val OplusPowerNotificationWarningsClass =
-            "com.oplusos.systemui.notification.power.OplusPowerNotificationWarnings"
-
        /** ColorOS 存在的类 */
        private const val SystemPromptControllerClass = "com.oplusos.systemui.statusbar.policy.SystemPromptController"

+        /** 根据多个版本存在不同的包名相同的类 */
+        private val OplusPowerNotificationWarningsClass = VariousClass(
+            "com.oplusos.systemui.notification.power.OplusPowerNotificationWarnings",
+            "com.coloros.systemui.notification.power.ColorosPowerNotificationWarnings"
+        )
+
        /** 根据多个版本存在不同的包名相同的类 */
        private val ExpandableNotificationRowClass = VariousClass(
            "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
@@ -174,8 +177,12 @@ class HookEntry : YukiHookXposedInitProxy {
     */
    private fun PackageParam.compatCustomIcon(isGrayscaleIcon: Boolean, packageName: String): Pair<Bitmap?, Int> {
        var customPair: Pair<Bitmap?, Int>? = null
-        if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
-            run {
+        when {
+            /** 替换系统图标为 Android 默认 */
+            (packageName == "android" || packageName == "com.android.systemui") && !isGrayscaleIcon -> customPair =
+                Pair(if (isUpperOfAndroidS) IconPackParams.android12IconBitmap else IconPackParams.android11IconBitmap, 0)
+            /** 替换自定义通知图标 */
+            prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) -> run {
                if (iconDatas.isNotEmpty())
                    iconDatas.forEach {
                        if (packageName == it.packageName && isAppNotifyHookOf(it)) {
@@ -185,6 +192,7 @@ class HookEntry : YukiHookXposedInitProxy {
                        }
                    }
            }
+        }
        return customPair ?: Pair(null, 0)
    }

@@ -228,18 +236,24 @@ class HookEntry : YukiHookXposedInitProxy {
                    val oldStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else 0xff707173).toInt()

                    /** 新版风格 */
-                    val newStyle = (if (context.isSystemInDarkMode) 0xff2d2d2d else Color.WHITE).toInt()
+                    val newStyle = (if (context.isSystemInDarkMode) 0xffdcdcdc else Color.WHITE).toInt()

-                    /** 图标着色 */
-                    val applyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: oldStyle
+                    /** 优化风格 */
+                    val fixStyle = (if (context.isSystemInDarkMode) 0xff707173 else oldStyle).toInt()
+
+                    /** 旧版图标着色 */
+                    val oldApplyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: oldStyle
+
+                    /** 新版图标着色 */
+                    val newApplyColor = customPair.second.takeIf { it != 0 } ?: iconColor.takeIf { it != 0 } ?: fixStyle
                    /** 判断风格并开始 Hook */
                    if (isA12Style) {
-                        background = DrawableBuilder().rounded().solidColor(applyColor).build()
-                        setColorFilter(if (isA12Style) newStyle else oldStyle)
+                        background = DrawableBuilder().rounded().solidColor(newApplyColor).build()
+                        setColorFilter(newStyle)
                        setPadding(2.dp(context), 2.dp(context), 2.dp(context), 2.dp(context))
                    } else {
                        background = null
-                        setColorFilter(applyColor)
+                        setColorFilter(oldApplyColor)
                        setPadding(0, 0, 0, 0)
                    }
                }
@@ -293,16 +307,20 @@ class HookEntry : YukiHookXposedInitProxy {
                            }
                        }
                    }
-                    /** 修复并替换 ColorOS 原生灰度图标色彩判断 */
-                    NotificationUtilsClass.hook {
-                        injectMember {
-                            method {
-                                name = "isGrayscaleOplus"
-                                param(ImageViewClass, OplusContrastColorUtilClass.clazz)
+                    /**
+                     * 修复并替换新版本 ColorOS 原生灰度图标色彩判断
+                     * TODO 这里有一个 [YukiHookAPI] 捕捉异常错误后面填坑
+                     */
+                    if (OplusContrastColorUtilClass.hasClass)
+                        NotificationUtilsClass.hook {
+                            injectMember {
+                                method {
+                                    name = "isGrayscaleOplus"
+                                    param(ImageViewClass, OplusContrastColorUtilClass.clazz)
+                                }
+                                replaceAny { (firstArgs as? ImageView?)?.let { isGrayscaleIcon(it.context, it.drawable) } }
                            }
-                            replaceAny { (firstArgs as? ImageView?)?.let { isGrayscaleIcon(it.context, it.drawable) } }
                        }
-                    }
                    /** 替换状态栏图标 */
                    IconManagerClass.hook {
                        injectMember {
--- a/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/param/IconPackParams.kt
@@ -23,6 +23,7 @@
 package com.fankes.coloros.notify.param

 import android.content.Context
+import android.graphics.Bitmap
 import android.graphics.Color
 import com.fankes.coloros.notify.bean.IconDataBean
 import com.fankes.coloros.notify.hook.HookConst.NOTIFY_ICON_DATAS
@@ -43,6 +44,59 @@ import org.json.JSONObject
 */
 class IconPackParams(private val context: Context? = null, private val param: PackageParam? = null) {

+    companion object {
+
+        /**
+         * Android 11 系统默认图标
+         * @return [Bitmap]
+         */
+        val android11IconBitmap by lazy {
+            ("iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAYAAADjVADoAAAAAXNSR0IArs4c6QAAAARzQklUCAgI\n" +
+                    "CHwIZIgAAAPkSURBVHic7ZvfVdswFMY/9fS93qDZoNmg6QS4E8AGdAMYgQ1gg4QJkk5AOkGcCUgm\n" +
+                    "+Pog27EdCa7+WDIn/J4gx77W/SzpyvdKwCefdFE5H06yAPCj/vefUuqQqy1JhCA5B3AFYFH/NAdQ\n" +
+                    "WC4/ANjWf28APCultpZrozGaECQbx0sAs0BzFYAVgI1S6jm0baNDsiB5R/KV4/FK8i63r1ZIXpPc\n" +
+                    "jSjAkB3J69x+t5AsEwtgEqTMLcJjRgGGPOYQoCC5zu25gTV1SE4iwpx5h8J77KjDtRNO4ZPkAsAS\n" +
+                    "9jXAVDgA+K2U2khvEAtRq7zG9EVoOAD4JV2MfZFcRD3uXHvCEcBfh+vf429tU0oBYMmYcwbJF+H4\n" +
+                    "3FKH09ng/jnJG5IHh7F+qO+ZD2zN6mdshXbWsUSQhsh7ga2C5Epga0XBmyR5L2xbWGilVl6C04KG\n" +
+                    "5MMbth6m0MbhQyRhcuVhtyBZGWxV9BjTlPWynavdxviNwLhXw2v7C4M95/hf27IJO+TGx7CkNzh1\n" +
+                    "Y8Nzuo0PyjmQfBK019orbOHzD2Q5hMqr1Se6zse0ZWNGy6RuE+I24sOl98e09RZG386EoJ5dU60e\n" +
+                    "xUvgiBQ0RBBTj1gYfkuB10Tpef+ZjyYhrvzbEsT3wPtdhDjzsSdEHb5CE62+zEPCJ4CfDrfMhs8a\n" +
+                    "9oi8KS//j6RHuL/A3vAYCpFrfmiYAXj3m6VLPfH5vMDePaLP8MTckhT1DOq0/jJ6C+hejwjqQTQv\n" +
+                    "sxteqUsEps/wK8pTA1b7XbtfB22bUvapAPAEACQBveZ4q1ToY7+lHRpMlf31Z4HIL6rrc3eOCF3Q\n" +
+                    "fERan6c4WWahK8TopfcJ0vrcCpFzk0Yuuj5f8tDolQaGQsSsQ0yd3lRwyT2ix1CIHImSXPSy70Mh\n" +
+                    "nFPzH5jeS+8JURdM90mbk4f9sDhsmiMuoVec+WgS4hLmiTMfz4RQSq3gVn4PIUci6Fj72MMWPqUV\n" +
+                    "rJSZ51jIq3OU1xJDS36p92K5V9MoKwLvGLcIPDZuReBOYyW9wjlnSHmROSb+tVXm2SgyFmGlCsrK\n" +
+                    "7aRgozh1T1iO56uVpyAROg5shA98oc4wmzaTXXPcXfs2ROsi0T5L6glxC7f6ZHMAJWfRaA9gLkk6\n" +
+                    "uW443QD4FtCwlBwBLKJuOAXaD7IS6VadIRwBlKMegarHuySs5qKiZ1XdR4yC8gk0JRvmKFRRHlpT\n" +
+                    "ECdEBohRMu9QqZj7KFMX6m+TlIJU9P12SAH1RnGXXfiuHCjYAO/KmAdgS5wOwIZuFNvjdAB2lFRi\n" +
+                    "yiPRjTCATsjYFmZHnIovjfMf90i0BOpQ18T87SXWXz+ZKv8BVnFXPlKejoIAAAAASUVORK5CYII=").bitmap
+        }
+
+        /**
+         * Android 12 系统默认图标
+         * @return [Bitmap]
+         */
+        val android12IconBitmap by lazy {
+            ("iVBORw0KGgoAAAANSUhEUgAAAEIAAABCCAYAAADjVADoAAAAAXNSR0IArs4c6QAAAARzQklUCAgI\n" +
+                    "CHwIZIgAAANkSURBVHic7ZvNkRoxEIWfXL4vIbBVvpsMTAhksIRgRwAZsBnAxWfjCMARGM4+MBkw\n" +
+                    "RPB8kKh1zagljUYzwlv6qrZ2a0fo50lq9agboFAoFApeVI5GSX4xf07NDwDUAE4AbkqpU45+9Ybk\n" +
+                    "hOTK8/yF5JbklX6uJH+QfPG0uyI5ST+iCMwgf5sBbC3PVoGDd4nSGrARlabtvGI0RLizNc9eegrQ\n" +
+                    "5EJy0RDhTj4xBBHu/EkoQGjdvcT40EOLKYBn4dmnHvX6kOp+xpvh7UyvU4PkDMARwFOHj50B7KBP\n" +
+                    "iEopVZmZnOHtFFkA+NyhzhuAedbThuSMZB2wpHckg2eM5JzkMaDem5mQ/JD86ehoTXLeo+6lR+jv\n" +
+                    "KccSjZk5iRMTWHP6V1200MmgPtYGE+GfdlxiXFK1E9u5pdCxmh3sQYf2Jg4xlqnb69IxaTUsBmxz\n" +
+                    "LbR5GKpNX4dmQoeOI7RdCW1Hnx59HCrJQL02/0FySnJD8kDtHovbJrDsumOfhoN297oWyjZnUDRu\n" +
+                    "oWVptxX7VOMLRliaO0s56XhtLeOOZfe2grHj6bM1bFSJ63OR//KGsqG0nhZsL3dRsNCyJBehqyeE\n" +
+                    "jzEfAiA5SlYbAW3EvkK/WFWQjV2XshWAX96eDoljL+d3dSNJbSP+W4oQhiKEoQhhiD01JDYUvMsR\n" +
+                    "+RZzZZdaiEe4Mou6Aylbw1CEMBQhDLE2okZu91bbgi6xj/dJaje/bA1DEcJQhDAUIQxRp4a5BdpY\n" +
+                    "HkW5t49AHxfbZp2nGO8uUQoJRN2bRm0Nx6yP+a5hFUIpNZ4QDrILMTq0xxWuI7ZvS1SL3pZ9VoQt\n" +
+                    "xjnhCFFp6rCB7XW7FWAaHMqxjcFzFajjosliGik6dBI65Ipb9G1TCuyMGWVrdUpKFLlygARQ6ki5\n" +
+                    "lMSaL1HEdE7KVbikXKp0J7jmd+LoTia7phDDIwL5KBE2kq8eMZxZ9p6653TndI9/UkiYGZMM551D\n" +
+                    "l5mjtgfN5PMmydKUkn1xhdo4HuG/PjsB2EO/E1QAzkqpmnoLPUF7p0v4vdQzdNpx7jhKm8CVkYKk\n" +
+                    "OZyDYMTYDSjC49iEEKgdH+lojaFmbl8hFurVsWZY9r5LgDUffSuEQu2F7gNFqam313IsAXJ93XEG\n" +
+                    "/fZ4/w3o06QGAKXU4Nm7hUKhUIjgL/9/6dhvvYPfAAAAAElFTkSuQmCC").bitmap
+        }
+    }
+
    /**
     * 已存储的 JSON 数据
     * @return [String]
--- a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
@@ -147,10 +147,12 @@ class MainActivity : BaseActivity() {
        devNotifyConfigSwitch.setOnCheckedChangeListener { btn, b ->
            if (!btn.isPressed) return@setOnCheckedChangeListener
            modulePrefs.putBoolean(REMOVE_DEV_NOTIFY, b)
+            SystemUITool.showNeedRestartSnake(context = this)
        }
        crcpNotifyConfigSwitch.setOnCheckedChangeListener { btn, b ->
            if (!btn.isPressed) return@setOnCheckedChangeListener
            modulePrefs.putBoolean(REMOVE_CHANGECP_NOTIFY, b)
+            SystemUITool.showNeedRestartSnake(context = this)
        }
        a12StyleConfigSwitch.setOnCheckedChangeListener { btn, b ->
            if (!btn.isPressed) return@setOnCheckedChangeListener
--- a/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt
@@ -102,7 +102,7 @@ inline val isNotColorOS get() = !isColorOS
 val colorOSVersion
    get() = safeOf(default = "无法获取") {
        findPropString(key = "ro.system.build.fingerprint", default = "无法获取")
-            .split("ossi:")[1]
+            .split("ssi:")[1]
            .split("/")[0].trim()
    }

--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }

 ext {
-    appVersionName = "1.0"
-    appVersionCode = 1
+    appVersionName = "1.1"
+    appVersionCode = 2
 }

 task clean(type: Delete) {
Author	SHA1	Message	Date
Fankesyooni	3c07fb40d5	Update version to 1.1,fix more bugs.	2022-03-01 00:35:04 +08:00
Fankesyooni	21ff3938e3	Merge code	2022-03-01 00:27:20 +08:00
Fankesyooni	5fe1598546	替换系统的彩色图标为 Android 原生样式	2022-03-01 00:26:27 +08:00
Fankesyooni	018c137d85	优化深色模式的 Android 12 通知图标颜色	2022-02-28 22:07:34 +08:00
Fankesyooni	f066382d4c	尝试修复部分系统的问题，适配 ColorOS 11	2022-02-28 20:31:30 +08:00
Fankesyooni	c4f79452d0	修正文案	2022-02-28 20:02:31 +08:00
Fankesyooni	4bdb454d3c	修正文案	2022-02-28 20:02:12 +08:00
Fankesyooni	e77f9bf494	修复 ColorOS 11 无法识别版本号的问题	2022-02-28 20:01:40 +08:00