diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4c2e913..3e9edf7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -35,13 +35,13 @@ android { "proguard-rules.pro" ) } - debug { - isMinifyEnabled = true - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } +// debug { +// isMinifyEnabled = true +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) +// } } compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/app/src/main/java/melody/offline/music/activity/MoBaseActivity.kt b/app/src/main/java/melody/offline/music/activity/MoBaseActivity.kt index a890c90..141d095 100644 --- a/app/src/main/java/melody/offline/music/activity/MoBaseActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/MoBaseActivity.kt @@ -191,9 +191,6 @@ abstract class MoBaseActivity : AppCompatActivity(), MusicPlayerView.PlaySkipFor } override fun onPlaybackStateChanged(playbackState: Int) { - if (currentLayoutId != null) { - addMusicPlayerViewToLayout(currentLayoutId) - } val meController = MediaControllerManager.getController() if (meController != null) { musicPlayerView.updateProgressState(meController) @@ -210,6 +207,11 @@ abstract class MoBaseActivity : AppCompatActivity(), MusicPlayerView.PlaySkipFor Player.STATE_READY -> { LogTag.LogD(TAG, "base STATE_READY") musicPlayerView.updateSetProgress(meController) + //在加载的时候突然回到上一个界面,onResume会无法进入显示的判断 + //防止悬浮框消失 + if (currentLayoutId != null) { + addMusicPlayerViewToLayout(currentLayoutId) + } } else -> {}