Update version to 2.0,fix more bugs.

.idea/gradle.xml

@@ -7,13 +7,13 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -12,18 +12,20 @@
         <entry key="app/src/main/res/drawable/white_round.xml" value="0.256" />
         <entry key="app/src/main/res/layout-w1240dp/dia_source_from.xml" value="0.36484375" />
         <entry key="app/src/main/res/layout-w1240dp/dia_source_from_string.xml" value="0.36484375" />
+        <entry key="app/src/main/res/layout-w936dp/dia_status_icon_cout.xml" value="0.935546875" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.42168674698795183" />
         <entry key="app/src/main/res/layout/activity_login.xml" value="0.4375" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.36160137752905724" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.343980343980344" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.375" />
         <entry key="app/src/main/res/layout/dia_icon_filter.xml" value="0.4307692307692308" />
         <entry key="app/src/main/res/layout/dia_icon_search.xml" value="0.4307692307692308" />
         <entry key="app/src/main/res/layout/dia_source_from_string.xml" value="0.4307692307692308" />
+        <entry key="app/src/main/res/layout/dia_status_icon_count.xml" value="0.45" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.44871794871794873" />
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

README.md

@@ -2,7 +2,7 @@
 
 ![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.9-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v2.0-green)
 <br/><br/>
 <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
 <br/>
@@ -12,7 +12,7 @@ Fix the native notification bar icon function abandoned by the MIUI development
 # 开始使用
 
 点击下载最新版本
-<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.9-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v2.0-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 
@@ -20,7 +20,7 @@ Fix the native notification bar icon function abandoned by the MIUI development
 - 请确保你使用的是 MIUI 官方版本，任何第三方官改包发生的问题，开发者没有义务去解决和修复，请自求多福
 - 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
 - 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
-- 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题
+- 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题，若最新版本依然不生效请在作用域中长按“系统界面”(“系统 UI”)选择重新优化
 
 # 请勿用于非法用途
 

app/build.gradle

