7.1.0 (#519)

* fix: 可能的空指针问题 (#518) * 7.1.0 --------- Co-authored-by: 焕晨HChen <[email protected]>
Block-Network · Jan 3, 2025 · 48c3324 · 48c3324
1 parent c16aa34
commit 48c3324
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,8 +20,8 @@ android {
         applicationId = "statusbar.lyric"
         minSdk = 26
         targetSdk = 35
-        versionCode = 702
-        versionName = "7.0.2"
+        versionCode = 710
+        versionName = "7.1.0"
         aaptOptions.cruncherEnabled = false
         dependenciesInfo.includeInApk = false
         buildConfigField("long", "BUILD_TIME", "$buildTime")

diff --git a/app/src/main/kotlin/statusbar/lyric/hook/module/SystemUILyric.kt b/app/src/main/kotlin/statusbar/lyric/hook/module/SystemUILyric.kt
@@ -597,7 +597,7 @@ class SystemUILyric : BaseHook() {
         if (mCentralSurfacesImpl.existField("mIsFullscreen")) {
             isInFullScreenMode = mCentralSurfacesImpl?.getObjectField("mIsFullscreen") as Boolean
             statusbarShowing = mCentralSurfacesImpl?.getObjectField("mTransientShown") as Boolean
-        } else {
+        } else if (defaultDisplay.existField("isInFullscreenMode")) {
             val isInFullscreenMode = defaultDisplay?.getObjectField("isInFullscreenMode")
             isInFullScreenMode = isInFullscreenMode?.getObjectField("\$\$delegate_0")?.callMethod("getValue") as Boolean
 

diff --git a/app/src/main/kotlin/statusbar/lyric/tools/Tools.kt b/app/src/main/kotlin/statusbar/lyric/tools/Tools.kt
@@ -43,7 +43,6 @@ import statusbar.lyric.R
 import statusbar.lyric.config.XposedOwnSP
 import statusbar.lyric.tools.ActivityTools.isHook
 import statusbar.lyric.tools.LogTools.log
-import statusbar.lyric.tools.Tools.existField
 import java.io.DataOutputStream
 import java.util.Objects
 import java.util.regex.Pattern
@@ -247,7 +246,8 @@ object Tools {
     }
 
     fun Any?.existField(fieldName: String): Boolean {
-        return this?.javaClass?.declaredFields?.any { it.name == fieldName } ?: false
+        if (this == null) return false
+        return XposedHelpers.findFieldIfExists(this.javaClass, fieldName) != null
     }
 
     fun Any?.existMethod(methodName: String): Boolean {