From 1849b6cc1b86991dde86be7be1942d8bafb437b2 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 11 Feb 2022 10:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/data/entities/RssReadRecord.kt |  5 +++-
 .../io/legado/app/data/entities/RssSource.kt  | 29 ++++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt b/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt
index edbb4c15d..9fe86ae60 100644
--- a/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt
+++ b/app/src/main/java/io/legado/app/data/entities/RssReadRecord.kt
@@ -4,4 +4,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "rssReadRecords")
-data class RssReadRecord(@PrimaryKey val record: String, val read: Boolean = true)
\ No newline at end of file
+data class RssReadRecord(
+    @PrimaryKey val record: String,
+    val read: Boolean = true
+)
\ No newline at end of file
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
index 78830285a..bafa5139d 100644
--- a/app/src/main/java/io/legado/app/data/entities/RssSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/RssSource.kt
@@ -26,13 +26,13 @@ data class RssSource(
     var loginCheckJs: String? = null,               //登录检测js
     var sortUrl: String? = null,
     var singleUrl: Boolean = false,
-    //列表规则
+    /*列表规则*/
     var articleStyle: Int = 0,                      //列表样式,0,1,2
     var ruleArticles: String? = null,
     var ruleNextPage: String? = null,
     var ruleTitle: String? = null,
     var rulePubDate: String? = null,
-    //webView规则
+    /*webView规则*/
     var ruleDescription: String? = null,
     var ruleImage: String? = null,
     var ruleLink: String? = null,
@@ -40,6 +40,7 @@ data class RssSource(
     var style: String? = null,
     var enableJs: Boolean = true,
     var loadWithBaseUrl: Boolean = true,
+    /*其它规则*/
     var customOrder: Int = 0
 ) : Parcelable, BaseSource {
 
@@ -66,18 +67,18 @@ data class RssSource(
 
     fun equal(source: RssSource): Boolean {
         return equal(sourceUrl, source.sourceUrl)
-                && equal(sourceIcon, source.sourceIcon)
-                && enabled == source.enabled
-                && equal(sourceGroup, source.sourceGroup)
-                && equal(ruleArticles, source.ruleArticles)
-                && equal(ruleNextPage, source.ruleNextPage)
-                && equal(ruleTitle, source.ruleTitle)
-                && equal(rulePubDate, source.rulePubDate)
-                && equal(ruleDescription, source.ruleDescription)
-                && equal(ruleLink, source.ruleLink)
-                && equal(ruleContent, source.ruleContent)
-                && enableJs == source.enableJs
-                && loadWithBaseUrl == source.loadWithBaseUrl
+            && equal(sourceIcon, source.sourceIcon)
+            && enabled == source.enabled
+            && equal(sourceGroup, source.sourceGroup)
+            && equal(ruleArticles, source.ruleArticles)
+            && equal(ruleNextPage, source.ruleNextPage)
+            && equal(ruleTitle, source.ruleTitle)
+            && equal(rulePubDate, source.rulePubDate)
+            && equal(ruleDescription, source.ruleDescription)
+            && equal(ruleLink, source.ruleLink)
+            && equal(ruleContent, source.ruleContent)
+            && enableJs == source.enableJs
+            && loadWithBaseUrl == source.loadWithBaseUrl
     }
 
     private fun equal(a: String?, b: String?): Boolean {