@@ -63,13 +63,11 @@ tasks.whenTaskAdded {
 }
 
 dependencies {
+    compileOnly 'de.robv.android.xposed:api:82'
+    implementation 'com.highcapable.yukihookapi:api:1.0.4'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.4'
     implementation "com.github.topjohnwu.libsu:core:3.1.2"
     implementation 'androidx.annotation:annotation:1.3.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.3'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.3'
     implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
     implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'

app/src/main/java/com/fankes/miui/notify/application/MNNApplication.kt

@@ -36,15 +36,10 @@ class MNNApplication : Application() {
 
         /** 调用全局静态实例 */
         val appContext get() = context ?: error("App is death")
-
-        /** 自身 APP 是否已启动 */
-        var isMineStarted = false
     }
 
     override fun onCreate() {
         super.onCreate()
-        /** 设置状态 */
-        isMineStarted = true
         /** 设置静态实例 */
         context = this
         /** 跟随系统夜间模式 */

app/src/main/java/com/fankes/miui/notify/bean/IconDataBean.kt

@@ -23,7 +23,7 @@
 package com.fankes.miui.notify.bean
 
 import android.graphics.Bitmap
-import com.fankes.miui.notify.utils.base64
+import com.fankes.miui.notify.utils.factory.base64
 import java.io.Serializable
 
 /**

app/src/main/java/com/fankes/miui/notify/hook/HookConst.kt

@@ -32,7 +32,9 @@ object HookConst {
     const val ENABLE_COLOR_ICON_HOOK = "_color_icon_hook"
     const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
     const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
+    const val ENABLE_HOOK_STATUS_ICON_COUNT = "_enable_hook_status_icon_count"
     const val NOTIFY_ICON_DATAS = "_notify_icon_datas"
+    const val HOOK_STATUS_ICON_COUNT = "_hook_status_icon_count"
 
     const val SOURCE_SYNC_WAY = "_source_sync_way"
     const val SOURCE_SYNC_WAY_CUSTOM_URL = "_source_sync_way_custom_url"

app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt

@@ -32,21 +32,25 @@ import android.graphics.drawable.Icon
 import android.os.Build
 import android.service.notification.StatusBarNotification
 import android.view.View
+import android.view.ViewGroup
 import android.view.ViewOutlineProvider
 import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import com.fankes.miui.notify.bean.IconDataBean
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
+import com.fankes.miui.notify.hook.HookConst.ENABLE_HOOK_STATUS_ICON_COUNT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
 import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
+import com.fankes.miui.notify.hook.HookConst.HOOK_STATUS_ICON_COUNT
 import com.fankes.miui.notify.hook.HookConst.SYSTEMUI_PACKAGE_NAME
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookAllOf
 import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
 import com.fankes.miui.notify.params.IconPackParams
-import com.fankes.miui.notify.utils.*
 import com.fankes.miui.notify.utils.drawable.drawabletoolbox.DrawableBuilder
+import com.fankes.miui.notify.utils.factory.*
+import com.fankes.miui.notify.utils.tool.BitmapCompatTool
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.hook.bean.VariousClass
 import com.highcapable.yukihookapi.hook.factory.*
@@ -75,6 +79,12 @@ class HookEntry : YukiHookXposedInitProxy {
         /** 原生存在的类 */
         private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
 
+        /** 原生存在的类 */
+        private const val StatusBarIconViewClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.StatusBarIconView"
+
+        /** 原生存在的类 */
+        private const val NotificationIconContainerClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.phone.NotificationIconContainer"
+
         /** 根据多个版本存在不同的包名相同的类 */
         private val ExpandableNotificationRowClass = VariousClass(
             "$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
@@ -130,17 +140,6 @@ class HookEntry : YukiHookXposedInitProxy {
             }
         } else BitmapCompatTool.isGrayscaleDrawable(drawable)
 
-    /**
-     * 是否为新版本 MIUI 方案
-     *
-     * 拥有状态栏图标颜色检查功能
-     * @return [Boolean]
-     */
-    private val PackageParam.hasIgnoreStatusBarIconColor
-        get() = safeOfFalse {
-            NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
-        }
-
     /**
      * 是否为旧版本 MIUI 方案
      *
@@ -300,16 +299,16 @@ class HookEntry : YukiHookXposedInitProxy {
         expandedNf: StatusBarNotification?,
         iconDrawable: Drawable?,
         it: (Bitmap) -> Unit
-    ) = safeRun(msg = "GetSmallIconOnSet") {
+    ) = runSafe(msg = "GetSmallIconOnSet") {
-        if (iconDrawable == null) return@safeRun
+        if (iconDrawable == null) return@runSafe
         /** 如果没开启修复 APP 的彩色图标 */
-        if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
+        if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@runSafe
         /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
         expandedNf?.also { notifyInstance ->
             /** 判断是 MIUI 样式就停止 Hook */
             if (context.isMiuiNotifyStyle) {
                 it(notifyInstance.findAppIcon(context).toBitmap())
-                return@safeRun
+                return@runSafe
             }
             /** 判断是否不是灰度图标 */
             val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
@@ -341,11 +340,11 @@ class HookEntry : YukiHookXposedInitProxy {
         expandedNf: StatusBarNotification?,
         iconImageView: ImageView,
         isExpanded: Boolean
-    ) = safeRun(msg = "AutoSetAppIconOnSet") {
+    ) = runSafe(msg = "AutoSetAppIconOnSet") {
         /** 判断是 MIUI 样式就停止 Hook */
-        if (context.isMiuiNotifyStyle) return@safeRun
+        if (context.isMiuiNotifyStyle) return@runSafe
         /** 如果没开启修复 APP 的彩色图标 */
-        if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
+        if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@runSafe
         /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
         expandedNf?.let { notifyInstance ->
 
@@ -432,14 +431,14 @@ class HookEntry : YukiHookXposedInitProxy {
     }
 
     /**
-     * Hook 通知栏小图标颜色
+     * 判断状态栏小图标颜色以及反射的核心方法
      *
      * 区分系统版本 - 由于每个系统版本的方法不一样这里单独拿出来进行 Hook
      * @param context 实例
      * @param expandedNf 状态栏实例
      * @return [Boolean] 是否忽略通知图标颜色
      */
-    private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
+    private fun PackageParam.hasIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
         if (!context.isMiuiNotifyStyle)
             if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
                 /** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
@@ -456,16 +455,26 @@ class HookEntry : YukiHookXposedInitProxy {
                      * 只要不是灰度就返回彩色图标
                      * 否则不对颜色进行反色处理防止一些系统图标出现异常
                      */
-                    if (isTargetFixApp) false else isNotGrayscaleIcon
+                    (if (isTargetFixApp) false else isNotGrayscaleIcon).also {
-                } ?: true
+                        printLogcat(tag = "IconColor", context, expandedNf, isTargetFixApp, !isNotGrayscaleIcon)
-            } else false
+                    }
-        else true
+                } ?: true.also { printLogcat(tag = "IconColor", context, expandedNf = null, isCustom = false, isGrayscale = false) }
+            } else false.also { printLogcat(tag = "IconColor", context, expandedNf, isCustom = false, isGrayscale = true) }
+        else true.also { printLogcat(tag = "IconColor", context, expandedNf, isCustom = false, isGrayscale = false) }
 
-    override fun onHook() = encase {
+    override fun onHook() {
-        configs {
+        runConfig()
-            debugTag = "MIUINativeNotifyIcon"
+        runHook()
-            isDebug = false
+    }
-        }
+
+    /** 配置 Hook */
+    private fun runConfig() = configs {
+        debugTag = "MIUINativeNotifyIcon"
+        isDebug = false
+    }
+
+    /** 开始 Hook */
+    private fun runHook() = encase {
         loadApp(SYSTEMUI_PACKAGE_NAME) {
             when {
                 /** 不是 MIUI 系统停止 Hook */
@@ -494,19 +503,6 @@ class HookEntry : YukiHookXposedInitProxy {
                              */
                             replaceAny { globalContext?.isMiuiNotifyStyle ?: isShowMiuiStyle }
                         }
-                        if (hasIgnoreStatusBarIconColor)
-                            injectMember {
-                                method {
-                                    name = "ignoreStatusBarIconColor"
-                                    param(ExpandedNotificationClass.clazz)
-                                }
-                                replaceAny {
-                                    hookIgnoreStatusBarIconColor(
-                                        context = globalContext ?: error("GlobalContext got null"),
-                                        expandedNf = firstArgs as? StatusBarNotification?
-                                    )
-                                }
-                            }
                         /** 强制回写系统的状态栏图标样式为原生 */
                         injectMember {
                             var isUseLegacy = false
@@ -534,6 +530,41 @@ class HookEntry : YukiHookXposedInitProxy {
                             }
                         }
                     }
+                    StatusBarIconViewClass.hook {
+                        /** Hook 状态栏图标的颜色 */
+                        injectMember {
+                            method { name = "updateIconColor" }
+                            afterHook {
+                                instance<ImageView>().also {
+                                    if (hasIgnoreStatusBarIconColor(it.context, field { name = "mNotification" }
+                                            .of<StatusBarNotification>(instance))) it.colorFilter = null
+                                    /** 防止图标不是纯黑的问题 */
+                                    else it.setColorFilter(
+                                        field { name = "mCurrentSetColor" }.of<Int>(instance)
+                                            ?.let { color -> if (color == -419430401) color else Color.BLACK } ?: 0)
+                                }
+                            }
+                        }
+                    }
+                    NotificationIconContainerClass.hook {
+                        injectMember {
+                            method { name = "calculateIconTranslations" }
+                            afterHook {
+                                /** 修复最新开发版状态栏图标只能显示一个的问题 */
+                                instance<ViewGroup>().layoutParams.width = 9999
+                            }
+                        }
+                        injectMember {
+                            method { name = "updateState" }
+                            beforeHook {
+                                /** 解除状态栏通知图标个数限制 */
+                                if (prefs.getBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, default = true))
+                                    field { name = "MAX_STATIC_ICONS" }
+                                        .get(instance).set(prefs.getInt(HOOK_STATUS_ICON_COUNT, default = 5)
+                                            .let { if (it in 0..100) it else 5 })
+                            }
+                        }
+                    }
                     NotificationHeaderViewWrapperClass.hook {
                         /** 修复下拉通知图标自动设置回 APP 图标的方法 */
                         injectMember {

app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt

@@ -20,15 +20,15 @@
  *
  * This file is Created by fankes on 2022/1/24.
  */
+@file:Suppress("MemberVisibilityCanBePrivate")
+
 package com.fankes.miui.notify.params
 
 import android.content.Context
 import android.graphics.Color
 import com.fankes.miui.notify.bean.IconDataBean
 import com.fankes.miui.notify.hook.HookConst.NOTIFY_ICON_DATAS
-import com.fankes.miui.notify.utils.bitmap
+import com.fankes.miui.notify.utils.factory.*
-import com.fankes.miui.notify.utils.safeOf
-import com.fankes.miui.notify.utils.safeOfNan
 import com.highcapable.yukihookapi.hook.factory.modulePrefs
 import com.highcapable.yukihookapi.hook.param.PackageParam
 import org.json.JSONArray
@@ -47,7 +47,7 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
      * 已存储的 JSON 数据
      * @return [String]
      */
-    private val storageDataJson get() = (context?.modulePrefs ?: param?.prefs)?.getString(NOTIFY_ICON_DATAS)
+    internal val storageDataJson get() = (context?.modulePrefs ?: param?.prefs)?.getString(NOTIFY_ICON_DATAS)
 
     /**
      * 获取图标数据
@@ -59,25 +59,32 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
                 if (it.isNotBlank()) runCatching {
                     JSONArray(it).also { array ->
                         for (i in 0 until array.length()) runCatching {
-                            (array.get(i) as JSONObject).apply {
+                            add(convertToBean(array.get(i) as JSONObject)!!)
-                                add(
+                        }.onFailure { context?.snake(msg = "部分规则加载失败") }
-                                    IconDataBean(
-                                        appName = getString("appName"),
-                                        packageName = getString("packageName"),
-                                        isEnabled = getBoolean("isEnabled"),
-                                        isEnabledAll = getBoolean("isEnabledAll"),
-                                        iconBitmap = getString("iconBitmap").bitmap,
-                                        iconColor = safeOfNan { Color.parseColor(getString("iconColor")) },
-                                        contributorName = getString("contributorName")
-                                    )
-                                )
-                            }
-                        }
                     }
-                }
+                }.onFailure { context?.snake(msg = "规则加载发生错误") }
             }
         }
 
+    /**
+     * 转换为 [IconDataBean]
+     * @param jsonObject Json 实例
+     * @return [IconDataBean] or null
+     */
+    private fun convertToBean(jsonObject: JSONObject) = safeOfNull {
+        jsonObject.let {
+            IconDataBean(
+                appName = it.getString("appName"),
+                packageName = it.getString("packageName"),
+                isEnabled = it.getBoolean("isEnabled"),
+                isEnabledAll = it.getBoolean("isEnabledAll"),
+                iconBitmap = it.getString("iconBitmap").bitmap,
+                iconColor = safeOfNan { Color.parseColor(it.getString("iconColor")) },
+                contributorName = it.getString("contributorName")
+            )
+        }
+    }
+
     /**
      * 拼接图标数组数据
      * @param dataJson1 图标数据 JSON
@@ -93,7 +100,21 @@ class IconPackParams(private val context: Context? = null, private val param: Pa
      * @param json 数据
      * @return [Boolean]
      */
-    fun isNotVaildJson(json: String) = json.trim().let { !it.startsWith("[") || !it.endsWith("]") }
+    fun isNotVaildJson(json: String) = !isJsonArray(json) && !isJsonObject(json)
+
+    /**
+     * 是否为 JSON 数组
+     * @param json 数据
+     * @return [Boolean]
+     */
+    fun isJsonArray(json: String) = json.trim().let { it.startsWith("[") && it.endsWith("]") }
+
+    /**
+     * 是否为 JSON 实例
+     * @param json 数据
+     * @return [Boolean]
+     */
+    fun isJsonObject(json: String) = json.trim().let { it.startsWith("{") && it.endsWith("}") }
 
     /**
      * 是否为异常地址

app/src/main/java/com/fankes/miui/notify/ui/ConfigureActivity.kt

@@ -48,7 +48,9 @@ import com.fankes.miui.notify.hook.factory.putAppNotifyHookAllOf
 import com.fankes.miui.notify.hook.factory.putAppNotifyHookOf
 import com.fankes.miui.notify.params.IconPackParams
 import com.fankes.miui.notify.ui.base.BaseActivity
-import com.fankes.miui.notify.utils.*
+import com.fankes.miui.notify.utils.factory.*
+import com.fankes.miui.notify.utils.tool.ClientRequestTool
+import com.fankes.miui.notify.utils.tool.SystemUITool
 import com.fankes.miui.notify.view.MaterialSwitch
 import com.google.android.material.radiobutton.MaterialRadioButton
 import com.google.android.material.textfield.TextInputEditText
@@ -294,22 +296,42 @@ class ConfigureActivity : BaseActivity() {
                             invalidate()
                         }
                     }
-                    confirmButton {
+                    IconPackParams(context = this@ConfigureActivity).also { params ->
-                        IconPackParams(context = this@ConfigureActivity).also { params ->
+                        confirmButton(text = "合并") {
-                            when {
+                            editText.text.toString().also { jsonString ->
-                                editText.text.toString().isNotBlank() && params.isNotVaildJson(editText.text.toString()) ->
+                                when {
-                                    snake(msg = "不是有效的 JSON 数据")
+                                    jsonString.isNotBlank() && params.isNotVaildJson(jsonString) -> snake(msg = "不是有效的 JSON 数据")
-                                editText.text.toString().isNotBlank() -> {
+                                    jsonString.isNotBlank() -> {
-                                    params.save(editText.text.toString())
+                                        params.save(
-                                    filterText = ""
+                                            params.splicingJsonArray(
-                                    mockLocalData()
+                                                dataJson1 = params.storageDataJson ?: "[]",
-                                    SystemUITool.showNeedUpdateApplySnake(context = this@ConfigureActivity)
+                                                dataJson2 = jsonString.takeIf { params.isJsonArray(it) } ?: "[$jsonString]"
+                                            )
+                                        )
+                                        filterText = ""
+                                        mockLocalData()
+                                        SystemUITool.showNeedUpdateApplySnake(context = this@ConfigureActivity)
+                                    }
+                                    else -> snake(msg = "请输入有效内容")
+                                }
+                            }
+                        }
+                        cancelButton(text = "覆盖") {
+                            editText.text.toString().also { jsonString ->
+                                when {
+                                    jsonString.isNotBlank() && params.isNotVaildJson(jsonString) -> snake(msg = "不是有效的 JSON 数据")
+                                    jsonString.isNotBlank() -> {
+                                        params.save(dataJson = jsonString.takeIf { params.isJsonArray(it) } ?: "[$jsonString]")
+                                        filterText = ""
+                                        mockLocalData()
+                                        SystemUITool.showNeedUpdateApplySnake(context = this@ConfigureActivity)
+                                    }
+                                    else -> snake(msg = "请输入有效内容")
                                 }
-                                else -> snake(msg = "规则数组内容为空")
                             }
                         }
                     }
-                    cancelButton()
+                    neutralButton(text = "取消")
                 }
             }
         }

app/src/main/java/com/fankes/miui/notify/ui/MainActivity.kt

@@ -39,11 +39,15 @@ import com.fankes.miui.notify.R
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
 import com.fankes.miui.notify.hook.HookConst.ENABLE_HIDE_ICON
+import com.fankes.miui.notify.hook.HookConst.ENABLE_HOOK_STATUS_ICON_COUNT
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
 import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE_LOG
 import com.fankes.miui.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
+import com.fankes.miui.notify.hook.HookConst.HOOK_STATUS_ICON_COUNT
 import com.fankes.miui.notify.ui.base.BaseActivity
-import com.fankes.miui.notify.utils.*
+import com.fankes.miui.notify.utils.factory.*
+import com.fankes.miui.notify.utils.tool.SystemUITool
+import com.google.android.material.textfield.TextInputEditText
 import com.highcapable.yukihookapi.hook.factory.modulePrefs
 import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 
@@ -107,6 +111,10 @@ class MainActivity : BaseActivity() {
         /** 初始化 View */
         val moduleEnableSwitch = findViewById<SwitchCompat>(R.id.module_enable_switch)
         val moduleEnableLogSwitch = findViewById<SwitchCompat>(R.id.module_enable_log_switch)
+        val statusIconCountItem = findViewById<View>(R.id.config_item_s_count_hook)
+        val statusIconCountChildItem = findViewById<View>(R.id.config_item_s_count_child_hook)
+        val statusIconCountSwitch = findViewById<SwitchCompat>(R.id.config_status_icon_count_switch)
+        val statusIconCountText = findViewById<TextView>(R.id.config_status_icon_count_text)
         val colorIconHookItem = findViewById<View>(R.id.config_item_color_hook)
         val notifyIconConfigItem = findViewById<View>(R.id.config_item_notify)
         val hideIconInLauncherSwitch = findViewById<SwitchCompat>(R.id.hide_icon_in_launcher_switch)
@@ -115,25 +123,31 @@ class MainActivity : BaseActivity() {
         val colorIconCompatText = findViewById<View>(R.id.color_icon_compat_text)
         val notifyIconFixSwitch = findViewById<SwitchCompat>(R.id.notify_icon_fix_switch)
         val notifyIconFixButton = findViewById<View>(R.id.config_notify_app_button)
+
         /** 获取 Sp 存储的信息 */
+        var statusBarIconCount = modulePrefs.getInt(HOOK_STATUS_ICON_COUNT, default = 5)
         colorIconHookItem.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
+        statusIconCountItem.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
         colorIconCompatSwitch.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
         colorIconCompatText.isVisible = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
         notifyIconConfigItem.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true) &&
                 modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
-        moduleEnableLogSwitch.isVisible = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
         notifyIconFixButton.isVisible = modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
+        statusIconCountSwitch.isChecked = modulePrefs.getBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, default = true)
+        statusIconCountChildItem.isVisible = modulePrefs.getBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, default = true)
         moduleEnableSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE, default = true)
         moduleEnableLogSwitch.isChecked = modulePrefs.getBoolean(ENABLE_MODULE_LOG, default = false)
         hideIconInLauncherSwitch.isChecked = modulePrefs.getBoolean(ENABLE_HIDE_ICON)
         colorIconHookSwitch.isChecked = modulePrefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)
         colorIconCompatSwitch.isChecked = modulePrefs.getBoolean(ENABLE_COLOR_ICON_COMPAT)
         notifyIconFixSwitch.isChecked = modulePrefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true)
