Merge pull request #29 from fengyuecanzhu/dev

Release v2.4.8

app/release.md

@@ -5,4 +5,5 @@
 * 5、\[设置-缓存设置\]新增清除广告文件
 * 6、修复检查更新失败的问题
 * 7、修复获取更新链接失败的问题
-* 8、更新订阅书源链接
+* 8、更新订阅书源链接
+* 9、修复其他已知bug

app/src/main/assets/updatelog.fy

@@ -1,5 +1,5 @@
 2022.08.02
-风月读书v2.4.7
+风月读书v2.4.8
 1、修复阅读界面概率性闪退的问题
 2、关于界面新增插件加载结果
 3、修复书源订阅失败的问题
@@ -8,6 +8,7 @@
 6、修复检查更新失败的问题
 7、修复获取更新链接失败的问题
 8、更新订阅书源链接
+9、修复其他已知bug
 
 2022.05.28
 风月读书v2.4.6

app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java

@@ -393,7 +393,7 @@ public class ReadActivity extends BaseActivity<ActivityReadBinding> implements C
 
             @Override
             public void onLongPress() {
-                if (mSetting.getPageMode() == SCROLL){
+                if (mSetting.getPageMode() == SCROLL) {
                     ToastUtils.showWarring("滚动模式暂不支持长按复制");
                     return;
                 }
@@ -417,6 +417,9 @@ public class ReadActivity extends BaseActivity<ActivityReadBinding> implements C
                         mChapters = chapters;
                         mBook.setNoReadNum(0);
                         mBook.setChapterTotalNum(chapters.size());
+                        if (mBook.getHisttoryChapterNum() > chapters.size() - 1) {
+                            mBook.setHisttoryChapterNum(chapters.size() - 1);
+                        }
                         mBook.setNewestChapterTitle(chapters.get(chapters.size() - 1).getTitle());
                         if (hasChangeSource) {
                             boolean flag = mBookService.matchHistoryChapterPos(mBook, mChapters);
@@ -1275,7 +1278,7 @@ public class ReadActivity extends BaseActivity<ActivityReadBinding> implements C
             @Override
             public void onPageModeChange() {
                 mPageLoader.setPageMode(mSetting.getPageMode());
-                if (mSetting.getPageMode().equals(SCROLL)){
+                if (mSetting.getPageMode().equals(SCROLL)) {
                     DialogCreator.createTipDialog(ReadActivity.this,
                             "滚动模式存在大量问题，不建议使用；且作者本人不使用此模式，大概率不会进行修复/优化，也不接受此模式的问题反馈");
                 }
@@ -1590,22 +1593,22 @@ public class ReadActivity extends BaseActivity<ActivityReadBinding> implements C
                             selectedIndex = which;
                         }
                     }).setCancelButton("确定", (baseDialog, v) -> {
-                switch (selectedIndex) {
-                    case 0:
-                        addDownload(mPageLoader.getChapterPos(), mPageLoader.getChapterPos() + 50);
-                        break;
-                    case 1:
-                        addDownload(mPageLoader.getChapterPos() - 50, mPageLoader.getChapterPos() + 50);
-                        break;
-                    case 2:
-                        addDownload(mPageLoader.getChapterPos(), mChapters.size());
-                        break;
-                    case 3:
-                        addDownload(0, mChapters.size());
-                        break;
-                }
-                return false;
-            });
+                        switch (selectedIndex) {
+                            case 0:
+                                addDownload(mPageLoader.getChapterPos(), mPageLoader.getChapterPos() + 50);
+                                break;
+                            case 1:
+                                addDownload(mPageLoader.getChapterPos() - 50, mPageLoader.getChapterPos() + 50);
+                                break;
+                            case 2:
+                                addDownload(mPageLoader.getChapterPos(), mChapters.size());
+                                break;
+                            case 3:
+                                addDownload(0, mChapters.size());
+                                break;
+                        }
+                        return false;
+                    });
         });
     }
 

app/version_code.properties

@@ -17,5 +17,5 @@
 #
 
 #Fri Jun 18 21:45:31 CST 2021
-VERSION_CODE=247
+VERSION_CODE=248
 CREATE_RELEASE=true