From 8d5a1877aa2d08d206a631a801f73bf78e04c1ff Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 13 Mar 2020 18:34:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/service/TTSReadAloudService.kt |  6 +--
 .../app/ui/rss/read/ReadRssViewModel.kt       | 38 +++++++++++++------
 2 files changed, 30 insertions(+), 14 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 c7fc02b08..1f63dac89 100644
--- a/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/TTSReadAloudService.kt
@@ -29,7 +29,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         }
     }
 
-    private var ttsIsSuccess: Boolean = false
+    private var ttsInitFinish = false
 
     override fun onCreate() {
         super.onCreate()
@@ -47,7 +47,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         if (status == TextToSpeech.SUCCESS) {
             textToSpeech?.language = Locale.CHINA
             textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
-            ttsIsSuccess = true
+            ttsInitFinish = true
             play()
         } else {
             launch {
@@ -58,7 +58,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
 
     @Synchronized
     override fun play() {
-        if (contentList.isEmpty() || !ttsIsSuccess) {
+        if (contentList.isEmpty() || !ttsInitFinish) {
             return
         }
         if (requestFocus()) {
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
index 6d90fd181..d2aaad80f 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
@@ -35,7 +35,9 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
     val contentLiveData = MutableLiveData<String>()
     val urlLiveData = MutableLiveData<AnalyzeUrl>()
     var star = false
-    var textToSpeech: TextToSpeech = TextToSpeech(context, this)
+    var textToSpeech: TextToSpeech? = null
+    private var ttsInitFinish = false
+    private var ttsText = ""
 
     fun initData(intent: Intent) {
         execute {
@@ -143,28 +145,42 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
         }
     }
 
+    @Synchronized
     override fun onInit(status: Int) {
-        launch {
-            if (status == TextToSpeech.SUCCESS) {
-                textToSpeech.language = Locale.CHINA
-                textToSpeech.setOnUtteranceProgressListener(TTSUtteranceListener())
-            } else {
+        if (status == TextToSpeech.SUCCESS) {
+            textToSpeech?.language = Locale.CHINA
+            textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
+            ttsInitFinish = true
+            play()
+        } else {
+            launch {
                 toast(R.string.tts_init_failed)
             }
         }
     }
 
+    @Synchronized
+    private fun play() {
+        if (!ttsInitFinish) return
+        textToSpeech?.stop()
+        ttsText.split("\n", "  ", "　　").forEach {
+            textToSpeech?.speak(it, TextToSpeech.QUEUE_ADD, null, "rss")
+        }
+    }
+
     fun readAloud(text: String) {
-        textToSpeech.stop()
-        text.split("\n", "  ", "　　").forEach {
-            textToSpeech.speak(it, TextToSpeech.QUEUE_ADD, null, "rss")
+        ttsText = text
+        textToSpeech?.let {
+            play()
+        } ?: let {
+            textToSpeech = TextToSpeech(context, this)
         }
     }
 
     override fun onCleared() {
         super.onCleared()
-        textToSpeech.stop()
-        textToSpeech.shutdown()
+        textToSpeech?.stop()
+        textToSpeech?.shutdown()
     }
 
     /**