优化

gedoor · May 21, 2022 · 5868561 · 5868561
1 parent 57a0f7c
commit 5868561
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/src/main/java/io/legado/app/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
@@ -192,11 +192,15 @@ data class BookSource(
                 && bookSourceType == source.bookSourceType
                 && equal(bookUrlPattern, source.bookUrlPattern)
                 && equal(bookSourceComment, source.bookSourceComment)
+                && customOrder == source.customOrder
                 && enabled == source.enabled
                 && enabledExplore == source.enabledExplore
                 && enabledCookieJar == source.enabledCookieJar
+                && equal(concurrentRate, source.concurrentRate)
                 && equal(header, source.header)
-                && loginUrl == source.loginUrl
+                && equal(loginUrl, source.loginUrl)
+                && equal(loginUi, source.loginUi)
+                && equal(loginCheckJs, source.loginCheckJs)
                 && equal(exploreUrl, source.exploreUrl)
                 && equal(searchUrl, source.searchUrl)
                 && getSearchRule() == source.getSearchRule()

diff --git a/app/src/main/java/io/legado/app/data/entities/RssSource.kt b/app/src/main/java/io/legado/app/data/entities/RssSource.kt
@@ -69,6 +69,16 @@ data class RssSource(
                 && equal(sourceIcon, source.sourceIcon)
                 && enabled == source.enabled
                 && equal(sourceGroup, source.sourceGroup)
+                && enabledCookieJar == source.enabledCookieJar
+                && equal(sourceComment, source.sourceComment)
+                && equal(concurrentRate, source.concurrentRate)
+                && equal(header, source.header)
+                && equal(loginUrl, source.loginUrl)
+                && equal(loginUi, source.loginUi)
+                && equal(loginCheckJs, source.loginCheckJs)
+                && equal(sortUrl, source.sortUrl)
+                && singleUrl == source.singleUrl
+                && articleStyle == source.articleStyle
                 && equal(ruleArticles, source.ruleArticles)
                 && equal(ruleNextPage, source.ruleNextPage)
                 && equal(ruleTitle, source.ruleTitle)