Merge remote-tracking branch 'origin/master'

pull/2731/head
kunfei 2 years ago
commit 4dea547895
  1. 7
      app/src/main/java/io/legado/app/help/JsExtensions.kt
  2. 2
      app/src/main/java/io/legado/app/help/book/BookHelp.kt
  3. 4
      app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt

@ -656,11 +656,10 @@ interface JsExtensions : JsEncodeUtils {
* 输出调试日志 * 输出调试日志
*/ */
fun log(msg: Any?): Any? { fun log(msg: Any?): Any? {
val msg1 = "书源调试输出:${msg}"
getSource()?.let { getSource()?.let {
Debug.log(it.getKey(), msg1) Debug.log(it.getKey(), msg.toString())
} ?: Debug.log(msg1) } ?: Debug.log(msg.toString())
AppLog.putDebug(msg1) AppLog.putDebug("书源调试输出:$msg")
return msg return msg
} }

@ -162,7 +162,7 @@ object BookHelp {
} }
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
AppLog.put("图片 $src 下载错误", e) AppLog.put("图片 $src 下载错误\n${e.localizedMessage}", e)
} finally { } finally {
downloadImages.remove(src) downloadImages.remove(src)
} }

@ -119,7 +119,9 @@ class ChapterListAdapter(context: Context, val callback: Callback) :
) { ) {
binding.run { binding.run {
val isDur = callback.durChapterIndex() == item.index val isDur = callback.durChapterIndex() == item.index
val cached = callback.isLocalBook || cacheFileNames.contains(item.getFileName()) val cached = callback.isLocalBook
|| item.isVolume
|| cacheFileNames.contains(item.getFileName())
if (payloads.isEmpty()) { if (payloads.isEmpty()) {
if (isDur) { if (isDur) {
tvChapterName.setTextColor(context.accentColor) tvChapterName.setTextColor(context.accentColor)

Loading…
Cancel
Save