From c45db4e16ecacd369c6a21ffeeeef4f8573606f4 Mon Sep 17 00:00:00 2001 From: gedoor Date: Sat, 19 Dec 2020 18:25:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=BA=90=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8D=95url=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../legado/app/ui/rss/read/ReadRssViewModel.kt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) 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 0018c6e17..8a32734c6 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 @@ -60,18 +60,13 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), if (!ruleContent.isNullOrBlank()) { loadContent(rssArticle, ruleContent) } else { - loadUrl(rssArticle) + loadUrl(rssArticle.link, rssArticle.origin) } - } ?: loadUrl(rssArticle) + } ?: loadUrl(rssArticle.link, rssArticle.origin) } } } else { - val analyzeUrl = AnalyzeUrl( - origin, - useWebView = true, - headerMapF = rssSource?.getHeaderMap() - ) - urlLiveData.postValue(analyzeUrl) + loadUrl(origin, origin) } } }.onFinally { @@ -79,10 +74,10 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), } } - private fun loadUrl(rssArticle: RssArticle) { + private fun loadUrl(url: String, baseUrl: String) { val analyzeUrl = AnalyzeUrl( - rssArticle.link, - baseUrl = rssArticle.origin, + ruleUrl = url, + baseUrl = baseUrl, useWebView = true, headerMapF = rssSource?.getHeaderMap() )