pull/737/head
gedoor 4 years ago
parent ccedfdbfd3
commit abb686a1ab
  1. 4
      app/src/main/java/io/legado/app/App.kt
  2. 2
      app/src/main/java/io/legado/app/help/BookHelp.kt
  3. 7
      app/src/main/java/io/legado/app/help/JsExtensions.kt
  4. 13
      app/src/main/java/io/legado/app/help/http/ByteParser.kt
  5. 95
      app/src/main/java/io/legado/app/help/http/HttpHelper.kt
  6. 36
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
  7. 4
      app/src/main/java/io/legado/app/model/rss/Rss.kt
  8. 4
      app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt
  9. 4
      app/src/main/java/io/legado/app/model/webBook/BookContent.kt
  10. 10
      app/src/main/java/io/legado/app/model/webBook/WebBook.kt
  11. 2
      app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
  12. 5
      app/src/main/java/io/legado/app/ui/association/ImportBookSourceViewModel.kt
  13. 5
      app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleViewModel.kt
  14. 5
      app/src/main/java/io/legado/app/ui/association/ImportRssSourceViewModel.kt
  15. 7
      app/src/main/java/io/legado/app/ui/book/read/config/BgTextConfigDialog.kt
  16. 5
      app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineViewModel.kt
  17. 5
      app/src/main/java/io/legado/app/ui/book/read/config/TocRegexViewModel.kt
  18. 5
      app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt

