Merge branch 'master' of https://github.com/gedoor/legado

4 years ago · 35b6a6ad22
parent 2844989f0e a6f83282c3
commit 35b6a6ad22
12 changed files with 19 additions and 19 deletions
--- 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**
 * 添加规则订阅功能,订阅界面第一个图标,可以订阅书源/订阅源/替换规则

--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetDetector.java
+++ b/app/src/main/java/io/legado/app/utils/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;
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetMatch.java
+++ b/app/src/main/java/io/legado/app/utils/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;
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_2022.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_2022.java
@ -5,7 +5,7 @@
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 /**
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_UTF8.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_UTF8.java
@ -5,7 +5,7 @@
 * others. All Rights Reserved.                                                *
 * ******************************************************************************
 */
-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 /**
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_Unicode.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_Unicode.java
@ -7,7 +7,7 @@
 *
 */

-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 /**
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_mbcs.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_mbcs.java
@ -6,7 +6,7 @@
 ****************************************************************************
 *
 */
-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 import java.util.Arrays;
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_sbcs.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecog_sbcs.java
@ -7,7 +7,7 @@
 *
 */

-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 /**
--- a/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecognizer.java
+++ b/app/src/main/java/io/legado/app/utils/icu4j/CharsetRecognizer.java
@ -5,7 +5,7 @@
 * others. All Rights Reserved.                                                *
 * ******************************************************************************
 */
-package io.legado.app.utils.icu4j;
+package io.legado.app.lib.icu4j;


 /**
--- 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<ActivityMainBinding, MainViewModel>(),

        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()
            }
        }

--- 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<BookshelfViewModel>(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 {
--- 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