Merge pull request #1 from gedoor/master

merge

app/build.gradle

@@ -19,7 +19,7 @@ def gitCommits = Integer.parseInt('git rev-list --count HEAD'.execute([], projec
 
 android {
     compileSdkVersion 29
-    flavorDimensions ("version")
+    flavorDimensions("version")
     signingConfigs {
         if (project.hasProperty("RELEASE_STORE_FILE")) {
             myConfig {
@@ -56,7 +56,7 @@ android {
                 signingConfig signingConfigs.myConfig
             }
             applicationIdSuffix '.release'
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -66,7 +66,7 @@ android {
             applicationIdSuffix '.debug'
             versionNameSuffix 'debug'
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         android.applicationVariants.all { variant ->
             variant.outputs.all {
@@ -87,7 +87,7 @@ android {
     }
     compileOptions {
         // Flag to enable support for the new language APIs
-        //coreLibraryDesugaringEnabled true
+        coreLibraryDesugaringEnabled true
         // Sets Java compatibility to Java 8
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -109,6 +109,7 @@ kapt {
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
@@ -117,16 +118,16 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     //fireBase
-    implementation 'com.google.firebase:firebase-core:17.3.0'
+    implementation 'com.google.firebase:firebase-core:17.4.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 
     //androidX
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.media:media:1.1.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.google.android:flexbox:1.1.0'
@@ -143,7 +144,7 @@ dependencies {
     kapt "androidx.room:room-compiler:$room_version"
 
     //paging
-    implementation 'androidx.paging:paging-runtime:2.1.2'
+    implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
 
     //anko
     def anko_version = '0.10.8'
@@ -154,7 +155,7 @@ dependencies {
     implementation 'com.jeremyliao:live-event-bus-x:1.5.7'
 
     //协程
-    def coroutines_version = '1.3.3'
+    def coroutines_version = '1.3.7'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
@@ -193,6 +194,8 @@ dependencies {
     //转换繁体
     implementation 'com.hankcs:hanlp:portable-1.7.7'
 
+    //E-Ink 有些手机会出现重影
+    //implementation 'fadeapp.widgets:scrollless-recyclerView:1.0.2'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/proguard-rules.pro

@@ -58,14 +58,13 @@
 # 保留我们使用的四大组件，自定义的Application等等这些类不被混淆
 # 因为这些子类都有可能被外部调用
 -keep public class * extends android.app.Activity
--keep public class * extends android.app.Appliction
+-keep public class * extends android.app.Application
 -keep public class * extends android.app.Service
 -keep public class * extends android.content.BroadcastReceiver
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
 -keep public class * extends android.view.View
--keep public class com.android.vending.licensing.ILicensingService
 
 
 # 保留androidx下的所有类及其内部类
@@ -128,16 +127,11 @@
 }
 
 # webView处理，项目中没有使用到webView忽略即可
--keepclassmembers class fqcn.of.javascript.interface.for.webview {
+-keepclassmembers class * extends android.webkit.WebViewClient {
-    public *;
+    public void *(android.webkit.WebView, java.lang.String);
-}
--keepclassmembers class * extends android.webkit.webViewClient {
     public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
     public boolean *(android.webkit.WebView, java.lang.String);
 }
--keepclassmembers class * extends android.webkit.webViewClient {
-    public void *(android.webkit.webView, jav.lang.String);
-}
 
 # 移除Log类打印各个等级日志的代码，打正式包的时候可以做为禁log使用，这里可以作为禁止log打印的功能使用
 # 记得proguard-android.txt中一定不要加-dontoptimize才起作用
@@ -170,20 +164,20 @@
 -dontwarn org.conscrypt.**
 -dontwarn com.jeremyliao.liveeventbus.**
 
+-keep class com.google.gson.** { *; }
+-keep class com.ke.gson.** { *; }
 -keep class com.jeremyliao.liveeventbus.** { *; }
 -keep class okhttp3.**{*;}
 -keep class okio.**{*;}
 -keep class com.hwangjr.rxbus.**{*;}
 -keep class org.conscrypt.**{*;}
--keep class com.kunfei.bookshelf.widget.**{*;}
--keep class com.kunfei.bookshelf.bean.**{*;}
 -keep class android.support.**{*;}
 -keep class me.grantland.widget.**{*;}
 -keep class de.hdodenhof.circleimageview.**{*;}
 -keep class tyrant.explosionfield.**{*;}
 -keep class tyrantgit.explosionfield.**{*;}
 -keep class freemarker.**{*;}
--keep class com.gyf.barlibrary.* {*;}
+-keep class com.gyf.barlibrary.** {*;}
 ##JSOUP
 -keep class org.jsoup.**{*;}
 -keep class **.xpath.**{*;}
@@ -197,7 +191,7 @@
 -dontwarn com.jayway.**
 -keep class com.fasterxml.**{*;}
 
--keep class javax.swing..**{*;}
+-keep class javax.swing.**{*;}
 -dontwarn javax.swing.**
 -keep class java.awt.**{*;}
 -dontwarn java.awt.**
@@ -215,10 +209,10 @@
 -dontwarn nl.siegmann.epublib.**
 -dontwarn org.xmlpull.**
 -keep class nl.siegmann.epublib.**{*;}
--keep class javax.xml.**{*;}
+-keep class javax.xml**{*;}
--keep class org.xmlpull.**{*;}
+-keep class org.xmlpull**{*;}
 
--keep class org.simpleframework.xml.**{*;}
+-keep class org.simpleframework.xml**{*;}
 -dontwarn org.simpleframework.xml.**
 
 -keepclassmembers class * {

app/src/debug/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">阅读·D</string>
+    <string name="app_name" translatable="false">阅读·D</string>
-    <string name="receiving_shared_label">阅读·D·搜索</string>
+    <string name="receiving_shared_label" translatable="false">阅读·D·搜索</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="io.legado.app">
 
+    <uses-permission
+        android:name="android.permission.MANAGE_DOCUMENTS"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -237,6 +240,10 @@
             android:name="io.legado.app.ui.book.chapterlist.ChapterListActivity"
             android:screenOrientation="behind"
             android:launchMode="singleTop" />
+        <!--RSS条目-->
+        <activity
+            android:name=".ui.rss.article.RssSortActivity"
+            android:launchMode="singleTop" />
         <!--RSS阅读-->
         <activity
             android:name=".ui.rss.read.ReadRssActivity"
@@ -255,10 +262,6 @@
         <activity
             android:name=".ui.rss.source.debug.RssSourceDebugActivity"
             android:launchMode="singleTop" />
-        <!--订阅条目-->
-        <activity
-            android:name=".ui.rss.article.RssSortActivity"
-            android:launchMode="singleTop" />
         <!--Rss收藏-->
         <activity
             android:name=".ui.rss.favorites.RssFavoritesActivity"

app/src/main/assets/18PlusList.txt

@@ -0,0 +1,3 @@
+OGN5dS5jb20=
+c2cwMC54eXo=
+aXRyYWZmaWNuZXQuY29t

app/src/main/assets/readConfig.json

@@ -7,9 +7,7 @@
     "bgType": 0,
     "bgTypeNight": 0,
     "darkStatusIcon": true,
-    "textSize": 24,
+    "darkStatusIconNight": false
-    "letterSpacing": 0,
-    "lineSpacingExtra": 10
   },
   {
     "bgStr": "#DDC090",
@@ -19,9 +17,7 @@
     "bgType": 0,
     "bgTypeNight": 0,
     "darkStatusIcon": true,
-    "textSize": 24,
+    "darkStatusIconNight": false
-    "letterSpacing": 0,
-    "lineSpacingExtra": 10
   },
   {
     "bgStr": "#C2D8AA",
@@ -31,9 +27,7 @@
     "bgType": 0,
     "bgTypeNight": 0,
     "darkStatusIcon": false,
-    "textSize": 24,
+    "darkStatusIconNight": false
-    "letterSpacing": 0,
-    "lineSpacingExtra": 10
   },
   {
     "bgStr": "#DBB8E2",
@@ -43,9 +37,7 @@
     "bgType": 0,
     "bgTypeNight": 0,
     "darkStatusIcon": false,
-    "textSize": 24,
+    "darkStatusIconNight": false
-    "letterSpacing": 0,
-    "lineSpacingExtra": 10
   },
   {
     "bgStr": "#ABCEE0",
@@ -55,8 +47,6 @@
     "bgType": 0,
     "bgTypeNight": 0,
     "darkStatusIcon": false,
-    "textSize": 24,
+    "darkStatusIconNight": false
-    "letterSpacing": 0,
-    "lineSpacingExtra": 10
   }
 ]

app/src/main/assets/txtTocRule.json

@@ -4,118 +4,125 @@
         "enable": true,
         "name": "目录",
         "rule": "^[ 　\\t]{0,4}(?:序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-        "serialNumber": -17
+        "serialNumber": 0
     },
     {
         "id": -2,
-        "enable": false,
+        "enable": true,
         "name": "目录(去空白)",
         "rule": "(?<=[　\\s])(?:序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|篇(?!张))).{0,30}$",
-        "serialNumber": -16
+        "serialNumber": 1
     },
     {
         "id": -3,
         "enable": false,
         "name": "目录(匹配简介)",
         "rule": "(?<=[　\\s])(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
-        "serialNumber": -15
+        "serialNumber": 2
     },
     {
         "id": -4,
         "enable": false,
         "name": "目录(古典、轻小说备用)",
         "rule": "^[ 　\\t]{0,4}(?:序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|第?\\s{0,4}[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]+?\\s{0,4}(?:章|节(?!课)|卷|集(?![合和])|部(?!分)|回(?![合来事去])|场(?![和合比电是])|篇(?!张))).{0,30}$",
-        "serialNumber": -14
+        "serialNumber": 3
     },
     {
         "id": -5,
         "enable": false,
         "name": "数字(纯数字标题)",
         "rule": "(?<=[　\\s])\\d+[ 　\\t]{0,4}$",
-        "serialNumber": -13
+        "serialNumber": 4
     },
     {
         "id": -6,
         "enable": true,
         "name": "数字 分隔符 标题名称",
         "rule": "^[ 　\\t]{0,4}\\d{1,5}[,.， 、_—\\-].{1,30}$",
-        "serialNumber": -12
+        "serialNumber": 5
     },
     {
         "id": -7,
         "enable": true,
         "name": "大写数字 分隔符 标题名称",
         "rule": "^[ 　\\t]{0,4}[零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}[ 、_—\\-].{1,30}$",
-        "serialNumber": -11
+        "serialNumber": 6
     },
     {
         "id": -8,
         "enable": true,
         "name": "正文 标题/序号",
         "rule": "^[ 　\\t]{0,4}正文[ 　]{1,4}.{0,20}$",
-        "serialNumber": -10
+        "serialNumber": 7
     },
     {
         "id": -9,
         "enable": true,
         "name": "Chapter/Section/Part/Episode 序号 标题",
-        "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Ee]pisode|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)\\s{0,4}\\d{1,4}.{0,30}$",
+        "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Nn][oO]\\.|[Ee]pisode|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)\\s{0,4}\\d{1,4}.{0,30}$",
-        "serialNumber": -9
+        "serialNumber": 8
     },
     {
         "id": -10,
         "enable": false,
         "name": "Chapter(去简介)",
-        "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Ee]pisode)\\s{0,4}\\d{1,4}.{0,30}$",
+        "rule": "^[ 　\\t]{0,4}(?:[Cc]hapter|[Ss]ection|[Pp]art|ＰＡＲＴ|[Nn][Oo]\\.|[Ee]pisode)\\s{0,4}\\d{1,4}.{0,30}$",
-        "serialNumber": -8
+        "serialNumber": 9
     },
     {
         "id": -11,
         "enable": true,
         "name": "特殊符号 序号 标题",
         "rule": "(?<=[\\s　])[【〔〖「『〈［\\[](?:第|[Cc]hapter)[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,10}[章节].{0,20}$",
-        "serialNumber": -7
+        "serialNumber": 10
     },
     {
         "id": -12,
         "enable": false,
         "name": "特殊符号 标题(成对)",
         "rule": "(?<=[\\s　]{0,4})(?:[\\[〈「『〖〔《（【\\(].{1,30}[\\)】）》〕〗』」〉\\]]?|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)[ 　]{0,4}$",
-        "serialNumber": -6
+        "serialNumber": 11
     },
     {
         "id": -13,
         "enable":true,
         "name": "特殊符号 标题(单个)",
         "rule": "(?<=[\\s　]{0,4})(?:[☆★✦✧].{1,30}|(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外)[ 　]{0,4}$",
-        "serialNumber": -5
+        "serialNumber": 12
     },
     {
         "id": -14,
         "enable": true,
         "name": "章/卷 序号 标题",
         "rule": "^[ \\t　]{0,4}(?:(?:内容|文章)?简介|文案|前言|序章|楔子|正文(?!完|结)|终章|后记|尾声|番外|[卷章][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8})[ 　]{0,4}.{0,30}$",
-        "serialNumber": -4
+        "serialNumber": 13
     },
     {
         "id": -15,
         "enable":false,
         "name": "顶格标题",
         "rule": "^\\S.{1,20}$",
-        "serialNumber": -3
+        "serialNumber": 14
     },
     {
         "id": -16,
         "enable":false,
         "name": "双标题(前向)",
         "rule": "(?m)(?<=[ \\t　]{0,4})第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$(?=[\\s　]{0,8}第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章)",
-        "serialNumber": -2
+        "serialNumber": 15
     },
     {
         "id": -17,
         "enable":false,
         "name": "双标题(后向)",
         "rule": "(?m)(?<=[ \\t　]{0,4}第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$[\\s　]{0,8})第[\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}章.{0,30}$",
-        "serialNumber": -1
+        "serialNumber": 16
+    },
+    {
+        "id":-18,
+        "enable": true,
+        "name": "标题 特殊符号 序号",
+        "rule": "^.{1,20}[(（][\\d零一二两三四五六七八九十百千万壹贰叁肆伍陆柒捌玖拾佰仟]{1,8}[)）][ 　\t]{0,4}$",
+        "serialNumber": 17
     }
 ]

app/src/main/assets/updateLog.md

@@ -3,6 +3,134 @@
 * 请关注公众号[开源阅读]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
 * 新公众号[开源阅读]()已启用,[开源阅读软件]()备用
 
+**2020/07/04**
+* 修复滚动bug
+* 其它一些优化
+
+**2020/07/03**
+* 修复关闭两端对齐是朗读高亮不准确的bug
+* 添加文字底部对齐开关
+
+**2020/06/25**
+* E-Ink模式合并到主题模式里, E-Ink模式不能修改阅读界面背景和文字颜色
+* 添加判断,防止背景透明引起重影,花屏问题
+
+**2020/06/22**
+* 修复xpath获取正文多了许多逗号的bug
+* 修复检验有效书源移除失效分组失败的bug
+
+**2020/06/21**
+* 双击书架图标返回顶部
+
+**2020/06/20**
+* 适配NavigationBar
+
+**2020/06/19**
+* 修复eInk bug
+* 修复分组下载bug
+* 导入本地添加滚动条
+
+**2020/06/18**
+* fadeapp.widgets:scrollless-recyclerView导致有些手机重影,暂时去除
+* 下载界面添加分组
+* 修复eInk bug
+
+**2020/06/17**
+* 修复更新书架时更新禁止更新的问题
+* 修复导入旧版本数据问题
+
+**2020/06/16**
+* 刷新时只刷新当前书架
+* 修复恢复备份需要退出重进的问题
+* 保存打开 E-Ink 模式前的主题、翻页动画，关闭后恢复之前的配置, 现在可以切着玩了
+* 修复因繁体语言导致的崩溃bug
+
+**2020/06/15**
+* 添加 E-Ink 模式 by Modificator
+* 修复发现打开书时可能的错误
+
+**2020/06/14**
+* 修复txt文件目录识别
+* 书源分组添加已启用已禁用
+
+**2020/06/13**
+* 优化搜索
+
+**2020/06/12**
+* 修复分组变化的bug
+
+**2020/06/10**
+* 正文字体的粗细选择增加可以选择细体(Android O生效) by hingbong
+* 修复bug
+
+**2020/06/09**
+* 修复从发现界面打开已在书架的书时,显示不对的问题
+
+**2020/06/07**
+* 优化书源检测,自定义搜索关键词
+* 失效书源如果校验为有效会去掉失效标志
+
+**2020/06/06**
+* 修复一些bug,包括从阅读界面退出后还是显示红色更新的bug
+
+**2020/06/03**
+* zh-TW translation by david082321
+* 修复音频播放时播放速度调节会再下一章失效的bug
+
+**2020/05/31**
+* 更新到android studio 4.0
+* 书源排序添加按url
+* 去除朗读通知的进度条
+* 修复恢复问题,暂时去除混淆
+
+**2020/05/24**
+* 添加自动翻页速度调节
+
+**2020/05/23**
+* 添加文字两端对齐配置
+
+**2020/05/20**
+* Rss列表增加一种显示样式
+
+**2020/05/18**
+* 修复http://alanskycn.gitee.io/书源导入失败问题,被屏蔽UA了
+* Rss列表添加样式切换
+
+**2020/05/17**
+* 自动翻页功能完成
+* 替换规则输入时弹出辅助输入条
+
+**2020/05/10**
+* 添加识别rss分组中的频道信息，在菜单中可以切换频道 from yangyxd
+* 源管理添加置底,批量置顶,批量置地
+* 封面选择本地图片完成
+
+**2020/05/04**
+* 优化txt文件目录解析
+
+**2020/05/03**
+* 优化一些界面显示问题
+* 订阅源添加style
+* 修复一些重复目录的bug
+
+**2020/05/02**
+* 修复不停换源的bug
+* 修复本地书籍自动换源
+* 修复书源校验的一些问题
+
+**2020/05/01**
+* 尝试修复朗读时可能错位的bug
+* 添加自动换源配置
+* 换源添加禁用菜单
+
+**2020/04/29**
+* 修复bug
+* 订阅界面添加长按菜单
+
+**2020/04/26**
+* 添加导入旧的书源转换
+* 修复不自动朗读下一章的bug
+
 **2020/04/25**
 * 修复翻页按键设置为空时崩溃的bug
 * 翻页按键优先自定义按键,可覆盖音量按键

app/src/main/java/io/legado/app/App.kt

@@ -5,6 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatDelegate
@@ -12,14 +13,19 @@ import com.jeremyliao.liveeventbus.LiveEventBus
 import io.legado.app.constant.AppConst.channelIdDownload
 import io.legado.app.constant.AppConst.channelIdReadAloud
 import io.legado.app.constant.AppConst.channelIdWeb
+import io.legado.app.constant.EventBus
+import io.legado.app.constant.PreferKey
 import io.legado.app.data.AppDatabase
 import io.legado.app.help.ActivityHelp
 import io.legado.app.help.AppConfig
 import io.legado.app.help.CrashHandler
 import io.legado.app.help.ReadBookConfig
+import io.legado.app.lib.theme.ColorUtils
 import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.utils.getCompatColor
 import io.legado.app.utils.getPrefInt
+import io.legado.app.utils.postEvent
+import io.legado.app.utils.putPrefInt
 
 @Suppress("DEPRECATION")
 class App : Application() {
@@ -68,28 +74,66 @@ class App : Application() {
      * 更新主题
      */
     fun applyTheme() {
-        if (AppConfig.isNightTheme) {
+        when {
-            ThemeStore.editTheme(this)
+            AppConfig.isEInkMode -> {
-                .primaryColor(
+                ThemeStore.editTheme(this)
-                    getPrefInt("colorPrimaryNight", getCompatColor(R.color.md_blue_grey_600))
+                    .coloredNavigationBar(true)
-                ).accentColor(
+                    .primaryColor(Color.WHITE)
-                    getPrefInt("colorAccentNight", getCompatColor(R.color.md_deep_orange_800))
+                    .accentColor(Color.BLACK)
-                ).backgroundColor(
+                    .backgroundColor(Color.WHITE)
-                    getPrefInt("colorBackgroundNight", getCompatColor(R.color.shine_color))
+                    .bottomBackground(Color.WHITE)
-                ).bottomBackground(
+                    .apply()
-                    getPrefInt("colorBottomBackgroundNight", getCompatColor(R.color.md_grey_850))
+            }
-                ).apply()
+            AppConfig.isNightTheme -> {
-        } else {
+                val primary =
-            ThemeStore.editTheme(this)
+                    getPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_blue_grey_600))
-                .primaryColor(
+                val accent =
-                    getPrefInt("colorPrimary", getCompatColor(R.color.md_indigo_800))
+                    getPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_deep_orange_800))
-                ).accentColor(
+                var background =
-                    getPrefInt("colorAccent", getCompatColor(R.color.md_red_600))
+                    getPrefInt(PreferKey.cNBackground, getCompatColor(R.color.md_grey_900))
-                ).backgroundColor(
+                if (ColorUtils.isColorLight(background)) {
-                    getPrefInt("colorBackground", getCompatColor(R.color.md_grey_100))
+                    background = getCompatColor(R.color.md_grey_900)
-                ).bottomBackground(
+                    putPrefInt(PreferKey.cNBackground, background)
-                    getPrefInt("colorBottomBackground", getCompatColor(R.color.md_grey_200))
+                }
-                ).apply()
+                var bBackground =
+                    getPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_850))
+                if (!ColorUtils.isColorLight(bBackground)) {
+                    bBackground = getCompatColor(R.color.md_grey_850)
+                    putPrefInt(PreferKey.cNBBackground, bBackground)
+                }
+                ThemeStore.editTheme(this)
+                    .coloredNavigationBar(true)
+                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
+                    .accentColor(ColorUtils.withAlpha(accent, 1f))
+                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
+                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
+                    .apply()
+            }
+            else -> {
+                val primary =
+                    getPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_indigo_800))
+                val accent =
+                    getPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_red_600))
+                var background =
+                    getPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
+                if (!ColorUtils.isColorLight(background)) {
+                    background = getCompatColor(R.color.md_grey_100)
+                    putPrefInt(PreferKey.cBackground, background)
+                }
+                var bBackground =
+                    getPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
+                if (!ColorUtils.isColorLight(bBackground)) {
+                    bBackground = getCompatColor(R.color.md_grey_200)
+                    putPrefInt(PreferKey.cBBackground, bBackground)
+                }
+                ThemeStore.editTheme(this)
+                    .coloredNavigationBar(true)
+                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
+                    .accentColor(ColorUtils.withAlpha(accent, 1f))
+                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
+                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
+                    .apply()
+            }
         }
     }
 
@@ -97,6 +141,7 @@ class App : Application() {
         ReadBookConfig.upBg()
         applyTheme()
         initNightMode()
+        postEvent(EventBus.RECREATE, "")
     }
 
     private fun initNightMode() {

app/src/main/java/io/legado/app/base/BaseActivity.kt

@@ -107,6 +107,11 @@ abstract class BaseActivity(
         } else if (theme == Theme.Light) {
             ATH.setLightStatusBar(this, true)
         }
+        upNavigationBarColor()
+    }
+
+    open fun upNavigationBarColor() {
+        ATH.setNavigationBarColorAuto(this)
     }
 
     open fun observeLiveBus() {

app/src/main/java/io/legado/app/constant/AppConst.kt

@@ -20,7 +20,7 @@ object AppConst {
     const val UA_NAME = "User-Agent"
 
     val userAgent: String by lazy {
-        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36"
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36"
     }
 
     val SCRIPT_ENGINE: ScriptEngine by lazy {
@@ -56,4 +56,15 @@ object AppConst {
     const val notificationIdAudio = 1144772
     const val notificationIdWeb = 1144773
     const val notificationIdDownload = 1144774
+
+    val urlOption: String by lazy {
+        """
+        ,{
+        "charset": "",
+        "method": "POST",
+        "body": "",
+        "headers": {"User-Agent": ""}
+        }
+        """.trimIndent()
+    }
 }

app/src/main/java/io/legado/app/constant/PreferKey.kt

@@ -43,4 +43,20 @@ object PreferKey {
     const val readStyleSelect = "readStyleSelect"
     const val systemTypefaces = "system_typefaces"
     const val readBodyToLh = "readBodyToLh"
+    const val textFullJustify = "textFullJustify"
+    const val textBottomJustify = "textBottomJustify"
+    const val autoReadSpeed = "autoReadSpeed"
+    const val barElevation = "barElevation"
+    const val transparentStatusBar = "transparentStatusBar"
+
+    const val cPrimary = "colorPrimary"
+    const val cAccent = "colorAccent"
+    const val cBackground = "colorBackground"
+    const val cBBackground = "colorBottomBackground"
+
+    const val cNPrimary = "colorPrimaryNight"
+    const val cNAccent = "colorAccentNight"
+    const val cNBackground = "colorBackgroundNight"
+    const val cNBBackground = "colorBottomBackgroundNight"
+
 }

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
         RssSource::class, Bookmark::class, RssArticle::class, RssReadRecord::class,
         RssStar::class, TxtTocRule::class],
-    version = 11,
+    version = 13,
     exportSchema = true
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -31,25 +31,48 @@ abstract class AppDatabase : RoomDatabase() {
         fun createDatabase(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME)
                 .fallbackToDestructiveMigration()
-                .addMigrations(object : Migration(10, 11) {
+                .addMigrations(migration_10_11, migration_11_12, migration_12_13)
-                    override fun migrate(database: SupportSQLiteDatabase) {
-                        database.execSQL("DROP TABLE txtTocRules")
-                        database.execSQL(
-                            """
-                            CREATE TABLE txtTocRules(id INTEGER NOT NULL, 
-                            name TEXT NOT NULL, rule TEXT NOT NULL, serialNumber INTEGER NOT NULL, 
-                            enable INTEGER NOT NULL, PRIMARY KEY (id))
-                        """
-                        )
-                    }
-                })
                 .addCallback(object : Callback() {
                     override fun onDestructiveMigration(db: SupportSQLiteDatabase) {
                         GlobalScope.launch { Restore.restoreDatabase(Backup.backupPath) }
                     }
                 })
+                .allowMainThreadQueries()
                 .build()
         }
+
+        private val migration_10_11 = object : Migration(10, 11) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("DROP TABLE txtTocRules")
+                database.execSQL(
+                    """
+                    CREATE TABLE txtTocRules(id INTEGER NOT NULL, 
+                    name TEXT NOT NULL, rule TEXT NOT NULL, serialNumber INTEGER NOT NULL, 
+                    enable INTEGER NOT NULL, PRIMARY KEY (id))
+                    """
+                )
+            }
+        }
+
+        private val migration_11_12 = object : Migration(11, 12) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                    ALTER TABLE rssSources ADD style TEXT
+                    """
+                )
+            }
+        }
+
+        private val migration_12_13 = object : Migration(12, 13) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                    ALTER TABLE rssSources ADD articleStyle INTEGER NOT NULL DEFAULT 0
+                    """
+                )
+            }
+        }
     }
 
     abstract fun bookDao(): BookDao

app/src/main/java/io/legado/app/data/dao/BookDao.kt

