fankes/ColorOSNotifyIcon
2
0
Fork 0
mirror of https://github.com/fankes/ColorOSNotifyIcon.git synced 2025-09-06 02:35:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge code

Browse Source
This commit is contained in:
Fankesyooni
2022-03-25 15:44:32 +08:00
parent 6a4e96923e
commit 2619f924f3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
View File

@@ -35,7 +35,6 @@ import android.graphics.drawable.Drawable
import android.graphics.drawable.Icon import android.graphics.drawable.Icon
import android.graphics.drawable.VectorDrawable import android.graphics.drawable.VectorDrawable
import android.service.notification.StatusBarNotification import android.service.notification.StatusBarNotification
import android.util.ArraySet
import android.view.View import android.view.View
import android.view.ViewOutlineProvider import android.view.ViewOutlineProvider
import android.widget.ImageView import android.widget.ImageView
@@ -160,11 +159,14 @@ class SystemUIHooker : YukiBaseHooker() {
) )
} }
/** 缓存的彩色 APP 图标 */
private var appIcons = HashMap<String, Drawable>()
/** 缓存的通知优化图标数组 */ /** 缓存的通知优化图标数组 */
private var iconDatas = ArrayList<IconDataBean>() private var iconDatas = ArrayList<IconDataBean>()
/** 缓存的状态栏小图标实例 */ /** 缓存的状态栏小图标实例 */
private var statusBarIconViews = ArraySet<ImageView>() private var statusBarIconViews = HashSet<ImageView>()
/** 缓存的通知小图标包装纸实例 */ /** 缓存的通知小图标包装纸实例 */
private var notificationViewWrappers = HashSet<Any>() private var notificationViewWrappers = HashSet<Any>()
@@ -332,14 +334,13 @@ class SystemUIHooker : YukiBaseHooker() {
* 适配通知栏、状态栏来自系统推送的彩色 APP 图标 * 适配通知栏、状态栏来自系统推送的彩色 APP 图标
* *
* 适配第三方图标包对系统包管理器更换图标后的彩色图标 * 适配第三方图标包对系统包管理器更换图标后的彩色图标
* @param context 实例
* @param iconDrawable 原始图标 * @param iconDrawable 原始图标
* @return [Drawable] 适配的图标 * @return [Drawable] 适配的图标
*/ */
private fun StatusBarNotification.compatPushingIcon(context: Context, iconDrawable: Drawable) = safeOf(iconDrawable) { private fun StatusBarNotification.compatPushingIcon(iconDrawable: Drawable) = safeOf(iconDrawable) {
/** 给系统推送设置 APP 自己的图标 */ /** 给系统推送设置 APP 自己的图标 */
if (isOplusPush && opPkg.isNotBlank()) if (isOplusPush && opPkg.isNotBlank())
context.findAppIcon(packageName) ?: iconDrawable appIcons[packageName] ?: iconDrawable
else iconDrawable else iconDrawable
} }
@@ -389,7 +390,7 @@ class SystemUIHooker : YukiBaseHooker() {
/** 打印日志 */ /** 打印日志 */
printLogcat(tag = "StatusIcon", context, packageName, isCustom = it != null, isGrayscaleIcon) printLogcat(tag = "StatusIcon", context, packageName, isCustom = it != null, isGrayscaleIcon)
}?.let { Pair(BitmapDrawable(context.resources, it), true) } }?.let { Pair(BitmapDrawable(context.resources, it), true) }
?: Pair(if (isGrayscaleIcon) drawable else nf.compatPushingIcon(context, drawable), !isGrayscaleIcon) ?: Pair(if (isGrayscaleIcon) drawable else nf.compatPushingIcon(drawable), !isGrayscaleIcon)
/** /**
* 自动适配通知栏小图标 * 自动适配通知栏小图标
@@ -450,7 +451,7 @@ class SystemUIHooker : YukiBaseHooker() {
} }
else -> iconView.apply { else -> iconView.apply {
/** 重新设置图标 */ /** 重新设置图标 */
setImageDrawable(nf.compatPushingIcon(context, drawable)) setImageDrawable(nf.compatPushingIcon(drawable))
/** 设置裁切到边界 */ /** 设置裁切到边界 */
clipToOutline = true clipToOutline = true
/** 设置一个圆角轮廓裁切 */ /** 设置一个圆角轮廓裁切 */
@@ -561,7 +562,10 @@ class SystemUIHooker : YukiBaseHooker() {
compatStatusIcon( compatStatusIcon(
context = context, context = context,
nf = nf, nf = nf,
isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable), isGrayscaleIcon = isGrayscaleIcon(context, iconDrawable).also {
/** 缓存第一次的 APP 小图标 */
if (!it) context.findAppIcon(nf.packageName)?.also { e -> appIcons[nf.packageName] = e }
},
packageName = nf.packageName, packageName = nf.packageName,
drawable = iconDrawable drawable = iconDrawable
).also { pair -> ).also { pair ->