重构歌词相关代码

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)
@@ -248,7 +250,6 @@ dependencies {
     implementation(libs.rebound)
     implementation(libs.rxandroid)
     implementation(libs.rxjava)
-    implementation(libs.xxpermissions)
     implementation(libs.sardine.android) {
         // https://github.com/thegrizzlylabs/sardine-android/issues/70
         // 上游已经exclude了，但是不知道为什么还是会有
@@ -258,6 +259,7 @@ dependencies {
     implementation(libs.slf4j)
     implementation(libs.timber)
     implementation(libs.tinypinyin)
+    implementation(libs.xxpermissions)
 
     debugImplementation(libs.leakcanary)
 

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

@@ -6,7 +6,6 @@ import android.os.Build
 import android.os.Process
 import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
-import com.hjq.permissions.XXPermissions
 import com.tencent.bugly.crashreport.CrashReport
 import com.tencent.bugly.crashreport.CrashReport.UserStrategy
 import io.reactivex.Completable
@@ -60,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) {
@@ -85,8 +73,6 @@ class App : MultiDexApplication() {
   }
 
   private fun setUp() {
-    XXPermissions.setCheckMode(false)
-    DiskCache.init(this, "lyric")
     setApplicationLanguage(this)
     Completable
         .fromAction {

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

@@ -0,0 +1,34 @@
+package remix.myplayer.helper
+
+import android.content.Context
+import remix.myplayer.R
+import remix.myplayer.theme.Theme
+import remix.myplayer.util.SPUtil
+
+object LyricsHelper {
+  fun showLocalLyricsTip(context: Context, action: () -> Unit) {
+    if (!SPUtil.getValue(
+        context,
+        SPUtil.LYRICS_KEY.NAME,
+        SPUtil.LYRICS_KEY.LOCAL_LYRICS_TIP_SHOWN,
+        false
+      )
+    ) {
+      Theme.getBaseDialog(context)
+          .positiveText(R.string.confirm)
+          .onPositive { _, _ ->
+            SPUtil.putValue(
+              context,
+              SPUtil.LYRICS_KEY.NAME,
+              SPUtil.LYRICS_KEY.LOCAL_LYRICS_TIP_SHOWN,
+              true
+            )
+            action.invoke()
+          }
+          .content(R.string.local_lyrics_tip)
+          .show()
+    } else {
+      action.invoke()
+    }
+  }
+}

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

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