Update version to 1.2,fix more bugs.

更新 YukiHookAPI
2025-09-07 19:14:20 +08:00 · 2022-03-02 03:25:24 +08:00 · 2022-03-02 03:25:14 +08:00 · 2022-03-02 03:24:03 +08:00 · 2022-03-02 01:07:50 +08:00 · 2022-03-01 21:34:02 +08:00
9 changed files with 91 additions and 65 deletions
--- a/.github/ISSUE_TEMPLATE/----bug---.md
+++ b/.github/ISSUE_TEMPLATE/----bug---.md
@@ -13,7 +13,7 @@ assignees: fankes

 **系统类型(请保留一个)**

-* ColorOS/RealmeOS/OxygenOS
+* ColorOS/RealmeUI/OxygenOS

 **Android 版本(必填)**

--- a/README.md
+++ b/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.1-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v1.2-green)
 <br/><br/>
 <img src="https://github.com/fankes/ColorOSNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
 <br/>
@@ -12,7 +12,7 @@ Optimize notification icons for ColorOS and adapt to native notification icon sp
 # 开始使用

 点击下载最新版本
-<a href='https://github.com/fankes/ColorOSNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.1-green)</a>
+<a href='https://github.com/fankes/ColorOSNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v1.2-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,8 +65,8 @@ dependencies {
    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.2'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.2'
+    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'
--- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
@@ -44,7 +44,6 @@ import com.fankes.coloros.notify.hook.factory.isAppNotifyHookOf
 import com.fankes.coloros.notify.param.IconPackParams
 import com.fankes.coloros.notify.utils.*
 import com.fankes.coloros.notify.utils.drawable.drawabletoolbox.DrawableBuilder
-import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.hook.bean.VariousClass
 import com.highcapable.yukihookapi.hook.factory.configs
@@ -258,7 +257,6 @@ class HookEntry : YukiHookXposedInitProxy {
                    }
                }
                else -> iconView.apply {
-                    setImageDrawable(drawable)
                    setPadding(0, 0, 0, 0)
                    background = null
                    colorFilter = null
@@ -307,20 +305,16 @@ class HookEntry : YukiHookXposedInitProxy {
                            }
                        }
                    }