@ -9,6 +9,7 @@ import android.provider.Settings
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.multidex.MultiDexApplication import androidx.multidex.MultiDexApplication
import com.jeremyliao.liveeventbus.LiveEventBus import com.jeremyliao.liveeventbus.LiveEventBus
import io.legado.app.constant.AppConst
import io.legado.app.constant.AppConst.channelIdDownload import io.legado.app.constant.AppConst.channelIdDownload
import io.legado.app.constant.AppConst.channelIdReadAloud import io.legado.app.constant.AppConst.channelIdReadAloud
import io.legado.app.constant.AppConst.channelIdWeb import io.legado.app.constant.AppConst.channelIdWeb
@ -47,6 +48,9 @@ class App : MultiDexApplication() {
LanguageUtils.setConfiguration(this) LanguageUtils.setConfiguration(this)
db = AppDatabase.createDatabase(INSTANCE) db = AppDatabase.createDatabase(INSTANCE)
RxHttp.init(HttpHelper.client, BuildConfig.DEBUG) RxHttp.init(HttpHelper.client, BuildConfig.DEBUG)
RxHttp.setOnParamAssembly {
it.addHeader(AppConst.UA_NAME, AppConfig.userAgent)
}
packageManager.getPackageInfo(packageName, 0)?.let { packageManager.getPackageInfo(packageName, 0)?.let {
versionCode = it.versionCode versionCode = it.versionCode
versionName = it.versionName versionName = it.versionName

@ -112,7 +112,7 @@ object BookHelp {
downloadImages.add(src) downloadImages.add(src)
val analyzeUrl = AnalyzeUrl(src) val analyzeUrl = AnalyzeUrl(src)
try { try {
analyzeUrl.getResponseBytes(book.origin)?.let { analyzeUrl.getByteArray(book.origin).let {
FileUtils.createFileIfNotExist( FileUtils.createFileIfNotExist(
downloadDir, downloadDir,
cacheFolderName, cacheFolderName,

@ -6,7 +6,6 @@ import androidx.annotation.Keep
import io.legado.app.App import io.legado.app.App
import io.legado.app.constant.AppConst.dateFormat import io.legado.app.constant.AppConst.dateFormat
import io.legado.app.help.http.CookieStore import io.legado.app.help.http.CookieStore
import io.legado.app.help.http.HttpHelper
import io.legado.app.help.http.SSLHelper import io.legado.app.help.http.SSLHelper
import io.legado.app.model.Debug import io.legado.app.model.Debug
import io.legado.app.model.analyzeRule.AnalyzeUrl import io.legado.app.model.analyzeRule.AnalyzeUrl
@ -15,6 +14,8 @@ import io.legado.app.utils.*
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import org.jsoup.Connection import org.jsoup.Connection
import org.jsoup.Jsoup import org.jsoup.Jsoup
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toByteArray
import java.io.File import java.io.File
import java.net.URLEncoder import java.net.URLEncoder
import java.nio.charset.Charset import java.nio.charset.Charset
@ -250,8 +251,8 @@ interface JsExtensions {
str.isAbsUrl() -> runBlocking { str.isAbsUrl() -> runBlocking {
var x = CacheManager.getByteArray(key) var x = CacheManager.getByteArray(key)
if (x == null) { if (x == null) {
x = HttpHelper.simpleGetBytesAsync(str) x = RxHttp.get(str).toByteArray().await()
x?.let { x.let {
CacheManager.put(key, it) CacheManager.put(key, it)
} }
} }

@ -0,0 +1,13 @@
package io.legado.app.help.http
import okhttp3.Response
import rxhttp.wrapper.annotation.Parser
@Parser(name = "ByteArray")
class ByteParser : rxhttp.wrapper.parse.Parser<ByteArray> {
override fun onParse(response: Response): ByteArray {
return response.body()!!.bytes()
}
}

@ -1,14 +1,8 @@
package io.legado.app.help.http package io.legado.app.help.http
import io.legado.app.constant.AppConst
import io.legado.app.help.AppConfig
import io.legado.app.help.http.api.HttpGetApi
import io.legado.app.utils.NetworkUtils
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import okhttp3.* import okhttp3.*
import retrofit2.Retrofit import retrofit2.Retrofit
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
import java.net.InetSocketAddress import java.net.InetSocketAddress
import java.net.Proxy import java.net.Proxy
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -41,72 +35,48 @@ object HttpHelper {
builder.build() builder.build()
} }
suspend fun simpleGetAsync(url: String): String {
val str = RxHttp.get(url)
.addHeader(AppConst.UA_NAME, AppConfig.userAgent)
.toText()
return str.await()
}
suspend fun simpleGetBytesAsync(url: String): ByteArray? {
NetworkUtils.getBaseUrl(url)?.let { baseUrl ->
return getByteRetrofit(baseUrl)
.create(HttpGetApi::class.java)
.getMapByteAsync(url, mapOf(), mapOf(Pair(AppConst.UA_NAME, AppConfig.userAgent)))
.body()
}
return null
}
inline fun <reified T> getApiService( inline fun <reified T> getApiService(
baseUrl: String, baseUrl: String,
encode: String? = null, encode: String? = null,
proxy: String? = null proxy: String? = null
): T { ): T {
return if (proxy.isNullOrEmpty()) { return getRetrofit(baseUrl, encode, proxy).create(T::class.java)
getRetrofit(baseUrl, encode).create(T::class.java)
} else {
getRetrofitWithProxy(baseUrl, encode, proxy).create(T::class.java)
}
}
inline fun <reified T> getBytesApiService(baseUrl: String): T {
return getByteRetrofit(baseUrl).create(T::class.java)
} }
fun getRetrofit(baseUrl: String, encode: String? = null): Retrofit { fun getRetrofit(
baseUrl: String,
encode: String? = null,
proxy: String? = null
): Retrofit {
return Retrofit.Builder().baseUrl(baseUrl) return Retrofit.Builder().baseUrl(baseUrl)
//增加返回值为字符串的支持(以实体类返回) //增加返回值为字符串的支持(以实体类返回)
.addConverterFactory(EncodeConverter(encode)) .addConverterFactory(EncodeConverter(encode))
.client(client) .client(getProxyClient(proxy))
.build() .build()
} }
fun getRetrofitWithProxy( fun getProxyClient(proxy: String? = null): OkHttpClient {
baseUrl: String, if (proxy.isNullOrBlank()) {
encode: String? = null, return client
proxy: String? = null }
): Retrofit {
val r = Regex("(http|socks4|socks5)://(.*):(\\d{2,5})(@.*@.*)?") val r = Regex("(http|socks4|socks5)://(.*):(\\d{2,5})(@.*@.*)?")
val ms = proxy?.let { r.findAll(it) } val ms = r.findAll(proxy)
val group = ms?.first() val group = ms.first()
var type = "direct" //直接连接 val type: String //直接连接
var host = "127.0.0.1" //代理服务器hostname val host: String //代理服务器hostname
var port = 1080 //代理服务器port val port: Int //代理服务器port
var username = "" //代理服务器验证用户名 var username = "" //代理服务器验证用户名
var password = "" //代理服务器验证密码 var password = "" //代理服务器验证密码
if (group != null) { type = if (group.groupValues[1] == "http") {
type = if (group.groupValues[1] == "http") { "http"
"http" } else {
} else { "socks"
"socks" }
} host = group.groupValues[2]
host = group.groupValues[2] port = group.groupValues[3].toInt()
port = group.groupValues[3].toInt() if (group.groupValues[4] != "") {
if (group.groupValues[4] != "") { username = group.groupValues[4].split("@")[1]
username = group.groupValues[4].split("@")[1] password = group.groupValues[4].split("@")[2]
password = group.groupValues[4].split("@")[2]
}
} }
val builder = client.newBuilder() val builder = client.newBuilder()
if (type != "direct" && host != "") { if (type != "direct" && host != "") {
@ -125,18 +95,7 @@ object HttpHelper {
} }
} }
return Retrofit.Builder().baseUrl(baseUrl) return builder.build()
//增加返回值为字符串的支持(以实体类返回)
.addConverterFactory(EncodeConverter(encode))
.client(builder.build())
.build()
}
fun getByteRetrofit(baseUrl: String): Retrofit {
return Retrofit.Builder().baseUrl(baseUrl)
.addConverterFactory(ByteConverter())
.client(client)
.build()
} }
private fun getHeaderInterceptor(): Interceptor { private fun getHeaderInterceptor(): Interceptor {

@ -22,6 +22,8 @@ import okhttp3.FormBody
import okhttp3.MediaType import okhttp3.MediaType
import okhttp3.RequestBody import okhttp3.RequestBody
import retrofit2.Call import retrofit2.Call
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toByteArray
import java.net.URLEncoder import java.net.URLEncoder
import java.util.* import java.util.*
import java.util.regex.Pattern import java.util.regex.Pattern
@ -315,13 +317,13 @@ class AnalyzeUrl(
} }
} }
suspend fun getResponseAwait( suspend fun getRes(
tag: String, tag: String,
jsStr: String? = null, jsStr: String? = null,
sourceRegex: String? = null, sourceRegex: String? = null,
): Res { ): Res {
if (type != null) { if (type != null) {
return Res(url, StringUtils.byteToHexString(getResponseBytes(tag))) return Res(url, StringUtils.byteToHexString(getByteArray(tag)))
} }
val cookie = CookieStore.getCookie(tag) val cookie = CookieStore.getCookie(tag)
if (cookie.isNotEmpty()) { if (cookie.isNotEmpty()) {
@ -369,7 +371,7 @@ class AnalyzeUrl(
return Res(NetworkUtils.getUrl(res), res.body()) return Res(NetworkUtils.getUrl(res), res.body())
} }
suspend fun getResponseBytes(tag: String? = null): ByteArray? { suspend fun getByteArray(tag: String? = null): ByteArray {
if (tag != null) { if (tag != null) {
val cookie = CookieStore.getCookie(tag) val cookie = CookieStore.getCookie(tag)
if (cookie.isNotEmpty()) { if (cookie.isNotEmpty()) {
@ -382,26 +384,24 @@ class AnalyzeUrl(
} }
} }
} }
val response = when { return when (method) {
method == RequestMethod.POST -> { RequestMethod.POST -> {
if (fieldMap.isNotEmpty()) { if (fieldMap.isNotEmpty()) {
HttpHelper RxHttp.postForm(url)
.getBytesApiService<HttpPostApi>(baseUrl) .addAll(fieldMap)
.postMapByteAsync(url, fieldMap, headerMap) .addAllHeader(headerMap)
.toByteArray().await()
} else { } else {
HttpHelper RxHttp.postJson(url)
.getBytesApiService<HttpPostApi>(baseUrl) .addAll(body)
.postBodyByteAsync(url, requestBody!!, headerMap) .addAllHeader(headerMap)
.toByteArray().await()
} }
} }
fieldMap.isEmpty() -> HttpHelper else -> RxHttp.get(url)
.getBytesApiService<HttpGetApi>(baseUrl) .addAll(fieldMap)
.getByteAsync(url, headerMap) .toByteArray().await()
else -> HttpHelper
.getBytesApiService<HttpGetApi>(baseUrl)
.getMapByteAsync(url, fieldMap, headerMap)
} }
return response.body()
} }
fun getGlideUrl(): GlideUrl { fun getGlideUrl(): GlideUrl {

@ -26,7 +26,7 @@ object Rss {
page = page, page = page,
headerMapF = rssSource.getHeaderMap() headerMapF = rssSource.getHeaderMap()
) )
val body = analyzeUrl.getResponseAwait(rssSource.sourceUrl).body val body = analyzeUrl.getRes(rssSource.sourceUrl).body
RssParserByRule.parseXML(sortName, sortUrl, body, rssSource) RssParserByRule.parseXML(sortName, sortUrl, body, rssSource)
} }
} }
@ -42,7 +42,7 @@ object Rss {
val body = AnalyzeUrl( val body = AnalyzeUrl(
rssArticle.link, baseUrl = rssArticle.origin, rssArticle.link, baseUrl = rssArticle.origin,
headerMapF = rssSource?.getHeaderMap() headerMapF = rssSource?.getHeaderMap()
).getResponseAwait(rssArticle.origin) ).getRes(rssArticle.origin)
.body .body
val analyzeRule = AnalyzeRule() val analyzeRule = AnalyzeRule()
analyzeRule.setContent(body) analyzeRule.setContent(body)

@ -63,7 +63,7 @@ object BookChapterList {
ruleUrl = nextUrl, ruleUrl = nextUrl,
book = book, book = book,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
).getResponseAwait(bookSource.bookSourceUrl) ).getRes(bookSource.bookSourceUrl)
.body?.let { nextBody -> .body?.let { nextBody ->
chapterData = analyzeChapterList( chapterData = analyzeChapterList(
book, nextUrl, nextBody, tocRule, listRule, bookSource book, nextUrl, nextBody, tocRule, listRule, bookSource
@ -132,7 +132,7 @@ object BookChapterList {
ruleUrl = chapterData.nextUrl, ruleUrl = chapterData.nextUrl,
book = book, book = book,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
).getResponseAwait(bookSource.bookSourceUrl).body ).getRes(bookSource.bookSourceUrl).body
?: throw Exception("${chapterData.nextUrl}, 下载失败") ?: throw Exception("${chapterData.nextUrl}, 下载失败")
val nextChapterData = analyzeChapterList( val nextChapterData = analyzeChapterList(
book, chapterData.nextUrl, nextBody, tocRule, listRule, bookSource, book, chapterData.nextUrl, nextBody, tocRule, listRule, bookSource,

@ -56,7 +56,7 @@ object BookContent {
ruleUrl = nextUrl, ruleUrl = nextUrl,
book = book, book = book,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
).getResponseAwait(bookSource.bookSourceUrl).body?.let { nextBody -> ).getRes(bookSource.bookSourceUrl).body?.let { nextBody ->
contentData = analyzeContent( contentData = analyzeContent(
book, nextUrl, nextBody, contentRule, bookChapter, bookSource, false book, nextUrl, nextBody, contentRule, bookChapter, bookSource, false
) )
@ -78,7 +78,7 @@ object BookContent {
ruleUrl = item.nextUrl, ruleUrl = item.nextUrl,
book = book, book = book,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
).getResponseAwait(bookSource.bookSourceUrl).body?.let { ).getRes(bookSource.bookSourceUrl).body?.let {
contentData = analyzeContent( contentData = analyzeContent(
book, item.nextUrl, it, contentRule, bookChapter, bookSource, false book, item.nextUrl, it, contentRule, bookChapter, bookSource, false
) )

@ -46,7 +46,7 @@ class WebBook(val bookSource: BookSource) {
headerMapF = bookSource.getHeaderMap(), headerMapF = bookSource.getHeaderMap(),
book = variableBook book = variableBook
) )
val res = analyzeUrl.getResponseAwait(bookSource.bookSourceUrl) val res = analyzeUrl.getRes(bookSource.bookSourceUrl)
return BookList.analyzeBookList( return BookList.analyzeBookList(
scope, scope,
res.body, res.body,
@ -77,7 +77,7 @@ class WebBook(val bookSource: BookSource) {
baseUrl = sourceUrl, baseUrl = sourceUrl,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
) )
val res = analyzeUrl.getResponseAwait(bookSource.bookSourceUrl) val res = analyzeUrl.getRes(bookSource.bookSourceUrl)
BookList.analyzeBookList( BookList.analyzeBookList(
scope, scope,
res.body, res.body,
@ -110,7 +110,7 @@ class WebBook(val bookSource: BookSource) {
baseUrl = sourceUrl, baseUrl = sourceUrl,
headerMapF = bookSource.getHeaderMap(), headerMapF = bookSource.getHeaderMap(),
book = book book = book
).getResponseAwait(bookSource.bookSourceUrl) ).getRes(bookSource.bookSourceUrl)
BookInfo.analyzeBookInfo(book, res.body, bookSource, book.bookUrl, canReName) BookInfo.analyzeBookInfo(book, res.body, bookSource, book.bookUrl, canReName)
} }
book book
@ -141,7 +141,7 @@ class WebBook(val bookSource: BookSource) {
ruleUrl = book.tocUrl, ruleUrl = book.tocUrl,
baseUrl = book.bookUrl, baseUrl = book.bookUrl,
headerMapF = bookSource.getHeaderMap() headerMapF = bookSource.getHeaderMap()
).getResponseAwait(bookSource.bookSourceUrl) ).getRes(bookSource.bookSourceUrl)
BookChapterList.analyzeChapterList( BookChapterList.analyzeChapterList(
this, this,
book, book,
@ -201,7 +201,7 @@ class WebBook(val bookSource: BookSource) {
headerMapF = bookSource.getHeaderMap(), headerMapF = bookSource.getHeaderMap(),
book = book, book = book,
chapter = bookChapter chapter = bookChapter
).getResponseAwait( ).getRes(
bookSource.bookSourceUrl, bookSource.bookSourceUrl,
jsStr = bookSource.getContentRule().webJs, jsStr = bookSource.getContentRule().webJs,
sourceRegex = bookSource.getContentRule().sourceRegex sourceRegex = bookSource.getContentRule().sourceRegex

@ -76,7 +76,7 @@ class HttpReadAloudService : BaseReadAloudService(),
it.url, it.url,
speakText = contentList[index], speakText = contentList[index],
speakSpeed = AppConfig.ttsSpeechRate speakSpeed = AppConfig.ttsSpeechRate
).getResponseBytes()?.let { bytes -> ).getByteArray().let { bytes ->
if (isActive) { if (isActive) {
val file = getSpeakFile(index) val file = getSpeakFile(index)
file.writeBytes(bytes) file.writeBytes(bytes)

@ -11,10 +11,11 @@ import io.legado.app.base.BaseViewModel
import io.legado.app.data.entities.BookSource import io.legado.app.data.entities.BookSource
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import io.legado.app.help.SourceHelp import io.legado.app.help.SourceHelp
import io.legado.app.help.http.HttpHelper
import io.legado.app.help.storage.OldRule import io.legado.app.help.storage.OldRule
import io.legado.app.help.storage.Restore import io.legado.app.help.storage.Restore
import io.legado.app.utils.* import io.legado.app.utils.*
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
import java.io.File import java.io.File
class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) { class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
@ -119,7 +120,7 @@ class ImportBookSourceViewModel(app: Application) : BaseViewModel(app) {
} }
private suspend fun importSourceUrl(url: String) { private suspend fun importSourceUrl(url: String) {
HttpHelper.simpleGetAsync(url).let { body -> RxHttp.get(url).toText("utf-8").await().let { body ->
val items: List<Map<String, Any>> = Restore.jsonPath.parse(body).read("$") val items: List<Map<String, Any>> = Restore.jsonPath.parse(body).read("$")
for (item in items) { for (item in items) {
val jsonItem = Restore.jsonPath.parse(item) val jsonItem = Restore.jsonPath.parse(item)

@ -7,11 +7,12 @@ import androidx.lifecycle.MutableLiveData
import io.legado.app.R import io.legado.app.R
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel
import io.legado.app.data.entities.ReplaceRule import io.legado.app.data.entities.ReplaceRule
import io.legado.app.help.http.HttpHelper
import io.legado.app.help.storage.OldReplace import io.legado.app.help.storage.OldReplace
import io.legado.app.utils.isAbsUrl import io.legado.app.utils.isAbsUrl
import io.legado.app.utils.isContentScheme import io.legado.app.utils.isContentScheme
import io.legado.app.utils.readText import io.legado.app.utils.readText
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
import java.io.File import java.io.File
class ImportReplaceRuleViewModel(app: Application) : BaseViewModel(app) { class ImportReplaceRuleViewModel(app: Application) : BaseViewModel(app) {
@ -48,7 +49,7 @@ class ImportReplaceRuleViewModel(app: Application) : BaseViewModel(app) {
fun import(text: String) { fun import(text: String) {
execute { execute {
if (text.isAbsUrl()) { if (text.isAbsUrl()) {
HttpHelper.simpleGetAsync(text).let { RxHttp.get(text).toText("utf-8").await().let {
val rules = OldReplace.jsonToReplaceRules(it) val rules = OldReplace.jsonToReplaceRules(it)
allRules.addAll(rules) allRules.addAll(rules)
} }

@ -11,9 +11,10 @@ import io.legado.app.base.BaseViewModel
import io.legado.app.data.entities.RssSource import io.legado.app.data.entities.RssSource
import io.legado.app.help.AppConfig import io.legado.app.help.AppConfig
import io.legado.app.help.SourceHelp import io.legado.app.help.SourceHelp
import io.legado.app.help.http.HttpHelper
import io.legado.app.help.storage.Restore import io.legado.app.help.storage.Restore
import io.legado.app.utils.* import io.legado.app.utils.*
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
import java.io.File import java.io.File
class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) { class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
@ -114,7 +115,7 @@ class ImportRssSourceViewModel(app: Application) : BaseViewModel(app) {
} }
private suspend fun importSourceUrl(url: String) { private suspend fun importSourceUrl(url: String) {
HttpHelper.simpleGetAsync(url).let { body -> RxHttp.get(url).toText("utf-8").await().let { body ->
val items: List<Map<String, Any>> = Restore.jsonPath.parse(body).read("$") val items: List<Map<String, Any>> = Restore.jsonPath.parse(body).read("$")
for (item in items) { for (item in items) {
val jsonItem = Restore.jsonPath.parse(item) val jsonItem = Restore.jsonPath.parse(item)

@ -17,7 +17,6 @@ import io.legado.app.databinding.DialogEditTextBinding
import io.legado.app.databinding.DialogReadBgTextBinding import io.legado.app.databinding.DialogReadBgTextBinding
import io.legado.app.databinding.ItemBgImageBinding import io.legado.app.databinding.ItemBgImageBinding
import io.legado.app.help.ReadBookConfig import io.legado.app.help.ReadBookConfig
import io.legado.app.help.http.HttpHelper
import io.legado.app.help.permission.Permissions import io.legado.app.help.permission.Permissions
import io.legado.app.help.permission.PermissionsCompat import io.legado.app.help.permission.PermissionsCompat
import io.legado.app.lib.dialogs.alert import io.legado.app.lib.dialogs.alert
@ -31,6 +30,8 @@ import io.legado.app.utils.*
import io.legado.app.utils.viewbindingdelegate.viewBinding import io.legado.app.utils.viewbindingdelegate.viewBinding
import org.jetbrains.anko.sdk27.listeners.onCheckedChange import org.jetbrains.anko.sdk27.listeners.onCheckedChange
import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.sdk27.listeners.onClick
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toByteArray
import java.io.File import java.io.File
class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack { class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack {
@ -286,9 +287,9 @@ class BgTextConfigDialog : BaseDialogFragment(), FilePickerDialog.CallBack {
private fun importNetConfig(url: String) { private fun importNetConfig(url: String) {
execute { execute {
HttpHelper.simpleGetBytesAsync(url)?.let { RxHttp.get(url).toByteArray().await()?.let {
importConfig(it) importConfig(it)
} ?: throw Exception("获取失败") }
}.onError { }.onError {
longToast(it.msg) longToast(it.msg)
} }

@ -5,9 +5,10 @@ import io.legado.app.App
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel
import io.legado.app.data.entities.HttpTTS import io.legado.app.data.entities.HttpTTS
import io.legado.app.help.DefaultData import io.legado.app.help.DefaultData
import io.legado.app.help.http.HttpHelper
import io.legado.app.utils.GSON import io.legado.app.utils.GSON
import io.legado.app.utils.fromJsonArray import io.legado.app.utils.fromJsonArray
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
class SpeakEngineViewModel(application: Application) : BaseViewModel(application) { class SpeakEngineViewModel(application: Application) : BaseViewModel(application) {
@ -21,7 +22,7 @@ class SpeakEngineViewModel(application: Application) : BaseViewModel(application
fun importOnLine(url: String, finally: (msg: String) -> Unit) { fun importOnLine(url: String, finally: (msg: String) -> Unit) {
execute { execute {
HttpHelper.simpleGetAsync(url).let { json -> RxHttp.get(url).toText("utf-8").await().let { json ->
GSON.fromJsonArray<HttpTTS>(json)?.let { GSON.fromJsonArray<HttpTTS>(json)?.let {
App.db.httpTTSDao.insert(*it.toTypedArray()) App.db.httpTTSDao.insert(*it.toTypedArray())
} }

@ -5,9 +5,10 @@ import io.legado.app.App
import io.legado.app.base.BaseViewModel import io.legado.app.base.BaseViewModel
import io.legado.app.data.entities.TxtTocRule import io.legado.app.data.entities.TxtTocRule
import io.legado.app.help.DefaultData import io.legado.app.help.DefaultData
import io.legado.app.help.http.HttpHelper
import io.legado.app.utils.GSON import io.legado.app.utils.GSON
import io.legado.app.utils.fromJsonArray import io.legado.app.utils.fromJsonArray
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toText
class TocRegexViewModel(application: Application) : BaseViewModel(application) { class TocRegexViewModel(application: Application) : BaseViewModel(application) {
@ -28,7 +29,7 @@ class TocRegexViewModel(application: Application) : BaseViewModel(application) {
fun importOnLine(url: String, finally: (msg: String) -> Unit) { fun importOnLine(url: String, finally: (msg: String) -> Unit) {
execute { execute {
HttpHelper.simpleGetAsync(url).let { json -> RxHttp.get(url).toText("utf-8").await().let { json ->
GSON.fromJsonArray<TxtTocRule>(json)?.let { GSON.fromJsonArray<TxtTocRule>(json)?.let {
App.db.txtTocRule.insert(*it.toTypedArray()) App.db.txtTocRule.insert(*it.toTypedArray())
} }

@ -16,7 +16,6 @@ import io.legado.app.constant.AppConst
import io.legado.app.data.entities.RssArticle import io.legado.app.data.entities.RssArticle
import io.legado.app.data.entities.RssSource import io.legado.app.data.entities.RssSource
import io.legado.app.data.entities.RssStar import io.legado.app.data.entities.RssStar
import io.legado.app.help.http.HttpHelper
import io.legado.app.model.analyzeRule.AnalyzeUrl import io.legado.app.model.analyzeRule.AnalyzeUrl
import io.legado.app.model.rss.Rss import io.legado.app.model.rss.Rss
import io.legado.app.utils.DocumentUtils import io.legado.app.utils.DocumentUtils
@ -25,6 +24,8 @@ import io.legado.app.utils.isContentScheme
import io.legado.app.utils.writeBytes import io.legado.app.utils.writeBytes
import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import rxhttp.wrapper.param.RxHttp
import rxhttp.wrapper.param.toByteArray
import java.io.File import java.io.File
import java.util.* import java.util.*
@ -131,7 +132,7 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
private suspend fun webData2bitmap(data: String): ByteArray? { private suspend fun webData2bitmap(data: String): ByteArray? {
return if (URLUtil.isValidUrl(data)) { return if (URLUtil.isValidUrl(data)) {
HttpHelper.simpleGetBytesAsync(data) RxHttp.get(data).toByteArray().await()
} else { } else {
Base64.decode(data.split(",").toTypedArray()[1], Base64.DEFAULT) Base64.decode(data.split(",").toTypedArray()[1], Base64.DEFAULT)
} }

Loading…
Cancel
Save