pull/1581/head
kunfei 3 years ago
parent b89495c87d
commit 35dfa58f9d
  1. 4
      app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
  2. 5
      app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
  3. 6
      app/src/main/java/io/legado/app/service/TTSReadAloudService.kt

@ -156,13 +156,9 @@ abstract class BaseReadAloudService : BaseService(),
@CallSuper @CallSuper
open fun resumeReadAloud() { open fun resumeReadAloud() {
pause = false pause = false
if (contentList.isEmpty()) {
ReadBook.readAloud()
} else {
upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING) upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PLAYING)
postEvent(EventBus.ALOUD_STATE, Status.PLAY) postEvent(EventBus.ALOUD_STATE, Status.PLAY)
} }
}
abstract fun upSpeechRate(reset: Boolean = false) abstract fun upSpeechRate(reset: Boolean = false)

@ -63,7 +63,9 @@ class HttpReadAloudService : BaseReadAloudService(),
} }
override fun play() { override fun play() {
if (contentList.isEmpty()) return if (contentList.isEmpty()) {
ReadBook.readAloud()
} else {
ReadAloud.httpTTS?.let { ReadAloud.httpTTS?.let {
val fileName = val fileName =
md5SpeakFileName(it.url, AppConfig.ttsSpeechRate.toString(), contentList[nowSpeak]) md5SpeakFileName(it.url, AppConfig.ttsSpeechRate.toString(), contentList[nowSpeak])
@ -79,6 +81,7 @@ class HttpReadAloudService : BaseReadAloudService(),
} }
} }
} }
}
override fun playStop() { override fun playStop() {
mediaPlayer.stop() mediaPlayer.stop()

@ -65,7 +65,11 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
@Synchronized @Synchronized
override fun play() { override fun play() {
if (contentList.isNotEmpty() && ttsInitFinish && requestFocus()) { if (!ttsInitFinish) return
if (!requestFocus()) return
if (contentList.isEmpty()) {
ReadBook.readAloud()
} else {
super.play() super.play()
execute { execute {
MediaHelp.playSilentSound(this@TTSReadAloudService) MediaHelp.playSilentSound(this@TTSReadAloudService)

Loading…
Cancel
Save