修复一些bug

Author: rRemix

app/src/main/java/remix/myplayer/request/qq/QQClient.kt

@@ -25,8 +25,9 @@ class QQClient @Inject constructor(
   // 通用参数
   private val comm = mutableMapOf<String, Any>(
     "ct" to 11,
-    "cv" to "2111",
-    "v" to "2111",
+    // QQ 音乐目前只接受轻量版客户端标识；桌面版组合会返回 2001。
+    "cv" to "1003006",
+    "v" to "1003006",
     "os_ver" to "15",
     "phonetype" to "24122RKC7C", // REDMI K80 Pro
     "rom" to "Redmi/miro/miro:15/AE3A.240806.005/OS2.0.10${
@@ -35,7 +36,7 @@ class QQClient @Inject constructor(
         6
       )
     }.0.VOMCNXM:user/release-keys",
-    "tmeAppID" to "qqmusic",
+    "tmeAppID" to "qqmusiclight",
     "nettype" to "NETWORK_WIFI",
     "udid" to "0"
   )
@@ -56,7 +57,8 @@ class QQClient @Inject constructor(
     val data = request("GetSession", "music.getSession.session", param)
     val session = data.getJSONObject("session")
 
-    comm["uid"] = session.getString("uid")
+    // 服务端返回的是数值 uid，保留其 JSON 类型以匹配轻量版客户端请求。
+    comm["uid"] = session.getLong("uid")
     comm["sid"] = session.getString("sid")
     comm["userip"] = session.getString("userip")
 
@@ -131,8 +133,8 @@ class QQClient @Inject constructor(
       "grp" to 1
     )
 
-    val data = request("DoSearchForQQMusicDesktop", "music.search.SearchCgiService", param)
-    val itemSong = data.getJSONObject("body").getJSONObject("song").optJSONArray("list") ?: JSONArray()
+    val data = request("DoSearchForQQMusicLite", "music.search.SearchCgiService", param)
+    val itemSong = data.getJSONObject("body").optJSONArray("item_song") ?: JSONArray()
     val result = ArrayList<QQSong>()
     for (i in 0 until itemSong.length()) {
       val obj = itemSong.getJSONObject(i)

app/src/main/java/remix/myplayer/service/MusicService.kt

@@ -807,10 +807,10 @@ class MusicService : BaseService(),
    */
   private fun start(crossFade: Boolean) {
     Timber.v("play: $crossFade")
-    if (!playback.isPrepared) {
-      MessageNotifier.show(R.string.buffering_wait)
-      return
-    }
+//    if (!playback.isPrepared) {
+//      MessageNotifier.show(R.string.buffering_wait)
+//      return
+//    }
 
     // 播放
     playback.start()

app/src/main/java/remix/myplayer/ui/screen/playing/PlayingLyric.kt

@@ -175,6 +175,10 @@ internal fun PlayingLyric(song: Song) {
 
           when (extra) {
             LyricManager.CHANGE_LYRIC -> {
+              if (!currentSong.valid()) {
+                return
+              }
+
               lyricsManager.clearCache(currentSong)
 
               // 如果是手动选择则直接使用UriProvider解析

app/src/main/java/remix/myplayer/util/ImageUtil.kt

@@ -66,7 +66,7 @@ object ImageUtil {
       }
       return@withContext null
     } catch (e: Exception) {
-      Timber.w("extractAlbumArt", e)
+      Timber.w(e, "extractAlbumArt")
       return@withContext null
     }
   }