fix: 优化小米设备专属功能判断

* 防止开启不存在的高级材质导致其他设备崩溃

Author: YuKongA

app/src/main/kotlin/statusbar/lyric/hook/module/SystemUILyric.kt

@@ -91,6 +91,7 @@ import statusbar.lyric.tools.Tools.isTargetView
 import statusbar.lyric.tools.Tools.observableChange
 import statusbar.lyric.tools.Tools.shell
 import statusbar.lyric.tools.XiaomiUtils.isHyperOS
+import statusbar.lyric.tools.XiaomiUtils.isXiaomi
 import statusbar.lyric.view.LyricSwitchView
 import statusbar.lyric.view.TitleDialog
 import java.io.File
@@ -220,10 +221,10 @@ class SystemUILyric : BaseHook() {
     override fun init() {
         "Initializing Hook".log()
         Application::class.java.methodFinder().filterByName("attach").single().createHook {
-            after { hook ->
+            after {
                 hook()
                 if (!canLoad) return@after
-                registerSuperLyric(hook.args[0] as Context)
+                registerSuperLyric(it.args[0] as Context)
             }
         }
     }
@@ -235,7 +236,6 @@ class SystemUILyric : BaseHook() {
                 if (!canLoad) return@after
 
                 val view = it.thisObject as TextView
-
                 view.post {
                     if (view.isTargetView()) {
                         "Running onDraw".log()
@@ -256,7 +256,7 @@ class SystemUILyric : BaseHook() {
         "lyricHook init".log()
         View::class.java.methodFinder().filterByName("onDetachedFromWindow").single().createHook {
             after {
-                val view = (it.thisObject as View)
+                val view = it.thisObject as View
                 if (view.isTargetView()) {
                     "Running onDetachedFromWindow".log()
                     canLoad = true
@@ -493,15 +493,15 @@ class SystemUILyric : BaseHook() {
     }
 
     private fun lyricLayoutInit() {
-        goMainThread(1) {
+        goMainThread {
             "lyricLayout init".log()
             runCatching { (lyricLayout.parent as ViewGroup).removeView(lyricLayout) }
             if (config.viewLocation == 0) {
                 targetView.addView(lyricLayout, 0)
             } else {
                 targetView.addView(lyricLayout)
             }
-            if (isHyperOS && config.mHyperOSTexture) {
+            if (isXiaomi && isHyperOS && config.mHyperOSTexture) {
                 val blurRadio = config.mHyperOSTextureRadio
                 val cornerRadius = cornerRadius(config.mHyperOSTextureCorner.toFloat())
                 val blendModes = arrayOf(
@@ -743,10 +743,10 @@ class SystemUILyric : BaseHook() {
         }
     }
 
-    private fun updateConfig(delay: Long = 0L) {
+    private fun updateConfig() {
         "Updating Config".log()
         config.update()
-        goMainThread(delay) {
+        goMainThread {
             lyricView.apply {
                 setTextSize(
                     TypedValue.COMPLEX_UNIT_SHIFT,

app/src/main/kotlin/statusbar/lyric/hook/module/SystemUITest.kt

@@ -106,6 +106,8 @@ class SystemUITest : BaseHook() {
                 val className = view::class.java.name
                 val textContent = view.text.toString().dispose()
 
+                if (view.visibility != View.VISIBLE) return@after
+                if (!view.isAttachedToWindow) return@after
                 if (!textContent.isTimeSameInternal()) return@after
                 if (!className.filterClassNameInternal()) return@after
                 val parentView = view.parent as? LinearLayout ?: return@after

app/src/main/kotlin/statusbar/lyric/hook/module/xiaomi/FocusNotifyController.kt

@@ -35,9 +35,9 @@ import statusbar.lyric.R
 import statusbar.lyric.config.XposedOwnSP
 import statusbar.lyric.hook.module.SystemUILyric
 import statusbar.lyric.tools.LogTools.log
-import statusbar.lyric.tools.Tools
 import statusbar.lyric.tools.Tools.callMethod
 import statusbar.lyric.tools.Tools.getObjectField
+import statusbar.lyric.tools.Tools.goMainThread
 import statusbar.lyric.tools.Tools.ifNotNull
 import statusbar.lyric.tools.Tools.isNotNull
 import statusbar.lyric.tools.XiaomiUtils
@@ -142,7 +142,7 @@ class FocusNotifyController {
             val mIcon = focusedNotify!!.getObjectField("mIcon")
             val mContent = focusedNotify!!.getObjectField("mContent")
             if (mIcon == null || mContent == null) return
-            Tools.goMainThread {
+            goMainThread {
                 focusedNotify!!.callMethod("cancelFolme")
                 focusedNotify!!.callMethod("hideImmediately", mIcon)
                 focusedNotify!!.callMethod("hideImmediately", mContent)
@@ -161,7 +161,7 @@ class FocusNotifyController {
             val mContent = focusedNotify!!.getObjectField("mContent")
             if (mIcon == null || mContent == null) return
             isHideFocusNotify = false
-            Tools.goMainThread {
+            goMainThread {
                 focusedNotify!!.callMethod("cancelFolme")
                 focusedNotify!!.callMethod("showImmediately", mIcon)
                 focusedNotify!!.callMethod("showImmediately", mContent)

app/src/main/kotlin/statusbar/lyric/tools/Tools.kt

@@ -152,6 +152,9 @@ object Tools {
     }
 
     fun View.isTargetView(): Boolean {
+        if (this !is TextView) return false
+        if (this.visibility != View.VISIBLE) return false
+        if (!this.isAttachedToWindow) return false
         val textViewClassName = config.textViewClassName
         val textViewId = config.textViewId
         val textSize = config.textSize
@@ -160,7 +163,6 @@ object Tools {
             EzXHelper.moduleRes.getString(R.string.load_class_empty).log()
             return false
         }
-        if (this !is TextView) return false
         if (this.javaClass.name != textViewClassName) return false
         if (this.id != textViewId) return false
         if (this.textSize != textSize) return false
@@ -202,7 +204,7 @@ object Tools {
     }
 
     fun goMainThread(delayed: Long = 0, callback: () -> Unit): Boolean {
-        return Handler(Looper.getMainLooper()).postDelayed({ callback() }, delayed * 1000)
+        return Handler(Looper.getMainLooper()).postDelayed({ callback() }, delayed)
     }
 
     fun Context.isLandscape() = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE