From 4fcee4175e0d102a204d370ab58904328b1ec241 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sun, 3 May 2020 17:35:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/service/TTSReadAloudService.kt | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
index 0fba1d507..28b7efdc9 100644
--- a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
@@ -1,7 +1,6 @@
 package io.legado.app.service
 
 import android.app.PendingIntent
-import android.os.Build
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import io.legado.app.R
@@ -33,6 +32,8 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         }
     }
 
+    private val ttsUtteranceListener = TTSUtteranceListener()
+
     override fun onCreate() {
         super.onCreate()
         initTts()
@@ -41,7 +42,9 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
 
     private fun initTts() {
         ttsInitFinish = false
-        textToSpeech = TextToSpeech(this, this)
+        textToSpeech = TextToSpeech(this, this).apply {
+            setOnUtteranceProgressListener(ttsUtteranceListener)
+        }
     }
 
     override fun onDestroy() {
@@ -54,10 +57,9 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         if (status == TextToSpeech.SUCCESS) {
             textToSpeech?.let {
                 it.language = Locale.CHINA
-                it.setOnUtteranceProgressListener(TTSUtteranceListener())
                 ttsInitFinish = true
+                play()
             }
-            play()
         } else {
             launch {
                 toast(R.string.tts_init_failed)
@@ -73,29 +75,18 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         if (requestFocus()) {
             MediaHelp.playSilentSound(this)
             super.play()
+            textToSpeech?.stop()
             for (i in nowSpeak until contentList.size) {
-                if (i == 0) {
-                    speak(contentList[i], TextToSpeech.QUEUE_FLUSH, AppConst.APP_TAG + i)
-                } else {
-                    speak(contentList[i], TextToSpeech.QUEUE_ADD, AppConst.APP_TAG + i)
-                }
+                textToSpeech?.speak(
+                    contentList[i],
+                    TextToSpeech.QUEUE_ADD,
+                    null,
+                    AppConst.APP_TAG + i
+                )
             }
         }
     }
 
-    private fun speak(content: String, queueMode: Int, utteranceId: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            textToSpeech?.speak(content, queueMode, null, utteranceId)
-        } else {
-            @Suppress("DEPRECATION")
-            textToSpeech?.speak(
-                content,
-                queueMode,
-                hashMapOf(Pair(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, utteranceId))
-            )
-        }
-    }
-
     /**
      * 更新朗读速度
      */
@@ -161,8 +152,8 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
                     pageIndex++
                     ReadBook.moveToNextPage()
                 }
+                postEvent(EventBus.TTS_PROGRESS, readAloudNumber + 1)
             }
-            postEvent(EventBus.TTS_PROGRESS, readAloudNumber + 1)
         }
 
         override fun onDone(s: String) {