Merge code

.idea/misc.xml

@@ -9,6 +9,7 @@
         <entry key="app/src/main/res/drawable/ic_nf_icon_refresh.xml" value="0.232" />
         <entry key="app/src/main/res/drawable/ic_nf_icon_update.xml" value="0.232" />
         <entry key="app/src/main/res/drawable/ic_notify_icon.xml" value="0.232" />
+        <entry key="app/src/main/res/drawable/ic_system_clock.xml" value="0.232" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.4375" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.335" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.4375" />

app/src/main/java/com/fankes/coloros/notify/const/Const.kt

@@ -41,7 +41,7 @@ object Const {
     const val MODULE_VERSION_CODE = BuildConfig.VERSION_CODE
 
     /** 当前模块的版本校验 */
-    const val MODULE_VERSION_VERIFY = "${MODULE_VERSION_NAME}_${MODULE_VERSION_CODE}_202203252250"
+    const val MODULE_VERSION_VERIFY = "${MODULE_VERSION_NAME}_${MODULE_VERSION_CODE}_202203281333"
 
     /** 当前模块的版本校验标签 */
     const val MODULE_VERSION_VERIFY_TAG = "module_version_verify"

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

@@ -240,4 +240,18 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
         else iconAllDatas.filter {
             it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
         }
+
+    override fun onBackPressed() {
+        if (MainActivity.isActivityLive.not())
+            showDialog {
+                title = "提示"
+                msg = "要返回模块主页吗？"
+                confirmButton {
+                    super.onBackPressed()
+                    navigate<MainActivity>()
+                }
+                cancelButton { super.onBackPressed() }
+            }
+        else super.onBackPressed()
+    }
 }

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

@@ -44,6 +44,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     companion object {
 
+        /** 窗口是否启动 */
+        internal var isActivityLive = false
+
         /** 模块版本 */
         private const val moduleVersion = BuildConfig.VERSION_NAME
 
@@ -58,6 +61,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private var isModuleValied = false
 
     override fun onCreate() {
+        /** 设置可用性 */
+        isActivityLive = true
+        /** 设置文本 */
+        binding.mainTextVersion.text = "模块版本：$moduleVersion $pendingFlag"
+        binding.mainTextColorOsVersion.text = "系统版本：$colorOSFullVersion"
         /** 检查更新 */
         GithubReleaseTool.checkingForUpdate(context = this, moduleVersion) { version, function ->
             binding.mainTextReleaseVersion.apply {
@@ -66,9 +74,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 setOnClickListener { function() }
             }
         }
-        /** 设置文本 */
-        binding.mainTextVersion.text = "模块版本：$moduleVersion $pendingFlag"
-        binding.mainTextColorOsVersion.text = "系统版本：$colorOSFullVersion"
         when {
             /** 判断是否为 ColorOS 系统 */
             isNotColorOS ->
@@ -110,12 +115,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                     noCancelable()
                 }
         }
-        /** 获取 Sp 存储的信息 */
+        var notifyIconAutoSyncTime = modulePrefs.get(DataConst.NOTIFY_ICON_FIX_AUTO_TIME)
         binding.devNotifyConfigItem.isVisible = modulePrefs.get(DataConst.ENABLE_MODULE)
         binding.a12StyleConfigItem.isVisible = modulePrefs.get(DataConst.ENABLE_MODULE)
         binding.notifyIconConfigItem.isVisible = modulePrefs.get(DataConst.ENABLE_MODULE)
         binding.notifyIconFixButton.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
         binding.notifyIconFixNotifyItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
+        binding.notifyIconAutoSyncItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
+        binding.notifyIconAutoSyncChildItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO)
         binding.devNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_DEV_NOTIFY)
         binding.crcpNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_CHANGECP_NOTIFY)
         binding.dndNotifyConfigSwitch.isChecked = modulePrefs.get(DataConst.REMOVE_DNDALERT_NOTIFY)
@@ -125,6 +132,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.hideIconInLauncherSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_HIDE_ICON)
         binding.notifyIconFixSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
         binding.notifyIconFixNotifySwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_NOTIFY)
