This commit is contained in:
ocean 2024-07-05 14:22:38 +08:00
parent 631618ace4
commit 9127cf77e1
2 changed files with 12 additions and 10 deletions

View File

@ -35,13 +35,13 @@ android {
"proguard-rules.pro" "proguard-rules.pro"
) )
} }
debug { // debug {
isMinifyEnabled = true // isMinifyEnabled = true
proguardFiles( // proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"), // getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro" // "proguard-rules.pro"
) // )
} // }
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8

View File

@ -191,9 +191,6 @@ abstract class MoBaseActivity : AppCompatActivity(), MusicPlayerView.PlaySkipFor
} }
override fun onPlaybackStateChanged(playbackState: Int) { override fun onPlaybackStateChanged(playbackState: Int) {
if (currentLayoutId != null) {
addMusicPlayerViewToLayout(currentLayoutId)
}
val meController = MediaControllerManager.getController() val meController = MediaControllerManager.getController()
if (meController != null) { if (meController != null) {
musicPlayerView.updateProgressState(meController) musicPlayerView.updateProgressState(meController)
@ -210,6 +207,11 @@ abstract class MoBaseActivity : AppCompatActivity(), MusicPlayerView.PlaySkipFor
Player.STATE_READY -> { Player.STATE_READY -> {
LogTag.LogD(TAG, "base STATE_READY") LogTag.LogD(TAG, "base STATE_READY")
musicPlayerView.updateSetProgress(meController) musicPlayerView.updateSetProgress(meController)
//在加载的时候突然回到上一个界面onResume会无法进入显示的判断
//防止悬浮框消失
if (currentLayoutId != null) {
addMusicPlayerViewToLayout(currentLayoutId)
}
} }
else -> {} else -> {}