Update version to 2.101

Fix notification icon problem in MIUI 14 DEV version in SystemUIHooker
Update version to 2.100
2025-09-06 02:35:32 +08:00 · 2023-05-14 19:16:05 +08:00 · 2023-05-14 15:51:36 +08:00 · 2023-04-25 06:40:55 +08:00 · 2023-04-25 06:26:05 +08:00 · 2023-04-25 06:25:55 +08:00
8 changed files with 52 additions and 94 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/MIUINativeNotifyIcon)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v2.98-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
+[![Blank](https://img.shields.io/badge/version-v2.101-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/fankes/MIUINativeNotifyIcon/total?label=Release)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.miui.notify/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.miui.notify/releases)
 [![Telegram](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,8 +72,8 @@ android {

 dependencies {
    compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.1.10'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.1.10'
+    implementation 'com.highcapable.yukihookapi:api:1.1.11'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.1.11'
    implementation 'com.github.duanhong169:drawabletoolbox:1.0.7'
    implementation "com.github.topjohnwu.libsu:core:5.0.4"
    implementation 'androidx.annotation:annotation:1.6.0'
--- a/app/src/main/java/com/fankes/miui/notify/data/ConfigData.kt
+++ b/app/src/main/java/com/fankes/miui/notify/data/ConfigData.kt
@@ -26,7 +26,6 @@ package com.fankes.miui.notify.data

 import android.content.Context
 import com.fankes.miui.notify.const.IconRuleSourceSyncType
-import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.hook.factory.prefs
 import com.highcapable.yukihookapi.hook.log.loggerW
 import com.highcapable.yukihookapi.hook.param.PackageParam
@@ -40,9 +39,6 @@ object ConfigData {
    /** 启用模块 */
    val ENABLE_MODULE = PrefsData("_enable_module", true)

-    /** 启用数据缓存 */
-    val ENABLE_PREFS_CACHE = PrefsData("_enable_prefs_cache", true)
-
    /** 启用模块日志 */
    val ENABLE_MODULE_LOG = PrefsData("_enable_module_log", false)

@@ -110,8 +106,6 @@ object ConfigData {
            is Context, is PackageParam -> this.instance = instance
            else -> error("Unknown type for init ConfigData")
        }
-        /** 设置是否启用数据缓存 */
-        YukiHookAPI.Configs.isEnablePrefsBridgeCache = isEnablePrefsCache
    }

    /**
@@ -196,16 +190,6 @@ object ConfigData {
            putBoolean(ENABLE_MODULE, value)
        }

-    /**
-     * 是否启用数据缓存
-     * @return [Boolean]
-     */
-    var isEnablePrefsCache
-        get() = getBoolean(ENABLE_PREFS_CACHE)
-        set(value) {
-            putBoolean(ENABLE_PREFS_CACHE, value)
-        }
-
    /**
     * 是否启用模块日志
     * @return [Boolean]
--- a/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt
+++ b/app/src/main/java/com/fankes/miui/notify/hook/entity/SystemUIHooker.kt
@@ -735,7 +735,6 @@ object SystemUIHooker : YukiBaseHooker() {
        /** 获取可读写状态 */
        return prefs.isPreferencesAvailable.also {
            isUsingCachingMethod = true
-            prefs.clearCache()
            cachingIconDatas()
            if (isRefreshCacheOnly) return@also
            refreshStatusBarIcons()
@@ -753,9 +752,9 @@ object SystemUIHooker : YukiBaseHooker() {
            /** 强制回写系统的状态栏图标样式为原生 */
            injectMember {
                method {
-                    name = "shouldSubstituteSmallIcon"
-                    param(ExpandedNotificationClass)
-                }
+                    name { it == "shouldSubstituteSmallIcon" || it == "shouldSubstituteSmallIconForStatusBarNotification" }
+                    param { it[0] extends StatusBarNotificationClass }
+                }.all()
                replaceToFalse()
            }
            /** 强制回写系统的状态栏图标样式为原生 */
@@ -763,7 +762,7 @@ object SystemUIHooker : YukiBaseHooker() {
                var isUseLegacy = false
                method {
                    name = "getSmallIcon"
-                    param(ExpandedNotificationClass, IntType)
+                    param { it[0] extends StatusBarNotificationClass && it[1] == IntType }
                }.remedys {
                    method {
                        name = "getSmallIcon"
--- a/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt
+++ b/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt
@@ -47,7 +47,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
     * 已存储的 JSON 数据
     * @return [String]
     */
-    internal val storageDataJson get() = (context?.prefs() ?: param?.prefs)?.direct()?.get(ConfigData.NOTIFY_ICONS_DATA)
+    internal val storageDataJson get() = (context?.prefs() ?: param?.prefs)?.get(ConfigData.NOTIFY_ICONS_DATA)

    /**
     * 获取图标数据
--- a/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt
@@ -163,11 +163,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        binding.notifyIconAutoSyncText.text = ConfigData.notifyIconFixAutoTime
        binding.moduleEnableSwitch.bind(ConfigData.ENABLE_MODULE) {
            onInitialize {
-                binding.moduleEnableLogSwitch.isVisible = it
-                binding.moduleEnableLogText.isVisible = it
-                binding.modulePrefsCacheEnableSwitch.isVisible = it
-                binding.modulePrefsCacheEnableText.isVisible = it
-                binding.expAllDebugLogButton.isVisible = it && ConfigData.isEnableModuleLog
+                binding.moduleEnableLogItem.isVisible = it
                binding.colorIconHookItem.isVisible = it
                binding.statusIconCountItem.isVisible = isLowerAndroidR.not() && it
                binding.notifyStyleConfigItem.isVisible = it
@@ -179,11 +175,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                SystemUITool.showNeedRestartSnake(context = this@MainActivity)
            }
        }
-        binding.modulePrefsCacheEnableSwitch.bind(ConfigData.ENABLE_PREFS_CACHE) {
-            onChanged { SystemUITool.showNeedRestartSnake(context = this@MainActivity) }
-        }
        binding.moduleEnableLogSwitch.bind(ConfigData.ENABLE_MODULE_LOG) {
-            onInitialize { binding.expAllDebugLogButton.isVisible = it && ConfigData.isEnableModule }
+            onInitialize { binding.expAllDebugLogButton.isVisible = it }
            onChanged {
                reinitialize()
                SystemUITool.refreshSystemUI(context = this@MainActivity, isRefreshCacheOnly = true)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -270,68 +270,50 @@
                    android:textColor="@color/colorTextDark"
                    android:textSize="12sp" />

-                <com.fankes.miui.notify.ui.widget.MaterialSwitch
-                    android:id="@+id/module_prefs_cache_enable_switch"
-                    android:layout_width="match_parent"
-                    android:layout_height="30dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
-                    android:layout_marginBottom="10dp"
-                    android:text="启用数据缓存"
-                    android:textColor="@color/colorTextGray"
-                    android:textSize="15sp" />
-
-                <TextView
-                    android:id="@+id/module_prefs_cache_enable_text"
+                <LinearLayout
+                    android:id="@+id/module_enable_log_item"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
-                    android:layout_marginBottom="5dp"
-                    android:alpha="0.6"
-                    android:lineSpacingExtra="6dp"
-                    android:text="此选项默认开启，默认情况下模块会将数据缓存在内存中，防止每次重复读取数据造成卡顿，如果开启此选项后一段时间导致系统界面 (系统 UI) 崩溃 (内存溢出)，你可以尝试关闭此选项，但是这有可能会造成在通知较多时下拉通知栏出现卡顿。"
-                    android:textColor="@color/colorTextDark"
-                    android:textSize="12sp" />
-
-                <com.fankes.miui.notify.ui.widget.MaterialSwitch
-                    android:id="@+id/module_enable_log_switch"
-                    android:layout_width="match_parent"
-                    android:layout_height="35dp"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
-                    android:layout_marginBottom="5dp"
-                    android:text="启用调试日志"
-                    android:textColor="@color/colorTextGray"
-                    android:textSize="15sp" />
-
-                <TextView
-                    android:id="@+id/exp_all_debug_log_button"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="13dp"
-                    android:layout_marginRight="13dp"
                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/bg_button_round"
-                    android:gravity="center"
-                    android:padding="10dp"
-                    android:singleLine="true"
-                    android:text="导出全部调试日志"
-                    android:textColor="@color/colorTextGray"
-                    android:textSize="15sp" />
+                    android:orientation="vertical">

-                <TextView
-                    android:id="@+id/module_enable_log_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="15dp"
-                    android:layout_marginRight="15dp"
-                    android:layout_marginBottom="10dp"
-                    android:alpha="0.6"
-                    android:lineSpacingExtra="6dp"
-                    android:text="默认情况下不建议开启此选项，仅在模块故障时开启，此时你可以发送调试日志给开发者帮助我们快速定位问题。"
-                    android:textColor="@color/colorTextDark"
-                    android:textSize="12sp" />
+                    <com.fankes.miui.notify.ui.widget.MaterialSwitch
+                        android:id="@+id/module_enable_log_switch"
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_marginBottom="10dp"
+                        android:text="启用调试日志"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/exp_all_debug_log_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="13dp"
+                        android:layout_marginRight="13dp"
+                        android:layout_marginBottom="10dp"
+                        android:background="@drawable/bg_button_round"
+                        android:gravity="center"
+                        android:padding="10dp"
+                        android:singleLine="true"
+                        android:text="导出全部调试日志"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:alpha="0.6"
+                        android:lineSpacingExtra="6dp"
+                        android:text="默认情况下不建议开启此选项，仅在模块故障时开启，此时你可以发送调试日志给开发者帮助我们快速定位问题。"
+                        android:textColor="@color/colorTextDark"
+                        android:textSize="12sp" />
+                </LinearLayout>
            </LinearLayout>

            <LinearLayout
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,8 @@ ext {
            targetSdk : 33
    ]
    app = [
-            versionName   : '2.98',
-            versionCode   : 38,
+            versionName   : '2.101',
+            versionCode   : 41,
            signingConfigs: [
                    secretConfigsDirPath : "${projectDir.getAbsolutePath()}/.secret",
                    secretConfigsFileName: "key_store_secret.json"
Author	SHA1	Message	Date
fankesyooni	4703d339b7	Update version to 2.101	2023-05-14 19:16:05 +08:00
fankesyooni	76b1cc2f0b	Fix notification icon problem in MIUI 14 DEV version in SystemUIHooker	2023-05-14 15:51:36 +08:00
fankesyooni	62ec1d16ae	Update version to 2.100	2023-04-25 06:40:55 +08:00
fankesyooni	7db010c9a1	Modify merge to YukiHookAPI new usage	2023-04-25 06:26:05 +08:00
fankesyooni	e6fa34d7fd	Update YukiHookAPI	2023-04-25 06:25:55 +08:00
fankesyooni	d4661abb71	Update version to 2.99	2023-04-22 22:37:11 +08:00
fankesyooni	744d028160	Modify remove prefs cache function and disable prefs cache	2023-04-22 22:32:16 +08:00