File tree Expand file tree Collapse file tree
app/src/main/java/com/fankes/coloros/notify/hook/entity Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -290,6 +290,14 @@ object SystemUIHooker : YukiBaseHooker() {
290290 */
291291 private val StatusBarNotification .isOplusPush get() = opPkg == PackageName .SYSTEM_FRAMEWORK && opPkg != packageName
292292
293+ /* *
294+ * 判断通知是否由系统生成 (ColorOS 16.1折叠通知)
295+ * @return [Boolean]
296+ */
297+ private fun isCollapseNotification (nfPackageName : String , contextPackageName : String ) : Boolean {
298+ return contextPackageName == PackageName .SYSTEMUI && nfPackageName != contextPackageName
299+ }
300+
293301 /* *
294302 * 判断通知背景是否为旧版本
295303 * @return [Boolean]
@@ -541,13 +549,14 @@ object SystemUIHooker : YukiBaseHooker() {
541549 iconView : ImageView ,
542550 header : Boolean = false
543551 ) = runInSafe {
544- compatCustomIcon(context, isGrayscaleIcon, if (nf.isOplusPush) nf.packageName else packageName).also { customTriple ->
552+ val realPackageName = if (nf.isOplusPush || isCollapseNotification(nf.packageName, packageName)) nf.packageName else packageName
553+ compatCustomIcon(context, isGrayscaleIcon, realPackageName).also { customTriple ->
545554 when {
546555 ConfigData .isEnableNotifyIconForceAppIcon -> iconView.apply {
547556 /* * 标记为已处理但非本模块接管 */
548557 moduleStyledIcons[this ] = false
549558 /* * 重新设置图标 */
550- setImageDrawable(appIcons[packageName ] ? : context.appIconOf(packageName ))
559+ setImageDrawable(appIcons[realPackageName ] ? : context.appIconOf(realPackageName ))
551560 /* * 设置默认样式 */
552561 setDefaultNotifyIconViewStyle()
553562 }
You can’t perform that action at this time.
0 commit comments