Merge pull request #1555 from Xwite/master

fix:书源调试显示bug；二级目录显示bug

app/src/main/java/io/legado/app/model/webBook/BookInfo.kt

@@ -82,8 +82,8 @@ object BookInfo {
                 ?.joinToString(",")
                 ?.let {
                     if (it.isNotEmpty()) book.kind = it
-                }
-            Debug.log(bookSource.bookSourceUrl, "└${book.kind}")
+                    Debug.log(bookSource.bookSourceUrl, "└${it}")
+                } ?: Debug.log(bookSource.bookSourceUrl, "└")
         } catch (e: Exception) {
             Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}")
         }
@@ -92,8 +92,8 @@ object BookInfo {
         try {
             wordCountFormat(analyzeRule.getString(infoRule.wordCount)).let {
                 if (it.isNotEmpty()) book.wordCount = it
+                Debug.log(bookSource.bookSourceUrl, "└${it}")
             }
-            Debug.log(bookSource.bookSourceUrl, "└${book.wordCount}")
         } catch (e: Exception) {
             Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}")
         }
@@ -102,18 +102,18 @@ object BookInfo {
         try {
             analyzeRule.getString(infoRule.lastChapter).let {
                 if (it.isNotEmpty()) book.latestChapterTitle = it
+                Debug.log(bookSource.bookSourceUrl, "└${it}")
             }
-            Debug.log(bookSource.bookSourceUrl, "└${book.latestChapterTitle}")
         } catch (e: Exception) {
             Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}")
         }
         scope.ensureActive()
         Debug.log(bookSource.bookSourceUrl, "┌获取简介")
         try {
-            analyzeRule.getString(infoRule.intro).let {
-                if (it.isNotEmpty()) book.intro = HtmlFormatter.format(it)
+            HtmlFormatter.format(analyzeRule.getString(infoRule.intro)).let {
+                if (it.isNotEmpty()) book.intro = it
+                Debug.log(bookSource.bookSourceUrl, "└${it}")
             }
-            Debug.log(bookSource.bookSourceUrl, "└${book.intro}")
         } catch (e: Exception) {
             Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}")
         }
@@ -122,8 +122,8 @@ object BookInfo {
         try {
             analyzeRule.getString(infoRule.coverUrl).let {
                 if (it.isNotEmpty()) book.coverUrl = NetworkUtils.getAbsoluteURL(baseUrl, it)
+                Debug.log(bookSource.bookSourceUrl, "└${it}")
             }
-            Debug.log(bookSource.bookSourceUrl, "└${book.coverUrl}")
         } catch (e: Exception) {
             Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}")
         }

app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt

@@ -14,6 +14,7 @@ import io.legado.app.lib.theme.ThemeUtils
 import io.legado.app.help.AppConfig
 import io.legado.app.utils.getCompatColor
 import io.legado.app.utils.visible
+import io.legado.app.utils.gone
 
 class ChapterListAdapter(context: Context, val callback: Callback) :
     RecyclerAdapter<BookChapter, ItemChapterListBinding>(context) {
@@ -68,6 +69,8 @@ class ChapterListAdapter(context: Context, val callback: Callback) :
                 //卷名不显示tag(更新时间规则)
                     tvTag.text = item.tag
                     tvTag.visible()
+                } else {
+                    tvTag.gone()
                 }
                 upHasCache(binding, isDur, cached)
             } else {