From 05a0ed1ddc24cc19971c8ebfe753076b36b6e99e Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 2 Feb 2022 22:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=B7=E6=96=B0=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/rss/read/ReadRssActivity.kt | 4 +++- .../java/io/legado/app/ui/rss/read/ReadRssViewModel.kt | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index 7874afcec..24274377a 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -91,7 +91,9 @@ class ReadRssActivity : VMBaseActivity override fun onCompatOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.menu_rss_refresh -> viewModel.refresh() + R.id.menu_rss_refresh -> viewModel.refresh { + binding.webView.reload() + } R.id.menu_rss_star -> viewModel.favorite() R.id.menu_share_it -> viewModel.rssArticle?.let { share(it.link) 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 1cfbe34fc..41be659fa 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 @@ -104,17 +104,17 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), } } - fun refresh() { + fun refresh(finish: () -> Unit) { rssArticle?.let { rssArticle -> rssSource?.let { val ruleContent = it.ruleContent if (!ruleContent.isNullOrBlank()) { loadContent(rssArticle, ruleContent) } else { - loadUrl(rssArticle.link, rssArticle.origin) + finish.invoke() } - } ?: loadUrl(rssArticle.link, rssArticle.origin) - } + } ?: finish.invoke() + } ?: finish.invoke() } fun favorite() {