From 82d587eabf08f644eadefd77102cf2d138361aa5 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 9 Dec 2020 11:02:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/{utils => lib}/icu4j/CharsetDetector.java | 2 +- .../java/io/legado/app/{utils => lib}/icu4j/CharsetMatch.java | 2 +- .../io/legado/app/{utils => lib}/icu4j/CharsetRecog_2022.java | 2 +- .../io/legado/app/{utils => lib}/icu4j/CharsetRecog_UTF8.java | 2 +- .../legado/app/{utils => lib}/icu4j/CharsetRecog_Unicode.java | 2 +- .../io/legado/app/{utils => lib}/icu4j/CharsetRecog_mbcs.java | 2 +- .../io/legado/app/{utils => lib}/icu4j/CharsetRecog_sbcs.java | 2 +- .../io/legado/app/{utils => lib}/icu4j/CharsetRecognizer.java | 2 +- app/src/main/java/io/legado/app/utils/EncodingDetect.kt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetDetector.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetMatch.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecog_2022.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecog_UTF8.java (98%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecog_Unicode.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecog_mbcs.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecog_sbcs.java (99%) rename app/src/main/java/io/legado/app/{utils => lib}/icu4j/CharsetRecognizer.java (98%) diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetDetector.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetDetector.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java index 23c8c7d13..ce3a348d9 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetDetector.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetDetector.java @@ -5,7 +5,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetMatch.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetMatch.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java index 0c98e4937..bc520e836 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetMatch.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetMatch.java @@ -5,7 +5,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_2022.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_2022.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java index 838bcd467..28142f237 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_2022.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_2022.java @@ -5,7 +5,7 @@ * others. All Rights Reserved. * ******************************************************************************* */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; /** diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_UTF8.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java similarity index 98% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_UTF8.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java index da648141d..ba4d35746 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_UTF8.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_UTF8.java @@ -5,7 +5,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; /** diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_Unicode.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_Unicode.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java index 52da0a99f..de27df172 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_Unicode.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_Unicode.java @@ -7,7 +7,7 @@ * */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; /** diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_mbcs.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_mbcs.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java index 2881b8fec..5e4e25554 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_mbcs.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_mbcs.java @@ -6,7 +6,7 @@ **************************************************************************** * */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; import java.util.Arrays; diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_sbcs.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java similarity index 99% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_sbcs.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java index c84eada05..4f310219a 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_sbcs.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecog_sbcs.java @@ -7,7 +7,7 @@ * */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; /** diff --git a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecognizer.java b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java similarity index 98% rename from app/src/main/java/io/legado/app/utils/icu4j/CharsetRecognizer.java rename to app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java index 07a01aa68..d96a213c0 100644 --- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecognizer.java +++ b/app/src/main/java/io/legado/app/lib/icu4j/CharsetRecognizer.java @@ -5,7 +5,7 @@ * others. All Rights Reserved. * * ****************************************************************************** */ -package io.legado.app.utils.icu4j; +package io.legado.app.lib.icu4j; /** diff --git a/app/src/main/java/io/legado/app/utils/EncodingDetect.kt b/app/src/main/java/io/legado/app/utils/EncodingDetect.kt index 7b82e42c8..aaa448ad2 100644 --- a/app/src/main/java/io/legado/app/utils/EncodingDetect.kt +++ b/app/src/main/java/io/legado/app/utils/EncodingDetect.kt @@ -1,7 +1,7 @@ package io.legado.app.utils import android.text.TextUtils -import io.legado.app.utils.icu4j.CharsetDetector +import io.legado.app.lib.icu4j.CharsetDetector import org.jsoup.Jsoup import java.io.File import java.io.FileInputStream From cb54d2adcc3c50d0fe99bafdb2b99eff8f161555 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 9 Dec 2020 11:03:22 +0800 Subject: [PATCH 2/4] update log --- app/src/main/assets/updateLog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index bf5754f4a..2ce28118f 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -3,6 +3,11 @@ * 关注合作公众号 **[小说拾遗]** 获取好看的小说。 * 旧版数据导入教程：先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】。 +**2020/12/09** +* 修复bug +* 优化中文排序 +* 优化编码识别 + **2020/12/06** * 添加规则订阅功能,订阅界面第一个图标,可以订阅书源/订阅源/替换规则 From b915f43ba559a6334151c422182b1c770186cb63 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 9 Dec 2020 11:29:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/main/bookshelf/BookshelfFragment.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt index 074472401..fd4f39ee4 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt @@ -218,12 +218,7 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b override fun getItem(position: Int): Fragment { val group = bookGroups[position] - var fragment = fragmentMap[group.groupId] - if (fragment == null) { - fragment = BooksFragment.newInstance(position, group.groupId) - fragmentMap[group.groupId] = fragment - } - return fragment + return BooksFragment.newInstance(position, group.groupId) } override fun getCount(): Int { From a6f83282c376500f7c778b378d8b2ad189d03760 Mon Sep 17 00:00:00 2001 From: gedoor Date: Wed, 9 Dec 2020 11:32:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/ui/main/MainActivity.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 32794d127..4890d22da 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -205,10 +205,10 @@ class MainActivity : VMBaseActivity(), override fun getItem(position: Int): Fragment { return when (getId(position)) { - 0 -> fragmentMap[0] ?: BookshelfFragment() - 1 -> fragmentMap[1] ?: ExploreFragment() - 2 -> fragmentMap[2] ?: RssFragment() - else -> fragmentMap[3] ?: MyFragment() + 0 -> BookshelfFragment() + 1 -> ExploreFragment() + 2 -> RssFragment() + else -> MyFragment() } }