+        statusIconCountText.text = statusBarIconCount.toString()
         moduleEnableSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
             modulePrefs.putBoolean(ENABLE_MODULE, b)
             moduleEnableLogSwitch.isVisible = b
             colorIconHookItem.isVisible = b
+            statusIconCountItem.isVisible = b
             notifyIconConfigItem.isVisible = b && colorIconHookSwitch.isChecked
             SystemUITool.showNeedRestartSnake(context = this)
         }
@@ -151,6 +165,12 @@ class MainActivity : BaseActivity() {
                 PackageManager.DONT_KILL_APP
             )
         }
+        statusIconCountSwitch.setOnCheckedChangeListener { btn, b ->
+            if (!btn.isPressed) return@setOnCheckedChangeListener
+            modulePrefs.putBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, b)
+            statusIconCountChildItem.isVisible = b
+            SystemUITool.showNeedRestartSnake(context = this)
+        }
         colorIconHookSwitch.setOnCheckedChangeListener { btn, b ->
             if (!btn.isPressed) return@setOnCheckedChangeListener
             modulePrefs.putBoolean(ENABLE_COLOR_ICON_HOOK, b)
@@ -172,16 +192,45 @@ class MainActivity : BaseActivity() {
         }
         /** 通知图标优化名单按钮点击事件 */
         notifyIconFixButton.setOnClickListener { startActivity(Intent(this, ConfigureActivity::class.java)) }
+        /** 修改状态栏通知图标个数按钮点击事件 */
+        findViewById<View>(R.id.config_status_icon_count_button).setOnClickListener {
+            showDialog {
+                title = "设置最多显示的图标个数"
+                var editText: TextInputEditText
+                addView(R.layout.dia_status_icon_count).apply {
+                    editText = findViewById<TextInputEditText>(R.id.dia_status_icon_count_input_edit).apply {
+                        requestFocus()
+                        invalidate()
+                        setText(statusBarIconCount.toString())
+                        setSelection(statusBarIconCount.toString().length)
+                    }
+                }
+                confirmButton {
+                    when {
+                        (runCatching { editText.text.toString().toInt() }.getOrNull() ?: -1)
+                                !in 0..100 -> snake(msg = "请输入有效数值")
+                        editText.text.toString().isNotBlank() -> runCatching {
+                            statusBarIconCount = editText.text.toString().trim().toInt()
+                            modulePrefs.putInt(HOOK_STATUS_ICON_COUNT, statusBarIconCount)
+                            statusIconCountText.text = statusBarIconCount.toString()
+                            SystemUITool.showNeedRestartSnake(context = this@MainActivity)
+                        }.onFailure { snake(msg = "数值格式无效") }
+                        else -> snake(msg = "请输入有效数值")
+                    }
+                }
+                cancelButton()
+            }
+        }
         /** 重启按钮点击事件 */
         findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
+        /** 项目地址按钮点击事件 */
+        findViewById<View>(R.id.title_github_icon).setOnClickListener {
+            openBrowser(url = "https://github.com/fankes/MIUINativeNotifyIcon")
+        }
         /** 恰饭！ */
         findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
             openBrowser(url = "https://www.coolapk.com/u/876977", packageName = "com.coolapk.market")
         }