+        binding.notifyIconAutoSyncSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO)
+        binding.notifyIconAutoSyncText.text = notifyIconAutoSyncTime
         binding.moduleEnableSwitch.setOnCheckedChangeListener { btn, b ->
             if (btn.isPressed.not()) return@setOnCheckedChangeListener
             modulePrefs.put(DataConst.ENABLE_MODULE, b)
@@ -153,6 +162,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             modulePrefs.put(DataConst.ENABLE_NOTIFY_ICON_FIX, b)
             binding.notifyIconFixButton.isVisible = b
             binding.notifyIconFixNotifyItem.isVisible = b
+            binding.notifyIconAutoSyncItem.isVisible = b
             SystemUITool.refreshSystemUI(context = this)
         }
         binding.notifyIconFixNotifySwitch.setOnCheckedChangeListener { btn, b ->
@@ -180,8 +190,36 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             modulePrefs.put(DataConst.ENABLE_ANDROID12_STYLE, b)
             SystemUITool.refreshSystemUI(context = this)
         }
+        binding.notifyIconAutoSyncSwitch.setOnCheckedChangeListener { btn, b ->
+            if (btn.isPressed.not()) return@setOnCheckedChangeListener
+            modulePrefs.put(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO, b)
+            binding.notifyIconAutoSyncChildItem.isVisible = b
+            SystemUITool.refreshSystemUI(context = this, isRefreshCacheOnly = true)
+        }
         /** 通知图标优化名单按钮点击事件 */
         binding.notifyIconFixButton.setOnClickListener { navigate<ConfigureActivity>() }
+        /** 自动更新在线规则修改时间按钮点击事件 */
+        binding.notifyIconAutoSyncButton.setOnClickListener {
+            showTimePicker(notifyIconAutoSyncTime) {
+                showDialog {
+                    title = "每天 $it 自动更新"
+                    msg = "设置保存后将在每天 $it 自动同步名单到最新云端数据，若数据已是最新则不会显示任何提示，否则会发送一条通知。\n\n" +
+                            "请确保：\n\n" +
+                            "1.模块没有被禁止前台以及后台联网权限\n" +
+                            "2.模块没有被禁止被其它 APP 关联唤醒\n" +
+                            "3.模块的系统通知权限已开启\n\n" +
+                            "模块无需保持在后台运行，到达同步时间后会自动启动，如果到达时间后模块正在运行则会自动取消本次计划任务。"
+                    confirmButton(text = "保存设置") {
+                        notifyIconAutoSyncTime = it
+                        binding.notifyIconAutoSyncText.text = it
+                        modulePrefs.put(DataConst.NOTIFY_ICON_FIX_AUTO_TIME, it)
+                        SystemUITool.refreshSystemUI(context, isRefreshCacheOnly = true)
+                    }
+                    cancelButton()
+                    noCancelable()
+                }
+            }
+        }
         /** 重启按钮点击事件 */
         binding.titleRestartIcon.setOnClickListener { SystemUITool.restartSystemUI(context = this) }
         /** 项目地址按钮点击事件 */

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

@@ -25,6 +25,7 @@
 package com.fankes.coloros.notify.utils.factory
 
 import android.app.Dialog
+import android.app.TimePickerDialog
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
@@ -50,6 +51,14 @@ import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass
 fun Context.showDialog(isUseBlackTheme: Boolean = false, it: DialogBuilder.() -> Unit) =
     DialogBuilder(this, isUseBlackTheme).apply(it).show()
 
