Merge pull request #7 from gedoor/master

up
5 years ago · 76e80edd17
parent 6e036596e1 4fdc262089
commit 76e80edd17
2 changed files with 16 additions and 12 deletions
--- 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
@ -59,20 +59,11 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
            viewModel.rssArticle?.let {
                upJavaScriptEnable()
                val url = NetworkUtils.getAbsoluteURL(it.origin, it.link)
                val html = viewModel.clHtml(content)
                if (viewModel.rssSource?.loadWithBaseUrl == true) {
-                    webView.loadDataWithBaseURL(
+                    webView.loadDataWithBaseURL(url, html, "text/html", "utf-8", url)
                        url,
                        "<style>img{max-width:100%}</style>$content",
                        "text/html",
                        "utf-8",
                        url
                    )
                } else {
-                    webView.loadData(
+                    webView.loadData(html, "text/html", "utf-8")
                        "<style>img{max-width:100%}</style>$content",
                        "text/html",
                        "utf-8"
                    )
                }
            }
        })
--- 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
@ -77,6 +77,19 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application) {
        }
    }
    fun clHtml(content: String): String {
        return """
            <html>
            <head>
                <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
                <style>img{max-width:100% !important; width:auto; height:auto;}</style>
            </head>
            <body style:"height:auto;max-width: 100%; width:auto;">
                $content
            </body></html>
        """
    }
    interface CallBack {
        fun upStarMenu()
    }