-        /** 项目地址点击事件 */
-        findViewById<View>(R.id.link_with_project_address).setOnClickListener {
-            openBrowser(url = "https://github.com/fankes/MIUINativeNotifyIcon")
-        }
     }
 
     /** 刷新模块状态 */

app/src/main/java/com/fankes/miui/notify/ui/base/BaseActivity.kt

@@ -25,7 +25,7 @@ package com.fankes.miui.notify.ui.base
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.fankes.miui.notify.R
-import com.fankes.miui.notify.utils.isNotSystemInDarkMode
+import com.fankes.miui.notify.utils.factory.isNotSystemInDarkMode
 import com.gyf.immersionbar.ktx.immersionBar
 
 abstract class BaseActivity : AppCompatActivity() {

app/src/main/java/com/fankes/miui/notify/utils/factory/DialogBuilderFactory.kt

@@ -22,7 +22,7 @@
  */
 @file:Suppress("unused", "DEPRECATION")
 
-package com.fankes.miui.notify.utils
+package com.fankes.miui.notify.utils.factory
 
 import android.app.AlertDialog
 import android.content.Context

app/src/main/java/com/fankes/miui/notify/utils/factory/ExceptionFactory.kt

@@ -0,0 +1,83 @@
+/*
+ * MIUINativeNotifyIcon - Fix the native notification bar icon function abandoned by the MIUI development team.
+ * Copyright (C) 2019-2022 Fankes Studio(qzmmcn@163.com)
+ * https://github.com/fankes/MIUINativeNotifyIcon
+ *
+ * This software is non-free but opensource software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ * <p>
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * and eula along with this software.  If not, see
+ * <https://www.gnu.org/licenses/>
+ *
+ * This file is Created by fankes on 2022/3/13.
+ */
+@file:Suppress("unused")
+
+package com.fankes.miui.notify.utils.factory
+
+import com.highcapable.yukihookapi.hook.log.loggerE
+
+/**
+ * 忽略异常返回值
+ * @param result 回调 - 如果异常为空
+ * @return [T] 发生异常时返回设定值否则返回正常值
+ */
+inline fun <T> safeOfNull(result: () -> T): T? = safeOf(default = null, result)
+
+/**
+ * 忽略异常返回值
+ * @param result 回调 - 如果异常为 false
+ * @return [Boolean] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfFalse(result: () -> Boolean) = safeOf(default = false, result)
+
+/**
+ * 忽略异常返回值
+ * @param result 回调 - 如果异常为 true
+ * @return [Boolean] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfTrue(result: () -> Boolean) = safeOf(default = true, result)
+
+/**
+ * 忽略异常返回值
+ * @param result 回调 - 如果异常为 false
+ * @return [String] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfNothing(result: () -> String) = safeOf(default = "", result)
+
+/**
+ * 忽略异常返回值
+ * @param result 回调 - 如果异常为 false
+ * @return [Int] 发生异常时返回设定值否则返回正常值
+ */
+inline fun safeOfNan(result: () -> Int) = safeOf(default = 0, result)
+
+/**
+ * 忽略异常返回值
+ * @param default 异常返回值
+ * @param result 正常回调值
+ * @return [T] 发生异常时返回设定值否则返回正常值
+ */
+inline fun <T> safeOf(default: T, result: () -> T) = try {
+    result()
+} catch (_: Throwable) {
+    default
+}
+
+/**
+ * 忽略异常运行
+ * @param msg 出错输出的消息 - 默认为空
+ * @param block 正常回调
+ */
+inline fun <T> T.runSafe(msg: String = "", block: () -> Unit) {
+    runCatching(block).onFailure { if (msg.isNotBlank()) loggerE(msg = msg, e = it) }
+}

app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt

@@ -22,7 +22,7 @@
  */
 @file:Suppress("DEPRECATION", "PrivateApi", "unused", "ObsoleteSdkInt")
 
-package com.fankes.miui.notify.utils
+package com.fankes.miui.notify.utils.factory
 
 import android.app.Activity
 import android.app.AlertDialog
@@ -47,7 +47,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.highcapable.yukihookapi.hook.factory.classOf
 import com.highcapable.yukihookapi.hook.factory.hasClass
 import com.highcapable.yukihookapi.hook.factory.method
-import com.highcapable.yukihookapi.hook.log.loggerE
 import com.highcapable.yukihookapi.hook.type.java.StringType
 import com.topjohnwu.superuser.Shell
 import java.io.ByteArrayOutputStream
@@ -324,127 +323,29 @@ fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) =
  * @param url 网址
  * @param packageName 指定包名 - 可不填
  */
