From 628f2d22f00bb4a2d0595a992c0298f8c6e25046 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 28 Feb 2022 08:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=97=E8=AF=BB=E7=94=A8exoPlayer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/service/HttpReadAloudService.kt | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
index 248530263..e8a7e57bd 100644
--- a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
@@ -43,7 +43,6 @@ class HttpReadAloudService : BaseReadAloudService(),
     }
     private val cacheFiles = hashSetOf<String>()
     private var task: Coroutine<*>? = null
-    private var playingIndex = -1
     private var playIndexJob: Job? = null
     private val mutex = Mutex()
 
@@ -58,12 +57,8 @@ class HttpReadAloudService : BaseReadAloudService(),
         exoPlayer.release()
     }
 
-    override fun newReadAloud(play: Boolean) {
-        playingIndex = -1
-        super.newReadAloud(play)
-    }
-
     override fun play() {
+        exoPlayer.stop()
         if (contentList.isEmpty()) {
             AppLog.putDebug("朗读列表为空")
             ReadBook.readAloud()
@@ -213,7 +208,7 @@ class HttpReadAloudService : BaseReadAloudService(),
 
     @Synchronized
     private fun playAudio(file: File) {
-        if (playingIndex != nowSpeak && requestFocus()) {
+        if (requestFocus()) {
             launch {
                 kotlin.runCatching {
                     val mediaItem = MediaItem.fromUri(Uri.fromFile(file))
@@ -288,12 +283,8 @@ class HttpReadAloudService : BaseReadAloudService(),
     override fun resumeReadAloud() {
         super.resumeReadAloud()
         kotlin.runCatching {
-            if (playingIndex == -1) {
-                play()
-            } else {
-                exoPlayer.play()
-                upPlayPos()
-            }
+            exoPlayer.play()
+            upPlayPos()
         }
     }
 
@@ -328,7 +319,6 @@ class HttpReadAloudService : BaseReadAloudService(),
     override fun upSpeechRate(reset: Boolean) {
         task?.cancel()
         exoPlayer.stop()
-        playingIndex = -1
         downloadAudio()
     }