From de46c6a1d5e1374c384baefd1e10c576380d546f Mon Sep 17 00:00:00 2001 From: kunfei Date: Thu, 24 Oct 2019 11:10:09 +0800 Subject: [PATCH] up --- .../main/java/io/legado/app/data/api/IHttpPostApi.kt | 4 ++-- .../io/legado/app/service/HttpReadAloudService.kt | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/api/IHttpPostApi.kt b/app/src/main/java/io/legado/app/data/api/IHttpPostApi.kt index 92b5f1cf3..17bf16ee8 100644 --- a/app/src/main/java/io/legado/app/data/api/IHttpPostApi.kt +++ b/app/src/main/java/io/legado/app/data/api/IHttpPostApi.kt @@ -45,9 +45,9 @@ interface IHttpPostApi { @FormUrlEncoded @POST - fun postMapByte( + fun postMapByteAsync( @Url url: String, @FieldMap(encoded = true) fieldMap: Map, @HeaderMap headers: Map - ): Call + ): Deferred> } 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 9e2a919cc..cedb58979 100644 --- a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt @@ -14,7 +14,6 @@ import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Job import kotlinx.coroutines.isActive import kotlinx.coroutines.launch -import org.jetbrains.anko.toast import java.io.File import java.io.FileDescriptor import java.io.FileInputStream @@ -85,14 +84,12 @@ class HttpReadAloudService : BaseReadAloudService(), if (isActive) { val bytes = HttpHelper.getByteRetrofit("http://tts.baidu.com") .create(IHttpPostApi::class.java) - .postMapByte( + .postMapByteAsync( "http://tts.baidu.com/text2audio", getAudioBody(contentList[index]), mapOf() - ) - .execute().body() - if (bytes == null) { - toast("访问失败") - } else { + ).await() + .body() + if (bytes != null && isActive) { val file = getSpeakFile(index) file.writeBytes(bytes) if (index == nowSpeak) {