@@ -21,9 +21,6 @@ interface BookDao {
     @Query("SELECT bookUrl FROM books WHERE origin = '${BookType.local}'")
     fun observeLocalUri(): LiveData<List<String>>
 
-    @Query("SELECT * FROM books WHERE origin <> '${BookType.local}' and type = 0")
-    fun observeDownload(): LiveData<List<Book>>
-
     @Query("SELECT * FROM books WHERE (`group` & :group) > 0")
     fun observeByGroup(group: Int): LiveData<List<Book>>
 

app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt

@@ -14,6 +14,12 @@ interface BookSourceDao {
     @Query("select * from book_sources where bookSourceName like :searchKey or bookSourceGroup like :searchKey or bookSourceUrl like :searchKey order by customOrder asc")
     fun liveDataSearch(searchKey: String = ""): LiveData<List<BookSource>>
 
+    @Query("select * from book_sources where enabled = 1 order by customOrder asc")
+    fun liveDataEnabled(): LiveData<List<BookSource>>
+
+    @Query("select * from book_sources where enabled = 0 order by customOrder asc")
+    fun liveDataDisabled(): LiveData<List<BookSource>>
+
     @Query("select * from book_sources where enabledExplore = 1 and trim(exploreUrl) <> '' order by customOrder asc")
     fun liveExplore(): LiveData<List<BookSource>>
 

app/src/main/java/io/legado/app/data/dao/SearchBookDao.kt

@@ -19,7 +19,7 @@ interface SearchBookDao {
     @Query("select * from searchBooks where bookUrl = :bookUrl")
     fun getSearchBook(bookUrl: String): SearchBook?
 
-    @Query("select * from searchBooks where name = :name and author = :author and origin in (select bookSourceUrl from book_sources where enabled = 1) order by originOrder limit 1")
+    @Query("select * from searchBooks where name = :name and author = :author and origin in (select bookSourceUrl from book_sources) order by originOrder limit 1")
     fun getFirstByNameAuthor(name: String, author: String): SearchBook?
 
     @Query(

app/src/main/java/io/legado/app/data/entities/BaseBook.kt

@@ -4,7 +4,7 @@ import io.legado.app.utils.splitNotBlank
 
 interface BaseBook {
     var bookUrl: String
-    var variableMap: HashMap<String, String>?
+    val variableMap: HashMap<String, String>
     var kind: String?
     var wordCount: String?
 

app/src/main/java/io/legado/app/data/entities/Book.kt

@@ -56,10 +56,14 @@ data class Book(
         return origin == BookType.local
     }
 
-    fun isTxt(): Boolean {
+    fun isLocalTxt(): Boolean {
         return isLocalBook() && originName.endsWith(".txt", true)
     }
 
+    fun isOnLineTxt(): Boolean {
+        return !isLocalBook() && type == 0
+    }
+
     override fun equals(other: Any?): Boolean {
         if (other is Book) {
             return other.bookUrl == bookUrl
@@ -71,15 +75,17 @@ data class Book(
         return bookUrl.hashCode()
     }
 
-    @Ignore
+    @delegate:Transient
+    @delegate:Ignore
     @IgnoredOnParcel
-    override var variableMap: HashMap<String, String>? = null
+    override val variableMap by lazy {
-        get() {
+        GSON.fromJsonObject<HashMap<String, String>>(variable) ?: HashMap()
-            if (field == null) {
+    }
-                field = GSON.fromJsonObject<HashMap<String, String>>(variable) ?: HashMap()
+
-            }
+    override fun putVariable(key: String, value: String) {
-            return field
+        variableMap[key] = value
-        }
+        variable = GSON.toJson(variableMap)
+    }
 
     @Ignore
     @IgnoredOnParcel
@@ -97,11 +103,6 @@ data class Book(
 
     fun getDisplayIntro() = if (customIntro.isNullOrEmpty()) intro else customIntro
 
-    override fun putVariable(key: String, value: String) {
-        variableMap?.put(key, value)
-        variable = GSON.toJson(variableMap)
-    }
-
     fun fileCharset(): Charset {
         return charset(charset ?: "UTF-8")
     }

app/src/main/java/io/legado/app/data/entities/BookSource.kt

@@ -1,6 +1,7 @@
 package io.legado.app.data.entities
 
 import android.os.Parcelable
+import android.text.TextUtils
 import androidx.room.*
 import io.legado.app.App
 import io.legado.app.constant.AppConst
@@ -8,10 +9,7 @@ import io.legado.app.constant.AppConst.userAgent
 import io.legado.app.constant.BookType
 import io.legado.app.data.entities.rule.*
 import io.legado.app.help.JsExtensions
-import io.legado.app.utils.ACache
+import io.legado.app.utils.*
-import io.legado.app.utils.GSON
-import io.legado.app.utils.fromJsonObject
-import io.legado.app.utils.getPrefString
 import kotlinx.android.parcel.Parcelize
 import java.util.*
 import javax.script.SimpleBindings
@@ -98,13 +96,20 @@ data class BookSource(
     fun addGroup(group: String) {
         bookSourceGroup?.let {
             if (!it.contains(group)) {
-                bookSourceGroup = "$it;$group"
+                bookSourceGroup = "$it,$group"
             }
         } ?: let {
             bookSourceGroup = group
         }
     }
 
+    fun removeGroup(group: String) {
+        bookSourceGroup?.splitNotBlank("[,;]".toRegex())?.toHashSet()?.let {
+            it.remove(group)
+            bookSourceGroup = TextUtils.join(",", it)
+        }
+    }
+
     fun getExploreKinds(): ArrayList<ExploreKind>? {
         val exploreKinds = arrayListOf<ExploreKind>()
         exploreUrl?.let {
@@ -179,7 +184,7 @@ data class BookSource(
 
     class Converters {
         @TypeConverter
-        fun exploreRuleToString(exploreRule: ExploreRule?): String {
+        fun exploreRuleToString(exploreRule: ExploreRule?): String? {
             return GSON.toJson(exploreRule)
         }
 
@@ -189,7 +194,7 @@ data class BookSource(
         }
 
         @TypeConverter
-        fun searchRuleToString(searchRule: SearchRule): String {
+        fun searchRuleToString(searchRule: SearchRule?): String? {
             return GSON.toJson(searchRule)
         }
 
@@ -199,7 +204,7 @@ data class BookSource(
         }
 
         @TypeConverter
-        fun bookInfoRuleToString(bookInfoRule: BookInfoRule): String {
+        fun bookInfoRuleToString(bookInfoRule: BookInfoRule?): String? {
             return GSON.toJson(bookInfoRule)
         }
 
@@ -209,7 +214,7 @@ data class BookSource(
         }
 
         @TypeConverter
-        fun tocRuleToString(tocRule: TocRule): String {
+        fun tocRuleToString(tocRule: TocRule?): String? {
             return GSON.toJson(tocRule)
         }
 
@@ -219,7 +224,7 @@ data class BookSource(
         }
 
         @TypeConverter
-        fun contentRuleToString(contentRule: ContentRule): String {
+        fun contentRuleToString(contentRule: ContentRule?): String? {
             return GSON.toJson(contentRule)
         }
 

app/src/main/java/io/legado/app/data/entities/RssArticle.kt

@@ -21,7 +21,7 @@ data class RssArticle(
 ) {
 
     override fun hashCode(): Int {
-        return super.hashCode()
+        return link.hashCode()
     }
 
     override fun equals(other: Any?): Boolean {

app/src/main/java/io/legado/app/data/entities/RssSource.kt

@@ -24,6 +24,7 @@ data class RssSource(
     var sourceGroup: String? = null,
     var enabled: Boolean = true,
     var sortUrl: String? = null,
+    var articleStyle: Int = 0,
     //列表规则
     var ruleArticles: String? = null,
     var ruleNextPage: String? = null,
@@ -34,9 +35,11 @@ data class RssSource(
     var ruleImage: String? = null,
     var ruleLink: String? = null,
     var ruleContent: String? = null,
+    var style: String? = null,
     var header: String? = null,
     var enableJs: Boolean = false,
     var loadWithBaseUrl: Boolean = false,
+
     var customOrder: Int = 0
 ) : Parcelable, JsExtensions {
 

app/src/main/java/io/legado/app/data/entities/SearchBook.kt

@@ -63,21 +63,19 @@ data class SearchBook(
         return other.originOrder - this.originOrder
     }
 
-    @Ignore
+    @delegate:Transient
+    @delegate:Ignore
     @IgnoredOnParcel
-    override var variableMap: HashMap<String, String>? = null
+    override val variableMap by lazy {
-        get() {
+        GSON.fromJsonObject<HashMap<String, String>>(variable) ?: HashMap()
-            if (field == null) {
+    }
-                field = GSON.fromJsonObject<HashMap<String, String>>(variable) ?: HashMap()
-            }
-            return field
-        }
 
     override fun putVariable(key: String, value: String) {
-        variableMap?.put(key, value)
+        variableMap[key] = value
         variable = GSON.toJson(variableMap)
     }
 
+    @delegate:Transient
     @delegate:Ignore
     @IgnoredOnParcel
     val origins: LinkedHashSet<String> by lazy { linkedSetOf(origin) }

app/src/main/java/io/legado/app/help/AdapterDataObserverHeader.kt

@@ -3,8 +3,8 @@ package io.legado.app.help
 import androidx.recyclerview.widget.RecyclerView
 
 internal class AdapterDataObserverHeader(
-    var adapterDataObserver: RecyclerView.AdapterDataObserver,
+    private var adapterDataObserver: RecyclerView.AdapterDataObserver,
-    var headerCount: Int
+    private var headerCount: Int
 ) : RecyclerView.AdapterDataObserver() {
     override fun onChanged() {
         adapterDataObserver.onChanged()

app/src/main/java/io/legado/app/help/AppConfig.kt

@@ -1,7 +1,7 @@
 package io.legado.app.help
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.content.pm.PackageManager
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.PreferKey
@@ -13,6 +13,7 @@ object AppConfig {
         return when (context.getPrefString(PreferKey.themeMode, "0")) {
             "1" -> false
             "2" -> true
+            "3" -> false
             else -> context.sysIsDarkMode()
         }
     }
@@ -27,10 +28,13 @@ object AppConfig {
             }
         }
 
+    val isEInkMode: Boolean
+        get() = App.INSTANCE.getPrefString(PreferKey.themeMode) == "3"
+
     var isTransparentStatusBar: Boolean
-        get() = App.INSTANCE.getPrefBoolean("transparentStatusBar")
+        get() = App.INSTANCE.getPrefBoolean(PreferKey.transparentStatusBar)
         set(value) {
-            App.INSTANCE.putPrefBoolean("transparentStatusBar", value)
+            App.INSTANCE.putPrefBoolean(PreferKey.transparentStatusBar, value)
         }
 
     val requestedDirection: String?
@@ -80,9 +84,6 @@ object AppConfig {
     val ttsSpeechPer: String
         get() = App.INSTANCE.getPrefString(PreferKey.ttsSpeechPer) ?: "0"
 
-    val isEInkMode: Boolean
-        get() = App.INSTANCE.getPrefBoolean("isEInkMode")
-
     val clickAllNext: Boolean get() = App.INSTANCE.getPrefBoolean(PreferKey.clickAllNext, false)
 
     var chineseConverterType: Int
@@ -122,25 +123,19 @@ object AppConfig {
         }
 
     var elevation: Int
-        get() = App.INSTANCE.getPrefInt("elevation", -1)
+        @SuppressLint("PrivateResource")
+        get() = App.INSTANCE.getPrefInt(
+            PreferKey.barElevation,
+            App.INSTANCE.resources.getDimension(R.dimen.design_appbar_elevation).toInt()
+        )
         set(value) {
-            App.INSTANCE.putPrefInt("elevation", value)
+            App.INSTANCE.putPrefInt(PreferKey.barElevation, value)
         }
 
+    val autoChangeSource: Boolean get() = App.INSTANCE.getPrefBoolean("autoChangeSource", true)
+
     val readBodyToLh: Boolean get() = App.INSTANCE.getPrefBoolean(PreferKey.readBodyToLh, true)
 
     val isGooglePlay: Boolean get() = App.INSTANCE.channel == "google"
 }
 
-val Context.channel: String
-    get() {
-        try {
-            val pm = packageManager
-            val appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
-            return appInfo.metaData.getString("channel") ?: ""
-        } catch (e: Exception) {
-            e.printStackTrace();
-        }
-        return ""
-    }
-

app/src/main/java/io/legado/app/help/BookHelp.kt

@@ -241,9 +241,10 @@ object BookHelp {
         val contents = arrayListOf<String>()
         c.split("\n").forEach {
             val str = it.replace("^\\s+".toRegex(), "")
+                .replace("\r", "")
             if (contents.isEmpty()) {
                 contents.add(title)
-                if (it != title && it.isNotEmpty()) {
+                if (str != title && it.isNotEmpty()) {
                     contents.add("${ReadBookConfig.bodyIndent}$str")
                 }
             } else if (str.isNotEmpty()) {

app/src/main/java/io/legado/app/help/ImageLoader.kt

@@ -7,14 +7,20 @@ import android.net.Uri
 import androidx.annotation.DrawableRes
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestBuilder
+import io.legado.app.utils.isAbsUrl
+import io.legado.app.utils.isContentPath
 import java.io.File
 
 object ImageLoader {
 
+    /**
+     * 自动判断path类型
+     */
     fun load(context: Context, path: String?): RequestBuilder<Drawable> {
         return when {
             path.isNullOrEmpty() -> Glide.with(context).load(path)
-            path.startsWith("http", true) -> Glide.with(context).load(path)
+            path.isAbsUrl() -> Glide.with(context).load(path)
+            path.isContentPath() -> Glide.with(context).load(Uri.parse(path))
             else -> try {
                 Glide.with(context).load(File(path))
             } catch (e: Exception) {

app/src/main/java/io/legado/app/help/ReadBookConfig.kt

@@ -27,8 +27,16 @@ object ReadBookConfig {
         GSON.fromJsonArray<Config>(json)!!
     }
     val durConfig get() = getConfig(styleSelect)
+
     var bg: Drawable? = null
     var bgMeanColor: Int = 0
+    val textColor: Int
+        get() =
+            if (AppConfig.isEInkMode && !AppConfig.isNightTheme) {
+                Color.BLACK
+            } else {
+                durConfig.textColor()
+            }
 
     init {
         upConfig()
@@ -59,6 +67,7 @@ object ReadBookConfig {
                 val json = configFile.readText()
                 return GSON.fromJsonArray(json)
             } catch (e: Exception) {
+                e.printStackTrace()
             }
         }
         return null
@@ -69,13 +78,19 @@ object ReadBookConfig {
         val dm = resources.displayMetrics
         val width = dm.widthPixels
         val height = dm.heightPixels
-        bg = durConfig.bgDrawable(width, height).apply {
+        if (AppConfig.isEInkMode && !AppConfig.isNightTheme) {
-            if (this is BitmapDrawable) {
+            bg = ColorDrawable(Color.WHITE)
-                bgMeanColor = BitmapUtils.getMeanColor(bitmap)
+            bgMeanColor = Color.WHITE
-            } else if (this is ColorDrawable) {
+        } else {
-                bgMeanColor = color
+            bg = durConfig.bgDrawable(width, height).apply {
+                if (this is BitmapDrawable) {
+                    bgMeanColor = BitmapUtils.getMeanColor(bitmap)
+                } else if (this is ColorDrawable) {
+                    bgMeanColor = color
+                }
             }
         }
+        isScroll = pageAnim == 3
     }
 
     fun save() {
@@ -103,6 +118,11 @@ object ReadBookConfig {
     }
 
     //配置写入读取
+    var autoReadSpeed = App.INSTANCE.getPrefInt(PreferKey.autoReadSpeed, 46)
+        set(value) {
+            field = value
+            App.INSTANCE.putPrefInt(PreferKey.autoReadSpeed, value)
+        }
     var styleSelect = App.INSTANCE.getPrefInt(PreferKey.readStyleSelect)
         set(value) {
             field = value
@@ -117,16 +137,16 @@ object ReadBookConfig {
                 App.INSTANCE.putPrefBoolean(PreferKey.shareLayout, value)
             }
         }
-    var pageAnim = App.INSTANCE.getPrefInt(PreferKey.pageAnim)
+    var pageAnim: Int
+        get() = if (AppConfig.isEInkMode) -1 else App.INSTANCE.getPrefInt(PreferKey.pageAnim)
         set(value) {
-            field = value
+            App.INSTANCE.putPrefInt(PreferKey.pageAnim, value)
-            isScroll = value == 3
+            isScroll = pageAnim == 3
-            if (App.INSTANCE.getPrefInt(PreferKey.pageAnim) != value) {
-                App.INSTANCE.putPrefInt(PreferKey.pageAnim, value)
-            }
         }
     var isScroll = pageAnim == 3
     val clickTurnPage get() = App.INSTANCE.getPrefBoolean(PreferKey.clickTurnPage, true)
+    val textFullJustify get() = App.INSTANCE.getPrefBoolean(PreferKey.textFullJustify, true)
+    val textBottomJustify get() = App.INSTANCE.getPrefBoolean(PreferKey.textBottomJustify, true)
     var bodyIndentCount = App.INSTANCE.getPrefInt(PreferKey.bodyIndent, 2)
         set(value) {
             field = value
@@ -141,7 +161,7 @@ object ReadBookConfig {
 
     private val config get() = if (shareLayout) getConfig(5) else durConfig
 
-    var textBold: Boolean
+    var textBold: Int
         get() = config.textBold
         set(value) {
             config.textBold = value
@@ -288,11 +308,11 @@ object ReadBookConfig {
         private var darkStatusIconNight: Boolean = false,//晚上是否暗色状态栏
         private var textColor: String = "#3E3D3B",//白天文字颜色
         private var textColorNight: String = "#ADADAD",//夜间文字颜色
-        var textBold: Boolean = false,//是否粗体字
+        var textBold: Int = 0,//是否粗体字 0:正常, 1:粗体, 2:细体
         var textSize: Int = 20,//文字大小
-        var letterSpacing: Float = 0.5f,//字间距
+        var letterSpacing: Float = 0.1f,//字间距
         var lineSpacingExtra: Int = 12,//行间距
-        var paragraphSpacing: Int = 12,//段距
+        var paragraphSpacing: Int = 4,//段距
         var titleMode: Int = 0,//标题居中
         var titleSize: Int = 0,
         var titleTopSpacing: Int = 0,

app/src/main/java/io/legado/app/help/SourceHelp.kt

@@ -0,0 +1,54 @@
+package io.legado.app.help
+
+import android.os.Handler
+import android.os.Looper
+import io.legado.app.App
+import io.legado.app.data.entities.RssSource
+import io.legado.app.utils.EncoderUtils
+import io.legado.app.utils.NetworkUtils
+import io.legado.app.utils.splitNotBlank
+import org.jetbrains.anko.toast
+
+object SourceHelp {
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val list18Plus by lazy {
+        try {
+            return@lazy String(App.INSTANCE.assets.open("18PlusList.txt").readBytes())
+                .splitNotBlank("\n")
+        } catch (e: Exception) {
+            return@lazy arrayOf<String>()
+        }
+    }
+
+    fun insertRssSource(vararg rssSources: RssSource) {
+        rssSources.forEach { rssSource ->
+            if (is18Plus(rssSource.sourceUrl)) {
+                handler.post {
+                    App.INSTANCE.toast("${rssSource.sourceName}是18+网址,禁止导入.")
+                }
+            } else {
+                App.db.rssSourceDao().insert(rssSource)
+            }
+        }
+    }
+
+    private fun is18Plus(url: String?): Boolean {
+        url ?: return false
+        if (AppConfig.isGooglePlay) return false
+        val baseUrl = NetworkUtils.getBaseUrl(url)
+        baseUrl ?: return false
+        try {
+            val host = baseUrl.split("//", ".")
+            val base64Url = EncoderUtils.base64Encode("${host[host.lastIndex - 1]}.${host.last()}")
+            list18Plus.forEach {
+                if (base64Url == it) {
+                    return true
+                }
+            }
+        } catch (e: Exception) {
+        }
+        return false
+    }
+
+}

app/src/main/java/io/legado/app/help/http/CookieStore.kt

@@ -39,10 +39,6 @@ object CookieStore {
         App.db.cookieDao().delete(url)
     }
 
-    fun clearCookies() {
-
-    }
-
     private fun cookieToMap(cookie: String): MutableMap<String, String> {
         val cookieMap = mutableMapOf<String, String>()
         if (cookie.isBlank()) {

app/src/main/java/io/legado/app/help/http/HttpHelper.kt

@@ -1,5 +1,6 @@
 package io.legado.app.help.http
 
+import io.legado.app.constant.AppConst
 import io.legado.app.help.http.api.HttpGetApi
 import io.legado.app.utils.NetworkUtils
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -41,7 +42,7 @@ object HttpHelper {
     fun simpleGet(url: String, encode: String? = null): String? {
         NetworkUtils.getBaseUrl(url)?.let { baseUrl ->
             val response = getApiService<HttpGetApi>(baseUrl, encode)
-                .get(url, mapOf())
+                .get(url, mapOf(Pair(AppConst.UA_NAME, AppConst.userAgent)))
                 .execute()
             return response.body()
         }
@@ -51,7 +52,7 @@ object HttpHelper {
     suspend fun simpleGetAsync(url: String, encode: String? = null): String? {
         NetworkUtils.getBaseUrl(url)?.let { baseUrl ->
             val response = getApiService<HttpGetApi>(baseUrl, encode)
-                .getAsync(url, mapOf())
+                .getAsync(url, mapOf(Pair(AppConst.UA_NAME, AppConst.userAgent)))
             return response.body()
         }
         return null
@@ -61,7 +62,7 @@ object HttpHelper {
         NetworkUtils.getBaseUrl(url)?.let { baseUrl ->
             return getByteRetrofit(baseUrl)
                 .create(HttpGetApi::class.java)
-                .getMapByteAsync(url, mapOf(), mapOf())
+                .getMapByteAsync(url, mapOf(), mapOf(Pair(AppConst.UA_NAME, AppConst.userAgent)))
                 .body()
         }
         return null

app/src/main/java/io/legado/app/help/storage/ImportOldData.kt

@@ -6,113 +6,78 @@ import androidx.documentfile.provider.DocumentFile
 import io.legado.app.App
 import io.legado.app.data.entities.BookSource
 import io.legado.app.data.entities.ReplaceRule
-import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.utils.DocumentUtils
 import io.legado.app.utils.FileUtils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.jetbrains.anko.toast
 import java.io.File
 
 object ImportOldData {
 
     fun import(context: Context, file: File) {
-        GlobalScope.launch(Dispatchers.IO) {
+        try {// 导入书架
-            try {// 导入书架
+            val shelfFile =
-                val shelfFile =
+                FileUtils.createFileIfNotExist(file, "myBookShelf.json")
-                    FileUtils.createFileIfNotExist(file, "myBookShelf.json")
+            val json = shelfFile.readText()
-                val json = shelfFile.readText()
+            val importCount = importOldBookshelf(json)
-                val importCount = importOldBookshelf(json)
+            context.toast("成功导入书籍${importCount}")
-                withContext(Dispatchers.Main) {
+        } catch (e: Exception) {
-                    context.toast("成功导入书籍${importCount}")
+            context.toast("导入书籍失败\n${e.localizedMessage}")
-                }
+        }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    context.toast("导入书籍失败\n${e.localizedMessage}")
-                }
-            }
 
-            try {// Book source
+        try {// Book source
-                val sourceFile =
+            val sourceFile =
-                    FileUtils.getFile(file, "myBookSource.json")
+                FileUtils.getFile(file, "myBookSource.json")
-                val json = sourceFile.readText()
+            val json = sourceFile.readText()
-                val importCount = importOldSource(json)
+            val importCount = importOldSource(json)
-                withContext(Dispatchers.Main) {
+            context.toast("成功导入书源${importCount}")
-                    context.toast("成功导入书源${importCount}")
+        } catch (e: Exception) {
-                }
+            context.toast("导入源失败\n${e.localizedMessage}")
-            } catch (e: Exception) {
+        }
-                withContext(Dispatchers.Main) {
-                    context.toast("导入源失败\n${e.localizedMessage}")
-                }
-            }
 
-            try {// Replace rules
+        try {// Replace rules
-                val ruleFile = FileUtils.getFile(file, "myBookReplaceRule.json")
+            val ruleFile = FileUtils.getFile(file, "myBookReplaceRule.json")
-                if (ruleFile.exists()) {
+            if (ruleFile.exists()) {
-                    val json = ruleFile.readText()
+                val json = ruleFile.readText()
-                    val importCount = importOldReplaceRule(json)
+                val importCount = importOldReplaceRule(json)
-                    withContext(Dispatchers.Main) {
+                context.toast("成功导入替换规则${importCount}")
-                        context.toast("成功导入替换规则${importCount}")
+            } else {
-                    }
+                context.toast("未找到替换规则")
-                } else {
-                    withContext(Dispatchers.Main) {
-                        context.toast("未找到替换规则")
-                    }
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    context.toast("导入替换规则失败\n${e.localizedMessage}")
-                }
             }
+        } catch (e: Exception) {
+            context.toast("导入替换规则失败\n${e.localizedMessage}")
         }
     }
 
     fun importUri(uri: Uri) {
-        Coroutine.async {
+        DocumentFile.fromTreeUri(App.INSTANCE, uri)?.listFiles()?.forEach {
-            DocumentFile.fromTreeUri(App.INSTANCE, uri)?.listFiles()?.forEach {
+            when (it.name) {
-                when (it.name) {
+                "myBookShelf.json" ->
-                    "myBookShelf.json" ->
+                    try {
-                        try {
+                        DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
-                            DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
+                            val importCount = importOldBookshelf(json)
-                                val importCount = importOldBookshelf(json)
+                            App.INSTANCE.toast("成功导入书籍${importCount}")
-                                withContext(Dispatchers.Main) {
-                                    App.INSTANCE.toast("成功导入书籍${importCount}")
-                                }
-                            }
-                        } catch (e: java.lang.Exception) {
-                            withContext(Dispatchers.Main) {
-                                App.INSTANCE.toast("导入书籍失败\n${e.localizedMessage}")
-                            }
                         }
-                    "myBookSource.json" ->
+                    } catch (e: java.lang.Exception) {
-                        try {
+                        App.INSTANCE.toast("导入书籍失败\n${e.localizedMessage}")
-                            DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
+                    }
-                                val importCount = importOldSource(json)
+                "myBookSource.json" ->
-                                withContext(Dispatchers.Main) {
+                    try {
-                                    App.INSTANCE.toast("成功导入书源${importCount}")
+                        DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
-                                }
+                            val importCount = importOldSource(json)
-                            }
+                            App.INSTANCE.toast("成功导入书源${importCount}")
-                        } catch (e: Exception) {
-                            withContext(Dispatchers.Main) {
-                                App.INSTANCE.toast("导入源失败\n${e.localizedMessage}")
-                            }
                         }
-                    "myBookReplaceRule.json" ->
+                    } catch (e: Exception) {
-                        try {
+                        App.INSTANCE.toast("导入源失败\n${e.localizedMessage}")
-                            DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
+                    }
-                                val importCount = importOldReplaceRule(json)
+                "myBookReplaceRule.json" ->
-                                withContext(Dispatchers.Main) {
+                    try {
-                                    App.INSTANCE.toast("成功导入替换规则${importCount}")
+                        DocumentUtils.readText(App.INSTANCE, it.uri)?.let { json ->
-                                }
+                            val importCount = importOldReplaceRule(json)
-                            }
+                            App.INSTANCE.toast("成功导入替换规则${importCount}")
-                        } catch (e: Exception) {
-                            withContext(Dispatchers.Main) {
-                                App.INSTANCE.toast("导入替换规则失败\n${e.localizedMessage}")
-                            }
                         }
-                }
+                    } catch (e: Exception) {
+                        App.INSTANCE.toast("导入替换规则失败\n${e.localizedMessage}")
+                    }
             }
         }
     }
@@ -136,14 +101,12 @@ object ImportOldData {
         return bookSources.size
     }
 
-
-
     fun importOldReplaceRule(json: String): Int {
         val replaceRules = mutableListOf<ReplaceRule>()
         val items: List<Map<String, Any>> = Restore.jsonPath.parse(json).read("$")
         for (item in items) {
             val jsonItem = Restore.jsonPath.parse(item)
-            OldRule.jsonToReplaceRule(jsonItem.jsonString())?.let {
+            OldReplace.jsonToReplaceRule(jsonItem.jsonString())?.let {
                 if (it.isValid()){
                     replaceRules.add(it)
                 }

app/src/main/java/io/legado/app/help/storage/OldReplace.kt

@@ -0,0 +1,32 @@
+package io.legado.app.help.storage
+
+import io.legado.app.data.entities.ReplaceRule
+import io.legado.app.utils.*
+
+object OldReplace {
+
+    fun jsonToReplaceRule(json: String): ReplaceRule? {
+        var replaceRule: ReplaceRule? = null
+        runCatching {
+            replaceRule = GSON.fromJsonObject<ReplaceRule>(json.trim())
+        }
+        runCatching {
+            if (replaceRule == null || replaceRule?.pattern.isNullOrBlank()) {
+                val jsonItem = Restore.jsonPath.parse(json.trim())
+                val rule = ReplaceRule()
+                rule.id = jsonItem.readLong("$.id") ?: System.currentTimeMillis()
+                rule.pattern = jsonItem.readString("$.regex") ?: ""
+                if (rule.pattern.isEmpty()) return null
+                rule.name = jsonItem.readString("$.replaceSummary") ?: ""
+                rule.replacement = jsonItem.readString("$.replacement") ?: ""
+                rule.isRegex = jsonItem.readBool("$.isRegex") == true
+                rule.scope = jsonItem.readString("$.useTo")
+                rule.isEnabled = jsonItem.readBool("$.enable") == true
+                rule.order = jsonItem.readInt("$.serialNumber") ?: 0
+                return rule
+            }
+        }
+        return replaceRule
+    }
+
+}

app/src/main/java/io/legado/app/help/storage/OldRule.kt

@@ -1,9 +1,9 @@
 package io.legado.app.help.storage
 
+import androidx.annotation.Keep
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.BookType
 import io.legado.app.data.entities.BookSource
-import io.legado.app.data.entities.ReplaceRule
 import io.legado.app.data.entities.rule.*
 import io.legado.app.help.storage.Restore.jsonPath
 import io.legado.app.utils.*
@@ -14,13 +14,15 @@ object OldRule {
     private val jsPattern = Pattern.compile("\\{\\{.+?\\}\\}", Pattern.CASE_INSENSITIVE)
 
     fun jsonToBookSource(json: String): BookSource? {
-        var source: BookSource? = null
+        val source = BookSource()
-        runCatching {
+        val sourceAny = try {
-            source = GSON.fromJsonObject<BookSource>(json.trim())
+            GSON.fromJsonObject<BookSourceAny>(json.trim())
+        } catch (e: Exception) {
+            null
         }
-        runCatching {
+        try {
-            if (source == null || source?.ruleToc == null) {
+            if (sourceAny?.ruleToc == null) {
-                source = BookSource().apply {
+                source.apply {
                     val jsonItem = jsonPath.parse(json.trim())
                     bookSourceUrl = jsonItem.readString("bookSourceUrl") ?: ""
                     bookSourceName = jsonItem.readString("bookSourceName") ?: ""
@@ -82,11 +84,76 @@ object OldRule {
                         nextContentUrl = toNewRule(jsonItem.readString("ruleContentUrlNext"))
                     )
                 }
+            } else {
+                source.bookSourceUrl = sourceAny.bookSourceUrl
+                source.bookSourceName = sourceAny.bookSourceName
+                source.bookSourceGroup = sourceAny.bookSourceGroup
+                source.bookSourceType = sourceAny.bookSourceType
+                source.bookUrlPattern = sourceAny.bookUrlPattern
+                source.customOrder = sourceAny.customOrder
+                source.enabled = sourceAny.enabled
+                source.enabledExplore = sourceAny.enabledExplore
+                source.header = sourceAny.header
+                source.loginUrl = sourceAny.loginUrl
+                source.lastUpdateTime = sourceAny.lastUpdateTime
+                source.weight = sourceAny.weight
+                source.exploreUrl = sourceAny.exploreUrl
+                source.ruleExplore = if (sourceAny.ruleExplore is String) {
+                    GSON.fromJsonObject(sourceAny.ruleExplore as? String)
+                } else {
+                    GSON.fromJsonObject(GSON.toJson(sourceAny.ruleExplore))
+                }
+                source.searchUrl = sourceAny.searchUrl
+                source.ruleSearch = if (sourceAny.ruleSearch is String) {
+                    GSON.fromJsonObject(sourceAny.ruleSearch as? String)
+                } else {
+                    GSON.fromJsonObject(GSON.toJson(sourceAny.ruleSearch))
+                }
+                source.ruleBookInfo = if (sourceAny.ruleBookInfo is String) {
+                    GSON.fromJsonObject(sourceAny.ruleBookInfo as? String)
+                } else {
+                    GSON.fromJsonObject(GSON.toJson(sourceAny.ruleBookInfo))
+                }
+                source.ruleToc = if (sourceAny.ruleToc is String) {
+                    GSON.fromJsonObject(sourceAny.ruleToc as? String)
+                } else {
+                    GSON.fromJsonObject(GSON.toJson(sourceAny.ruleToc))
+                }
+                source.ruleContent = if (sourceAny.ruleContent is String) {
+                    GSON.fromJsonObject(sourceAny.ruleContent as? String)
+                } else {
+                    GSON.fromJsonObject(GSON.toJson(sourceAny.ruleContent))
+                }
             }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
         return source
     }
 
+    @Keep
+    data class BookSourceAny(
+        var bookSourceName: String = "",                // 名称
+        var bookSourceGroup: String? = null,            // 分组
+        var bookSourceUrl: String = "",                 // 地址，包括 http/https
+        var bookSourceType: Int = BookType.default,     // 类型，0 文本，1 音频
+        var bookUrlPattern: String? = null,             // 详情页url正则
+        var customOrder: Int = 0,                       // 手动排序编号
+        var enabled: Boolean = true,                    // 是否启用
+        var enabledExplore: Boolean = true,             // 启用发现
+        var header: String? = null,                     // 请求头
+        var loginUrl: String? = null,                   // 登录地址
+        var lastUpdateTime: Long = 0,                   // 最后更新时间，用于排序
+        var weight: Int = 0,                            // 智能排序的权重
+        var exploreUrl: String? = null,                 // 发现url
+        var ruleExplore: Any? = null,           // 发现规则
+        var searchUrl: String? = null,                  // 搜索url
+        var ruleSearch: Any? = null,             // 搜索规则
+        var ruleBookInfo: Any? = null,         // 书籍信息页规则
+        var ruleToc: Any? = null,                   // 目录页规则
+        var ruleContent: Any? = null            // 正文页规则
+    )
+
     // default规则适配
     // #正则#替换内容 替换成 ##正则##替换内容
     // | 替换成 ||
@@ -109,8 +176,8 @@ object OldRule {
             !newRule.startsWith("//") &&
             !newRule.startsWith("##") &&
             !newRule.startsWith(":") &&
-            !newRule.contains("@js:",true) &&
+            !newRule.contains("@js:", true) &&
-            !newRule.contains("<js>",true)
+            !newRule.contains("<js>", true)
         ) {
             if (newRule.contains("#") && !newRule.contains("##")) {
                 newRule = oldRule.replace("#", "##")
@@ -137,10 +204,10 @@ object OldRule {
             }
         }
         if (allinone) {
-            newRule = "+" + newRule
+            newRule = "+$newRule"
         }
         if (reverse) {
-            newRule = "-" + newRule
+            newRule = "-$newRule"
         }
         return newRule
     }
@@ -211,27 +278,4 @@ object OldRule {
         return GSON.toJson(map)
     }
 
-    fun jsonToReplaceRule(json: String): ReplaceRule? {
-        var replaceRule: ReplaceRule? = null
-        runCatching {
-            replaceRule = GSON.fromJsonObject<ReplaceRule>(json.trim())
-        }
-        runCatching {
-            if (replaceRule == null || replaceRule?.pattern.isNullOrBlank()) {
-                val jsonItem = jsonPath.parse(json.trim())
-                val rule = ReplaceRule()
-                rule.id = jsonItem.readLong("$.id") ?: System.currentTimeMillis()
-                rule.pattern = jsonItem.readString("$.regex") ?: ""
-                if (rule.pattern.isEmpty()) return null
-                rule.name = jsonItem.readString("$.replaceSummary") ?: ""
-                rule.replacement = jsonItem.readString("$.replacement") ?: ""
-                rule.isRegex = jsonItem.readBool("$.isRegex") == true
-                rule.scope = jsonItem.readString("$.useTo")
-                rule.isEnabled = jsonItem.readBool("$.enable") == true
-                rule.order = jsonItem.readInt("$.serialNumber") ?: 0
-                return rule
-            }
-        }
-        return replaceRule
-    }
 }

app/src/main/java/io/legado/app/help/storage/Restore.kt

@@ -2,7 +2,6 @@ package io.legado.app.help.storage
 
 import android.content.Context
 import android.net.Uri
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.documentfile.provider.DocumentFile
 import com.jayway.jsonpath.Configuration
 import com.jayway.jsonpath.JsonPath
@@ -13,7 +12,6 @@ import io.legado.app.BuildConfig
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.*
-import io.legado.app.help.AppConfig
 import io.legado.app.help.LauncherIconHelp
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.service.help.ReadBook
@@ -126,18 +124,14 @@ object Restore {
                 hideStatusBar = App.INSTANCE.getPrefBoolean(PreferKey.hideStatusBar)
                 hideNavigationBar = App.INSTANCE.getPrefBoolean(PreferKey.hideNavigationBar)
                 bodyIndentCount = App.INSTANCE.getPrefInt(PreferKey.bodyIndent, 2)
+                autoReadSpeed = App.INSTANCE.getPrefInt(PreferKey.autoReadSpeed, 46)
             }
             ChapterProvider.upStyle()
             ReadBook.loadContent(resetPageOffset = false)
         }
         withContext(Main) {
-            if (AppConfig.isNightTheme && AppCompatDelegate.getDefaultNightMode() != AppCompatDelegate.MODE_NIGHT_YES) {
+            App.INSTANCE.applyDayNight()
-                App.INSTANCE.applyDayNight()
+            postEvent(EventBus.RECREATE, "true")
-            } else if (!AppConfig.isNightTheme && AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
-                App.INSTANCE.applyDayNight()
-            } else {
-                postEvent(EventBus.RECREATE, "true")
-            }
             if (!BuildConfig.DEBUG) {
                 LauncherIconHelp.changeIcon(App.INSTANCE.getPrefString(PreferKey.launcherIcon))
             }

app/src/main/java/io/legado/app/lib/theme/ATH.kt

@@ -93,18 +93,13 @@ object ATH {
         }
     }
 
-    fun setLightNavigationBarAuto(activity: Activity, bgColor: Int) {
+    fun setNavigationBarColorAuto(
-        setLightNavigationBar(activity, ColorUtils.isColorLight(bgColor))
+        activity: Activity,
-    }
+        color: Int = ThemeStore.navigationBarColor(activity)
-
+    ) {
-    fun setNavigationBarColorAuto(activity: Activity) {
-        setNavigationBarColor(activity, ThemeStore.navigationBarColor(activity))
-    }
-
-    fun setNavigationBarColor(activity: Activity, color: Int) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             activity.window.navigationBarColor = color
-            setLightNavigationBarAuto(activity, color)
+            setLightNavigationBar(activity, ColorUtils.isColorLight(color))
         }
     }
 

app/src/main/java/io/legado/app/lib/theme/ThemeStore.kt

@@ -9,6 +9,7 @@ import androidx.annotation.CheckResult
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
+import io.legado.app.App
 import io.legado.app.R
 
 /**
@@ -194,7 +195,7 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
 
         @CheckResult
         @ColorInt
-        fun primaryColor(context: Context): Int {
+        fun primaryColor(context: Context = App.INSTANCE): Int {
             return prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_PRIMARY_COLOR,
                 ATHUtils.resolveColor(context, R.attr.colorPrimary, Color.parseColor("#455A64"))
@@ -212,7 +213,7 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
 
         @CheckResult
         @ColorInt
-        fun accentColor(context: Context): Int {
+        fun accentColor(context: Context = App.INSTANCE): Int {
             return prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_ACCENT_COLOR,
                 ATHUtils.resolveColor(context, R.attr.colorAccent, Color.parseColor("#263238"))
@@ -236,7 +237,10 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
         fun navigationBarColor(context: Context): Int {
             return if (!coloredNavigationBar(context)) {
                 Color.BLACK
-            } else prefs(context).getInt(ThemeStorePrefKeys.KEY_NAVIGATION_BAR_COLOR, primaryColor(context))
+            } else prefs(context).getInt(
+                ThemeStorePrefKeys.KEY_NAVIGATION_BAR_COLOR,
+                bottomBackground(context)
+            )
         }
 
         @CheckResult
@@ -277,7 +281,7 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
 
         @CheckResult
         @ColorInt
-        fun backgroundColor(context: Context): Int {
+        fun backgroundColor(context: Context = App.INSTANCE): Int {
             return prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_BACKGROUND_COLOR,
                 ATHUtils.resolveColor(context, android.R.attr.colorBackground)
@@ -294,7 +298,7 @@ private constructor(private val mContext: Context) : ThemeStoreInterface {
 
         @CheckResult
         @ColorInt
-        fun bottomBackground(context: Context): Int {
+        fun bottomBackground(context: Context = App.INSTANCE): Int {
             return prefs(context).getInt(
                 ThemeStorePrefKeys.KEY_BOTTOM_BACKGROUND,
                 ATHUtils.resolveColor(context, android.R.attr.colorBackground)

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt

@@ -169,7 +169,7 @@ class AnalyzeByXPath {
         if (rules.size == 1) {
             val jxNodes = jxNode?.sel(rule) ?: jxDocument?.selN(rule)
             jxNodes?.let {
-                return TextUtils.join(",", jxNodes)
+                return TextUtils.join("\n", jxNodes)
             }
             return null
         } else {

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -51,7 +51,7 @@ class AnalyzeUrl(
     private var queryStr: String? = null
     private val fieldMap = LinkedHashMap<String, String>()
     private var charset: String? = null
-    private var body: Any? = null
+    private var body: String? = null
     private var requestBody: RequestBody? = null
     private var method = RequestMethod.GET
 
@@ -157,11 +157,12 @@ class AnalyzeUrl(
             baseUrl = it
         }
         if (urlArray.size > 1) {
-            val options = GSON.fromJsonObject<UrlOption>(urlArray[1])
+            val option = GSON.fromJsonObject<UrlOption>(urlArray[1])
-            options?.let { _ ->
+            option?.let { _ ->
-                options.method?.let { if (it.equals("POST", true)) method = RequestMethod.POST }
+                option.method?.let { if (it.equals("POST", true)) method = RequestMethod.POST }
-                options.headers?.let { headers ->
+                option.headers?.let { headers ->
                     if (headers is Map<*, *>) {
+                        @Suppress("unchecked_cast")
                         headerMap.putAll(headers as Map<out String, String>)
                     }
                     if (headers is String) {
@@ -169,9 +170,13 @@ class AnalyzeUrl(
                             ?.let { headerMap.putAll(it) }
                     }
                 }
-                body = options.body
+                charset = option.charset
-                charset = options.charset
+                body = if (option.body is String) {
-                options.webView?.let {
+                    option.body
+                } else {
+                    GSON.toJson(option.body)
+                }
+                option.webView?.let {
                     if (it.toString().isNotEmpty()) {
                         useWebView = true
                     }
@@ -190,19 +195,18 @@ class AnalyzeUrl(
             }
             RequestMethod.POST -> {
                 body?.let {
-                    if (it is String) {
+                    if (it.isJson()) {
-                        analyzeFields(it)
+                        requestBody = RequestBody.create(jsonType, it)
                     } else {
-                        body = RequestBody.create(jsonType, GSON.toJson(it))
+                        analyzeFields(it)
                     }
                 } ?: let {
-                    body = FormBody.Builder().build()
+                    requestBody = FormBody.Builder().build()
                 }
             }
         }
     }
 
-
     /**
      * 解析QueryMap
      */
@@ -287,7 +291,7 @@ class AnalyzeUrl(
             params.requestMethod = method
             params.javaScript = jsStr
             params.sourceRegex = sourceRegex
-            params.postData = body?.toString()?.toByteArray()
+            params.postData = body?.toByteArray()
             params.tag = tag
             return HttpHelper.ajax(params)
         }

app/src/main/java/io/legado/app/model/localBook/AnalyzeTxtFile.kt

@@ -40,6 +40,7 @@ class AnalyzeTxtFile {
         book: Book,
         pattern: Pattern?
     ): ArrayList<BookChapter> {
+        bookStream.seek(0)
         val toc = arrayListOf<BookChapter>()
         var tocRule: TxtTocRule? = null
         val rulePattern = pattern ?: let {
@@ -83,7 +84,8 @@ class AnalyzeTxtFile {
                     //获取章节内容
                     val chapterContent = blockContent.substring(seekPos, chapterStart)
                     val chapterLength = chapterContent.toByteArray(charset).size
-                    if (chapterLength > 30000 && pattern == null) {
+                    val lastStart = toc.lastOrNull()?.start ?: 0
+                    if (curOffset + chapterLength - lastStart > 50000 && pattern == null) {
                         //移除不匹配的规则
                         tocRules.remove(tocRule)
                         return analyze(bookStream, book, null)
@@ -139,6 +141,11 @@ class AnalyzeTxtFile {
                     //设置指针偏移
                     seekPos += chapterContent.length
                 }
+                if (seekPos == 0 && length > 50000 && pattern == null) {
+                    //移除不匹配的规则
+                    tocRules.remove(tocRule)
+                    return analyze(bookStream, book, null)
+                }
             } else { //进行本地虚拟分章
                 //章节在buffer的偏移量
                 var chapterOffset = 0
@@ -271,18 +278,20 @@ class AnalyzeTxtFile {
         }
 
         private fun getTocRules(): List<TxtTocRule> {
-            val rules = App.db.txtTocRule().all
+            val rules = App.db.txtTocRule().enabled
             if (rules.isEmpty()) {
-                return getDefaultRules()
+                return getDefaultEnabledRules()
             }
             return rules
         }
 
-        fun getDefaultRules(): List<TxtTocRule> {
+        fun getDefaultEnabledRules(): List<TxtTocRule> {
             App.INSTANCE.assets.open("txtTocRule.json").readBytes().let { byteArray ->
-                GSON.fromJsonArray<TxtTocRule>(String(byteArray))?.let {
+                GSON.fromJsonArray<TxtTocRule>(String(byteArray))?.let { txtTocRules ->
-                    App.db.txtTocRule().insert(*it.toTypedArray())
+                    App.db.txtTocRule().insert(*txtTocRules.toTypedArray())
-                    return it
+                    return txtTocRules.filter {
+                        it.enable
+                    }
                 }
             }
             return emptyList()

app/src/main/java/io/legado/app/model/localBook/LocalBook.kt

@@ -47,7 +47,7 @@ object LocalBook {
 
     fun deleteBook(book: Book, deleteOriginal: Boolean) {
         kotlin.runCatching {
-            if (book.isTxt()) {
+            if (book.isLocalTxt()) {
                 val bookFile = FileUtils.getFile(AnalyzeTxtFile.cacheFolder, book.originName)
                 bookFile.delete()
             }

app/src/main/java/io/legado/app/service/AudioPlayService.kt

@@ -63,6 +63,7 @@ class AudioPlayService : BaseService(),
     private val dsRunnable: Runnable = Runnable { doDs() }
     private var mpRunnable: Runnable = Runnable { upPlayProgress() }
     private var bookChapter: BookChapter? = null
+    private var playSpeed: Float = 1f
 
     override fun onCreate() {
         super.onCreate()
@@ -95,7 +96,9 @@ class AudioPlayService : BaseService(),
                 IntentAction.adjustSpeed -> upSpeed(intent.getFloatExtra("adjust", 1f))
                 IntentAction.addTimer -> addTimer()
                 IntentAction.setTimer -> setTimer(intent.getIntExtra("minute", 0))
-                IntentAction.adjustProgress -> adjustProgress(intent.getIntExtra("position", position))
+                IntentAction.adjustProgress -> {
+                    adjustProgress(intent.getIntExtra("position", position))
+                }
                 else -> stopSelf()
             }
         }
@@ -140,14 +143,18 @@ class AudioPlayService : BaseService(),
         if (url.contains(".m3u8", false)) {
             stopSelf()
         } else {
-            AudioPlayService.pause = pause
+            try {
-            handler.removeCallbacks(mpRunnable)
+                AudioPlayService.pause = pause
-            position = mediaPlayer.currentPosition
+                handler.removeCallbacks(mpRunnable)
-            mediaPlayer.pause()
+                position = mediaPlayer.currentPosition
-            upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PAUSED)
+                mediaPlayer.pause()
-            AudioPlay.status = Status.PAUSE
+                upMediaSessionPlaybackState(PlaybackStateCompat.STATE_PAUSED)
-            postEvent(EventBus.AUDIO_STATE, Status.PAUSE)
+                AudioPlay.status = Status.PAUSE
-            upNotification()
+                postEvent(EventBus.AUDIO_STATE, Status.PAUSE)
+                upNotification()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
     }
 
@@ -174,12 +181,12 @@ class AudioPlayService : BaseService(),
     private fun upSpeed(adjust: Float) {
         kotlin.runCatching {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                with(mediaPlayer) {
+                playSpeed += adjust
-                    if (isPlaying) {
+                if (mediaPlayer.isPlaying) {
-                        playbackParams = playbackParams.apply { speed += adjust }
+                    mediaPlayer.playbackParams =
-                    }
+                        mediaPlayer.playbackParams.apply { speed = playSpeed }
-                    postEvent(EventBus.AUDIO_SPEED, playbackParams.speed)
                 }
+                postEvent(EventBus.AUDIO_SPEED, playSpeed)
             }
         }
     }
@@ -189,7 +196,11 @@ class AudioPlayService : BaseService(),
      */
     override fun onPrepared(mp: MediaPlayer?) {
         if (pause) return
-        mediaPlayer.start()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            mediaPlayer.playbackParams = mediaPlayer.playbackParams.apply { speed = playSpeed }
+        } else {
+            mediaPlayer.start()
+        }
         mediaPlayer.seekTo(position)
         postEvent(EventBus.AUDIO_SIZE, mediaPlayer.duration)
         bookChapter?.let {
@@ -506,7 +517,6 @@ class AudioPlayService : BaseService(),
         )
         builder.setStyle(
             androidx.media.app.NotificationCompat.MediaStyle()
-                .setMediaSession(mediaSessionCompat?.sessionToken)
                 .setShowActionsInCompactView(0, 1, 2)
         )
         builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)

app/src/main/java/io/legado/app/service/BaseReadAloudService.kt

@@ -44,7 +44,7 @@ abstract class BaseReadAloudService : BaseService(),
     private lateinit var audioManager: AudioManager
     private var mFocusRequest: AudioFocusRequest? = null
     private var broadcastReceiver: BroadcastReceiver? = null
-    private var mediaSessionCompat: MediaSessionCompat? = null
+    private lateinit var mediaSessionCompat: MediaSessionCompat
     private var title: String = ""
     private var subtitle: String = ""
     internal val contentList = arrayListOf<String>()
@@ -59,6 +59,7 @@ abstract class BaseReadAloudService : BaseService(),
         isRun = true
         audioManager = getSystemService(Context.AUDIO_SERVICE) as AudioManager
         mFocusRequest = MediaHelp.getFocusRequest(this)
+        mediaSessionCompat = MediaSessionCompat(this, "readAloud")
         initMediaSession()
         initBroadcastReceiver()
         upNotification()
@@ -72,7 +73,7 @@ abstract class BaseReadAloudService : BaseService(),
         unregisterReceiver(broadcastReceiver)
         postEvent(EventBus.ALOUD_STATE, Status.STOP)
         upMediaSessionPlaybackState(PlaybackStateCompat.STATE_STOPPED)
-        mediaSessionCompat?.release()
+        mediaSessionCompat.release()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -116,7 +117,9 @@ abstract class BaseReadAloudService : BaseService(),
                     }
                 } else {
                     textChapter.getUnRead(pageIndex).split("\n").forEach {
-                        contentList.add(it)
+                        if (it.isNotEmpty()) {
+                            contentList.add(it)
+                        }
                     }
                 }
                 if (play) play()
@@ -200,7 +203,7 @@ abstract class BaseReadAloudService : BaseService(),
      * 更新媒体状态
      */
     private fun upMediaSessionPlaybackState(state: Int) {
-        mediaSessionCompat?.setPlaybackState(
+        mediaSessionCompat.setPlaybackState(
             PlaybackStateCompat.Builder()
                 .setActions(MediaHelp.MEDIA_SESSION_ACTIONS)
                 .setState(state, nowSpeak.toLong(), 1f)
@@ -212,13 +215,12 @@ abstract class BaseReadAloudService : BaseService(),
      * 初始化MediaSession, 注册多媒体按钮
      */
     private fun initMediaSession() {
-        mediaSessionCompat = MediaSessionCompat(this, "readAloud")
+        mediaSessionCompat.setCallback(object : MediaSessionCompat.Callback() {
-        mediaSessionCompat?.setCallback(object : MediaSessionCompat.Callback() {
             override fun onMediaButtonEvent(mediaButtonEvent: Intent): Boolean {
                 return MediaButtonReceiver.handleIntent(this@BaseReadAloudService, mediaButtonEvent)
             }
         })
-        mediaSessionCompat?.setMediaButtonReceiver(
+        mediaSessionCompat.setMediaButtonReceiver(
             PendingIntent.getBroadcast(
                 this,
                 0,
@@ -231,7 +233,7 @@ abstract class BaseReadAloudService : BaseService(),
                 PendingIntent.FLAG_CANCEL_CURRENT
             )
         )
-        mediaSessionCompat?.isActive = true
+        mediaSessionCompat.isActive = true
     }
 
     /**
@@ -321,7 +323,6 @@ abstract class BaseReadAloudService : BaseService(),
         )
         builder.setStyle(
             androidx.media.app.NotificationCompat.MediaStyle()
-                .setMediaSession(mediaSessionCompat?.sessionToken)
                 .setShowActionsInCompactView(0, 1, 2)
         )
         builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)

app/src/main/java/io/legado/app/service/CheckSourceService.kt

@@ -7,20 +7,18 @@ import io.legado.app.R
 import io.legado.app.base.BaseService
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.IntentAction
-import io.legado.app.data.entities.BookSource
 import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.coroutine.CompositeCoroutine
-import io.legado.app.model.WebBook
+import io.legado.app.service.help.CheckSource
 import io.legado.app.ui.book.source.manage.BookSourceActivity
-import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.asCoroutineDispatcher
 import org.jetbrains.anko.toast
 import java.util.concurrent.Executors
 import kotlin.math.min
 
 class CheckSourceService : BaseService() {
-    private val threadCount = AppConfig.threadCount
+    private var threadCount = AppConfig.threadCount
     private var searchPool = Executors.newFixedThreadPool(threadCount).asCoroutineDispatcher()
     private var tasks = CompositeCoroutine()
     private val allIds = ArrayList<String>()
@@ -58,42 +56,37 @@ class CheckSourceService : BaseService() {
         checkedIds.clear()
         allIds.addAll(ids)
         processIndex = 0
+        threadCount = min(allIds.size, threadCount)
         updateNotification(0, getString(R.string.progress_show, 0, allIds.size))
-        for (i in 0 until min(threadCount, allIds.size)) {
+        for (i in 0 until threadCount) {
             check()
         }
     }
 
-
+    /**
+     * 检测
+     */
     private fun check() {
+        val index = processIndex
         synchronized(this) {
             processIndex++
         }
         execute {
-            if (processIndex < allIds.size) {
+            if (index < allIds.size) {
-                val sourceUrl = allIds[processIndex]
+                val sourceUrl = allIds[index]
                 App.db.bookSourceDao().getBookSource(sourceUrl)?.let { source ->
                     if (source.searchUrl.isNullOrEmpty()) {
                         onNext(sourceUrl)
                     } else {
-                        check(source)
+                        CheckSource(source).check(this, searchPool) {
+                            onNext(it)
+                        }
                     }
                 } ?: onNext(sourceUrl)
             }
         }
     }
 
-    private fun check(source: BookSource) {
-        val webBook = WebBook(source)
-        tasks.add(webBook.searchBook("我的", scope = this, context = searchPool)
-            .onError(IO) {
-                source.addGroup("失效")
-                App.db.bookSourceDao().update(source)
-            }.onFinally(IO) {
-                onNext(source.bookSourceUrl)
-            })
-    }
-
     private fun onNext(sourceUrl: String) {
         synchronized(this) {
             check()
@@ -102,7 +95,7 @@ class CheckSourceService : BaseService() {
                 checkedIds.size,
                 getString(R.string.progress_show, checkedIds.size, allIds.size)
             )
-            if (processIndex >= allIds.size + min(threadCount, allIds.size) - 1) {
+            if (processIndex >= allIds.size + threadCount - 1) {
                 stopSelf()
             }
         }

app/src/main/java/io/legado/app/service/DownloadService.kt

@@ -9,6 +9,7 @@ import io.legado.app.base.BaseService
 import io.legado.app.constant.AppConst
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.IntentAction
+import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
@@ -24,14 +25,21 @@ import org.jetbrains.anko.toast
 import java.util.concurrent.Executors
 
 class DownloadService : BaseService() {
+    private val threadCount = AppConfig.threadCount
     private var searchPool =
-        Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
+        Executors.newFixedThreadPool(threadCount).asCoroutineDispatcher()
     private var tasks = CompositeCoroutine()
     private val handler = Handler()
     private var runnable: Runnable = Runnable { upDownload() }
+    private val bookMap = hashMapOf<String, Book>()
+    private val webBookMap = hashMapOf<String, WebBook>()
     private val downloadMap = hashMapOf<String, LinkedHashSet<BookChapter>>()
-    private val downloadCount = hashMapOf<String, DownloadCount>();
+    private val downloadCount = hashMapOf<String, DownloadCount>()
     private val finalMap = hashMapOf<String, LinkedHashSet<BookChapter>>()
+    private val downloadingList = arrayListOf<String>()
+
+    @Volatile
+    private var downloadingCount = 0
     private var notificationContent = "正在启动下载"
 
     private val notificationBuilder by lazy {
@@ -78,20 +86,50 @@ class DownloadService : BaseService() {
         postEvent(EventBus.UP_DOWNLOAD, downloadMap)
     }
 
+    private fun getBook(bookUrl: String): Book? {
+        var book = bookMap[bookUrl]
+        if (book == null) {
+            book = App.db.bookDao().getBook(bookUrl)
+        }
+        if (book == null) {
+            removeDownload(bookUrl)
+        }
+        return book
+    }
+
+    private fun getWebBook(bookUrl: String, origin: String): WebBook? {
+        var webBook = webBookMap[origin]
+        if (webBook == null) {
+            App.db.bookSourceDao().getBookSource(origin)?.let {
+                webBook = WebBook(it)
+            }
+        }
+        if (webBook == null) {
+            removeDownload(bookUrl)
+        }
+        return webBook
+    }
+
     private fun addDownloadData(bookUrl: String?, start: Int, end: Int) {
         bookUrl ?: return
         if (downloadMap.containsKey(bookUrl)) {
             toast("该书已在下载列表")
             return
         }
+        downloadCount[bookUrl] = DownloadCount()
         execute {
-            val chapterMap = downloadMap[bookUrl] ?: linkedSetOf<BookChapter>().apply {
-                downloadMap[bookUrl] = this
-            }
             App.db.bookChapterDao().getChapterList(bookUrl, start, end).let {
-                chapterMap.addAll(it)
+                if (it.isNotEmpty()) {
+                    val chapters = linkedSetOf<BookChapter>()
+                    chapters.addAll(it)
+                    downloadMap[bookUrl] = chapters
+                }
+            }
+            for (i in 0 until threadCount) {
+                if (downloadingCount < threadCount) {
+                    download()
+                }
             }
-            download()
         }
     }
 
@@ -100,70 +138,84 @@ class DownloadService : BaseService() {
         finalMap.remove(bookUrl)
     }
 
-    private fun updateNotification(downloadCount:DownloadCount, totalCount: Int, content: String){
-        notificationContent =
-            "进度:${downloadCount.downloadFinishedCount}/$totalCount,成功:${downloadCount.successCount},$content"
-    }
-
     private fun download() {
-        val task = Coroutine.async(this, context = searchPool) {
+        ++downloadingCount
-            downloadMap.forEach { entry ->
+        tasks.add(Coroutine.async(this, context = searchPool) {
-                if (!isActive) return@async
+            if (!isActive) return@async
-                if (!finalMap.containsKey(entry.key)) {
+            val bookChapter: BookChapter? = synchronized(this@DownloadService) {
-                    val book = App.db.bookDao().getBook(entry.key) ?: return@async
+                downloadMap.forEach {
-                    val bookSource =
+                    it.value.forEach { chapter ->
-                        App.db.bookSourceDao().getBookSource(book.origin) ?: return@async
+                        if (!downloadingList.contains(chapter.url)) {
-                    val webBook = WebBook(bookSource)
+                            downloadingList.add(chapter.url)
-
+                            return@synchronized chapter
-                    downloadCount[entry.key] = DownloadCount()
+                        }
-
+                    }
-                    entry.value.forEach { chapter ->
+                }
-                        if (!isActive) return@async
+                return@synchronized null
-                        if (downloadMap.containsKey(book.bookUrl)) {
+            }
-                            if (!BookHelp.hasContent(book, chapter)) {
+            if (bookChapter == null) {
-                                webBook.getContent(
+                postDownloading(false)
-                                    book,
+            } else {
-                                    chapter,
+                val book = getBook(bookChapter.bookUrl)
-                                    scope = this,
+                if (book == null) {
-                                    context = searchPool
+                    postDownloading(true)
-                                ).onSuccess(IO) { content ->
+                    return@async
-                                        downloadCount[entry.key]?.increaseSuccess()
+                }
-                                        BookHelp.saveContent(book, chapter, content)
+                val webBook = getWebBook(bookChapter.bookUrl, book.origin)
-                                    }
+                if (webBook == null) {
-                                    .onFinally(IO) {
+                    postDownloading(true)
-                                        synchronized(this@DownloadService) {
+                    return@async
-                                            downloadCount[entry.key]?.increaseFinished()
+                }
-                                            downloadCount[entry.key]?.let { updateNotification(it, entry.value.size, chapter.title) }
+                if (!BookHelp.hasContent(book, bookChapter)) {
-                                            val chapterMap =
+                    webBook.getContent(
-                                                finalMap[book.bookUrl]
+                        book,
-                                                    ?: linkedSetOf<BookChapter>().apply {
+                        bookChapter,
-                                                        finalMap[book.bookUrl] = this
+                        scope = this,
-                                                    }
+                        context = searchPool
-                                            chapterMap.add(chapter)
+                    ).onSuccess(IO) { content ->
-                                            if (chapterMap.size == entry.value.size) {
+                        downloadCount[book.bookUrl]?.increaseSuccess()
-                                                downloadMap.remove(book.bookUrl)
+                        BookHelp.saveContent(book, bookChapter, content)
-                                                finalMap.remove(book.bookUrl)
+                    }.onFinally(IO) {
-                                                downloadCount.remove(entry.key)
+                        synchronized(this@DownloadService) {
-                                            }
+                            downloadCount[book.bookUrl]?.increaseFinished()
-                                        }
+                            downloadCount[book.bookUrl]?.let {
+                                updateNotification(
+                                    it,
+                                    downloadMap[book.bookUrl]?.size,
+                                    bookChapter.title
+                                )
+                            }
+                            val chapterMap =
+                                finalMap[book.bookUrl]
+                                    ?: linkedSetOf<BookChapter>().apply {
+                                        finalMap[book.bookUrl] = this
                                     }
-                            } else{
+                            chapterMap.add(bookChapter)
-                                //无需下载的，设置为增加成功
+                            if (chapterMap.size == downloadMap[book.bookUrl]?.size) {
-                                downloadCount[entry.key]?.increaseSuccess()
+                                downloadMap.remove(book.bookUrl)
-                                downloadCount[entry.key]?.increaseFinished()
+                                finalMap.remove(book.bookUrl)
+                                downloadCount.remove(book.bookUrl)
                             }
                         }
                     }
+                    postDownloading(true)
+                } else {
+                    //无需下载的，设置为增加成功
+                    downloadCount[book.bookUrl]?.increaseSuccess()
+                    downloadCount[book.bookUrl]?.increaseFinished()
+                    postDownloading(true)
                 }
-
             }
-        }
+        })
+    }
 
-        tasks.add(task)
+    private fun postDownloading(hasChapter: Boolean) {
-        task.invokeOnCompletion {
+        --downloadingCount
-            tasks.remove(task)
+        if (hasChapter) {
-            if (tasks.isEmpty) {
+            download()
-                stopSelf()
+        } else {
+            if (downloadingCount < 1) {
+                stopDownload()
             }
         }
     }
@@ -180,6 +232,15 @@ class DownloadService : BaseService() {
         handler.postDelayed(runnable, 1000)
     }
 
+    private fun updateNotification(
+        downloadCount: DownloadCount,
+        totalCount: Int?,
+        content: String
+    ) {
+        notificationContent =
+            "进度:${downloadCount.downloadFinishedCount}/$totalCount,成功:${downloadCount.successCount},$content"
+    }
+
     /**
      * 更新通知
      */
@@ -199,11 +260,11 @@ class DownloadService : BaseService() {
         var successCount = 0 //下载成功的条目数量
 
         fun increaseSuccess() {
-            ++successCount;
+            ++successCount
         }
 
         fun increaseFinished() {
-            ++downloadFinishedCount;
+            ++downloadFinishedCount
         }
     }
 }

app/src/main/java/io/legado/app/service/HttpReadAloudService.kt

@@ -76,7 +76,9 @@ class HttpReadAloudService : BaseReadAloudService(),
                         val file = getSpeakFile(index)
                         file.writeBytes(bytes)
                         if (index == nowSpeak) {
-                            playAudio(FileInputStream(file).fd)
+                            @Suppress("BlockingMethodInNonBlockingContext")
+                            val fis = FileInputStream(file)
+                            playAudio(fis.fd)
                         }
                     }
                 } else {
@@ -204,7 +206,7 @@ class HttpReadAloudService : BaseReadAloudService(),
             } else {
                 nextChapter()
             }
-        }, 1000)
+        }, 50)
         return true
     }
 

app/src/main/java/io/legado/app/service/TTSReadAloudService.kt

@@ -1,7 +1,6 @@
 package io.legado.app.service
 
 import android.app.PendingIntent
-import android.os.Build
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
 import io.legado.app.R
@@ -20,35 +19,45 @@ import java.util.*
 class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener {
 
     companion object {
-        var textToSpeech: TextToSpeech? = null
+        private var textToSpeech: TextToSpeech? = null
+        private var ttsInitFinish = false
 
         fun clearTTS() {
-            textToSpeech?.stop()
+            textToSpeech?.let {
-            textToSpeech?.shutdown()
+                it.stop()
+                it.shutdown()
+            }
             textToSpeech = null
+            ttsInitFinish = false
         }
     }
 
-    private var ttsInitFinish = false
+    private val ttsUtteranceListener = TTSUtteranceListener()
 
     override fun onCreate() {
         super.onCreate()
-        textToSpeech = TextToSpeech(this, this)
+        initTts()
         upSpeechRate()
     }
 
+    private fun initTts() {
+        ttsInitFinish = false
+        textToSpeech = TextToSpeech(this, this)
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         clearTTS()
     }
 
-    @Synchronized
     override fun onInit(status: Int) {
         if (status == TextToSpeech.SUCCESS) {
-            textToSpeech?.language = Locale.CHINA
+            textToSpeech?.let {
-            textToSpeech?.setOnUtteranceProgressListener(TTSUtteranceListener())
+                it.setOnUtteranceProgressListener(ttsUtteranceListener)
-            ttsInitFinish = true
+                it.language = Locale.CHINA
-            play()
+                ttsInitFinish = true
+                play()
+            }
         } else {
             launch {
                 toast(R.string.tts_init_failed)
@@ -58,35 +67,25 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
 
     @Synchronized
     override fun play() {
-        if (contentList.isEmpty() || !ttsInitFinish) {
+        if (contentList.isNotEmpty() && ttsInitFinish && requestFocus()) {
-            return
-        }
-        if (requestFocus()) {
-            MediaHelp.playSilentSound(this)
             super.play()
-            for (i in nowSpeak until contentList.size) {
+            execute {
-                if (i == 0) {
+                MediaHelp.playSilentSound(this@TTSReadAloudService)
-                    speak(contentList[i], TextToSpeech.QUEUE_FLUSH, AppConst.APP_TAG + i)
+                textToSpeech?.let {
-                } else {
+                    it.speak("", TextToSpeech.QUEUE_FLUSH, null, null)
-                    speak(contentList[i], TextToSpeech.QUEUE_ADD, AppConst.APP_TAG + i)
+                    for (i in nowSpeak until contentList.size) {
+                        it.speak(
+                            contentList[i],
+                            TextToSpeech.QUEUE_ADD,
+                            null,
+                            AppConst.APP_TAG + i
+                        )
+                    }
                 }
             }
         }
     }
 
-    private fun speak(content: String, queueMode: Int, utteranceId: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            textToSpeech?.speak(content, queueMode, null, utteranceId)
-        } else {
-            @Suppress("DEPRECATION")
-            textToSpeech?.speak(
-                content,
-                queueMode,
-                hashMapOf(Pair(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, utteranceId))
-            )
-        }
-    }
-
     /**
      * 更新朗读速度
      */
@@ -94,7 +93,7 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
         if (this.getPrefBoolean("ttsFollowSys", true)) {
             if (reset) {
                 clearTTS()
-                textToSpeech = TextToSpeech(this, this)
+                initTts()
             }
         } else {
             textToSpeech?.setSpeechRate((AppConfig.ttsSpeechRate + 5) / 10f)
@@ -152,8 +151,8 @@ class TTSReadAloudService : BaseReadAloudService(), TextToSpeech.OnInitListener
                     pageIndex++
                     ReadBook.moveToNextPage()
                 }
+                postEvent(EventBus.TTS_PROGRESS, readAloudNumber + 1)
             }
-            postEvent(EventBus.TTS_PROGRESS, readAloudNumber + 1)
         }
 
         override fun onDone(s: String) {

app/src/main/java/io/legado/app/service/help/CheckSource.kt

@@ -2,34 +2,62 @@ package io.legado.app.service.help
 
 import android.content.Context
 import android.content.Intent
+import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.IntentAction
 import io.legado.app.data.entities.BookSource
+import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.model.WebBook
 import io.legado.app.service.CheckSourceService
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import org.jetbrains.anko.toast
+import kotlin.coroutines.CoroutineContext
 
-object CheckSource {
+class CheckSource(val source: BookSource) {
 
-    fun start(context: Context, sources: LinkedHashSet<BookSource>) {
+    companion object {
-        if (sources.isEmpty()) {
+        var keyword = "我的"
-            context.toast(R.string.non_select)
+
-            return
+        fun start(context: Context, sources: List<BookSource>) {
-        }
+            if (sources.isEmpty()) {
-        val selectedIds: ArrayList<String> = arrayListOf()
+                context.toast(R.string.non_select)
-        sources.map {
+                return
-            selectedIds.add(it.bookSourceUrl)
+            }
+            val selectedIds: ArrayList<String> = arrayListOf()
+            sources.map {
+                selectedIds.add(it.bookSourceUrl)
+            }
+            Intent(context, CheckSourceService::class.java).let {
+                it.action = IntentAction.start
+                it.putExtra("selectIds", selectedIds)
+                context.startService(it)
+            }
         }
-        Intent(context, CheckSourceService::class.java).let {
+
-            it.action = IntentAction.start
+        fun stop(context: Context) {
-            it.putExtra("selectIds", selectedIds)
+            Intent(context, CheckSourceService::class.java).let {
-            context.startService(it)
+                it.action = IntentAction.stop
+                context.startService(it)
+            }
         }
     }
 
-    fun stop(context: Context) {
+    fun check(
-        Intent(context, CheckSourceService::class.java).let {
+        scope: CoroutineScope,
-            it.action = IntentAction.stop
+        context: CoroutineContext,
-            context.startService(it)
+        onNext: (sourceUrl: String) -> Unit
-        }
+    ): Coroutine<*> {
+        val webBook = WebBook(source)
+        return webBook.searchBook(keyword, scope = scope, context = context)
+            .onError(Dispatchers.IO) {
+                source.addGroup("失效")
+                App.db.bookSourceDao().update(source)
+            }.onSuccess(Dispatchers.IO) {
+                source.removeGroup("失效")
+                App.db.bookSourceDao().update(source)
+            }.onFinally(Dispatchers.IO) {
+                onNext(source.bookSourceUrl)
+            }
     }
 }

app/src/main/java/io/legado/app/service/help/ReadBook.kt

@@ -1,11 +1,13 @@
 package io.legado.app.service.help
 
 import androidx.lifecycle.MutableLiveData
+import com.hankcs.hanlp.HanLP
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.BookType
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
+import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
 import io.legado.app.help.IntentDataHelp
 import io.legado.app.help.coroutine.Coroutine
@@ -36,9 +38,8 @@ object ReadBook {
     var msg: String? = null
     private val loadingChapters = arrayListOf<Int>()
 
-    fun resetData(book: Book, noSource: (name: String, author: String) -> Unit) {
+    fun resetData(book: Book) {
         this.book = book
-        titleDate.postValue(book.name)
         durChapterIndex = book.durChapterIndex
         durPageIndex = book.durChapterPos
         isLocalBook = book.origin == BookType.local
@@ -46,20 +47,19 @@ object ReadBook {
         prevTextChapter = null
         curTextChapter = null
         nextTextChapter = null
-        upWebBook(book, noSource)
+        titleDate.postValue(book.name)
+        upWebBook(book)
     }
 
-    fun upWebBook(book: Book?, noSource: (name: String, author: String) -> Unit) {
+    fun upWebBook(book: Book) {
-        book ?: return
+        webBook = if (book.origin == BookType.local) {
-        if (book.origin == BookType.local) {
+            null
-            webBook = null
         } else {
             val bookSource = App.db.bookSourceDao().getBookSource(book.origin)
             if (bookSource != null) {
-                webBook = WebBook(bookSource)
+                WebBook(bookSource)
             } else {
-                webBook = null
+                null
-                noSource.invoke(book.name, book.author)
             }
         }
     }
@@ -149,7 +149,7 @@ object ReadBook {
     }
 
     private fun curPageChanged() {
-        callBack?.upPageProgress()
+        callBack?.pageChanged()
         if (BaseReadAloudService.isRun) {
             readAloud(!BaseReadAloudService.pause)
         }
@@ -293,6 +293,11 @@ object ReadBook {
     ) {
         Coroutine.async {
             if (chapter.index in durChapterIndex - 1..durChapterIndex + 1) {
+                chapter.title = when (AppConfig.chineseConverterType) {
+                    1 -> HanLP.convertToSimplifiedChinese(chapter.title)
+                    2 -> HanLP.convertToTraditionalChinese(chapter.title)
+                    else -> chapter.title
+                }
                 val contents = BookHelp.disposeContent(
                     chapter.title,
                     book!!.name,
@@ -345,7 +350,7 @@ object ReadBook {
     interface CallBack {
         fun upContent(relativePosition: Int = 0, resetPageOffset: Boolean = true)
         fun upView()
-        fun upPageProgress()
+        fun pageChanged()
         fun contentLoadFinish()
     }
 }

app/src/main/java/io/legado/app/ui/about/AboutActivity.kt

@@ -24,14 +24,19 @@ class AboutActivity : BaseActivity(R.layout.activity_about) {
             .replace(R.id.fl_fragment, aboutFragment, fTag)
             .commit()
         tv_app_summary.post {
-            val span = ForegroundColorSpan(accentColor)
+            try {
-            val spannableString = SpannableString(tv_app_summary.text)
+                val span = ForegroundColorSpan(accentColor)
-            val start = spannableString.indexOf("开源阅读软件")
+                val spannableString = SpannableString(tv_app_summary.text)
-            spannableString.setSpan(
+                val gzh = getString(R.string.legado_gzh)
-                span, start, start + 6,
+                val start = spannableString.indexOf(gzh)
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                spannableString.setSpan(
-            )
+                    span, start, start + gzh.length,
-            tv_app_summary.text = spannableString
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+                tv_app_summary.text = spannableString
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
     }
 

app/src/main/java/io/legado/app/ui/about/AboutFragment.kt

@@ -27,7 +27,8 @@ class AboutFragment : PreferenceFragmentCompat() {
         Pair("(QQ群2)773736122", "5Bm5w6OgLupXnICbYvbgzpPUgf0UlsJF"),
         Pair("(QQ群3)981838750", "g_Sgmp2nQPKqcZQ5qPcKLHziwX_mpps9"),
         Pair("(QQ群4)256929088", "czEJPLDnT4Pd9SKQ6RoRVzKhDxLchZrO"),
-        Pair("(QQ群5)811843556", "zKZ2UYGZ7o5CzcA6ylxzlqi21si_iqaX")
+        Pair("(QQ群5)811843556", "zKZ2UYGZ7o5CzcA6ylxzlqi21si_iqaX"),
+        Pair("(QQ群6)870270970", "FeCF8iSxfQbe90HPvGsvcqs5P5oSeY5n")
     )
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -47,12 +48,13 @@ class AboutFragment : PreferenceFragmentCompat() {
             "update_log" -> showUpdateLog()
             "check_update" -> openUrl(R.string.latest_release_url)
             "mail" -> sendMail()
+            "sourceRuleSummary" -> openUrl(R.string.source_rule_url)
             "git" -> openUrl(R.string.this_github_url)
             "home_page" -> openUrl(R.string.home_page_url)
             "license" -> requireContext().openUrl(licenseUrl)
             "disclaimer" -> requireContext().openUrl(disclaimerUrl)
             "qq" -> showQqGroups()
-            "gzGzh" -> requireContext().sendToClip("开源阅读软件")
+            "gzGzh" -> requireContext().sendToClip(getString(R.string.legado_gzh))
         }
         return super.onPreferenceTreeClick(preference)
     }

app/src/main/java/io/legado/app/ui/about/DonateFragment.kt

@@ -35,7 +35,7 @@ class DonateFragment : PreferenceFragmentCompat() {
             "zfbSkRwm" -> requireContext().openUrl(zfbSkRwmUrl)
             "qqSkRwm" -> requireContext().openUrl(qqSkRwmUrl)
             "zfbHbSsm" -> getZfbHb(requireContext())
-            "gzGzh" -> requireContext().sendToClip("开源阅读软件")
+            "gzGzh" -> requireContext().sendToClip("开源阅读")
         }
         return super.onPreferenceTreeClick(preference)
     }

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceAdapter.kt

@@ -2,6 +2,8 @@ package io.legado.app.ui.book.changesource
 
 import android.content.Context
 import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
@@ -10,6 +12,7 @@ import io.legado.app.utils.invisible
 import io.legado.app.utils.visible
 import kotlinx.android.synthetic.main.item_change_source.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
+import org.jetbrains.anko.sdk27.listeners.onLongClick
 
 
 class ChangeSourceAdapter(context: Context, val callBack: CallBack) :
@@ -43,10 +46,30 @@ class ChangeSourceAdapter(context: Context, val callBack: CallBack) :
                 callBack.changeTo(it)
             }
         }
+        holder.itemView.onLongClick {
+            showMenu(holder.itemView, getItem(holder.layoutPosition))
+            true
+        }
+    }
+
+    private fun showMenu(view: View, searchBook: SearchBook?) {
+        searchBook ?: return
+        val popupMenu = PopupMenu(context, view)
+        popupMenu.inflate(R.menu.change_source_item)
+        popupMenu.setOnMenuItemClickListener {
+            when (it.itemId) {
+                R.id.menu_disable_book_source -> {
+                    callBack.disableSource(searchBook)
+                }
+            }
+            true
+        }
+        popupMenu.show()
     }
 
     interface CallBack {
         val bookUrl: String?
         fun changeTo(searchBook: SearchBook)
+        fun disableSource(searchBook: SearchBook)
     }
 }

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt

@@ -185,6 +185,10 @@ class ChangeSourceDialog : BaseDialogFragment(),
     override val bookUrl: String?
         get() = callBack?.oldBook?.bookUrl
 
+    override fun disableSource(searchBook: SearchBook) {
+        viewModel.disableSource(searchBook)
+    }
+
     interface CallBack {
         val oldBook: Book?
         fun changeTo(book: Book)

app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt

@@ -2,6 +2,7 @@ package io.legado.app.ui.book.changesource
 
 import android.app.Application
 import android.os.Bundle
+import android.os.Handler
 import androidx.lifecycle.MutableLiveData
 import io.legado.app.App
 import io.legado.app.R
@@ -22,6 +23,7 @@ import java.util.concurrent.Executors
 class ChangeSourceViewModel(application: Application) : BaseViewModel(application) {
     private var searchPool =
         Executors.newFixedThreadPool(AppConfig.threadCount).asCoroutineDispatcher()
+    val handler = Handler()
     val searchStateData = MutableLiveData<Boolean>()
     val searchBooksLiveData = MutableLiveData<List<SearchBook>>()
     var name: String = ""
@@ -29,6 +31,9 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
     private var task: Coroutine<*>? = null
     private var screenKey: String = ""
     private val searchBooks = hashSetOf<SearchBook>()
+    private var postTime = 0L
+    private val sendRunnable = Runnable { upAdapter() }
+
 
     fun initData(arguments: Bundle?) {
         arguments?.let { bundle ->
@@ -55,9 +60,17 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
         }
     }
 
+    @Synchronized
     private fun upAdapter() {
-        val books = searchBooks.toList()
+        if (System.currentTimeMillis() >= postTime + 500) {
-        searchBooksLiveData.postValue(books.sortedBy { it.originOrder })
+            handler.removeCallbacks(sendRunnable)
+            postTime = System.currentTimeMillis()
+            val books = searchBooks.toList()
+            searchBooksLiveData.postValue(books.sortedBy { it.originOrder })
+        } else {
+            handler.removeCallbacks(sendRunnable)
+            handler.postDelayed(sendRunnable, 500 - System.currentTimeMillis() + postTime)
+        }
     }
 
     private fun searchFinish(searchBook: SearchBook) {
@@ -165,4 +178,15 @@ class ChangeSourceViewModel(application: Application) : BaseViewModel(applicatio
         searchPool.close()
     }
 
+    fun disableSource(searchBook: SearchBook) {
+        execute {
+            App.db.bookSourceDao().getBookSource(searchBook.origin)?.let { source ->
+                source.enabled = false
+                App.db.bookSourceDao().update(source)
+            }
+            searchBooks.remove(searchBook)
+            upAdapter()
+        }
+    }
+
 }

app/src/main/java/io/legado/app/ui/book/changesource/DiffCallBack.kt

@@ -24,13 +24,11 @@ class DiffCallBack(private val oldItems: List<SearchBook>, private val newItems:
     override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
         val oldItem = oldItems[oldItemPosition]
         val newItem = newItems[newItemPosition]
-        if (oldItem.originName != newItem.originName) {
+        return when {
-            return false
+            oldItem.originName != newItem.originName -> false
-        }
+            oldItem.latestChapterTitle != newItem.latestChapterTitle -> false
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle) {
+            else -> true
-            return false
         }
-        return true
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {

app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt

@@ -12,10 +12,12 @@ import com.google.android.material.snackbar.Snackbar
 import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
+import io.legado.app.constant.AppConst
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
+import io.legado.app.data.entities.BookGroup
 import io.legado.app.help.BookHelp
 import io.legado.app.service.help.Download
 import io.legado.app.ui.filechooser.FileChooserDialog
@@ -35,29 +37,49 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
     private val exportRequestCode = 32
     private val exportBookPathKey = "exportBookPath"
     lateinit var adapter: DownloadAdapter
-    private var bookshelfLiveData: LiveData<List<Book>>? = null
+    private var groupLiveData: LiveData<List<BookGroup>>? = null
+    private var booksLiveData: LiveData<List<Book>>? = null
     private var menu: Menu? = null
     private var exportPosition = -1
+    private val groupList: ArrayList<BookGroup> = arrayListOf()
+    private var groupId: Int = -1
 
     override val viewModel: DownloadViewModel
         get() = getViewModel(DownloadViewModel::class.java)
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
+        groupId = intent.getIntExtra("groupId", -1)
+        title_bar.subtitle = intent.getStringExtra("groupName") ?: getString(R.string.all)
         initRecyclerView()
-        initLiveData()
+        initGroupData()
+        initBookData()
     }
 
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.download, menu)
-        this.menu = menu
         return super.onCompatCreateOptionsMenu(menu)
     }
 
+    override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
+        this.menu = menu
+        upMenu()
+        return super.onPrepareOptionsMenu(menu)
+    }
+
+    private fun upMenu() {
+        menu?.findItem(R.id.menu_book_group)?.subMenu?.let { subMenu ->
+            subMenu.removeGroup(R.id.menu_group)
+            groupList.forEach { bookGroup ->
+                subMenu.add(R.id.menu_group, bookGroup.groupId, Menu.NONE, bookGroup.groupName)
+            }
+        }
+    }
+
     override fun onCompatOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_download -> launch(IO) {
                 if (adapter.downloadMap.isNullOrEmpty()) {
-                    App.db.bookDao().webBooks.forEach { book ->
+                    adapter.getItems().forEach { book ->
                         Download.start(
                             this@DownloadActivity,
                             book.bookUrl,
@@ -69,6 +91,21 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
                     Download.stop(this@DownloadActivity)
                 }
             }
+            R.id.menu_no_group -> {
+                title_bar.subtitle = getString(R.string.no_group)
+                groupId = AppConst.bookGroupNone.groupId
+                initBookData()
+            }
+            R.id.menu_all -> {
+                title_bar.subtitle = item.title
+                groupId = AppConst.bookGroupAll.groupId
+                initBookData()
+            }
+            else -> if (item.groupId == R.id.menu_group) {
+                title_bar.subtitle = item.title
+                groupId = item.itemId
+                initBookData()
+            }
         }
         return super.onCompatOptionsItemSelected(item)
     }
@@ -79,21 +116,39 @@ class DownloadActivity : VMBaseActivity<DownloadViewModel>(R.layout.activity_dow
         recycler_view.adapter = adapter
     }
 
-    private fun initLiveData() {
+    private fun initBookData() {
-        bookshelfLiveData?.removeObservers(this)
+        booksLiveData?.removeObservers(this)
-        bookshelfLiveData = App.db.bookDao().observeDownload()
+        booksLiveData = when (groupId) {
-        bookshelfLiveData?.observe(this, Observer { list ->
+            AppConst.bookGroupAll.groupId -> App.db.bookDao().observeAll()
+            AppConst.bookGroupNone.groupId -> App.db.bookDao().observeNoGroup()
+            else -> App.db.bookDao().observeByGroup(groupId)
+        }
+        booksLiveData?.observe(this, Observer { list ->
+            val booksDownload = list.filter {
+                it.isOnLineTxt()
+            }
             val books = when (getPrefInt(PreferKey.bookshelfSort)) {
-                1 -> list.sortedByDescending { it.latestChapterTime }
+                1 -> booksDownload.sortedByDescending { it.latestChapterTime }
-                2 -> list.sortedBy { it.name }
+                2 -> booksDownload.sortedBy { it.name }
-                3 -> list.sortedBy { it.order }
+                3 -> booksDownload.sortedBy { it.order }
-                else -> list.sortedByDescending { it.durChapterTime }
+                else -> booksDownload.sortedByDescending { it.durChapterTime }
             }
             adapter.setItems(books)
             initCacheSize(books)
         })
     }
 
+    private fun initGroupData() {
+        groupLiveData?.removeObservers(this)
+        groupLiveData = App.db.bookGroupDao().liveDataAll()
+        groupLiveData?.observe(this, Observer {
+            groupList.clear()
+            groupList.addAll(it)
+            adapter.notifyDataSetChanged()
+            upMenu()
+        })
+    }
+
     private fun initCacheSize(books: List<Book>) {
         launch(IO) {
             books.forEach { book ->

app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt

@@ -72,7 +72,8 @@ class ExploreShowActivity : VMBaseActivity<ExploreShowViewModel>(R.layout.activi
 
     override fun showBookInfo(book: Book) {
         startActivity<BookInfoActivity>(
-            Pair("bookUrl", book.bookUrl)
+            Pair("name", book.name),
+            Pair("author", book.author)
         )
     }
 }

app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -86,6 +86,9 @@ class BookInfoActivity :
             R.id.menu_refresh -> {
                 upLoading(true)
                 viewModel.bookData.value?.let {
+                    if (it.isLocalBook()) {
+                        it.tocUrl = ""
+                    }
                     viewModel.loadBookInfo(it)
                 }
             }

app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt

@@ -12,6 +12,7 @@ import io.legado.app.help.BookHelp
 import io.legado.app.model.WebBook
 import io.legado.app.model.localBook.AnalyzeTxtFile
 import io.legado.app.model.localBook.LocalBook
+import io.legado.app.service.help.ReadBook
 import kotlinx.coroutines.Dispatchers.IO
 
 class BookInfoViewModel(application: Application) : BaseViewModel(application) {
@@ -22,13 +23,13 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
 
     fun initData(intent: Intent) {
         execute {
-            intent.getStringExtra("bookUrl")?.let {
+            val name = intent.getStringExtra("name") ?: ""
-                App.db.bookDao().getBook(it)?.let { book ->
+            val author = intent.getStringExtra("author") ?: ""
-                    inBookshelf = true
+            App.db.bookDao().getBook(name, author)?.let { book ->
-                    setBook(book)
+                inBookshelf = true
-                } ?: App.db.searchBookDao().getSearchBook(it)?.toBook()?.let { book ->
+                setBook(book)
-                    setBook(book)
+            } ?: App.db.searchBookDao().getFirstByNameAuthor(name, author)?.toBook()?.let { book ->
-                }
+                setBook(book)
             }
         }
     }
@@ -178,6 +179,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                     book.durChapterTitle = it.durChapterTitle
                 }
                 App.db.bookDao().insert(book)
+                if (ReadBook.book?.name == book.name && ReadBook.book?.author == book.author) {
+                    ReadBook.book = book
+                }
             }
         }.onSuccess {
             success?.invoke()

app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt

@@ -1,6 +1,7 @@
 package io.legado.app.ui.book.info.edit
 
 import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -16,6 +17,9 @@ import org.jetbrains.anko.sdk27.listeners.onClick
 class BookInfoEditActivity :
     VMBaseActivity<BookInfoEditViewModel>(R.layout.activity_book_info_edit),
     ChangeCoverDialog.CallBack {
+
+    private val resultSelectCover = 132
+
     override val viewModel: BookInfoEditViewModel
         get() = getViewModel(BookInfoEditViewModel::class.java)
 
@@ -47,6 +51,13 @@ class BookInfoEditActivity :
                 ChangeCoverDialog.show(supportFragmentManager, it.name, it.author)
             }
         }
+        tv_select_cover.onClick {
+            selectImage()
+        }
+        tv_refresh_cover.onClick {
+            viewModel.book?.customCoverUrl = tie_cover_url.text?.toString()
+            upCover()
+        }
     }
 
     private fun upView(book: Book) {
@@ -77,9 +88,29 @@ class BookInfoEditActivity :
         }
     }
 
+    private fun selectImage() {
+        val intent = Intent(Intent.ACTION_GET_CONTENT)
+        intent.addCategory(Intent.CATEGORY_OPENABLE)
+        intent.type = "image/*"
+        startActivityForResult(intent, resultSelectCover)
+    }
+
     override fun coverChangeTo(coverUrl: String) {
         viewModel.book?.customCoverUrl = coverUrl
         tie_cover_url.setText(coverUrl)
         upCover()
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            resultSelectCover -> {
+                if (resultCode == Activity.RESULT_OK) {
+                    data?.data?.let { uri ->
+                        coverChangeTo(uri.toString())
+                    }
+                }
+            }
+        }
+    }
 }

app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
@@ -30,6 +32,7 @@ import io.legado.app.help.storage.SyncBookProgress
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.okButton
+import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.receiver.TimeBatteryReceiver
 import io.legado.app.service.BaseReadAloudService
@@ -69,6 +72,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     ReadAloudDialog.CallBack,
     ChangeSourceDialog.CallBack,
     ReadBook.CallBack,
+    AutoReadDialog.CallBack,
     TocRegexDialog.CallBack,
     ReplaceEditDialog.CallBack,
     ColorPickerDialogListener {
@@ -85,7 +89,9 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
 
     private val mHandler = Handler()
     private val keepScreenRunnable: Runnable = Runnable { Help.keepScreenOn(window, false) }
-
+    private val autoPageRunnable: Runnable = Runnable { autoPagePlus() }
+    override var autoPageProgress = 0
+    override var isAutoPage = false
     private var screenTimeOut: Long = 0
     private var timeBatteryReceiver: TimeBatteryReceiver? = null
     override val pageFactory: TextPageFactory get() = page_view.pageFactory
@@ -129,6 +135,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
 
     override fun onPause() {
         super.onPause()
+        ReadBook.saveRead()
         timeBatteryReceiver?.let {
             unregisterReceiver(it)
             timeBatteryReceiver = null
@@ -140,6 +147,21 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
         }
     }
 
+    override fun upNavigationBarColor() {
+        when {
+            read_menu == null -> return
+            read_menu.isVisible -> {
+                ATH.setNavigationBarColorAuto(this)
+            }
+            ReadBookConfig.bg is ColorDrawable -> {
+                ATH.setNavigationBarColorAuto(this, ReadBookConfig.bgMeanColor)
+            }
+            else -> {
+                ATH.setNavigationBarColorAuto(this, Color.BLACK)
+            }
+        }
+    }
+
     /**
      * 初始化View
      */
@@ -194,7 +216,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                     when (item.groupId) {
                         R.id.menu_group_on_line -> item.isVisible = onLine
                         R.id.menu_group_local -> item.isVisible = !onLine
-                        R.id.menu_group_text -> item.isVisible = book.isTxt()
+                        R.id.menu_group_text -> item.isVisible = book.isLocalTxt()
                         R.id.menu_group_login ->
                             item.isVisible = !ReadBook.webBook?.bookSource?.loginUrl.isNullOrEmpty()
                         else -> if (item.itemId == R.id.menu_enable_replace) {
@@ -238,7 +260,10 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 onReplaceRuleSave()
             }
             R.id.menu_book_info -> ReadBook.book?.let {
-                startActivity<BookInfoActivity>(Pair("bookUrl", it.bookUrl))
+                startActivity<BookInfoActivity>(
+                    Pair("name", it.name),
+                    Pair("author", it.author)
+                )
             }
             R.id.menu_toc_regex -> TocRegexDialog.show(
                 supportFragmentManager,
@@ -344,6 +369,10 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                             toast(R.string.read_aloud_pause)
                             return true
                         }
+                        if (isAutoPage) {
+                            autoPageStop()
+                            return true
+                        }
                     }
                 }
             }
@@ -466,6 +495,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 if (getPrefBoolean("volumeKeyPageOnPlay")
                     || BaseReadAloudService.pause
                 ) {
+                    page_view.pageDelegate?.isCancel = false
                     page_view.pageDelegate?.keyTurnPage(direction)
                     return true
                 }
@@ -511,14 +541,18 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
                 seek_read_page.progress = ReadBook.durPageIndex
                 tv_pre.isEnabled = ReadBook.durChapterIndex != 0
                 tv_next.isEnabled = ReadBook.durChapterIndex != ReadBook.chapterSize - 1
+            } ?: let {
+                tv_chapter_name.gone()
+                tv_chapter_url.gone()
             }
         }
     }
 
     /**
-     * 更新进度条
+     * 页面改变
      */
-    override fun upPageProgress() {
+    override fun pageChanged() {
+        autoPageProgress = 0
         launch {
             seek_read_page.progress = ReadBook.durPageIndex
         }
@@ -539,10 +573,16 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
     }
 
     override fun clickCenter() {
-        if (BaseReadAloudService.isRun) {
+        when {
-            showReadAloudDialog()
+            BaseReadAloudService.isRun -> {
-        } else {
+                showReadAloudDialog()
-            read_menu.runMenuIn()
+            }
+            isAutoPage -> {
+                AutoReadDialog().show(supportFragmentManager, "autoRead")
+            }
+            else -> {
+                read_menu.runMenuIn()
+            }
         }
     }
 
@@ -557,7 +597,33 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
      * 自动翻页
      */
     override fun autoPage() {
+        if (isAutoPage) {
+            autoPageStop()
+        } else {
+            isAutoPage = true
+            page_view.upContent()
+            page_view.upContent(1)
+            autoPagePlus()
+        }
+        read_menu.setAutoPage(isAutoPage)
+    }
+
+    override fun autoPageStop() {
+        isAutoPage = false
+        mHandler.removeCallbacks(autoPageRunnable)
+        page_view.upContent()
+    }
 
+    private fun autoPagePlus() {
+        mHandler.removeCallbacks(autoPageRunnable)
+        autoPageProgress++
+        if (autoPageProgress >= ReadBookConfig.autoReadSpeed * 10) {
+            autoPageProgress = 0
+            page_view.fillPage(PageDelegate.Direction.NEXT)
+        } else {
+            page_view.invalidate()
+        }
+        mHandler.postDelayed(autoPageRunnable, 100)
     }
 
     /**
@@ -608,6 +674,7 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
      */
     override fun upSystemUiVisibility() {
         Help.upSystemUiVisibility(this, !read_menu.isVisible)
+        upNavigationBarColor()
     }
 
     /**

app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt

@@ -7,6 +7,7 @@ import io.legado.app.R
 import io.legado.app.base.BaseViewModel
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
+import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
 import io.legado.app.help.IntentDataHelp
 import io.legado.app.model.WebBook
@@ -34,13 +35,19 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
             } ?: App.db.bookDao().lastReadBook?.let {
                 initBook(it)
             }
+        }.onFinally {
+            if (ReadBook.inBookshelf) {
+                ReadBook.saveRead()
+            }
         }
     }
 
     private fun initBook(book: Book) {
         if (ReadBook.book?.bookUrl != book.bookUrl) {
-            ReadBook.resetData(book) { name, author ->
+            ReadBook.resetData(book)
-                autoChangeSource(name, author)
+            if (!book.isLocalBook() && ReadBook.webBook == null) {
+                autoChangeSource(book.name, book.author)
+                return
             }
             isInitFinish = true
             ReadBook.chapterSize = App.db.bookChapterDao().getChapterCount(book.bookUrl)
@@ -56,14 +63,14 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
                 }
                 ReadBook.loadContent(resetPageOffset = true)
             }
-            if (ReadBook.inBookshelf) {
-                ReadBook.saveRead()
-            }
         } else {
             isInitFinish = true
+            ReadBook.book!!.group = book.group
             ReadBook.titleDate.postValue(book.name)
-            ReadBook.upWebBook(book) { name, author ->
+            ReadBook.upWebBook(book)
-                autoChangeSource(name, author)
+            if (!book.isLocalBook() && ReadBook.webBook == null) {
+                autoChangeSource(book.name, book.author)
+                return
             }
             ReadBook.chapterSize = App.db.bookChapterDao().getChapterCount(book.bookUrl)
             if (ReadBook.chapterSize == 0) {
@@ -163,6 +170,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
     }
 
     private fun autoChangeSource(name: String, author: String) {
+        if (!AppConfig.autoChangeSource) return
         execute {
             App.db.bookSourceDao().allTextEnabled.forEach { source ->
                 try {

app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt

@@ -4,12 +4,12 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.WindowManager
 import android.view.animation.Animation
-import android.view.animation.AnimationUtils
 import android.widget.FrameLayout
 import android.widget.SeekBar
 import androidx.core.view.isVisible
 import io.legado.app.App
 import io.legado.app.R
+import io.legado.app.constant.EventBus
 import io.legado.app.help.AppConfig
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.lib.theme.accentColor
@@ -140,7 +140,11 @@ class ReadMenu : FrameLayout {
         })
 
         //自动翻页
-        fabAutoPage.onClick { callBack?.autoPage() }
+        fabAutoPage.onClick {
+            runMenuOut {
+                callBack?.autoPage()
+            }
+        }
 
         //替换
         fabReplaceRule.onClick { callBack?.openReplaceRule() }
@@ -149,6 +153,7 @@ class ReadMenu : FrameLayout {
         fabNightTheme.onClick {
             AppConfig.isNightTheme = !AppConfig.isNightTheme
             App.INSTANCE.applyDayNight()
+            postEvent(EventBus.RECREATE, "")
         }
 
         //上一章
@@ -190,8 +195,8 @@ class ReadMenu : FrameLayout {
     }
 
     private fun initAnimation() {
-        menuTopIn = AnimationUtils.loadAnimation(context, R.anim.anim_readbook_top_in)
+        menuTopIn = AnimationUtilsSupport.loadAnimation(context, R.anim.anim_readbook_top_in)
-        menuBottomIn = AnimationUtils.loadAnimation(context, R.anim.anim_readbook_bottom_in)
+        menuBottomIn = AnimationUtilsSupport.loadAnimation(context, R.anim.anim_readbook_bottom_in)
         menuTopIn.setAnimationListener(object : Animation.AnimationListener {
             override fun onAnimationStart(animation: Animation) {
                 callBack?.upSystemUiVisibility()
@@ -213,8 +218,8 @@ class ReadMenu : FrameLayout {
         })
 
         //隐藏菜单
-        menuTopOut = AnimationUtils.loadAnimation(context, R.anim.anim_readbook_top_out)
+        menuTopOut = AnimationUtilsSupport.loadAnimation(context, R.anim.anim_readbook_top_out)
-        menuBottomOut = AnimationUtils.loadAnimation(context, R.anim.anim_readbook_bottom_out)
+        menuBottomOut = AnimationUtilsSupport.loadAnimation(context, R.anim.anim_readbook_bottom_out)
         menuTopOut.setAnimationListener(object : Animation.AnimationListener {
             override fun onAnimationStart(animation: Animation) {
                 vw_menu_bg.setOnClickListener(null)

app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt

@@ -0,0 +1,100 @@
+package io.legado.app.ui.book.read.config
+
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.SeekBar
+import io.legado.app.R
+import io.legado.app.base.BaseDialogFragment
+import io.legado.app.help.ReadBookConfig
+import io.legado.app.lib.theme.bottomBackground
+import io.legado.app.service.BaseReadAloudService
+import io.legado.app.service.help.ReadAloud
+import io.legado.app.ui.book.read.Help
+import kotlinx.android.synthetic.main.dialog_auto_read.*
+import org.jetbrains.anko.sdk27.listeners.onClick
+
+class AutoReadDialog : BaseDialogFragment() {
+    var callBack: CallBack? = null
+
+    override fun onStart() {
+        super.onStart()
+        val dm = DisplayMetrics()
+        activity?.let {
+            Help.upSystemUiVisibility(it)
+            it.windowManager?.defaultDisplay?.getMetrics(dm)
+        }
+        dialog?.window?.let {
+            it.setBackgroundDrawableResource(R.color.background)
+            it.decorView.setPadding(0, 0, 0, 0)
+            val attr = it.attributes
+            attr.dimAmount = 0.0f
+            attr.gravity = Gravity.BOTTOM
+            it.attributes = attr
+            it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        callBack = activity as? CallBack
+        return inflater.inflate(R.layout.dialog_auto_read, container)
+    }
+
+    override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
+        root_view.setBackgroundColor(requireContext().bottomBackground)
+        initOnChange()
+        initData()
+        initEvent()
+    }
+
+    private fun initData() {
+        seek_auto_read.progress = ReadBookConfig.autoReadSpeed
+    }
+
+    private fun initOnChange() {
+        seek_auto_read.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
+
+            override fun onStopTrackingTouch(seekBar: SeekBar?) {
+                ReadBookConfig.autoReadSpeed = seek_auto_read.progress
+                upTtsSpeechRate()
+            }
+        })
+    }
+
+    private fun initEvent() {
+        ll_main_menu.onClick { callBack?.showMenuBar(); dismiss() }
+        ll_setting.onClick {
+            ReadAloudConfigDialog().show(childFragmentManager, "readAloudConfigDialog")
+        }
+        ll_catalog.onClick { callBack?.openChapterList() }
+        ll_auto_page_stop.onClick {
+            callBack?.autoPageStop()
+            dismiss()
+        }
+    }
+
+    private fun upTtsSpeechRate() {
+        ReadAloud.upTtsSpeechRate(requireContext())
+        if (!BaseReadAloudService.pause) {
+            ReadAloud.pause(requireContext())
+            ReadAloud.resume(requireContext())
+        }
+    }
+
+    interface CallBack {
+        fun showMenuBar()
+        fun openChapterList()
+        fun autoPageStop()
+    }
+}

app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt

@@ -18,6 +18,7 @@ import io.legado.app.help.ReadBookConfig
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.ui.book.read.Help
+import io.legado.app.utils.dp
 import io.legado.app.utils.getPrefBoolean
 import io.legado.app.utils.postEvent
 
@@ -38,7 +39,7 @@ class MoreConfigDialog : DialogFragment() {
             attr.dimAmount = 0.0f
             attr.gravity = Gravity.BOTTOM
             it.attributes = attr
-            it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            it.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, 360.dp)
         }
     }
 
@@ -110,6 +111,10 @@ class MoreConfigDialog : DialogFragment() {
                         Help.setOrientation(it)
                     }
                 }
+                PreferKey.textFullJustify,
+                PreferKey.textBottomJustify -> {
+                    postEvent(EventBus.UP_CONFIG, true)
+                }
             }
         }
 

app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt

@@ -16,6 +16,7 @@ import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ATH
+import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.Help
@@ -42,8 +43,8 @@ class ReadAloudConfigDialog : DialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val view = LinearLayout(context)
+        val view = LinearLayout(requireContext())
-        view.setBackgroundResource(R.color.background)
+        view.setBackgroundColor(requireContext().backgroundColor)
         view.id = R.id.tag1
         container?.addView(view)
         return view

app/src/main/java/io/legado/app/ui/book/read/config/ReadStyleDialog.kt

@@ -103,9 +103,7 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
         tv_title_mode.onClick {
             showTitleConfig()
         }
-        tv_text_bold.onClick {
+        text_font_weight_converter.onChanged {
-            ReadBookConfig.textBold = !ReadBookConfig.textBold
-            tv_text_bold.isSelected = ReadBookConfig.textBold
             postEvent(EventBus.UP_CONFIG, true)
         }
         tv_text_font.onClick {
@@ -215,7 +213,6 @@ class ReadStyleDialog : DialogFragment(), FontSelectDialog.CallBack {
 
     private fun upStyle() {
         ReadBookConfig.let {
-            tv_text_bold.isSelected = it.textBold
             dsb_text_size.progress = it.textSize - 5
             dsb_text_letter_spacing.progress = (it.letterSpacing * 100).toInt() + 50
             dsb_line_size.progress = it.lineSpacingExtra

app/src/main/java/io/legado/app/ui/book/read/config/TextFontWeightConverter.kt

@@ -0,0 +1,55 @@
+package io.legado.app.ui.book.read.config
+
+import android.content.Context
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.util.AttributeSet
+import io.legado.app.R
+import io.legado.app.help.AppConfig
+import io.legado.app.help.ReadBookConfig
+import io.legado.app.lib.dialogs.alert
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.ui.widget.text.StrokeTextView
+import org.jetbrains.anko.sdk27.listeners.onClick
+
+class TextFontWeightConverter(context: Context, attrs: AttributeSet?) : StrokeTextView(context, attrs) {
+
+    private val spannableString = SpannableString("中/粗/细")
+    private var enabledSpan: ForegroundColorSpan = ForegroundColorSpan(context.accentColor)
+    private var onChanged: (() -> Unit)? = null
+
+    init {
+        text = spannableString
+        if (!isInEditMode) {
+            upUi(ReadBookConfig.textBold)
+        }
+        onClick {
+            selectType()
+        }
+    }
+
+    private fun upUi(type: Int) {
+        spannableString.removeSpan(enabledSpan)
+        when (type) {
+            0 -> spannableString.setSpan(enabledSpan, 0, 1, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+            1 -> spannableString.setSpan(enabledSpan, 2, 3, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+            2 -> spannableString.setSpan(enabledSpan, 4, 5, Spannable.SPAN_INCLUSIVE_EXCLUSIVE)
+        }
+        text = spannableString
+    }
+
+    private fun selectType() {
+        context.alert(titleResource = R.string.text_font_weight_converter) {
+            items(context.resources.getStringArray(R.array.text_font_weight).toList()) { _, i ->
+                ReadBookConfig.textBold = i
+                upUi(i)
+                onChanged?.invoke()
+            }
+        }.show()
+    }
+
+    fun onChanged(unit: () -> Unit) {
+        onChanged = unit
+    }
+}

app/src/main/java/io/legado/app/ui/book/read/config/TipConfigDialog.kt

@@ -25,12 +25,10 @@ class TipConfigDialog : BaseDialogFragment() {
             Help.upSystemUiVisibility(it)
             it.windowManager?.defaultDisplay?.getMetrics(dm)
         }
-        dialog?.window?.let {
+        dialog?.window?.setLayout(
-            val attr = it.attributes
+            ViewGroup.LayoutParams.MATCH_PARENT,
-            attr.dimAmount = 0.0f
+            ViewGroup.LayoutParams.WRAP_CONTENT
-            it.attributes = attr
+        )
-            it.setLayout((dm.widthPixels * 0.9).toInt(), ViewGroup.LayoutParams.WRAP_CONTENT)
-        }
     }
 
     override fun onCreateView(

app/src/main/java/io/legado/app/ui/book/read/config/TocRegexViewModel.kt

@@ -22,10 +22,8 @@ class TocRegexViewModel(application: Application) : BaseViewModel(application) {
 
     fun importDefault() {
         execute {
-            AnalyzeTxtFile.getDefaultRules().let {
+            App.db.txtTocRule().deleteDefault()
-                App.db.txtTocRule().deleteDefault()
+            AnalyzeTxtFile.getDefaultEnabledRules()
-                App.db.txtTocRule().insert(*it.toTypedArray())
-            }
         }
     }
 

app/src/main/java/io/legado/app/ui/book/read/page/ChapterProvider.kt

@@ -78,6 +78,7 @@ object ChapterProvider {
             item.title = bookChapter.title
             item.upLinesPosition()
         }
+
         return TextChapter(
             bookChapter.index,
             bookChapter.title,
@@ -123,7 +124,7 @@ object ChapterProvider {
                 val x = if (isTitle && ReadBookConfig.titleMode == 1)
                     (visibleWidth - layout.getLineWidth(lineIndex)) / 2
                 else 0f
-                addCharsToLineLast(textLine, words, textPaint, x)
+                addCharsToLineLast(textLine, words, textPaint, x, true)
             } else {
                 //中间行
                 addCharsToLineMiddle(textLine, words, textPaint, desiredWidth, 0f)
@@ -161,6 +162,10 @@ object ChapterProvider {
         desiredWidth: Float
     ) {
         var x = 0f
+        if (!ReadBookConfig.textFullJustify) {
+            addCharsToLineLast(textLine, words, textPaint, x, false)
+            return
+        }
         val bodyIndent = ReadBookConfig.bodyIndent
         val icw = StaticLayout.getDesiredWidth(bodyIndent, textPaint) / bodyIndent.length
         bodyIndent.toStringArray().forEach {
@@ -186,6 +191,10 @@ object ChapterProvider {
         desiredWidth: Float,
         startX: Float
     ) {
+        if (!ReadBookConfig.textFullJustify) {
+            addCharsToLineLast(textLine, words, textPaint, startX, false)
+            return
+        }
         val gapCount: Int = words.length - 1
         val d = (visibleWidth - desiredWidth) / gapCount
         var x = startX
@@ -209,9 +218,10 @@ object ChapterProvider {
         textLine: TextLine,
         words: String,
         textPaint: TextPaint,
-        startX: Float
+        startX: Float,
+        isLast: Boolean
     ) {
-        textLine.text = "$words\n"
+        textLine.text = if (isLast) "$words\n" else words
         var x = startX
         words.toStringArray().forEach {
             val cw = StaticLayout.getDesiredWidth(it, textPaint)
@@ -262,23 +272,37 @@ object ChapterProvider {
             App.INSTANCE.removePref(PreferKey.readBookFont)
             Typeface.SANS_SERIF
         }
+        // 字体统一处理
+        val bold = Typeface.create(typeface, Typeface.BOLD)
+        val normal = Typeface.create(typeface, Typeface.NORMAL)
+        val (titleFont, textFont) = when (ReadBookConfig.textBold) {
+            1 -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                    Pair(Typeface.create(typeface, 900, false), bold)
+                else
+                    Pair(bold, bold)
+            }
+            2 -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                    Pair(normal, Typeface.create(typeface, 300, false))
+                else
+                    Pair(normal, normal)
+            }
+            else -> Pair(bold, normal)
+        }
+
         //标题
         titlePaint = TextPaint()
-        titlePaint.color = ReadBookConfig.durConfig.textColor()
+        titlePaint.color = ReadBookConfig.textColor
         titlePaint.letterSpacing = ReadBookConfig.letterSpacing
-        titlePaint.typeface = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+        titlePaint.typeface = titleFont
-            Typeface.create(typeface, if (ReadBookConfig.textBold) 900 else 700, false)
-        } else {
-            Typeface.create(typeface, Typeface.BOLD)
-        }
         titlePaint.textSize = with(ReadBookConfig) { textSize + titleSize }.sp.toFloat()
         titlePaint.isAntiAlias = true
         //正文
         contentPaint = TextPaint()
-        contentPaint.color = ReadBookConfig.durConfig.textColor()
+        contentPaint.color = ReadBookConfig.textColor
         contentPaint.letterSpacing = ReadBookConfig.letterSpacing
-        val style = if (ReadBookConfig.textBold) Typeface.BOLD else Typeface.NORMAL
+        contentPaint.typeface = textFont
-        contentPaint.typeface = Typeface.create(typeface, style)
         contentPaint.textSize = ReadBookConfig.textSize.sp.toFloat()
         contentPaint.isAntiAlias = true
         //间距

app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt

@@ -144,7 +144,7 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at
     ) {
         val textPaint = if (isTitle) ChapterProvider.titlePaint else ChapterProvider.contentPaint
         textPaint.color =
-            if (isReadAloud) context.accentColor else ReadBookConfig.durConfig.textColor()
+            if (isReadAloud) context.accentColor else ReadBookConfig.textColor
         textChars.forEach {
             canvas.drawText(it.charData, it.start, lineBase, textPaint)
             if (it.selected) {

app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt

@@ -7,10 +7,8 @@ import android.view.MotionEvent
 import android.widget.FrameLayout
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
-import com.hankcs.hanlp.HanLP
 import io.legado.app.R
 import io.legado.app.constant.AppConst.timeFormat
-import io.legado.app.help.AppConfig
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.help.ReadTipConfig
 import io.legado.app.ui.book.read.page.entities.TextPage
@@ -49,18 +47,22 @@ class ContentView(context: Context) : FrameLayout(context) {
 
     fun upStyle() {
         ReadBookConfig.apply {
+            bv_header_left.typeface = ChapterProvider.typeface
             tv_header_left.typeface = ChapterProvider.typeface
             tv_header_middle.typeface = ChapterProvider.typeface
             tv_header_right.typeface = ChapterProvider.typeface
+            bv_footer_left.typeface = ChapterProvider.typeface
             tv_footer_left.typeface = ChapterProvider.typeface
             tv_footer_middle.typeface = ChapterProvider.typeface
             tv_footer_right.typeface = ChapterProvider.typeface
-            tv_header_left.setColor(durConfig.textColor())
+            bv_header_left.setColor(textColor)
-            tv_header_middle.setColor(durConfig.textColor())
+            tv_header_left.setColor(textColor)
-            tv_header_right.setColor(durConfig.textColor())
+            tv_header_middle.setColor(textColor)
-            tv_footer_left.setColor(durConfig.textColor())
+            tv_header_right.setColor(textColor)
-            tv_footer_middle.setColor(durConfig.textColor())
+            bv_footer_left.setColor(textColor)
-            tv_footer_right.setColor(durConfig.textColor())
+            tv_footer_left.setColor(textColor)
+            tv_footer_middle.setColor(textColor)
+            tv_footer_right.setColor(textColor)
             //显示状态栏时隐藏header
             vw_status_bar.setPadding(0, context.statusBarHeight, 0, 0)
             vw_status_bar.isGone = hideStatusBar
@@ -86,18 +88,14 @@ class ContentView(context: Context) : FrameLayout(context) {
 
     fun upTipStyle() {
         ReadTipConfig.apply {
-            val tipHeaderLeftNone = tipHeaderLeft == none
+            tv_header_left.isInvisible = tipHeaderLeft != chapterTitle
-            val tipHeaderRightNone = tipHeaderRight == none
+            bv_header_left.isInvisible = tipHeaderLeft == none || !tv_header_left.isInvisible
-            val tipHeaderMiddleNone = tipHeaderMiddle == none
+            tv_header_right.isGone = tipHeaderRight == none
-            val tipFooterLeftNone = tipFooterLeft == none
+            tv_header_middle.isGone = tipHeaderMiddle == none
-            val tipFooterRightNone = tipFooterRight == none
+            tv_footer_left.isInvisible = tipFooterLeft != chapterTitle
-            val tipFooterMiddleNone = tipFooterMiddle == none
+            bv_footer_left.isInvisible = tipFooterLeft == none || !tv_footer_left.isInvisible
-            tv_header_left.isInvisible = tipHeaderLeftNone
+            tv_footer_right.isGone = tipFooterRight == none
-            tv_header_right.isGone = tipHeaderRightNone
+            tv_footer_middle.isGone = tipFooterMiddle == none
-            tv_header_middle.isGone = tipHeaderMiddleNone
-            tv_footer_left.isInvisible = tipFooterLeftNone
-            tv_footer_right.isGone = tipFooterRightNone
-            tv_footer_middle.isGone = tipFooterMiddleNone
             ll_header.isGone = hideHeader
             ll_footer.isGone = hideFooter
         }
@@ -115,10 +113,10 @@ class ContentView(context: Context) : FrameLayout(context) {
             textSize = 12f
         }
         tvTime = when (ReadTipConfig.time) {
-            ReadTipConfig.tipHeaderLeft -> tv_header_left
+            ReadTipConfig.tipHeaderLeft -> bv_header_left
             ReadTipConfig.tipHeaderMiddle -> tv_header_middle
             ReadTipConfig.tipHeaderRight -> tv_header_right
-            ReadTipConfig.tipFooterLeft -> tv_footer_left
+            ReadTipConfig.tipFooterLeft -> bv_footer_left
             ReadTipConfig.tipFooterMiddle -> tv_footer_middle
             ReadTipConfig.tipFooterRight -> tv_footer_right
             else -> null
@@ -128,10 +126,10 @@ class ContentView(context: Context) : FrameLayout(context) {
             textSize = 12f
         }
         tvBattery = when (ReadTipConfig.battery) {
-            ReadTipConfig.tipHeaderLeft -> tv_header_left
+            ReadTipConfig.tipHeaderLeft -> bv_header_left
             ReadTipConfig.tipHeaderMiddle -> tv_header_middle
             ReadTipConfig.tipHeaderRight -> tv_header_right
-            ReadTipConfig.tipFooterLeft -> tv_footer_left
+            ReadTipConfig.tipFooterLeft -> bv_footer_left
             ReadTipConfig.tipFooterMiddle -> tv_footer_middle
             ReadTipConfig.tipFooterRight -> tv_footer_right
             else -> null
@@ -141,10 +139,10 @@ class ContentView(context: Context) : FrameLayout(context) {
             textSize = 10f
         }
         tvPage = when (ReadTipConfig.page) {
-            ReadTipConfig.tipHeaderLeft -> tv_header_left
+            ReadTipConfig.tipHeaderLeft -> bv_header_left
             ReadTipConfig.tipHeaderMiddle -> tv_header_middle
             ReadTipConfig.tipHeaderRight -> tv_header_right
-            ReadTipConfig.tipFooterLeft -> tv_footer_left
+            ReadTipConfig.tipFooterLeft -> bv_footer_left
             ReadTipConfig.tipFooterMiddle -> tv_footer_middle
             ReadTipConfig.tipFooterRight -> tv_footer_right
             else -> null
@@ -154,10 +152,10 @@ class ContentView(context: Context) : FrameLayout(context) {
             textSize = 12f
         }
         tvTotalProgress = when (ReadTipConfig.totalProgress) {
-            ReadTipConfig.tipHeaderLeft -> tv_header_left
+            ReadTipConfig.tipHeaderLeft -> bv_header_left
             ReadTipConfig.tipHeaderMiddle -> tv_header_middle
             ReadTipConfig.tipHeaderRight -> tv_header_right
-            ReadTipConfig.tipFooterLeft -> tv_footer_left
+            ReadTipConfig.tipFooterLeft -> bv_footer_left
             ReadTipConfig.tipFooterMiddle -> tv_footer_middle
             ReadTipConfig.tipFooterRight -> tv_footer_right
             else -> null
@@ -167,10 +165,10 @@ class ContentView(context: Context) : FrameLayout(context) {
             textSize = 12f
         }
         tvPageAndTotal = when (ReadTipConfig.pageAndTotal) {
-            ReadTipConfig.tipHeaderLeft -> tv_header_left
+            ReadTipConfig.tipHeaderLeft -> bv_header_left
             ReadTipConfig.tipHeaderMiddle -> tv_header_middle
             ReadTipConfig.tipHeaderRight -> tv_header_right
-            ReadTipConfig.tipFooterLeft -> tv_footer_left
+            ReadTipConfig.tipFooterLeft -> bv_footer_left
             ReadTipConfig.tipFooterMiddle -> tv_footer_middle
             ReadTipConfig.tipFooterRight -> tv_footer_right
             else -> null
@@ -207,11 +205,7 @@ class ContentView(context: Context) : FrameLayout(context) {
 
     @SuppressLint("SetTextI18n")
     fun setProgress(textPage: TextPage) = textPage.apply {
-        val title = when (AppConfig.chineseConverterType) {
+        val title = textPage.title
-            1 -> HanLP.convertToSimplifiedChinese(textPage.title)
-            2 -> HanLP.convertToTraditionalChinese(textPage.title)
-            else -> textPage.title
-        }
         tvTitle?.text = title
         tvPage?.text = "${index.plus(1)}/$pageSize"
         tvTotalProgress?.text = readProgress

app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt

@@ -3,14 +3,19 @@ package io.legado.app.ui.book.read.page
 import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.widget.FrameLayout
 import io.legado.app.help.ReadBookConfig
+import io.legado.app.lib.theme.accentColor
 import io.legado.app.service.help.ReadBook
 import io.legado.app.ui.book.read.page.delegate.*
 import io.legado.app.ui.book.read.page.entities.TextChapter
 import io.legado.app.utils.activity
+import io.legado.app.utils.screenshot
+import kotlinx.android.synthetic.main.activity_book_read.view.*
 
 class PageView(context: Context, attrs: AttributeSet) :
     FrameLayout(context, attrs),
@@ -23,6 +28,12 @@ class PageView(context: Context, attrs: AttributeSet) :
     var prevPage: ContentView = ContentView(context)
     var curPage: ContentView = ContentView(context)
     var nextPage: ContentView = ContentView(context)
+    private val autoPageRect by lazy { Rect() }
+    private val autoPagePint by lazy {
+        Paint().apply {
+            color = context.accentColor
+        }
+    }
 
     init {
         addView(nextPage)
@@ -44,8 +55,22 @@ class PageView(context: Context, attrs: AttributeSet) :
 
     override fun dispatchDraw(canvas: Canvas) {
         super.dispatchDraw(canvas)
-
         pageDelegate?.onDraw(canvas)
+        if (callBack.isAutoPage) {
+            nextPage.screenshot()?.let {
+                val bottom =
+                    page_view.height * callBack.autoPageProgress / (ReadBookConfig.autoReadSpeed * 10)
+                autoPageRect.set(0, 0, page_view.width, bottom)
+                canvas.drawBitmap(it, autoPageRect, autoPageRect, null)
+                canvas.drawRect(
+                    0f,
+                    bottom.toFloat() - 1,
+                    page_view.width.toFloat(),
+                    bottom.toFloat(),
+                    autoPagePint
+                )
+            }
+        }
     }
 
     override fun computeScroll() {
@@ -94,9 +119,10 @@ class PageView(context: Context, attrs: AttributeSet) :
     }
 
     override fun upContent(relativePosition: Int, resetPageOffset: Boolean) {
-        if (ReadBookConfig.isScroll) {
+        if (ReadBookConfig.isScroll && !callBack.isAutoPage) {
             curPage.setContent(pageFactory.currentPage, resetPageOffset)
         } else {
+            curPage.resetPageOffset()
             when (relativePosition) {
                 -1 -> prevPage.setContent(pageFactory.prevPage)
                 1 -> nextPage.setContent(pageFactory.nextPage)
@@ -146,18 +172,18 @@ class PageView(context: Context, attrs: AttributeSet) :
 
     override val currentChapter: TextChapter?
         get() {
-        return if (callBack.isInitFinish) ReadBook.textChapter(0) else null
+            return if (callBack.isInitFinish) ReadBook.textChapter(0) else null
-    }
+        }
 
     override val nextChapter: TextChapter?
         get() {
-        return if (callBack.isInitFinish) ReadBook.textChapter(1) else null
+            return if (callBack.isInitFinish) ReadBook.textChapter(1) else null
-    }
+        }
 
     override val prevChapter: TextChapter?
         get() {
-        return if (callBack.isInitFinish) ReadBook.textChapter(-1) else null
+            return if (callBack.isInitFinish) ReadBook.textChapter(-1) else null
-    }
+        }
 
     override fun hasNextChapter(): Boolean {
         return ReadBook.durChapterIndex < ReadBook.chapterSize - 1
@@ -169,6 +195,8 @@ class PageView(context: Context, attrs: AttributeSet) :
 
     interface CallBack {
         val isInitFinish: Boolean
+        val isAutoPage: Boolean
+        val autoPageProgress: Int
         fun clickCenter()
         fun screenOffTimerStart()
         fun showTextActionMenu()

app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt

@@ -104,7 +104,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
     }
 
     override fun nextPageByAnim() {
-        super.nextPageByAnim()
+        abort()
         if (!hasNext()) return
         setDirection(Direction.NEXT)
         setTouchPoint(viewWidth.toFloat(), 0f)
@@ -112,7 +112,7 @@ abstract class HorizontalPageDelegate(pageView: PageView) : PageDelegate(pageVie
     }
 
     override fun prevPageByAnim() {
-        super.prevPageByAnim()
+        abort()
         if (!hasPrev()) return
         setDirection(Direction.PREV)
         setTouchPoint(0f, 0f)

app/src/main/java/io/legado/app/ui/book/read/page/delegate/PageDelegate.kt

@@ -15,6 +15,7 @@ import io.legado.app.help.ReadBookConfig
 import io.legado.app.ui.book.read.page.ContentView
 import io.legado.app.ui.book.read.page.PageView
 import kotlin.math.abs
+import io.legado.app.R
 
 abstract class PageDelegate(protected val pageView: PageView) :
     GestureDetector.SimpleOnGestureListener() {
@@ -170,13 +171,9 @@ abstract class PageDelegate(protected val pageView: PageView) :
 
     open fun onScroll() {}//移动contentView， slidePage
 
-    open fun nextPageByAnim() {
+    abstract fun nextPageByAnim()
-        abort()
-    }
 
-    open fun prevPageByAnim() {
+    abstract fun prevPageByAnim()
-        abort()
-    }
 
     open fun keyTurnPage(direction: Direction) {
         if (isRunning) return
@@ -320,7 +317,7 @@ abstract class PageDelegate(protected val pageView: PageView) :
         val hasPrev = pageView.pageFactory.hasPrev()
         if (!hasPrev) {
             if (!snackBar.isShown) {
-                snackBar.setText("没有上一页")
+                snackBar.setText(R.string.no_prev_page)
                 snackBar.show()
             }
         }
@@ -334,7 +331,7 @@ abstract class PageDelegate(protected val pageView: PageView) :
         val hasNext = pageView.pageFactory.hasNext()
         if (!hasNext) {
             if (!snackBar.isShown) {
-                snackBar.setText("没有下一页")
+                snackBar.setText(R.string.no_next_page)
                 snackBar.show()
             }
         }

app/src/main/java/io/legado/app/ui/book/read/page/delegate/ScrollPageDelegate.kt

@@ -79,12 +79,12 @@ class ScrollPageDelegate(pageView: PageView) : PageDelegate(pageView) {
     }
 
     override fun nextPageByAnim() {
-        super.nextPageByAnim()
+        abort()
         startScroll(0, 0, 0, -ChapterProvider.visibleHeight)
     }
 
     override fun prevPageByAnim() {
-        super.prevPageByAnim()
+        abort()
         startScroll(0, 0, 0, ChapterProvider.visibleHeight)
     }
 }

app/src/main/java/io/legado/app/ui/book/read/page/entities/TextPage.kt

@@ -4,6 +4,7 @@ import android.text.Layout
 import android.text.StaticLayout
 import io.legado.app.App
 import io.legado.app.R
+import io.legado.app.help.ReadBookConfig
 import io.legado.app.ui.book.read.page.ChapterProvider
 import java.text.DecimalFormat
 
@@ -19,6 +20,7 @@ data class TextPage(
 ) {
 
     fun upLinesPosition() = ChapterProvider.apply {
+        if (!ReadBookConfig.textBottomJustify) return@apply
         if (textLines.size <= 1) return@apply
         if (visibleHeight - height >= with(textLines.last()) { lineBottom - lineTop }) return@apply
         val surplus = (visibleBottom - textLines.last().lineBottom)

app/src/main/java/io/legado/app/ui/book/search/DiffCallBack.kt

@@ -18,64 +18,40 @@ class DiffCallBack(private val oldItems: List<SearchBook>, private val newItems:
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
         val oldItem = oldItems[oldItemPosition]
         val newItem = newItems[newItemPosition]
-        if (oldItem.name != newItem.name) {
+        return when {
-            return false
+            oldItem.name != newItem.name -> false
+            oldItem.author != newItem.author -> false
+            else -> true
         }
-        if (oldItem.author != newItem.author) {
-            return false
-        }
-        return true
     }
 
     override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
         val oldItem = oldItems[oldItemPosition]
         val newItem = newItems[newItemPosition]
-        if (oldItem.origins.size != newItem.origins.size) {
+        return when {
-            return false
+            oldItem.origins.size != newItem.origins.size -> false
-        }
+            oldItem.coverUrl != newItem.coverUrl -> false
-        if (oldItem.coverUrl != newItem.coverUrl) {
+            oldItem.kind != newItem.kind -> false
-            return false
+            oldItem.latestChapterTitle != newItem.latestChapterTitle -> false
-        }
+            oldItem.intro != newItem.intro -> false
-        if (oldItem.kind != newItem.kind) {
+            else -> true
-            return false
-        }
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle) {
-            return false
         }
-        if (oldItem.intro != newItem.intro) {
-            return false
-        }
-        return true
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
         val payload = Bundle()
         val newItem = newItems[newItemPosition]
         val oldItem = oldItems[oldItemPosition]
-        if (oldItem.name != newItem.name) {
+        if (oldItem.name != newItem.name) payload.putString("name", newItem.name)
-            payload.putString("name", newItem.name)
+        if (oldItem.author != newItem.author) payload.putString("author", newItem.author)
-        }
+        if (oldItem.origins.size != newItem.origins.size)
-        if (oldItem.author != newItem.author) {
-            payload.putString("author", newItem.author)
-        }
-        if (oldItem.origins.size != newItem.origins.size) {
             payload.putInt("origins", newItem.origins.size)
-        }
+        if (oldItem.coverUrl != newItem.coverUrl) payload.putString("cover", newItem.coverUrl)
-        if (oldItem.coverUrl != newItem.coverUrl) {
+        if (oldItem.kind != newItem.kind) payload.putString("kind", newItem.kind)
-            payload.putString("cover", newItem.coverUrl)
+        if (oldItem.latestChapterTitle != newItem.latestChapterTitle)
-        }
-        if (oldItem.kind != newItem.kind) {
-            payload.putString("kind", newItem.kind)
-        }
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle) {
             payload.putString("last", newItem.latestChapterTitle)
-        }
+        if (oldItem.intro != newItem.intro) payload.putString("intro", newItem.intro)
-        if (oldItem.intro != newItem.intro) {
+        if (payload.isEmpty) return null
-            payload.putString("intro", newItem.intro)
-        }
-        if (payload.isEmpty) {
-            return null
-        }
         return payload
     }
 }

app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -8,7 +8,6 @@ import android.view.View.VISIBLE
 import androidx.appcompat.widget.SearchView
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.flexbox.FlexboxLayoutManager
@@ -52,7 +51,6 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
     private var menu: Menu? = null
     private var precisionSearchMenuItem: MenuItem? = null
     private var groups = linkedSetOf<String>()
-    private var refreshTime = System.currentTimeMillis()
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         initRecyclerView()
@@ -181,14 +179,13 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
             upGroupMenu()
         })
         viewModel.searchBookLiveData.observe(this, Observer {
-            upSearchItems(it, false)
+            upSearchItems(it)
         })
         viewModel.isSearchLiveData.observe(this, Observer {
             if (it) {
                 startSearch()
             } else {
                 searchFinally()
-                upSearchItems(viewModel.searchBooks, true)
             }
         })
     }
@@ -284,14 +281,8 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
      * 更新搜索结果
      */
     @Synchronized
-    private fun upSearchItems(items: List<SearchBook>, isMandatoryUpdate: Boolean) {
+    private fun upSearchItems(items: List<SearchBook>) {
-        val searchItems = ArrayList(items)
+        adapter.setItems(items)
-        if (isMandatoryUpdate || System.currentTimeMillis() - refreshTime > 500) {
-            refreshTime = System.currentTimeMillis()
-            val diffResult =
-                DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), searchItems))
-            adapter.setItems(searchItems, diffResult)
-        }
     }
 
     /**
@@ -317,7 +308,10 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
     override fun showBookInfo(name: String, author: String) {
         viewModel.getSearchBook(name, author) { searchBook ->
             searchBook?.let {
-                startActivity<BookInfoActivity>(Pair("bookUrl", it.bookUrl))
+                startActivity<BookInfoActivity>(
+                    Pair("name", it.name),
+                    Pair("author", it.author)
+                )
             }
         }
     }
@@ -327,7 +321,8 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_book_se
      */
     override fun showBookInfo(book: Book) {
         startActivity<BookInfoActivity>(
-            Pair("bookUrl", book.bookUrl)
+            Pair("name", book.name),
+            Pair("author", book.author)
         )
     }
 

app/src/main/java/io/legado/app/ui/book/search/SearchViewModel.kt

@@ -1,6 +1,7 @@
 package io.legado.app.ui.book.search
 
 import android.app.Application
+import android.os.Handler
 import androidx.lifecycle.MutableLiveData
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
@@ -12,15 +13,18 @@ import io.legado.app.utils.getPrefBoolean
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.isActive
 
-class SearchViewModel(application: Application) : BaseViewModel(application)
+class SearchViewModel(application: Application) : BaseViewModel(application),
-    , SearchBookModel.CallBack {
+    SearchBookModel.CallBack {
+    val handler = Handler()
     private val searchBookModel = SearchBookModel(this, this)
     var isSearchLiveData = MutableLiveData<Boolean>()
     var searchBookLiveData = MutableLiveData<List<SearchBook>>()
     var searchKey: String = ""
     var isLoading = false
-    var searchBooks = arrayListOf<SearchBook>()
+    private var searchBooks = arrayListOf<SearchBook>()
     private var searchID = 0L
+    private var postTime = 0L
+    private val sendRunnable = Runnable { upAdapter() }
 
     /**
      * 开始搜索
@@ -36,6 +40,18 @@ class SearchViewModel(application: Application) : BaseViewModel(application)
         searchBookModel.search(searchID, searchKey)
     }
 
+    @Synchronized
+    private fun upAdapter() {
+        if (System.currentTimeMillis() >= postTime + 500) {
+            handler.removeCallbacks(sendRunnable)
+            postTime = System.currentTimeMillis()
+            searchBookLiveData.postValue(searchBooks)
+        } else {
+            handler.removeCallbacks(sendRunnable)
+            handler.postDelayed(sendRunnable, 500 - System.currentTimeMillis() + postTime)
+        }
+    }
+
     override fun onSearchStart() {
         isSearchLiveData.postValue(true)
     }
@@ -151,7 +167,7 @@ class SearchViewModel(application: Application) : BaseViewModel(application)
             })
             if (!scope.isActive) return
             searchBooks = copyDataS
-            searchBookLiveData.postValue(copyDataS)
+            upAdapter()
         }
     }
 

app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt

@@ -367,16 +367,7 @@ class BookSourceEditActivity :
 
     override fun sendText(text: String) {
         if (text == AppConst.keyboardToolChars[0]) {
-            insertText(
+            insertText(AppConst.urlOption)
-                """
-                ,{
-                "charset": "",
-                "method": "POST",
-                "body": "",
-                "headers": {"User-Agent": ""}
-                }
-                """.trimIndent()
-            )
         } else {
             insertText(text)
         }

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -57,6 +57,7 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
     private var bookSourceLiveDate: LiveData<List<BookSource>>? = null
     private var groups = linkedSetOf<String>()
     private var groupMenu: SubMenu? = null
+    private var sort = 0
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         initUriScheme()
@@ -74,6 +75,8 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
         groupMenu = menu?.findItem(R.id.menu_group)?.subMenu
+        groupMenu?.findItem(R.id.action_sort)?.subMenu
+            ?.setGroupCheckable(R.id.menu_group_sort, true, true)
         upGroupMenu()
         return super.onPrepareOptionsMenu(menu)
     }
@@ -92,6 +95,32 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
                     allowExtensions = arrayOf("txt", "json")
                 )
             R.id.menu_import_source_onLine -> showImportDialog()
+            R.id.menu_sort_manual -> {
+                item.isChecked = true
+                sort = 0
+                initLiveDataBookSource(search_view.query?.toString())
+            }
+            R.id.menu_sort_auto -> {
+                item.isChecked = true
+                sort = 2
+                initLiveDataBookSource(search_view.query?.toString())
+            }
+            R.id.menu_sort_pin_yin -> {
+                item.isChecked = true
+                sort = 3
+                initLiveDataBookSource(search_view.query?.toString())
+            }
+            R.id.menu_sort_url -> {
+                item.isChecked = true
+                sort = 4
+                initLiveDataBookSource(search_view.query?.toString())
+            }
+            R.id.menu_enabled_group -> {
+                search_view.setQuery(getString(R.string.enabled), true)
+            }
+            R.id.menu_disabled_group -> {
+                search_view.setQuery(getString(R.string.disabled), true)
+            }
         }
         if (item.groupId == R.id.source_group) {
             search_view.setQuery(item.title, true)
@@ -104,14 +133,14 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
             when (it.path) {
                 "/importonline" -> it.getQueryParameter("src")?.let { url ->
                     Snackbar.make(title_bar, R.string.importing, Snackbar.LENGTH_INDEFINITE).show()
-                    if (url.startsWith("http", false)){
+                    if (url.startsWith("http", false)) {
                         viewModel.importSource(url) { msg ->
                             title_bar.snackbar(msg)
                         }
-                    }
+                    } else {
-                    else{
+                        viewModel.importSourceFromFilePath(url) { msg ->
-                        viewModel.importSourceFromFilePath(url){msg ->
+                            title_bar.snackbar(msg)
-                            title_bar.snackbar(msg)}
+                        }
                     }
                 }
                 else -> {
@@ -143,15 +172,30 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
 
     private fun initLiveDataBookSource(searchKey: String? = null) {
         bookSourceLiveDate?.removeObservers(this)
-        bookSourceLiveDate = if (searchKey.isNullOrEmpty()) {
+        bookSourceLiveDate = when {
-            App.db.bookSourceDao().liveDataAll()
+            searchKey.isNullOrEmpty() -> {
-        } else {
+                App.db.bookSourceDao().liveDataAll()
-            App.db.bookSourceDao().liveDataSearch("%$searchKey%")
+            }
+            searchKey == getString(R.string.enabled) -> {
+                App.db.bookSourceDao().liveDataEnabled()
+            }
+            searchKey == getString(R.string.disabled) -> {
+                App.db.bookSourceDao().liveDataDisabled()
+            }
+            else -> {
+                App.db.bookSourceDao().liveDataSearch("%$searchKey%")
+            }
         }
-        bookSourceLiveDate?.observe(this, Observer {
+        bookSourceLiveDate?.observe(this, Observer { data ->
+            val sourceList = when (sort) {
+                1 -> data.sortedBy { it.weight }
+                2 -> data.sortedBy { it.bookSourceName }
+                3 -> data.sortedBy { it.bookSourceUrl }
+                else -> data
+            }
             val diffResult = DiffUtil
-                .calculateDiff(DiffCallBack(ArrayList(adapter.getItems()), it))
+                .calculateDiff(DiffCallBack(ArrayList(adapter.getItems()), sourceList))
-            adapter.setItems(it, diffResult)
+            adapter.setItems(sourceList, diffResult)
             upCountView()
         })
     }
@@ -202,11 +246,35 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
             R.id.menu_enable_explore -> viewModel.enableSelectExplore(adapter.getSelection())
             R.id.menu_disable_explore -> viewModel.disableSelectExplore(adapter.getSelection())
             R.id.menu_export_selection -> FilePicker.selectFolder(this, exportRequestCode)
-            R.id.menu_check_source -> CheckSource.start(this, adapter.getSelection())
+            R.id.menu_check_source -> checkSource()
+            R.id.menu_top_sel -> viewModel.topSource(*adapter.getSelection().toTypedArray())
+            R.id.menu_bottom_sel -> viewModel.bottomSource(*adapter.getSelection().toTypedArray())
         }
         return true
     }
 
+    @SuppressLint("InflateParams")
+    private fun checkSource() {
+        alert(titleResource = R.string.search_book_key) {
+            var editText: AutoCompleteTextView? = null
+            customView {
+                layoutInflater.inflate(R.layout.dialog_edit_text, null).apply {
+                    editText = edit_view
+                    edit_view.setText(CheckSource.keyword)
+                }
+            }
+            okButton {
+                editText?.text?.toString()?.let {
+                    if (it.isNotEmpty()) {
+                        CheckSource.keyword = it
+                    }
+                }
+                CheckSource.start(this@BookSourceActivity, adapter.getSelection())
+            }
+            noButton { }
+        }.show().applyTint()
+    }
+
     private fun upGroupMenu() {
         groupMenu?.removeGroup(R.id.source_group)
         groups.sortedWith(Collator.getInstance(java.util.Locale.CHINESE))
@@ -286,6 +354,10 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
         viewModel.topSource(bookSource)
     }
 
+    override fun toBottom(bookSource: BookSource) {
+        viewModel.bottomSource(bookSource)
+    }
+
     override fun onFilePicked(requestCode: Int, currentPath: String) {
         when (requestCode) {
             exportRequestCode -> viewModel.exportSelection(

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceAdapter.kt

@@ -46,14 +46,14 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
         callBack.upCountView()
     }
 
-    fun getSelection(): LinkedHashSet<BookSource> {
+    fun getSelection(): List<BookSource> {
-        val selection = linkedSetOf<BookSource>()
+        val selection = arrayListOf<BookSource>()
         getItems().map {
             if (selected.contains(it)) {
                 selection.add(it)
             }
         }
-        return selection
+        return selection.sortedBy { it.customOrder }
     }
 
     override fun convert(holder: ItemViewHolder, item: BookSource, payloads: MutableList<Any>) {
@@ -138,6 +138,7 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
         popupMenu.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
                 R.id.menu_top -> callBack.toTop(source)
+                R.id.menu_bottom -> callBack.toBottom(source)
                 R.id.menu_del -> callBack.del(source)
                 R.id.menu_enable_explore -> {
                     callBack.update(source.copy(enabledExplore = !source.enabledExplore))
@@ -197,6 +198,7 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) :
         fun edit(bookSource: BookSource)
         fun update(vararg bookSource: BookSource)
         fun toTop(bookSource: BookSource)
+        fun toBottom(bookSource: BookSource)
         fun upOrder()
         fun upCountView()
     }

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt

@@ -19,10 +19,23 @@ import java.io.File
 
 class BookSourceViewModel(application: Application) : BaseViewModel(application) {
 
-    fun topSource(bookSource: BookSource) {
+    fun topSource(vararg sources: BookSource) {
         execute {
-            bookSource.customOrder = App.db.bookSourceDao().minOrder - 1
+            val minOrder = App.db.bookSourceDao().minOrder - 1
-            App.db.bookSourceDao().insert(bookSource)
+            sources.forEachIndexed { index, bookSource ->
+                bookSource.customOrder = minOrder - index
+            }
+            App.db.bookSourceDao().update(*sources)
+        }
+    }
+
+    fun bottomSource(vararg sources: BookSource) {
+        execute {
+            val maxOrder = App.db.bookSourceDao().maxOrder + 1
+            sources.forEachIndexed { index, bookSource ->
+                bookSource.customOrder = maxOrder + index
+            }
+            App.db.bookSourceDao().update(*sources)
         }
     }
 
@@ -44,7 +57,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun enableSelection(sources: LinkedHashSet<BookSource>) {
+    fun enableSelection(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -54,7 +67,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun disableSelection(sources: LinkedHashSet<BookSource>) {
+    fun disableSelection(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -64,7 +77,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun enableSelectExplore(sources: LinkedHashSet<BookSource>) {
+    fun enableSelectExplore(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -74,7 +87,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun disableSelectExplore(sources: LinkedHashSet<BookSource>) {
+    fun disableSelectExplore(sources: List<BookSource>) {
         execute {
             val list = arrayListOf<BookSource>()
             sources.forEach {
@@ -84,13 +97,13 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun delSelection(sources: LinkedHashSet<BookSource>) {
+    fun delSelection(sources: List<BookSource>) {
         execute {
             App.db.bookSourceDao().delete(*sources.toTypedArray())
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<BookSource>, file: File) {
+    fun exportSelection(sources: List<BookSource>, file: File) {
         execute {
             val json = GSON.toJson(sources)
             FileUtils.createFileIfNotExist(file, "exportBookSource.json")
@@ -102,7 +115,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
         }
     }
 
-    fun exportSelection(sources: LinkedHashSet<BookSource>, doc: DocumentFile) {
+    fun exportSelection(sources: List<BookSource>, doc: DocumentFile) {
         execute {
             val json = GSON.toJson(sources)
             doc.findFile("exportBookSource.json")?.delete()
@@ -145,10 +158,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
             execute {
                 val sources = App.db.bookSourceDao().getByGroup(group)
                 sources.map { source ->
-                    source.bookSourceGroup?.splitNotBlank(",")?.toHashSet()?.let {
+                    source.removeGroup(group)
-                        it.remove(group)
-                        source.bookSourceGroup = TextUtils.join(",", it)
-                    }
                 }
                 App.db.bookSourceDao().update(*sources.toTypedArray())
             }
@@ -220,6 +230,7 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
                 else -> "格式不对"
             }
         }.onError {
+            it.printStackTrace()
             finally(it.localizedMessage ?: "")
         }.onSuccess {
             finally(it)
@@ -227,7 +238,11 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
     }
 
     private fun importSourceUrl(url: String): Int {
-        HttpHelper.simpleGet(url, "UTF-8")?.let { body ->
+        HttpHelper.simpleGet(url, "UTF-8").let { body ->
+            if (body == null) {
+                toast("访问网站失败")
+                return 0
+            }
             val bookSources = mutableListOf<BookSource>()
             val items: List<Map<String, Any>> = jsonPath.parse(body).read("$")
             for (item in items) {
@@ -239,6 +254,5 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application)
             App.db.bookSourceDao().insert(*bookSources.toTypedArray())
             return bookSources.size
         }
-        return 0
     }
 }

app/src/main/java/io/legado/app/ui/config/BackupRestoreUi.kt

@@ -190,10 +190,11 @@ object BackupRestoreUi {
                     AppConfig.backupPath = uri.toString()
                 }
             }
-            oldDataRequestCode ->
+            oldDataRequestCode -> if (resultCode == RESULT_OK) {
-                if (resultCode == RESULT_OK) data?.data?.let { uri ->
+                data?.data?.let { uri ->
                     ImportOldData.importUri(uri)
                 }
+            }
         }
     }
 

app/src/main/java/io/legado/app/ui/config/FileAssociationViewModel.kt

@@ -13,66 +13,73 @@ import io.legado.app.utils.readText
 import java.io.File
 
 class FileAssociationViewModel(application: Application) : BaseViewModel(application) {
+
     fun dispatchIndent(uri: Uri): Intent? {
-        val url: String
+        try {
-        //如果是普通的url，需要根据返回的内容判断是什么
+            val url: String
-        if (uri.scheme == "file" || uri.scheme == "content") {
+            //如果是普通的url，需要根据返回的内容判断是什么
-            val content = if (uri.scheme == "file") {
+            if (uri.scheme == "file" || uri.scheme == "content") {
-                val file = File(uri.path.toString())
+                val content = if (uri.scheme == "file") {
-                if (file.exists()) {
+                    val file = File(uri.path.toString())
-                    file.readText()
+                    if (file.exists()) {
+                        file.readText()
+                    } else {
+                        null
+                    }
                 } else {
-                    null
+                    DocumentFile.fromSingleUri(context, uri)?.readText(context)
                 }
-            } else {
+                var scheme = ""
-                DocumentFile.fromSingleUri(context, uri)?.readText(context)
+                if (content != null) {
-            }
+                    if (content.isJsonObject() || content.isJsonArray()) {
-            var scheme = ""
+                        //暂时根据文件内容判断属于什么
-            if (content != null) {
+                        when {
-                if (content.isJsonObject() || content.isJsonArray()) {
+                            content.contains("bookSourceUrl") -> {
-                    //暂时根据文件内容判断属于什么
+                                scheme = "booksource"
-                    when {
+                            }
-                        content.contains("bookSourceUrl") -> {
+                            content.contains("sourceUrl") -> {
-                            scheme = "booksource"
+                                scheme = "rsssource"
-                        }
+                            }
-                        content.contains("sourceUrl") -> {
+                            content.contains("pattern") -> {
-                            scheme = "rsssource"
+                                scheme = "replace"
-                        }
+                            }
-                        content.contains("pattern") -> {
-                            scheme = "replace"
                         }
                     }
-                }
+                    if (TextUtils.isEmpty(scheme)) {
-                if (TextUtils.isEmpty(scheme)) {
+                        execute {
-                    execute {
+                            if (uri.scheme == "content") {
-                        if (uri.scheme == "content"){
+                                LocalBook.importFile(uri.toString())
-                            LocalBook.importFile(uri.toString())
+                            } else {
-                        }else{
+                                LocalBook.importFile(uri.path.toString())
-                            LocalBook.importFile(uri.path.toString())
+                            }
+                            toast("添加本地文件成功${uri.path}")
                         }
-                        toast("添加本地文件成功${uri.path}")
+                        return null
                     }
+                } else {
+                    toast("文件不存在")
                     return null
                 }
+                // content模式下，需要传递完整的路径，方便后续解析
+                url = if (uri.scheme == "content") {
+                    "yuedu://${scheme}/importonline?src=$uri"
+                } else {
+                    "yuedu://${scheme}/importonline?src=${uri.path}"
+                }
+
+            } else if (uri.scheme == "yuedu") {
+                url = uri.toString()
             } else {
-                toast("文件不存在")
+                url = "yuedu://booksource/importonline?src=${uri.path}"
-                return null
-            }
-            // content模式下，需要传递完整的路径，方便后续解析
-            url = if (uri.scheme == "content"){
-                "yuedu://${scheme}/importonline?src=$uri"
-            }else{
-                "yuedu://${scheme}/importonline?src=${uri.path}"
             }
-
+            val data = Uri.parse(url)
-        } else if (uri.scheme == "yuedu") {
+            val newIndent = Intent(Intent.ACTION_VIEW)
-            url = uri.toString()
+            newIndent.data = data
-        } else {
+            return newIndent
-            url = "yuedu://booksource/importonline?src=${uri.path}"
+        } catch (e: Exception) {
+            e.printStackTrace()
+            toast(e.localizedMessage)
+            return null
         }
-        val data = Uri.parse(url)
-        val newIndent = Intent(Intent.ACTION_VIEW)
-        newIndent.data = data
-        return newIndent
     }
 }

app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt

@@ -1,8 +1,12 @@
 package io.legado.app.ui.config
 
+import android.annotation.SuppressLint
 import android.content.SharedPreferences
 import android.os.Build
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -22,7 +26,8 @@ import io.legado.app.ui.widget.prefs.IconListPreference
 import io.legado.app.utils.*
 
 
-class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
+class ThemeConfigFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
 
     val items = arrayListOf("极简", "曜夜", "经典", "黑白", "A屏黑")
 
@@ -33,12 +38,13 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
                 preferenceScreen.removePreference(it)
             }
         }
-        upPreferenceSummary("barElevation", AppConfig.elevation.toString())
+        upPreferenceSummary(PreferKey.barElevation, AppConfig.elevation.toString())
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         ATH.applyEdgeEffectColor(listView)
+        setHasOptionsMenu(true)
     }
 
     override fun onResume() {
@@ -51,22 +57,37 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
         super.onPause()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.theme_config, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.menu_theme_mode -> {
+                AppConfig.isNightTheme = !AppConfig.isNightTheme
+                App.INSTANCE.applyDayNight()
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         sharedPreferences ?: return
         when (key) {
             PreferKey.launcherIcon -> LauncherIconHelp.changeIcon(getPrefString(key))
-            "transparentStatusBar" -> recreateActivities()
+            PreferKey.transparentStatusBar -> recreateActivities()
-            "colorPrimary",
+            PreferKey.cPrimary,
-            "colorAccent",
+            PreferKey.cAccent,
-            "colorBackground",
+            PreferKey.cBackground,
-            "colorBottomBackground" -> {
+            PreferKey.cBBackground -> {
                 if (backgroundIsDark(sharedPreferences)) {
                     alert {
                         title = "白天背景太暗"
                         message = "将会恢复默认背景？"
                         yesButton {
                             putPrefInt(
-                                "colorBackground",
+                                PreferKey.cBackground,
                                 getCompatColor(R.color.md_grey_100)
                             )
                             upTheme(false)
@@ -80,17 +101,17 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
                     upTheme(false)
                 }
             }
-            "colorPrimaryNight",
+            PreferKey.cNPrimary,
-            "colorAccentNight",
+            PreferKey.cNAccent,
-            "colorBackgroundNight",
+            PreferKey.cNBackground,
-            "colorBottomBackgroundNight" -> {
+            PreferKey.cNBBackground -> {
                 if (backgroundIsLight(sharedPreferences)) {
                     alert {
                         title = "夜间背景太亮"
                         message = "将会恢复默认背景？"
                         yesButton {
                             putPrefInt(
-                                "colorBackgroundNight",
+                                PreferKey.cNBackground,
                                 getCompatColor(R.color.md_grey_800)
                             )
                             upTheme(true)
@@ -108,59 +129,18 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
 
     }
 
+    @SuppressLint("PrivateResource")
     override fun onPreferenceTreeClick(preference: Preference?): Boolean {
         when (preference?.key) {
-            "defaultTheme" -> alert(title = "切换默认主题") {
+            "defaultTheme" -> changeTheme()
-                items(items) { _, which ->
+            PreferKey.barElevation -> NumberPickerDialog(requireContext())
-                    when (which) {
-                        0 -> {
-                            putPrefInt("colorPrimary", getCompatColor(R.color.md_grey_100))
-                            putPrefInt("colorAccent", getCompatColor(R.color.lightBlue_color))
-                            putPrefInt("colorBackground", getCompatColor(R.color.md_grey_100))
-                            AppConfig.isNightTheme = false
-                        }
-                        1 -> {
-                            putPrefInt("colorPrimaryNight", getCompatColor(R.color.shine_color))
-                            putPrefInt("colorAccentNight", getCompatColor(R.color.lightBlue_color))
-                            putPrefInt("colorBackgroundNight", getCompatColor(R.color.shine_color))
-                            AppConfig.isNightTheme = true
-                        }
-                        2 -> {
-                            putPrefInt("colorPrimary", getCompatColor(R.color.md_light_blue_500))
-                            putPrefInt("colorAccent", getCompatColor(R.color.md_pink_800))
-                            putPrefInt("colorBackground", getCompatColor(R.color.md_grey_100))
-                            AppConfig.isNightTheme = false
-                        }
-                        3 -> {
-                            putPrefInt("colorPrimary", getCompatColor(R.color.white))
-                            putPrefInt("colorAccent", getCompatColor(R.color.black))
-                            putPrefInt("colorBackground", getCompatColor(R.color.white))
-                            AppConfig.isNightTheme = false
-                        }
-                        4 -> {
-                            putPrefInt("colorPrimaryNight", getCompatColor(R.color.black))
-                            putPrefInt(
-                                "colorAccentNight",
-                                getCompatColor(R.color.md_grey_600)
-                            )
-                            putPrefInt(
-                                "colorBackgroundNight",
-                                getCompatColor(R.color.black)
-                            )
-                            AppConfig.isNightTheme = true
-                        }
-                    }
-                    App.INSTANCE.applyDayNight()
-                    recreateActivities()
-                }
-            }.show().applyTint()
-            "barElevation" -> NumberPickerDialog(requireContext())
                 .setTitle(getString(R.string.bar_elevation))
                 .setMaxValue(32)
                 .setMinValue(0)
                 .setValue(AppConfig.elevation)
                 .setCustomButton((R.string.btn_default_s)) {
-                    AppConfig.elevation = App.INSTANCE.resources.getDimension(R.dimen.design_appbar_elevation).toInt()
+                    AppConfig.elevation =
+                        App.INSTANCE.resources.getDimension(R.dimen.design_appbar_elevation).toInt()
                     recreateActivities()
                 }
                 .show {
@@ -171,10 +151,56 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
         return super.onPreferenceTreeClick(preference)
     }
 
+    private fun changeTheme() {
+        alert(title = "切换默认主题") {
+            items(items) { _, which ->
+                when (which) {
+                    0 -> {
+                        putPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_grey_100))
+                        putPrefInt(PreferKey.cAccent, getCompatColor(R.color.lightBlue_color))
+                        putPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
+                        putPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
+                        AppConfig.isNightTheme = false
+                    }
+                    1 -> {
+                        putPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_grey_900))
+                        putPrefInt(PreferKey.cNAccent, getCompatColor(R.color.lightBlue_color))
+                        putPrefInt(PreferKey.cNBackground, getCompatColor(R.color.md_grey_900))
+                        putPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_900))
+                        AppConfig.isNightTheme = true
+                    }
+                    2 -> {
+                        putPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_light_blue_500))
+                        putPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_pink_800))
+                        putPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
+                        putPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
+                        AppConfig.isNightTheme = false
+                    }
+                    3 -> {
+                        putPrefInt(PreferKey.cPrimary, getCompatColor(R.color.white))
+                        putPrefInt(PreferKey.cAccent, getCompatColor(R.color.black))
+                        putPrefInt(PreferKey.cBackground, getCompatColor(R.color.white))
+                        putPrefInt(PreferKey.cBBackground, getCompatColor(R.color.white))
+                        AppConfig.isNightTheme = false
+                    }
+                    4 -> {
+                        putPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.black))
+                        putPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_grey_500))
+                        putPrefInt(PreferKey.cNBackground, getCompatColor(R.color.black))
+                        putPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.black))
+                        AppConfig.isNightTheme = true
+                    }
+                }
+                App.INSTANCE.applyDayNight()
+                recreateActivities()
+            }
+        }.show().applyTint()
+    }
+
     private fun backgroundIsDark(sharedPreferences: SharedPreferences): Boolean {
         return !ColorUtils.isColorLight(
             sharedPreferences.getInt(
-                "colorBackground",
+                PreferKey.cBackground,
                 getCompatColor(R.color.md_grey_100)
             )
         )
@@ -183,7 +209,7 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
     private fun backgroundIsLight(sharedPreferences: SharedPreferences): Boolean {
         return ColorUtils.isColorLight(
             sharedPreferences.getInt(
-                "colorBackgroundNight",
+                PreferKey.cNBackground,
                 getCompatColor(R.color.md_grey_800)
             )
         )
@@ -205,7 +231,8 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
     private fun upPreferenceSummary(preferenceKey: String, value: String?) {
         val preference = findPreference<Preference>(preferenceKey) ?: return
         when (preferenceKey) {
-            "barElevation" -> preference.summary = getString(R.string.bar_elevation_s, value)
+            PreferKey.barElevation -> preference.summary =
+                getString(R.string.bar_elevation_s, value)
         }
     }
 }

app/src/main/java/io/legado/app/ui/main/MainActivity.kt

@@ -18,7 +18,6 @@ import io.legado.app.help.AppConfig
 import io.legado.app.help.storage.Backup
 import io.legado.app.lib.theme.ATH
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.main.bookshelf.BookshelfFragment
 import io.legado.app.ui.main.explore.ExploreFragment
 import io.legado.app.ui.main.my.MyFragment
@@ -26,13 +25,16 @@ import io.legado.app.ui.main.rss.RssFragment
 import io.legado.app.ui.widget.dialog.TextDialog
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_main.*
+import org.jetbrains.anko.toast
 
 class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
     BottomNavigationView.OnNavigationItemSelectedListener,
+    BottomNavigationView.OnNavigationItemReselectedListener,
     ViewPager.OnPageChangeListener by ViewPager.SimpleOnPageChangeListener() {
     override val viewModel: MainViewModel
         get() = getViewModel(MainViewModel::class.java)
-
+    private var exitTime: Long = 0
+    private var bookshelfReselected: Long = 0
     private var pagePosition = 0
     private val fragmentId = arrayOf(0, 1, 2, 3)
     private val fragmentMap = mapOf<Int, Fragment>(
@@ -49,6 +51,7 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
         view_pager_main.adapter = TabFragmentPageAdapter(supportFragmentManager)
         view_pager_main.addOnPageChangeListener(this)
         bottom_navigation_view.setOnNavigationItemSelectedListener(this)
+        bottom_navigation_view.setOnNavigationItemReselectedListener(this)
         bottom_navigation_view.menu.findItem(R.id.menu_rss).isVisible = AppConfig.isShowRSS
     }
 
@@ -73,6 +76,18 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
         return false
     }
 
+    override fun onNavigationItemReselected(item: MenuItem) {
+        when (item.itemId) {
+            R.id.menu_bookshelf -> {
+                if (System.currentTimeMillis() - bookshelfReselected > 300) {
+                    bookshelfReselected = System.currentTimeMillis()
+                } else {
+                    (fragmentMap[0] as? BookshelfFragment)?.gotoTop()
+                }
+            }
+        }
+    }
+
     private fun upVersion() {
         if (getPrefInt(PreferKey.versionCode) != App.INSTANCE.versionCode) {
             putPrefInt(PreferKey.versionCode, App.INSTANCE.versionCode)
@@ -104,10 +119,17 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
                         view_pager_main.currentItem = 0
                         return true
                     }
-                    if (!BaseReadAloudService.pause) {
+                    if (System.currentTimeMillis() - exitTime > 2000) {
-                        moveTaskToBack(true)
+                        toast(R.string.double_click_exit)
-                        return true
+                        exitTime = System.currentTimeMillis()
+                    } else {
+                        if (BaseReadAloudService.pause) {
+                            finish()
+                        } else {
+                            moveTaskToBack(true)
+                        }
                     }
+                    return true
                 }
             }
         }
@@ -121,11 +143,6 @@ class MainActivity : VMBaseActivity<MainViewModel>(R.layout.activity_main),
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        ReadAloud.stop(this)
-    }
-
     override fun observeLiveBus() {
         observeEvent<String>(EventBus.RECREATE) {
             recreate()

app/src/main/java/io/legado/app/ui/main/MainViewModel.kt

@@ -3,7 +3,9 @@ package io.legado.app.ui.main
 import android.app.Application
 import io.legado.app.App
 import io.legado.app.base.BaseViewModel
+import io.legado.app.constant.BookType
 import io.legado.app.constant.EventBus
+import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.RssSource
 import io.legado.app.help.http.HttpHelper
 import io.legado.app.help.storage.Restore
@@ -19,7 +21,15 @@ class MainViewModel(application: Application) : BaseViewModel(application) {
 
     fun upChapterList() {
         execute {
-            App.db.bookDao().hasUpdateBooks.forEach { book ->
+            upChapterList(App.db.bookDao().hasUpdateBooks)
+        }
+    }
+
+    fun upChapterList(books: List<Book>) {
+        execute {
+            books.filter {
+                it.origin != BookType.local && it.canUpdate
+            }.forEach { book ->
                 if (!updateList.contains(book.bookUrl)) {
                     App.db.bookSourceDao().getBookSource(book.origin)?.let { bookSource ->
                         synchronized(this) {

app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt

@@ -31,6 +31,7 @@ import io.legado.app.ui.book.download.DownloadActivity
 import io.legado.app.ui.book.group.GroupManageDialog
 import io.legado.app.ui.book.local.ImportBookActivity
 import io.legado.app.ui.book.search.SearchActivity
+import io.legado.app.ui.main.MainViewModel
 import io.legado.app.ui.main.bookshelf.books.BooksFragment
 import io.legado.app.ui.widget.text.AutoCompleteTextView
 import io.legado.app.utils.*
@@ -52,11 +53,12 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
 
     override val viewModel: BookshelfViewModel
         get() = getViewModel(BookshelfViewModel::class.java)
-
+    private val activityViewModel: MainViewModel
+        get() = getViewModelOfActivity(MainViewModel::class.java)
     private var bookGroupLiveData: LiveData<List<BookGroup>>? = null
     private var noGroupLiveData: LiveData<Int>? = null
     private val bookGroups = mutableListOf<BookGroup>()
-    private val fragmentMap = hashMapOf<Int, Fragment>()
+    private val fragmentMap = hashMapOf<Int, BooksFragment>()
     private var showGroupNone = false
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
@@ -73,6 +75,13 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         super.onCompatOptionsItemSelected(item)
         when (item.itemId) {
             R.id.menu_search -> startActivity<SearchActivity>()
+            R.id.menu_update_toc -> {
+                val group = bookGroups[tab_layout.selectedTabPosition]
+                val fragment = fragmentMap[group.groupId]
+                fragment?.getBooks()?.let {
+                    activityViewModel.upChapterList(it)
+                }
+            }
             R.id.menu_bookshelf_layout -> configBookshelf()
             R.id.menu_group_manage -> GroupManageDialog()
                 .show(childFragmentManager, "groupManageDialog")
@@ -82,7 +91,10 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
                 Pair("groupId", selectedGroup.groupId),
                 Pair("groupName", selectedGroup.groupName)
             )
-            R.id.menu_download -> startActivity<DownloadActivity>()
+            R.id.menu_download -> startActivity<DownloadActivity>(
+                Pair("groupId", selectedGroup.groupId),
+                Pair("groupName", selectedGroup.groupName)
+            )
         }
     }
 
@@ -254,6 +266,10 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
         }
     }
 
+    fun gotoTop() {
+        fragmentMap[selectedGroup.groupId]?.gotoTop()
+    }
+
     private inner class TabFragmentPageAdapter internal constructor(fm: FragmentManager) :
         FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 

app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterGrid.kt

@@ -2,6 +2,7 @@ package io.legado.app.ui.main.bookshelf.books
 
 import android.content.Context
 import android.os.Bundle
+import android.view.View
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.constant.BookType
@@ -22,33 +23,30 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) :
                 ATH.applyBackgroundTint(this)
                 tv_name.text = item.name
                 iv_cover.load(item.getDisplayCover(), item.name, item.author)
-                if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+                upRefresh(this, item)
-                    bv_unread.invisible()
-                    rl_loading.show()
-                } else {
-                    rl_loading.hide()
-                    bv_unread.setBadgeCount(item.getUnreadChapterNum())
-                    bv_unread.setHighlight(item.lastCheckCount > 0)
-                }
             } else {
                 bundle.keySet().map {
                     when (it) {
                         "name" -> tv_name.text = item.name
                         "cover" -> iv_cover.load(item.getDisplayCover(), item.name, item.author)
-                        "refresh" -> if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+                        "refresh" -> upRefresh(this, item)
-                            bv_unread.invisible()
-                            rl_loading.show()
-                        } else {
-                            rl_loading.hide()
-                            bv_unread.setBadgeCount(item.getUnreadChapterNum())
-                            bv_unread.setHighlight(item.lastCheckCount > 0)
-                        }
                     }
                 }
             }
         }
     }
 
+    private fun upRefresh(itemView: View, item: Book) = with(itemView) {
+        if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+            bv_unread.invisible()
+            rl_loading.show()
+        } else {
+            rl_loading.hide()
+            bv_unread.setBadgeCount(item.getUnreadChapterNum())
+            bv_unread.setHighlight(item.lastCheckCount > 0)
+        }
+    }
+
     override fun registerListener(holder: ItemViewHolder) {
         holder.itemView.apply {
             onClick {

app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksAdapterList.kt

@@ -2,6 +2,7 @@ package io.legado.app.ui.main.bookshelf.books
 
 import android.content.Context
 import android.os.Bundle
+import android.view.View
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.constant.BookType
@@ -25,14 +26,7 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) :
                 tv_read.text = item.durChapterTitle
                 tv_last.text = item.latestChapterTitle
                 iv_cover.load(item.getDisplayCover(), item.name, item.author)
-                if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+                upRefresh(this, item)
-                    bv_unread.invisible()
-                    rl_loading.show()
-                } else {
-                    rl_loading.hide()
-                    bv_unread.setBadgeCount(item.getUnreadChapterNum())
-                    bv_unread.setHighlight(item.lastCheckCount > 0)
-                }
             } else {
                 bundle.keySet().map {
                     when (it) {
@@ -41,20 +35,24 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) :
                         "dur" -> tv_read.text = item.durChapterTitle
                         "last" -> tv_last.text = item.latestChapterTitle
                         "cover" -> iv_cover.load(item.getDisplayCover(), item.name, item.author)
-                        "refresh" -> if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+                        "refresh" -> upRefresh(this, item)
-                            bv_unread.invisible()
-                            rl_loading.show()
-                        } else {
-                            rl_loading.hide()
-                            bv_unread.setBadgeCount(item.getUnreadChapterNum())
-                            bv_unread.setHighlight(item.lastCheckCount > 0)
-                        }
                     }
                 }
             }
         }
     }
 
+    private fun upRefresh(itemView: View, item: Book) = with(itemView) {
+        if (item.origin != BookType.local && callBack.isUpdate(item.bookUrl)) {
+            bv_unread.invisible()
+            rl_loading.show()
+        } else {
+            rl_loading.hide()
+            bv_unread.setHighlight(item.lastCheckCount > 0)
+            bv_unread.setBadgeCount(item.getUnreadChapterNum())
+        }
+    }
+
     override fun registerListener(holder: ItemViewHolder) {
         holder.itemView.apply {
             onClick {

app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksDiffCallBack.kt

@@ -16,54 +16,45 @@ class BooksDiffCallBack(private val oldItems: List<Book>, private val newItems:
     }
 
     override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        return oldItems[oldItemPosition].bookUrl == newItems[newItemPosition].bookUrl
+        val oldItem = oldItems[oldItemPosition]
+        val newItem = newItems[newItemPosition]
+        return oldItem.name == newItem.name
+                && oldItem.author == newItem.author
     }
 
     override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
         val oldItem = oldItems[oldItemPosition]
         val newItem = newItems[newItemPosition]
-        if (oldItem.name != newItem.name)
+        return when {
-            return false
+            oldItem.durChapterTime != newItem.durChapterTime -> false
-        if (oldItem.author != newItem.author)
+            oldItem.name != newItem.name -> false
-            return false
+            oldItem.author != newItem.author -> false
-        if (oldItem.durChapterTitle != newItem.durChapterTitle)
+            oldItem.durChapterTitle != newItem.durChapterTitle -> false
-            return false
+            oldItem.latestChapterTitle != newItem.latestChapterTitle -> false
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle)
+            oldItem.lastCheckCount != newItem.lastCheckCount -> false
-            return false
+            oldItem.getDisplayCover() != newItem.getDisplayCover() -> false
-        if (oldItem.lastCheckCount != newItem.lastCheckCount)
+            oldItem.getUnreadChapterNum() != newItem.getUnreadChapterNum() -> false
-            return false
+            else -> true
-        if (oldItem.getDisplayCover() != newItem.getDisplayCover())
+        }
-            return false
-        if (oldItem.getUnreadChapterNum() != newItem.getUnreadChapterNum())
-            return false
-        return true
     }
 
     override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
         val oldItem = oldItems[oldItemPosition]
         val newItem = newItems[newItemPosition]
         val bundle = bundleOf()
-        if (oldItem.name != newItem.name)
+        if (oldItem.name != newItem.name) bundle.putString("name", null)
-            bundle.putString("name", null)
+        if (oldItem.author != newItem.author) bundle.putString("author", null)
-        if (oldItem.author != newItem.author)
+        if (oldItem.durChapterTitle != newItem.durChapterTitle) bundle.putString("dur", null)
-            bundle.putString("author", null)
+        if (oldItem.latestChapterTitle != newItem.latestChapterTitle) bundle.putString("last", null)
-        if (oldItem.durChapterTitle != newItem.durChapterTitle)
+        if (oldItem.getDisplayCover() != newItem.getDisplayCover()) bundle.putString("cover", null)
-            bundle.putString("dur", null)
+        if (oldItem.lastCheckCount != newItem.lastCheckCount
-        if (oldItem.latestChapterTitle != newItem.latestChapterTitle)
+            || oldItem.durChapterTime != newItem.durChapterTime
-            bundle.putString("last", null)
+            || oldItem.getUnreadChapterNum() != newItem.getUnreadChapterNum()
-        if (oldItem.getDisplayCover() != newItem.getDisplayCover())
-            bundle.putString("cover", null)
-        if (oldItem.lastCheckCount != newItem.lastCheckCount)
-            bundle.putString("refresh", null)
-        if (oldItem.getUnreadChapterNum() != newItem.getUnreadChapterNum()
             || oldItem.lastCheckCount != newItem.lastCheckCount
         ) {
             bundle.putString("refresh", null)
         }
-
+        if (bundle.isEmpty) return null
-        if (bundle.isEmpty) {
-            return null
-        }
         return bundle
     }
 

app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt

@@ -16,6 +16,7 @@ import io.legado.app.constant.BookType
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.entities.Book
+import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentDataHelp
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
@@ -45,14 +46,14 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
         }
     }
 
-    private lateinit var activityViewModel: MainViewModel
+    private val activityViewModel: MainViewModel
+        get() = getViewModelOfActivity(MainViewModel::class.java)
     private lateinit var booksAdapter: BaseBooksAdapter
     private var bookshelfLiveData: LiveData<List<Book>>? = null
     private var position = 0
     private var groupId = -1
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
-        activityViewModel = getViewModelOfActivity(MainViewModel::class.java)
         arguments?.let {
             position = it.getInt("position", 0)
             groupId = it.getInt("groupId", -1)
@@ -66,7 +67,7 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
         refresh_layout.setColorSchemeColors(accentColor)
         refresh_layout.setOnRefreshListener {
             refresh_layout.isRefreshing = false
-            activityViewModel.upChapterList()
+            activityViewModel.upChapterList(booksAdapter.getItems())
         }
         val bookshelfLayout = getPrefInt(PreferKey.bookshelfLayout)
         if (bookshelfLayout == 0) {
@@ -118,6 +119,18 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
         })
     }
 
+    fun getBooks(): List<Book> {
+        return booksAdapter.getItems()
+    }
+
+    fun gotoTop() {
+        if (AppConfig.isEInkMode) {
+            rv_bookshelf.scrollToPosition(0)
+        } else {
+            rv_bookshelf.smoothScrollToPosition(0)
+        }
+    }
+
     override fun open(book: Book) {
         when (book.type) {
             BookType.audio ->
@@ -130,7 +143,10 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
     }
 
     override fun openBookInfo(book: Book) {
-        context?.startActivity<BookInfoActivity>(Pair("bookUrl", book.bookUrl))
+        context?.startActivity<BookInfoActivity>(
+            Pair("name", book.name),
+            Pair("author", book.author)
+        )
     }
 
     override fun isUpdate(bookUrl: String): Boolean {

app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt

@@ -65,6 +65,9 @@ class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.
         BackupRestoreUi.onActivityResult(requestCode, resultCode, data)
     }
 
+    /**
+     * 配置
+     */
     class PreferenceFragment : PreferenceFragmentCompat(),
         SharedPreferences.OnSharedPreferenceChangeListener {
 

app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt

@@ -1,6 +1,8 @@
 package io.legado.app.ui.main.rss
 
 import android.content.Context
+import android.view.View
+import androidx.appcompat.widget.PopupMenu
 import io.legado.app.R
 import io.legado.app.base.adapter.ItemViewHolder
 import io.legado.app.base.adapter.SimpleRecyclerAdapter
@@ -8,6 +10,7 @@ import io.legado.app.data.entities.RssSource
 import io.legado.app.help.ImageLoader
 import kotlinx.android.synthetic.main.item_rss.view.*
 import org.jetbrains.anko.sdk27.listeners.onClick
+import org.jetbrains.anko.sdk27.listeners.onLongClick
 
 class RssAdapter(context: Context, val callBack: CallBack) :
     SimpleRecyclerAdapter<RssSource>(context, R.layout.item_rss) {
@@ -29,9 +32,32 @@ class RssAdapter(context: Context, val callBack: CallBack) :
                 callBack.openRss(it)
             }
         }
+        holder.itemView.onLongClick {
+            getItem(holder.layoutPosition)?.let {
+                showMenu(holder.itemView.iv_icon, it)
+            }
+            true
+        }
+    }
+
+    private fun showMenu(view: View, rssSource: RssSource) {
+        val popupMenu = PopupMenu(context, view)
+        popupMenu.inflate(R.menu.rss_main_item)
+        popupMenu.setOnMenuItemClickListener {
+            when (it.itemId) {
+                R.id.menu_top -> callBack.toTop(rssSource)
+                R.id.menu_edit -> callBack.edit(rssSource)
+                R.id.menu_del -> callBack.del(rssSource)
+            }
+            true
+        }
+        popupMenu.show()
     }
 
     interface CallBack {
         fun openRss(rssSource: RssSource)
+        fun toTop(rssSource: RssSource)
+        fun edit(rssSource: RssSource)
+        fun del(rssSource: RssSource)
     }
 }

app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt

@@ -8,22 +8,27 @@ import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import io.legado.app.App
 import io.legado.app.R
-import io.legado.app.base.BaseFragment
+import io.legado.app.base.VMBaseFragment
 import io.legado.app.data.entities.RssSource
 import io.legado.app.lib.theme.ATH
 import io.legado.app.ui.main.MainViewModel
 import io.legado.app.ui.rss.article.RssSortActivity
 import io.legado.app.ui.rss.favorites.RssFavoritesActivity
+import io.legado.app.ui.rss.source.edit.RssSourceEditActivity
 import io.legado.app.ui.rss.source.manage.RssSourceActivity
+import io.legado.app.ui.rss.source.manage.RssSourceViewModel
+import io.legado.app.utils.getViewModel
 import io.legado.app.utils.getViewModelOfActivity
 import io.legado.app.utils.startActivity
 import kotlinx.android.synthetic.main.fragment_rss.*
 import kotlinx.android.synthetic.main.view_title_bar.*
 
-class RssFragment : BaseFragment(R.layout.fragment_rss),
+class RssFragment : VMBaseFragment<RssSourceViewModel>(R.layout.fragment_rss),
     RssAdapter.CallBack {
 
     private lateinit var adapter: RssAdapter
+    override val viewModel: RssSourceViewModel
+        get() = getViewModel(RssSourceViewModel::class.java)
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
         setSupportToolbar(toolbar)
@@ -62,4 +67,16 @@ class RssFragment : BaseFragment(R.layout.fragment_rss),
     override fun openRss(rssSource: RssSource) {
         startActivity<RssSortActivity>(Pair("url", rssSource.sourceUrl))
     }
+
+    override fun toTop(rssSource: RssSource) {
+        viewModel.topSource(rssSource)
+    }
+
+    override fun edit(rssSource: RssSource) {
+        startActivity<RssSourceEditActivity>(Pair("data", rssSource.sourceUrl))
+    }
+
+    override fun del(rssSource: RssSource) {
+        viewModel.del(rssSource)
+    }
 }

app/src/main/java/io/legado/app/ui/replacerule/edit/ReplaceEditDialog.kt

@@ -1,26 +1,32 @@
 package io.legado.app.ui.replacerule.edit
 
 import android.os.Bundle
-import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import android.widget.EditText
+import android.widget.PopupWindow
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
 import io.legado.app.R
+import io.legado.app.constant.AppConst
 import io.legado.app.constant.Theme
 import io.legado.app.data.entities.ReplaceRule
+import io.legado.app.ui.widget.KeyboardToolPop
 import io.legado.app.utils.applyTint
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.toast
 import kotlinx.android.synthetic.main.dialog_replace_edit.*
+import org.jetbrains.anko.sdk27.listeners.onFocusChange
 
 class ReplaceEditDialog : DialogFragment(),
-    Toolbar.OnMenuItemClickListener {
+    Toolbar.OnMenuItemClickListener,
+    KeyboardToolPop.CallBack {
 
     companion object {
 
@@ -41,12 +47,11 @@ class ReplaceEditDialog : DialogFragment(),
     }
 
     private lateinit var viewModel: ReplaceEditViewModel
+    private lateinit var mSoftKeyboardTool: PopupWindow
 
     override fun onStart() {
         super.onStart()
-        val dm = DisplayMetrics()
+        dialog?.window?.setLayout(MATCH_PARENT, WRAP_CONTENT)
-        activity?.windowManager?.defaultDisplay?.getMetrics(dm)
-        dialog?.window?.setLayout((dm.widthPixels * 0.9).toInt(), WRAP_CONTENT)
     }
 
     override fun onCreateView(
@@ -60,6 +65,7 @@ class ReplaceEditDialog : DialogFragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        mSoftKeyboardTool = KeyboardToolPop(requireContext(), AppConst.keyboardToolChars, this)
         tool_bar.inflateMenu(R.menu.replace_edit)
         tool_bar.menu.applyTint(requireContext(), Theme.getTheme())
         tool_bar.setOnMenuItemClickListener(this)
@@ -69,12 +75,20 @@ class ReplaceEditDialog : DialogFragment(),
         arguments?.let {
             viewModel.initData(it)
         }
+        et_replace_rule.onFocusChange { v, hasFocus ->
+            if (hasFocus) {
+                mSoftKeyboardTool.width = v.width
+                mSoftKeyboardTool.showAsDropDown(v)
+            } else {
+                mSoftKeyboardTool.dismiss()
+            }
+        }
     }
 
     override fun onMenuItemClick(item: MenuItem?): Boolean {
         when (item?.itemId) {
             R.id.menu_save -> {
-                val rule = getReplaceRule();
+                val rule = getReplaceRule()
                 if (!rule.isValid()){
                     toast(R.string.replace_rule_invalid)
                 }
@@ -111,6 +125,30 @@ class ReplaceEditDialog : DialogFragment(),
 
     val callBack get() = activity as? CallBack
 
+    private fun insertText(text: String) {
+        if (text.isBlank()) return
+        val view = dialog?.window?.decorView?.findFocus()
+        if (view is EditText) {
+            val start = view.selectionStart
+            val end = view.selectionEnd
+            val edit = view.editableText//获取EditText的文字
+            if (start < 0 || start >= edit.length) {
+                edit.append(text)
+            } else {
+                edit.replace(start, end, text)//光标所在位置插入文字
+            }
+        }
+    }
+
+    override fun sendText(text: String) {
+        if (text == AppConst.keyboardToolChars[0]) {
+            val view = dialog?.window?.decorView?.findFocus()
+            view?.clearFocus()
+        } else {
+            insertText(text)
+        }
+    }
+
     interface CallBack {
         fun onReplaceRuleSave()
     }

app/src/main/java/io/legado/app/ui/rss/article/RssArticlesAdapter.kt

@@ -1,5 +1,6 @@
 package io.legado.app.ui.rss.article
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.Drawable
 import com.bumptech.glide.load.DataSource
@@ -18,41 +19,46 @@ import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.textColorResource
 
 
-class RssArticlesAdapter(context: Context, val callBack: CallBack) :
+class RssArticlesAdapter(context: Context, layoutId: Int, val callBack: CallBack) :
-    SimpleRecyclerAdapter<RssArticle>(context, R.layout.item_rss_article) {
+    SimpleRecyclerAdapter<RssArticle>(context, layoutId) {
 
+    @SuppressLint("CheckResult")
     override fun convert(holder: ItemViewHolder, item: RssArticle, payloads: MutableList<Any>) {
         with(holder.itemView) {
             tv_title.text = item.title
             tv_pub_date.text = item.pubDate
-            if (item.image.isNullOrBlank()) {
+            if (item.image.isNullOrBlank() && !callBack.isGridLayout) {
                 image_view.gone()
             } else {
-                ImageLoader.load(context, item.image)
+                ImageLoader.load(context, item.image).apply {
-                    .addListener(object : RequestListener<Drawable> {
+                    if (callBack.isGridLayout) {
-                        override fun onLoadFailed(
+                        placeholder(R.drawable.image_rss_article)
-                            e: GlideException?,
+                    } else {
-                            model: Any?,
+                        addListener(object : RequestListener<Drawable> {
-                            target: Target<Drawable>?,
+                            override fun onLoadFailed(
-                            isFirstResource: Boolean
+                                e: GlideException?,
-                        ): Boolean {
+                                model: Any?,
-                            image_view.gone()
+                                target: Target<Drawable>?,
-                            return false
+                                isFirstResource: Boolean
-                        }
+                            ): Boolean {
+                                image_view.gone()
+                                return false
+                            }
 
-                        override fun onResourceReady(
+                            override fun onResourceReady(
-                            resource: Drawable?,
+                                resource: Drawable?,
-                            model: Any?,
+                                model: Any?,
-                            target: Target<Drawable>?,
+                                target: Target<Drawable>?,
-                            dataSource: DataSource?,
+                                dataSource: DataSource?,
-                            isFirstResource: Boolean
+                                isFirstResource: Boolean
-                        ): Boolean {
+                            ): Boolean {
-                            image_view.visible()
+                                image_view.visible()
-                            return false
+                                return false
-                        }
+                            }
 
-                    })
+                        })
-                    .into(image_view)
+                    }
+                }.into(image_view)
             }
             if (item.read) {
                 tv_title.textColorResource = R.color.tv_text_summary
@@ -71,6 +77,7 @@ class RssArticlesAdapter(context: Context, val callBack: CallBack) :
     }
 
     interface CallBack {
+        val isGridLayout: Boolean
         fun readRss(rssArticle: RssArticle)
     }
 }