diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b086dac..9700e73 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,8 +22,8 @@ android { applicationId = "cn.lyric.getter" minSdk = 26 targetSdk = 35 - versionCode = 24 - versionName = "2.0.16" + versionCode = 25 + versionName = "2.0.25" dependenciesInfo.includeInApk = false ndk.abiFilters += arrayOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64") buildConfigField("long", "BUILD_TIME", "$buildTime") diff --git a/app/src/main/kotlin/cn/lyric/getter/config/Config.kt b/app/src/main/kotlin/cn/lyric/getter/config/Config.kt index b1eee1b..85e783f 100644 --- a/app/src/main/kotlin/cn/lyric/getter/config/Config.kt +++ b/app/src/main/kotlin/cn/lyric/getter/config/Config.kt @@ -12,6 +12,6 @@ class Config { var saltUseFlyme: Boolean by serialLazy(false) var updateTime: Long by serialLazy(0L) var showTitle: Boolean by serialLazy(false) - var fuckwyy: Boolean by serialLazy(false) + var fuckwyysb163: Boolean by serialLazy(false) } \ No newline at end of file diff --git a/app/src/main/kotlin/cn/lyric/getter/hook/app/Netease.kt b/app/src/main/kotlin/cn/lyric/getter/hook/app/Netease.kt index 8b3a867..f4cf3a6 100644 --- a/app/src/main/kotlin/cn/lyric/getter/hook/app/Netease.kt +++ b/app/src/main/kotlin/cn/lyric/getter/hook/app/Netease.kt @@ -45,7 +45,6 @@ object Netease : BaseHook() { } Class::class.java.methodFinder().first { name == "getField" }.replaceName() Class::class.java.methodFinder().first { name == "getDeclaredField" }.replaceName() - //fuckTinker() HookTools.getApplication { val verCode = it.packageManager?.getPackageInfo(it.packageName, 0)?.getVersionCode() ?: 0 if (verCode >= 8000041 || it.packageName == "com.hihonor.cloudmusic") { @@ -60,16 +59,16 @@ object Netease : BaseHook() { eventTools.sendLyric(hookParam.result as String) } } - if (verCode >= 9002033 ){ - val fuckwyy = dexKitBridge.findClass { + if (xConfig.fuckwyysb163){ + val sbNetease = dexKitBridge.findClass { matcher { usingStrings("com/netease/cloudmusic/module/lyric/flyme/StatusBarLyricSettingManager.class:setSwitchStatus:(Z)V") } }.single() - loadClass(fuckwyy.name).methodFinder().filterByParamCount(0).filterByName("a").first().createHook { + loadClass(sbNetease.name).methodFinder().filterByParamCount(0).filterByName("a").first().createHook { after { hookParam -> val a = hookParam.result as SharedPreferences - a.edit().putBoolean("status_bar_lyric_setting_key",xConfig.fuckwyy).commit() + a.edit().putBoolean("status_bar_lyric_setting_key",xConfig.fuckwyysb163).commit() } } } diff --git a/app/src/main/kotlin/cn/lyric/getter/ui/fragment/SettingsFragment.kt b/app/src/main/kotlin/cn/lyric/getter/ui/fragment/SettingsFragment.kt index 796315a..af5a71b 100644 --- a/app/src/main/kotlin/cn/lyric/getter/ui/fragment/SettingsFragment.kt +++ b/app/src/main/kotlin/cn/lyric/getter/ui/fragment/SettingsFragment.kt @@ -83,9 +83,10 @@ class SettingsFragment : Fragment() { } switch("fuckwyy") { titleRes = R.string.fuckwyy - defaultValue = config.fuckwyy + summaryRes = R.string.fuckwyy_tips + defaultValue = config.fuckwyysb163 onClick { - config.fuckwyy = checked + config.fuckwyysb163 = checked false } } diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index f0d8e5c..c29a3a3 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -74,4 +74,5 @@ 强制显示标题 发行版本 Release 不会输出 Log,Debug 版本会输出 Log,非必要不建议安装 Debug 版本 网易云状态栏歌词强开 + 开启开关可能导致网易云出现异常,本模块概不负责 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d9c23c..709d410 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,4 +74,5 @@ Force show title The release version won\'t generate logs, and the Debug version will generate logs, so it\'s recommended not to install the Debug version. Force opening of lyrics in NetEase Cloud status bar + Turning on the switch may cause abnormalities in the NetEase Cloud, which is not responsible for this module