|
|
@ -60,18 +60,13 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application), |
|
|
|
if (!ruleContent.isNullOrBlank()) { |
|
|
|
if (!ruleContent.isNullOrBlank()) { |
|
|
|
loadContent(rssArticle, ruleContent) |
|
|
|
loadContent(rssArticle, ruleContent) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
loadUrl(rssArticle) |
|
|
|
loadUrl(rssArticle.link, rssArticle.origin) |
|
|
|
} |
|
|
|
} |
|
|
|
} ?: loadUrl(rssArticle) |
|
|
|
} ?: loadUrl(rssArticle.link, rssArticle.origin) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
val analyzeUrl = AnalyzeUrl( |
|
|
|
loadUrl(origin, origin) |
|
|
|
origin, |
|
|
|
|
|
|
|
useWebView = true, |
|
|
|
|
|
|
|
headerMapF = rssSource?.getHeaderMap() |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
urlLiveData.postValue(analyzeUrl) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}.onFinally { |
|
|
|
}.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( |
|
|
|
val analyzeUrl = AnalyzeUrl( |
|
|
|
rssArticle.link, |
|
|
|
ruleUrl = url, |
|
|
|
baseUrl = rssArticle.origin, |
|
|
|
baseUrl = baseUrl, |
|
|
|
useWebView = true, |
|
|
|
useWebView = true, |
|
|
|
headerMapF = rssSource?.getHeaderMap() |
|
|
|
headerMapF = rssSource?.getHeaderMap() |
|
|
|
) |
|
|
|
) |
|
|
|