|
|
|
@ -39,7 +39,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private var activity: Activity? = null |
|
|
|
private var context: Context? = null |
|
|
|
private var loginManager: QQMusicLoginManager? = null |
|
|
|
private var musicManager: QQMusicManager? = null |
|
|
|
private val handler = Handler(Looper.getMainLooper()) |
|
|
|
@ -51,9 +51,9 @@ class QQMusicSingleton private constructor() { |
|
|
|
/** |
|
|
|
* 初始化单例，设置Activity上下文 |
|
|
|
*/ |
|
|
|
fun initialize(activity: Activity) { |
|
|
|
this.activity = activity |
|
|
|
this.sharedPreferences = activity.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) |
|
|
|
fun initialize(context: Context) { |
|
|
|
this.context = context |
|
|
|
this.sharedPreferences = context.getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE) |
|
|
|
loadSavedLoginInfo() |
|
|
|
Log.d(TAG, "QQ音乐单例初始化完成") |
|
|
|
} |
|
|
|
@ -72,7 +72,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
} |
|
|
|
|
|
|
|
return try { |
|
|
|
this.activity?.packageManager?.getPackageInfo(packageName, 0) |
|
|
|
this.context?.packageManager?.getPackageInfo(packageName, 0) |
|
|
|
Log.d(TAG, "QQ音乐app已安装: $packageName") |
|
|
|
true |
|
|
|
} catch (e: PackageManager.NameNotFoundException) { |
|
|
|
@ -113,7 +113,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
callback(Result.failure(Exception("未安装QQ音乐软件，请先安装QQ音乐软件"))) |
|
|
|
return |
|
|
|
} |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
// 先检查是否已经登录且未过期 |
|
|
|
if (isLoggedIn()) { |
|
|
|
Log.d(TAG, "用户已登录且未过期，直接返回登录信息") |
|
|
|
@ -159,7 +159,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
callback(Result.failure(Exception("未安装QQ音乐软件，请先安装QQ音乐软件"))) |
|
|
|
return |
|
|
|
} |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
|
|
|
|
// 先检查是否已经登录且未过期 |
|
|
|
if (isLoggedIn()) { |
|
|
|
@ -206,7 +206,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
retryCount: Int, |
|
|
|
callback: (Result<List<Map<String, Any?>>>) -> Unit |
|
|
|
) { |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
if (currentActivity == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return |
|
|
|
@ -240,7 +240,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
retryCount: Int, |
|
|
|
callback: (Result<List<Map<String, Any?>>>) -> Unit |
|
|
|
) { |
|
|
|
val currentActivity = activity ?: return |
|
|
|
val currentActivity = context ?: return |
|
|
|
val searchKey = "${keyword}_${System.currentTimeMillis()}" |
|
|
|
var completed = false |
|
|
|
|
|
|
|
@ -336,7 +336,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
index: Int, |
|
|
|
callback: (Result<Unit>) -> Unit |
|
|
|
) { |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
if (currentActivity == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return |
|
|
|
@ -369,7 +369,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
index: Int, |
|
|
|
callback: (Result<Unit>) -> Unit |
|
|
|
) { |
|
|
|
val currentActivity = activity ?: return |
|
|
|
val currentActivity = context ?: return |
|
|
|
|
|
|
|
ensureMusicManager(currentActivity) |
|
|
|
musicManager?.playSongs(songMids, index, object : QQMusicManager.PlayCallback { |
|
|
|
@ -481,7 +481,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
* 获取播放时间 |
|
|
|
*/ |
|
|
|
fun getPlayTime(callback: (Result<PlayTimeInfo>) -> Unit) { |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
if (currentActivity == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return |
|
|
|
@ -512,13 +512,13 @@ class QQMusicSingleton private constructor() { |
|
|
|
* 同步当前播放信息 - 统一接口 |
|
|
|
*/ |
|
|
|
fun syncCurrentPlayInfo(callback: (Result<Map<String, Any?>>) -> Unit) { |
|
|
|
val currentActivity = activity |
|
|
|
if (currentActivity == null) { |
|
|
|
val currentcontext = context |
|
|
|
if (currentcontext == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
ensureMusicManager(currentActivity) |
|
|
|
ensureMusicManager(currentcontext) |
|
|
|
musicManager?.syncCurrentPlayInfo(object : QQMusicManager.InfoCallback { |
|
|
|
override fun onSuccess(data: Map<String, Any?>) { |
|
|
|
handler.post { |
|
|
|
@ -549,7 +549,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
loginManager = null |
|
|
|
musicManager?.cleanup() |
|
|
|
musicManager = null |
|
|
|
activity = null |
|
|
|
context = null |
|
|
|
Log.d(TAG, "QQ音乐单例资源清理完成") |
|
|
|
} |
|
|
|
|
|
|
|
@ -598,9 +598,9 @@ class QQMusicSingleton private constructor() { |
|
|
|
} |
|
|
|
|
|
|
|
// 私有辅助方法 |
|
|
|
private fun ensureMusicManager(activity: Activity) { |
|
|
|
private fun ensureMusicManager(context: Context) { |
|
|
|
if (musicManager == null) { |
|
|
|
musicManager = QQMusicManager(activity) |
|
|
|
musicManager = QQMusicManager(context) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -609,7 +609,7 @@ class QQMusicSingleton private constructor() { |
|
|
|
action: (QQMusicManager, QQMusicManager.PlayCallback) -> Unit |
|
|
|
): (callback: (Result<Unit>) -> Unit) -> Unit { |
|
|
|
return lambda@{ callback -> |
|
|
|
val currentActivity = activity |
|
|
|
val currentActivity = context |
|
|
|
if (currentActivity == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return@lambda |
|
|
|
@ -639,13 +639,13 @@ class QQMusicSingleton private constructor() { |
|
|
|
action: (QQMusicManager, QQMusicManager.InfoCallback) -> Unit |
|
|
|
): (callback: (Result<Map<String, Any?>>) -> Unit) -> Unit { |
|
|
|
return lambda@{ callback -> |
|
|
|
val currentActivity = activity |
|
|
|
if (currentActivity == null) { |
|
|
|
val currentcontext = context |
|
|
|
if (currentcontext == null) { |
|
|
|
callback(Result.failure(Exception("Activity not available"))) |
|
|
|
return@lambda |
|
|
|
} |
|
|
|
|
|
|
|
ensureMusicManager(currentActivity) |
|
|
|
ensureMusicManager(currentcontext) |
|
|
|
action(musicManager!!, object : QQMusicManager.InfoCallback { |
|
|
|
override fun onSuccess(data: Map<String, Any?>) { |
|
|
|
handler.post { |
|
|
|
|
fdp
1 year ago