Skip to content

Commit 81cf93e

Browse files
kyrie25dead8309
authored andcommitted
fix: update media data for first session
1 parent b7ee456 commit 81cf93e

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

data/src/main/java/com/my/kizzy/data/get_current_data/AppTracker.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,11 @@ class AppTracker @Inject constructor(
2626
private val getCurrentlyRunningApp: GetCurrentlyRunningApp,
2727
private val getCurrentPlayingMedia: GetCurrentPlayingMedia
2828
) {
29-
3029
fun getCurrentAppData() = flow {
31-
var songTitle = "" // Title::packageName
3230
while (currentCoroutineContext().isActive) {
3331
val getCurrentMedia = getCurrentPlayingMedia()
3432
if (getCurrentMedia.name.isNotEmpty()) {
35-
if (songTitle != getCurrentMedia.packageName) {
36-
songTitle = getCurrentMedia.packageName
37-
emit(getCurrentMedia)
38-
}
33+
emit(getCurrentMedia)
3934
} else {
4035
val getCurrentApp = getCurrentlyRunningApp()
4136
if (getCurrentApp.name.isNotEmpty()) {

data/src/main/java/com/my/kizzy/data/get_current_data/media/GetCurrentlyPlayingMedia.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import android.content.ComponentName
1717
import android.content.Context
1818
import android.media.MediaMetadata
1919
import android.media.session.MediaSessionManager
20+
import android.media.session.PlaybackState.STATE_PLAYING
2021
import com.blankj.utilcode.util.AppUtils
2122
import com.my.kizzy.data.rpc.CommonRpc
2223
import com.my.kizzy.data.rpc.RpcImage
@@ -53,7 +54,7 @@ class GetCurrentPlayingMedia @Inject constructor(
5354
val bitmap = metadata?.let { metadataResolver.getCoverArt(it) }
5455
val duration = metadata?.getLong(MediaMetadata.METADATA_KEY_DURATION)
5556
duration?.let {
56-
if (it != 0L) timestamps = Timestamps(
57+
if (it != 0L && mediaController.playbackState?.state == STATE_PLAYING) timestamps = Timestamps(
5758
end = System.currentTimeMillis() + duration - (mediaController.playbackState?.position ?: 0L),
5859
start = System.currentTimeMillis() - (mediaController.playbackState?.position ?: 0L)
5960
)

0 commit comments

Comments
 (0)