Merge pull request #13 from gedoor/master

up

app/src/main/assets/updateLog.md

@@ -6,6 +6,7 @@
 **2020/01/11
 * RSS阅读界面添加朗读功能
 * 其它一些优化
+* 合并KKL369提交的代码,重写LinearLayoutManager，修复书籍目录模糊搜索后scrollToPosition在可见范围不置顶
 
 **2020/01/10
 * 合并KKL369提交的代码

app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt

@@ -14,12 +14,12 @@ import io.legado.app.lib.theme.DrawableUtils
 import io.legado.app.lib.theme.primaryTextColor
 import io.legado.app.utils.NetworkUtils
 import io.legado.app.utils.getViewModel
-import io.legado.app.utils.htmlFormat
 import io.legado.app.utils.shareText
 import kotlinx.android.synthetic.main.activity_rss_read.*
 import kotlinx.coroutines.launch
 import org.apache.commons.text.StringEscapeUtils
 import org.jsoup.Jsoup
+import org.jsoup.safety.Whitelist
 
 class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_read),
     ReadRssViewModel.CallBack {
@@ -149,7 +149,7 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
             webView.settings.javaScriptEnabled = true
             webView.evaluateJavascript("document.documentElement.outerHTML") {
                 val html = StringEscapeUtils.unescapeJson(it)
-                viewModel.readAloud(Jsoup.parse(html).body().html().htmlFormat())
+                viewModel.readAloud(Jsoup.clean(html, Whitelist()))
             }
         }
     }

app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt

@@ -110,7 +110,10 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
     }
 
     fun readAloud(text: String) {
-        textToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, null, "rss")
+        textToSpeech.stop()
+        text.split("\n", "  ", "　　").forEach {
+            textToSpeech.speak(it, TextToSpeech.QUEUE_ADD, null, "rss")
+        }
     }
 
     override fun onCleared() {