-fun Context.openBrowser(url: String, packageName: String = "") =
+fun Context.openBrowser(url: String, packageName: String = "") = runCatching {
-    runCatching {
+    startActivity(Intent().apply {
-        startActivity(Intent().apply {
+        if (packageName.isNotBlank()) setPackage(packageName)
-            if (packageName.isNotBlank()) setPackage(packageName)
+        action = Intent.ACTION_VIEW
-            action = Intent.ACTION_VIEW
+        data = Uri.parse(url)
-            data = Uri.parse(url)
+        /** 防止顶栈一样重叠在自己的 APP 中 */
-            /** 防止顶栈一样重叠在自己的 APP 中 */
+        flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    })
-        })
+}.onFailure {
-    }.onFailure {
+    if (packageName.isNotBlank())
-        if (packageName.isNotBlank())
+        snake(msg = "启动 $packageName 失败")
-            snake(msg = "启动 $packageName 失败")
+    else snake(msg = "启动系统浏览器失败")
-        else snake(msg = "启动系统浏览器失败")
+}
-    }
 
 /**
  * 复制到剪贴板
  * @param content 要复制的文本
  */
-fun Context.copyToClipboard(content: String) = runCatching {
+fun Context.copyToClipboard(content: String) = runSafe {
     (getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).apply {
         setPrimaryClip(ClipData.newPlainText(null, content))
         (primaryClip?.getItemAt(0)?.text ?: "").also {
             if (it != content) snake(msg = "复制失败") else snake(msg = "已复制")
         }
     }
-}
-
-/**
- * 忽略异常返回值
- * @param it 回调 - 如果异常为空
- * @return [T] 发生异常时返回设定值否则返回正常值
- */
-inline fun <T> safeOfNull(it: () -> T): T? = safeOf(null, it)
-
-/**
- * 忽略异常返回值
- * @param it 回调 - 如果异常为 false
- * @return [Boolean] 发生异常时返回设定值否则返回正常值
- */
-inline fun safeOfFalse(it: () -> Boolean) = safeOf(default = false, it)
-
-/**
- * 忽略异常返回值
- * @param it 回调 - 如果异常为 true
- * @return [Boolean] 发生异常时返回设定值否则返回正常值
- */
-inline fun safeOfTrue(it: () -> Boolean) = safeOf(default = true, it)
-
-/**
- * 忽略异常返回值
- * @param it 回调 - 如果异常为 false
- * @return [String] 发生异常时返回设定值否则返回正常值
- */
-inline fun safeOfNothing(it: () -> String) = safeOf(default = "", it)
-
-/**
- * 忽略异常返回值
- * @param it 回调 - 如果异常为 false
- * @return [Int] 发生异常时返回设定值否则返回正常值
- */
-inline fun safeOfNan(it: () -> Int) = safeOf(default = 0, it)
-
-/**
- * 忽略异常返回值
- * @param default 异常返回值
- * @param it 正常回调值
- * @return [T] 发生异常时返回设定值否则返回正常值
- */
-inline fun <T> safeOf(default: T, it: () -> T): T {
-    return try {
-        it()
-    } catch (t: NullPointerException) {
-        default
-    } catch (t: UnsatisfiedLinkError) {
-        default
-    } catch (t: UnsupportedOperationException) {
-        default
-    } catch (t: ClassNotFoundException) {
-        default
-    } catch (t: IllegalStateException) {
-        default
-    } catch (t: NoSuchMethodError) {
-        default
-    } catch (t: NoSuchFieldError) {
-        default
-    } catch (t: Error) {
-        default
-    } catch (t: Exception) {
-        default
-    } catch (t: Throwable) {
-        default
-    }
-}
-
-/**
- * 忽略异常运行
- * @param msg 出错输出的消息 - 默认为空
- * @param it 正常回调
- */
-inline fun safeRun(msg: String = "", it: () -> Unit) {
-    try {
-        it()
-    } catch (e: NullPointerException) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: UnsatisfiedLinkError) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: UnsupportedOperationException) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: ClassNotFoundException) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: IllegalStateException) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: NoSuchMethodError) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: NoSuchFieldError) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: Error) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: Exception) {
-        if (msg.isNotBlank()) loggerE(msg = msg, e = e)
-    } catch (e: Throwable) {
-    }
 }

