From ef222da824a53426b611319715bd2ac8751a6a1e Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sat, 8 Jul 2023 09:59:05 +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

---
 .../io/legado/app/help/http/CookieManager.kt  |  6 +--
 .../io/legado/app/service/AudioPlayService.kt | 43 +++++++++++++++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/http/CookieManager.kt b/app/src/main/java/io/legado/app/help/http/CookieManager.kt
index 9c3f30b67..e4d0fd192 100644
--- a/app/src/main/java/io/legado/app/help/http/CookieManager.kt
+++ b/app/src/main/java/io/legado/app/help/http/CookieManager.kt
@@ -56,15 +56,15 @@ object CookieManager {
         val cookie = CookieStore.getCookie(domain)
         val requestCookie = request.header("Cookie")
 
-        mergeCookies(cookie, requestCookie)?.let { cookie ->
+        mergeCookies(cookie, requestCookie)?.let { newCookie ->
             kotlin.runCatching {
                 return request.newBuilder()
-                    .header("Cookie", cookie)
+                    .header("Cookie", newCookie)
                     .build()
             }.onFailure {
                 CookieStore.removeCookie(url)
                 AppLog.put(
-                    "设置cookie出错，已清除cookie $domain cookie:$cookie\n${it.localizedMessage}",
+                    "设置cookie出错，已清除cookie $domain cookie:$newCookie\n${it.localizedMessage}",
                     it
                 )
             }
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 321306c02..5c6208d1c 100644
--- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt
+++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
@@ -8,6 +8,7 @@ import android.content.IntentFilter
 import android.graphics.BitmapFactory
 import android.media.AudioManager
 import android.os.Build
+import android.os.Bundle
 import android.os.PowerManager
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaSessionCompat
@@ -61,6 +62,14 @@ class AudioPlayService : BaseService(),
 
         var url: String = ""
             private set
+
+        private const val MEDIA_SESSION_ACTIONS = (PlaybackStateCompat.ACTION_PLAY
+                or PlaybackStateCompat.ACTION_PAUSE
+                or PlaybackStateCompat.ACTION_PLAY_PAUSE
+                or PlaybackStateCompat.ACTION_SEEK_TO)
+
+        private const val APP_ACTION_STOP = "Stop"
+        private const val APP_ACTION_TIMER = "Timer"
     }
 
     private val useWakeLock = AppConfig.audioPlayUseWakeLock
@@ -74,7 +83,7 @@ class AudioPlayService : BaseService(),
         MediaHelp.buildAudioFocusRequestCompat(this)
     }
     private val exoPlayer: ExoPlayer by lazy {
-       ExoPlayerHelper.createHttpExoPlayer(this)
+        ExoPlayerHelper.createHttpExoPlayer(this)
     }
     private var mediaSessionCompat: MediaSessionCompat? = null
     private var broadcastReceiver: BroadcastReceiver? = null
@@ -152,7 +161,12 @@ class AudioPlayService : BaseService(),
                     chapter = AudioPlay.durChapter,
                     headerMapF = AudioPlay.headers(true),
                 )
-                exoPlayer.setMediaItem(ExoPlayerHelper.createMediaItem(analyzeUrl.url,analyzeUrl.headerMap))
+                exoPlayer.setMediaItem(
+                    ExoPlayerHelper.createMediaItem(
+                        analyzeUrl.url,
+                        analyzeUrl.headerMap
+                    )
+                )
                 exoPlayer.playWhenReady = true
                 exoPlayer.prepare()
             }.onError {
@@ -419,9 +433,19 @@ class AudioPlayService : BaseService(),
     private fun upMediaSessionPlaybackState(state: Int) {
         mediaSessionCompat?.setPlaybackState(
             PlaybackStateCompat.Builder()
-                .setActions(PlaybackStateCompat.ACTION_SEEK_TO)
+                .setActions(MEDIA_SESSION_ACTIONS)
                 .setState(state, exoPlayer.currentPosition, 1f)
                 .setBufferedPosition(exoPlayer.bufferedPosition)
+                .addCustomAction(
+                    APP_ACTION_STOP,
+                    getString(R.string.set_timer),
+                    R.drawable.ic_stop_black_24dp
+                )
+                .addCustomAction(
+                    APP_ACTION_TIMER,
+                    getString(R.string.set_timer),
+                    R.drawable.ic_time_add_24dp
+                )
                 .build()
         )
     }
@@ -441,6 +465,19 @@ class AudioPlayService : BaseService(),
             override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
                 return MediaButtonReceiver.handleIntent(this@AudioPlayService, mediaButtonEvent)
             }
+
+            override fun onPlay() = resume()
+
+            override fun onPause() = pause()
+
+            override fun onCustomAction(action: String?, extras: Bundle?) {
+                action ?: return
+
+                when (action) {
+                    APP_ACTION_STOP -> stopSelf()
+                    APP_ACTION_TIMER -> addTimer()
+                }
+            }
         })
         mediaSessionCompat?.setMediaButtonReceiver(
             broadcastPendingIntent<MediaButtonReceiver>(Intent.ACTION_MEDIA_BUTTON)