重构歌词相关代码（部分）

Author: Henry-ZHR

app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.application)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.room)
 }
@@ -214,6 +215,7 @@ androidComponents {
 
 dependencies {
     implementation(libs.kotlinx.coroutines)
+    implementation(libs.kotlinx.serialization.json)
 
     implementation(libs.appcompat)
     implementation(libs.cardview)

app/src/main/java/remix/myplayer/App.kt

@@ -59,17 +59,6 @@ class App : MultiDexApplication() {
   }
 
   private fun checkMigration() {
-    if (!SPUtil.getValue(context, SPUtil.LYRIC_KEY.NAME, SPUtil.LYRIC_KEY.LYRIC_RESET_ON_16000, false)) {
-      SPUtil.deleteFile(this, SPUtil.LYRIC_KEY.NAME)
-      SPUtil.putValue(context, SPUtil.LYRIC_KEY.NAME, SPUtil.LYRIC_KEY.LYRIC_RESET_ON_16000, true)
-      SPUtil.putValue(context, SPUtil.LYRIC_KEY.NAME, SPUtil.LYRIC_KEY.PRIORITY_LYRIC, SPUtil.LYRIC_KEY.DEFAULT_PRIORITY)
-      try {
-        DiskCache.getLrcDiskCache().delete()
-      } catch (e: Exception) {
-        Timber.v(e)
-      }
-    }
-
     val oldVersion = SPUtil.getValue(context, SETTING_KEY.NAME, SETTING_KEY.VERSION, 1)
     if (oldVersion < SETTING_KEY.NEWEST_VERSION) {
       if (oldVersion == 1) {
@@ -84,7 +73,6 @@ class App : MultiDexApplication() {
   }
 
   private fun setUp() {
-    DiskCache.init(this, "lyric")
     setApplicationLanguage(this)
     Completable
         .fromAction {

app/src/main/java/remix/myplayer/bean/misc/LyricPriority.kt

@@ -0,0 +1,29 @@
+package remix.myplayer.helper
+
+import remix.myplayer.lyrics.LyricsLine
+import remix.myplayer.ui.widget.desktop.DesktopLyricsView
+
+object LyricsHelper {
+  fun getDesktopLyricsContent(
+    lyrics: List<LyricsLine>, offset: Int, progress: Int, duration: Int
+  ): DesktopLyricsView.Content {
+    if (lyrics.isEmpty()) {
+      return DesktopLyricsView.Content(LyricsLine.LYRICS_LINE_NO_LRC, null, 1, 1)
+    }
+    val progressWithOffset = progress + offset
+    val index = lyrics.binarySearchBy(progressWithOffset) { it.time }.let {
+      if (it < 0) -(it + 1) - 1 else it
+    }
+    if (index < 0) {
+      check(index == -1)
+      return DesktopLyricsView.Content(null, lyrics[0], 1, 1)
+    }
+    check(index < lyrics.size)
+    return DesktopLyricsView.Content(
+      lyrics[index],
+      lyrics.getOrNull(index + 1),
+      progressWithOffset,
+      lyrics.getOrNull(index + 1)?.time ?: (duration + offset)
+    )
+  }
+}

app/src/main/java/remix/myplayer/helper/LyricsHelper.kt

@@ -163,9 +163,4 @@ object MusicServiceRemote {
   fun getOperation(): Int {
     return service?.operation ?: Command.NEXT
   }
-
-  @JvmStatic
-  fun setLyricOffset(offset: Int) {
-    service?.setLyricOffset(offset)
-  }
 }