-                    /**
-                     * 修复并替换新版本 ColorOS 原生灰度图标色彩判断
-                     * TODO 这里有一个 [YukiHookAPI] 捕捉异常错误后面填坑
-                     */
-                    if (OplusContrastColorUtilClass.hasClass)
-                        NotificationUtilsClass.hook {
-                            injectMember {
-                                method {
-                                    name = "isGrayscaleOplus"
-                                    param(ImageViewClass, OplusContrastColorUtilClass.clazz)
-                                }
-                                replaceAny { (firstArgs as? ImageView?)?.let { isGrayscaleIcon(it.context, it.drawable) } }
+                    /** 修复并替换新版本 ColorOS 原生灰度图标色彩判断*/
+                    NotificationUtilsClass.hook {
+                        injectMember {
+                            method {
+                                name = "isGrayscaleOplus"
+                                param(ImageViewClass, OplusContrastColorUtilClass.clazz)
                            }
-                        }
+                            replaceAny { (firstArgs as? ImageView?)?.let { isGrayscaleIcon(it.context, it.drawable) } }
+                        }.ignoredHookingFailure()
+                    }
                    /** 替换状态栏图标 */
                    IconManagerClass.hook {
                        injectMember {
--- a/app/src/main/java/com/fankes/coloros/notify/ui/ConfigureActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/ConfigureActivity.kt
@@ -25,8 +25,6 @@
 package com.fankes.coloros.notify.ui

 import android.app.ProgressDialog
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -51,6 +49,9 @@ import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus

 class ConfigureActivity : BaseActivity() {

+    /** 访问请求链接 */
+    private var rawGithubUrl = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main"
+
    /** 当前筛选条件 */
    private var filterText = ""

@@ -192,16 +193,7 @@ class ConfigureActivity : BaseActivity() {
        }
        /** 设置点击事件 */
        findViewById<View>(R.id.config_cbr_button).setOnClickListener {
-            runCatching {
-                startActivity(Intent().apply {
-                    action = "android.intent.action.VIEW"
-                    data = Uri.parse("https://github.com/fankes/AndroidNotifyIconAdapt/blob/main/CONTRIBUTING.md")
-                    /** 防止顶栈一样重叠在自己的 APP 中 */
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                })
-            }.onFailure {
-                toast(msg = "无法启动系统默认浏览器")
-            }
+            openBrowser(url = "https://github.com/fankes/AndroidNotifyIconAdapt/blob/main/CONTRIBUTING.md")
        }
        /** 装载数据 */
        mockLocalData()
@@ -227,7 +219,7 @@ class ConfigureActivity : BaseActivity() {
        }

    /** 开始更新数据 */
-    private fun onRefreshing() {
+    private fun onRefreshing() = ClientRequestTool.checkingInternetConnect(context = this) {
        ProgressDialog(this).apply {
            setDefaultStyle(context = this@ConfigureActivity)
            setCancelable(false)
@@ -237,12 +229,12 @@ class ConfigureActivity : BaseActivity() {
        }.also {
            ClientRequestTool.wait(
                context = this,
-                url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/OS/ColorOS/NotifyIconsSupportConfig.json"
+                url = "$rawGithubUrl/OS/ColorOS/NotifyIconsSupportConfig.json"
            ) { isDone1, ctOS ->
                it.setMessage("正在同步 APP 数据")
                ClientRequestTool.wait(
                    context = this,
-                    url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/APP/NotifyIconsSupportConfig.json"
+                    url = "$rawGithubUrl/APP/NotifyIconsSupportConfig.json"
                ) { isDone2, ctAPP ->
                    it.cancel()
                    IconPackParams(context = this).also { params ->
@@ -253,12 +245,14 @@ class ConfigureActivity : BaseActivity() {
                                mockLocalData()
                                SystemUITool.showNeedUpdateApplySnake(context = this)
                            } else snake(msg = "列表数据已是最新")
-                        } else
-                            showDialog {
-                                title = "连接失败"
-                                msg = "连接失败，错误如下：\n${if (!isDone1) ctOS else ctAPP}"
-                                confirmButton(text = "我知道了")
+                        } else showDialog {
+                            title = "连接失败"
+                            msg = "连接失败，错误如下：\n${if (!isDone1) ctOS else ctAPP}"
+                            confirmButton(text = "解决方案") {
+                                openBrowser(url = "https://www.baidu.com/s?wd=github%2Braw%2B%E6%97%A0%E6%B3%95%E8%AE%BF%E9%97%AE")
                            }
+                            cancelButton()
+                        }
                    }
                }
            }
--- a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
@@ -27,7 +27,6 @@ package com.fankes.coloros.notify.ui
 import android.content.ComponentName
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.LinearLayout
@@ -165,30 +164,11 @@ class MainActivity : BaseActivity() {
        findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
        /** 恰饭！ */
        findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
-            runCatching {
-                startActivity(Intent().apply {
-                    setPackage("com.coolapk.market")
-                    action = "android.intent.action.VIEW"
-                    data = Uri.parse("https://www.coolapk.com/u/876977")
-                    /** 防止顶栈一样重叠在自己的 APP 中 */
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                })
-            }.onFailure {
-                toast(msg = "你可能没有安装酷安")
-            }
+            openBrowser(url = "https://www.coolapk.com/u/876977", packageName = "com.coolapk.market")
        }
        /** 项目地址点击事件 */
        findViewById<View>(R.id.link_with_project_address).setOnClickListener {
-            runCatching {
-                startActivity(Intent().apply {
-                    action = "android.intent.action.VIEW"
-                    data = Uri.parse("https://github.com/fankes/ColorOSNotifyIcon")
-                    /** 防止顶栈一样重叠在自己的 APP 中 */
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                })
-            }.onFailure {
-                toast(msg = "无法启动系统默认浏览器")
-            }
+            openBrowser(url = "https://github.com/fankes/ColorOSNotifyIcon")
        }
    }
 }
--- a/app/src/main/java/com/fankes/coloros/notify/utils/ClientRequestTool.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/ClientRequestTool.kt
@@ -20,11 +20,15 @@
 *
 * This file is Created by fankes on 2022/2/25.
 */
-@file:Suppress("TrustAllX509TrustManager", "CustomX509TrustManager")
+@file:Suppress("TrustAllX509TrustManager", "CustomX509TrustManager", "DEPRECATION")

 package com.fankes.coloros.notify.utils

 import android.app.Activity
+import android.app.ProgressDialog
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
 import com.highcapable.yukihookapi.hook.log.loggerD
 import okhttp3.*
 import java.io.IOException
@@ -37,6 +41,38 @@ import javax.net.ssl.*
 */
 object ClientRequestTool {

+    /**
+     * 检查网络连接情况
+     * @param context 实例
+     * @param it 已连接回调
+     */
+    fun checkingInternetConnect(context: Activity, it: () -> Unit) =
+        ProgressDialog(context).apply {
+            setDefaultStyle(context)
+            setCancelable(false)
+            setTitle("准备中")
+            setMessage("正在检查网络连接情况")
+        }.apply {
+            wait(context, url = "https://www.baidu.com") { isDone, _ ->
+                cancel()
+                if (isDone) it() else
+                    context.showDialog {
+                        title = "网络不可用"
+                        msg = "无法连接到互联网，请检查你当前的设备是否可以上网，且没有在手机管家中禁用本模块的联网权限。"
+                        confirmButton(text = "检查设置") {
+                            runCatching {
+                                context.startActivity(Intent().apply {
+                                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                                    action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+                                    data = Uri.fromParts("package", context.packageName, null)
+                                })
+                            }.onFailure { context.snake(msg = "启动应用信息页面失败") }
+                        }
+                        cancelButton()
+                    }
+            }
+        }.show()
+
    /**
     * 发送 GET 请求内容并等待
     * @param context 实例
--- a/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/Utils.kt
@@ -27,6 +27,7 @@ package com.fankes.coloros.notify.utils
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -34,6 +35,7 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
+import android.net.Uri
 import android.os.Build
 import android.util.Base64
 import android.widget.Toast
@@ -233,6 +235,26 @@ fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) =
            setAction(actionText) { it() }
        }.show()

+/**
+ * 启动系统浏览器
+ * @param url 网址
+ * @param packageName 指定包名 - 可不填
+ */
+fun Context.openBrowser(url: String, packageName: String = "") =
+    runCatching {
+        startActivity(Intent().apply {
+            if (packageName.isNotBlank()) setPackage(packageName)
+            action = Intent.ACTION_VIEW
+            data = Uri.parse(url)
+            /** 防止顶栈一样重叠在自己的 APP 中 */
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        })
+    }.onFailure {
+        if (packageName.isNotBlank())
+            snake(msg = "启动 $packageName 失败")
+        else snake(msg = "启动系统浏览器失败")
+    }
+
 /**
 * 忽略异常返回值
 * @param it 回调 - 如果异常为空
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }

 ext {
-    appVersionName = "1.1"
-    appVersionCode = 2
+    appVersionName = "1.2"
+    appVersionCode = 3
 }

 task clean(type: Delete) {
Author	SHA1	Message	Date
Fankesyooni	c8b13ce602	Update version to 1.2,fix more bugs.	2022-03-02 03:25:24 +08:00
Fankesyooni	9e7b92fdaa	Update version to 1.2,fix more bugs.	2022-03-02 03:25:14 +08:00
Fankesyooni	dd293a7e33	更新 YukiHookAPI	2022-03-02 03:24:03 +08:00
Fankesyooni	ddda41ab13	优化代码，加入保姆级别网络问题解答	2022-03-02 01:07:50 +08:00
Fankesyooni	0c5c2daf74	Update issue templates	2022-03-01 21:34:02 +08:00
Fankesyooni	2b2da7bdb5	去除圆角修复后的强制设置图标	2022-03-01 21:02:49 +08:00