+/**
+ * 显示时间选择对话框
+ * @param timeSet 当前时间 - 不写将使用当前时间格式：HH:mm
+ * @param it 回调 - 小时与分钟 HH:mm
+ */
+fun Context.showTimePicker(timeSet: String = "", it: (String) -> Unit) =
+    TimePickerDialog(this, { _, h, m -> it("${h.autoZero}:${m.autoZero}") }, timeSet.hour, timeSet.minute, true).show()
+
 /**
  * 对话框构造器
  * @param context 实例

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

@@ -193,6 +193,34 @@ fun Context.findAppName(name: String) =
 fun Context.findAppIcon(name: String) =
     safeOfNull { packageManager?.getPackageInfo(name, 0)?.applicationInfo?.loadIcon(packageManager) }
 
+/**
+ * 对数值自动补零
+ * @return [String]
+ */
+val Int.autoZero: String get() = if (this < 10) "0$this" else toString()
+
+/**
+ * 从字符串获取小时
+ * @return [Int]
+ */
+val String.hour
+    get() = safeOfNan {
+        Calendar.getInstance().also {
+            it.time = SimpleDateFormat("HH:mm", Locale.CHINA).parse(this) as Date
+        }.get(Calendar.HOUR_OF_DAY)
+    }
+
+/**
+ * 从字符串获取分钟
+ * @return [Int]
+ */
+val String.minute
+    get() = safeOfNan {
+        Calendar.getInstance().also {
+            it.time = SimpleDateFormat("HH:mm", Locale.CHINA).parse(this) as Date
+        }.get(Calendar.MINUTE)
+    }
+
 /**
  * 是否关闭了通知权限
  * @return [Boolean]

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

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM15.29,16.71L11,12.41V7h2v4.59l3.71,3.71L15.29,16.71z" />
+</vector>

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

@@ -7,7 +7,7 @@
     android:background="@color/colorThemeBackground"
     android:orientation="vertical"
     tools:context=".ui.activity.MainActivity"
-    tools:ignore="HardcodedText,UseCompoundDrawables,ContentDescription">
+    tools:ignore="HardcodedText,UseCompoundDrawables,ContentDescription,TooManyViews">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -533,6 +533,91 @@
                         android:textColor="@color/colorTextDark"
                         android:textSize="12sp" />
                 </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/notify_icon_auto_sync_item"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:animateLayoutChanges="true"
+                    android:orientation="vertical">
+
+                    <com.fankes.coloros.notify.ui.view.MaterialSwitch
+                        android:id="@+id/notify_icon_auto_sync_switch"
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"
+                        android:layout_marginBottom="5dp"
+                        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="此选项默认开启，为确保名单内的数据为云端最新版本，你可以设置每天自动更新在线规则的时间，自动更新的地址为你最后一次成功设置的在线规则同步地址。\n请确保模块能够后台联网并不被阻止其它 APP 唤醒，否则自动同步可能会失败。\n模块无需保持在后台运行，到达同步时间后会自动启动，如果到达时间后模块正在运行则会自动取消本次计划任务。"
+                        android:textColor="@color/colorTextDark"
+                        android:textSize="12sp" />
+
+                    <LinearLayout
+                        android:id="@+id/notify_icon_auto_sync_child_item"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="10dp"
+                        android:gravity="center">
+
+                        <ImageView
+                            android:layout_width="17dp"
+                            android:layout_height="17dp"
+                            android:src="@drawable/ic_system_clock"
+                            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/notify_icon_auto_sync_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="5dp"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxWidth="100dp"
+                            android:paddingLeft="5dp"
+                            android:paddingRight="5dp"
+                            android:singleLine="true"
+                            android:text="07:00"
+                            android:textColor="@color/colorTextGray"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/notify_icon_auto_sync_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>
 
             <LinearLayout
@@ -660,7 +745,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="10dp"
-                    android:text="Q.哪些是已知问题？\nA.问题如下：\n1.由于机型有限，仅对 ColorOS 12~12.1 测试正常运行，根据酷友的需要云调试修复 ColorOS 11 的问题，其它版本情况未知，请自行进行测试。\n2.OxygenOS 只支持 12 版本，其它类 ColorOS 魔改的 UI 理论没有问题，请自行测试。"
+                    android:text="Q.哪些是已知问题？\nA.问题如下：\n1.由于机型有限，仅对 ColorOS 12~12.1 测试正常运行，根据酷友的需要云调试修复 ColorOS 11 的问题，其它版本情况未知，请自行进行测试。\n2.OxygenOS 只支持 12 版本，其它类 ColorOS 魔改的 UI 理论没有问题，请自行测试。\n3.动态刷新系统界面为实验性功能，若动态地改变了系统深色模式，调节了分辨率和字体大小，状态栏的通知图标会还原，或在刷新时发生图标黑白块问题，发生类似这种情况请手动重启一次系统界面即可解决。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />