From fc84a5b9b2e9dd3c0cb88d4f8aaba838b3f8359f Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 21 Sep 2022 18:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/MediaHelp.kt | 7 +++++-- .../main/java/io/legado/app/service/AudioPlayService.kt | 2 +- .../java/io/legado/app/service/BaseReadAloudService.kt | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/MediaHelp.kt b/app/src/main/java/io/legado/app/help/MediaHelp.kt index ed69f64a2..b84e56130 100644 --- a/app/src/main/java/io/legado/app/help/MediaHelp.kt +++ b/app/src/main/java/io/legado/app/help/MediaHelp.kt @@ -10,6 +10,7 @@ import androidx.media.AudioManagerCompat import io.legado.app.R object MediaHelp { + const val MEDIA_SESSION_ACTIONS = (PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS or PlaybackStateCompat.ACTION_REWIND or PlaybackStateCompat.ACTION_PLAY @@ -32,18 +33,20 @@ object MediaHelp { or PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE or PlaybackStateCompat.ACTION_SET_CAPTIONING_ENABLED) - fun getFocusRequest(audioFocusChangeListener: AudioManager.OnAudioFocusChangeListener): AudioFocusRequestCompat { + fun buildAudioFocusRequestCompat( + audioFocusChangeListener: AudioManager.OnAudioFocusChangeListener + ): AudioFocusRequestCompat { val mPlaybackAttributes = AudioAttributesCompat.Builder() .setUsage(AudioAttributesCompat.USAGE_MEDIA) .setContentType(AudioAttributesCompat.CONTENT_TYPE_MUSIC) .build() return AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN) .setAudioAttributes(mPlaybackAttributes) - //.setAcceptsDelayedFocusGain(true) .setOnAudioFocusChangeListener(audioFocusChangeListener) .build() } + /** * @return 音频焦点 */ diff --git a/app/src/main/java/io/legado/app/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt index 4f782dd7c..884413db0 100644 --- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt +++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt @@ -62,7 +62,7 @@ class AudioPlayService : BaseService(), } private val mFocusRequest: AudioFocusRequestCompat by lazy { - MediaHelp.getFocusRequest(this) + MediaHelp.buildAudioFocusRequestCompat(this) } private val exoPlayer: ExoPlayer by lazy { ExoPlayer.Builder(this).setLoadControl( diff --git a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt index 607f968e4..e63efc10e 100644 --- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt @@ -56,7 +56,7 @@ abstract class BaseReadAloudService : BaseService(), } private val mFocusRequest: AudioFocusRequestCompat by lazy { - MediaHelp.getFocusRequest(this) + MediaHelp.buildAudioFocusRequestCompat(this) } private val mediaSessionCompat: MediaSessionCompat by lazy { MediaSessionCompat(this, "readAloud")