From d589ef2cd0983b5958aaed76367fa85a1b7e864b Mon Sep 17 00:00:00 2001 From: fankesyooni Date: Tue, 7 Feb 2023 06:23:35 +0800 Subject: [PATCH] Modify change wallpaperColor function's return value that cannot obtain return default color in FunctionFactory --- .../coloros/notify/utils/factory/FunctionFactory.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt index 8f86751..21a6551 100644 --- a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt @@ -338,12 +338,12 @@ val Context.systemAccentColor /** * 获取系统壁纸颜色 - * @return [Int] 无法获取时返回透明色 + * @return [Int] 无法获取时返回默认颜色 */ val Context.wallpaperColor - get() = safeOfNan { - WallpaperManager.getInstance(this).getWallpaperColors(WallpaperManager.FLAG_SYSTEM)?.primaryColor?.toArgb() ?: 0 - } + get() = runCatching { + WallpaperManager.getInstance(this).getWallpaperColors(WallpaperManager.FLAG_SYSTEM)?.primaryColor?.toArgb() + }.getOrNull() ?: (if (isSystemInDarkMode) 0xFFD8D8D8.toInt() else 0xFF707173.toInt()) /** * 是否为白色