app/src/main/java/com/fankes/miui/notify/utils/tool/BitmapCompatTool.kt

@@ -20,7 +20,7 @@
  *
  * This file is Created by fankes on 2022/2/19.
  */
-package com.fankes.miui.notify.utils
+package com.fankes.miui.notify.utils.tool
 
 import android.graphics.*
 import android.graphics.drawable.AnimationDrawable
@@ -29,6 +29,7 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import android.util.ArrayMap
 import androidx.core.graphics.drawable.toBitmap
+import com.fankes.miui.notify.utils.factory.safeOfFalse
 import kotlin.math.abs
 
 /**

app/src/main/java/com/fankes/miui/notify/utils/tool/ClientRequestTool.kt

@@ -22,13 +22,17 @@
  */
 @file:Suppress("TrustAllX509TrustManager", "CustomX509TrustManager", "DEPRECATION")
 
-package com.fankes.miui.notify.utils
+package com.fankes.miui.notify.utils.tool
 
 import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
+import com.fankes.miui.notify.utils.factory.safeOfNull
+import com.fankes.miui.notify.utils.factory.setDefaultStyle
+import com.fankes.miui.notify.utils.factory.showDialog
+import com.fankes.miui.notify.utils.factory.snake
 import com.highcapable.yukihookapi.hook.log.loggerD
 import okhttp3.*
 import java.io.IOException

app/src/main/java/com/fankes/miui/notify/utils/tool/SystemUITool.kt

@@ -20,9 +20,13 @@
  *
  * This file is Created by fankes on 2022/2/8.
  */
-package com.fankes.miui.notify.utils
+package com.fankes.miui.notify.utils.tool
 
 import android.content.Context
+import com.fankes.miui.notify.utils.factory.execShellSu
+import com.fankes.miui.notify.utils.factory.showDialog
+import com.fankes.miui.notify.utils.factory.snake
+import com.fankes.miui.notify.utils.factory.toast
 import com.google.android.material.snackbar.Snackbar
 import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
 

app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt

@@ -29,8 +29,8 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.util.AttributeSet
 import androidx.appcompat.widget.SwitchCompat
-import com.fankes.miui.notify.utils.dp
 import com.fankes.miui.notify.utils.drawable.drawabletoolbox.DrawableBuilder
+import com.fankes.miui.notify.utils.factory.dp
 
 class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) {
 
@@ -57,7 +57,7 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
             .solidColor(Color.WHITE)
             .size(20.dp, 20.dp)
             .cornerRadius(20.dp)
-            .strokeWidth(2.dp)
+            .strokeWidth(8.dp)
             .strokeColor(Color.TRANSPARENT)
             .build()
         trackTintList = toColors(

app/src/main/res/drawable/ic_notify_icon.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="150dp"
+    android:height="150dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M192,736 L192,416C192,261.2 302,132.1 448,102.4L448,64C448,28.6 476.6,0 512,0 547.4,0 576,28.6 576,64L576,102.4C722,132.1 832,261.2 832,416L832,736 864.1,736C899.4,736 928,764.4 928,800 928,835.4 899.4,864 864.1,864L159.9,864C124.6,864 96,835.6 96,800 96,764.6 124.6,736 159.9,736L192,736ZM608,928C608,981 565,1024 512,1024 459,1024 416,981 416,928L608,928Z"/>
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -29,6 +29,17 @@
             android:textSize="25sp"
             android:textStyle="bold" />
 
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/title_github_icon"
+            style="?android:attr/selectableItemBackgroundBorderless"
+            android:layout_width="27dp"
+            android:layout_height="27dp"
+            android:layout_marginEnd="15dp"
+            android:alpha="0.85"
+            android:src="@mipmap/ic_github"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="项目地址" />
+
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/title_restart_icon"
             style="?android:attr/selectableItemBackgroundBorderless"
@@ -189,6 +200,106 @@
                     android:textSize="12sp" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/config_item_s_count_hook"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="15dp"
+                android:animateLayoutChanges="true"
+                android:background="@drawable/bg_permotion_round"
+                android:elevation="0dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp">
+
+                <com.fankes.miui.notify.view.MaterialSwitch
+                    android:id="@+id/config_status_icon_count_switch"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="解除状态栏通知图标个数限制"
+                    android:textColor="@color/colorTextGray"
+                    android:textSize="15sp" />
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:alpha="0.6"
+                    android:lineSpacingExtra="6dp"
+                    android:text="此选项默认开启，MIUI 默认最多只能显示 3 个图标，其余图标将变成省略号，你可以在下方自定义最多显示的图标个数，修改为 0 则只会显示省略号代表图标个数，为防止发生异常，最大限制 100 个，超出的图标可能会被信号或网速指示器遮挡。"
+                    android:textColor="@color/colorTextDark"
+                    android:textSize="12sp" />
+
+                <LinearLayout
+                    android:id="@+id/config_item_s_count_child_hook"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:gravity="center">
+
+                    <ImageView
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:src="@drawable/ic_notify_icon"
+                        app:tint="@color/colorTextGray" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:singleLine="true"
+                        android:text="最多显示"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/config_status_icon_count_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:maxWidth="100dp"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:singleLine="true"
+                        android:text="5"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="10dp"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:singleLine="true"
+                        android:text="个"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/config_status_icon_count_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_button_round"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="5dp"
+                        android:paddingRight="10dp"
+                        android:paddingBottom="5dp"
+                        android:singleLine="true"
+                        android:text="修改个数"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="14sp" />
+                </LinearLayout>
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/config_item_color_hook"
                 android:layout_width="match_parent"
@@ -399,7 +510,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="6dp"
-                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 自身就存在的问题，后期只能等官方修复。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题。\n(3) 建议最低从 MIUI 12.5 “2021-5-18” 开发版以后开始使用，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块问题，若你的系统不存在原生图标问题不建议使用模块。"
+                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 自身就存在的问题，后期只能等官方修复。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题，若最新版本依然不生效请在作用域中长按“系统界面”(“系统 UI”)选择重新优化。\n(3) 建议最低从 MIUI 12.5 “2021-5-18” 开发版以后开始使用，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块问题，将不再进行适配。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
@@ -413,53 +524,6 @@
                     android:textSize="12sp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/link_with_project_address"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="15dp"
-                android:background="@drawable/bg_permotion_round"
-                android:elevation="0dp"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="15dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:gravity="center|start">
-
-                    <androidx.constraintlayout.utils.widget.ImageFilterView
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:layout_marginEnd="5dp"
-                        android:alpha="0.85"
-                        android:src="@mipmap/ic_about"
-                        android:tint="@color/colorTextGray" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:singleLine="true"
-                        android:text="项目地址"
-                        android:textColor="@color/colorTextGray"
-                        android:textSize="12sp" />
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.8"
-                    android:lineSpacingExtra="6dp"
-                    android:text="本软件是免费开源项目，遵循 AGPL3.0 协议，你可以点击这里前往 Github 查看源码以及获取模块更新。"
-                    android:textColor="@color/colorTextDark"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/layout/dia_source_from_string.xml

@@ -19,7 +19,7 @@
             android:layout_height="150dp"
             android:ellipsize="end"
             android:gravity="center|start|top"
-            android:hint="请粘贴 JSON 规则数组到此处"
+            android:hint="请粘贴 JSON 规则到此处"
             android:textSize="14sp" />
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>

app/src/main/res/layout/dia_status_icon_count.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingLeft="15dp"
+    android:paddingTop="15dp"
+    android:paddingRight="15dp"
+    tools:ignore="HardcodedText">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/dia_status_icon_count_input_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:digits="0123456789"
+            android:ellipsize="end"
+            android:hint="请输入 0-100 之间的整数"
+            android:inputType="number"
+            android:singleLine="true" />
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "1.9"
+    appVersionName = "2.0"
-    appVersionCode = 21
+    appVersionCode = 23
 }
 
 task clean(type: Delete) {