Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

kunfei 4 лет назад
Родитель
Сommit
103cb290b1

+ 2 - 3
app/build.gradle

@@ -137,11 +137,10 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0')
     implementation('androidx.multidex:multidex:2.0.1')
     //kotlin
-    //noinspection GradleDependency
-    //noinspection DifferentStdlibGradleVersion
+    //noinspection GradleDependency,DifferentStdlibGradleVersion
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
     //Kotlin反射
-    //noinspection GradleDependency
+    //noinspection GradleDependency,DifferentStdlibGradleVersion
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
     //协程
     def coroutines_version = '1.6.4'

+ 10 - 0
app/src/main/assets/updateLog.md

@@ -11,6 +11,16 @@
 * 正文出现缺字漏字、内容缺失、排版错乱等情况,有可能是净化规则或简繁转换出现问题。
 * 漫画源看书显示乱码,**阅读与其他软件的源并不通用**,请导入阅读的支持的漫画源!
 
+**2022/09/19**
+
+* 发现为空时不校验
+* 订阅添加刷新分类功能,菜单中
+* 修复webView因为不支持新夜间模式导致的崩溃
+* 修复阅读背景分主题设置bug by 821938089
+* 修复朗读高亮位置不对的问题 by 821938089
+* 添加忽略音频焦点设置 by 821938089
+* 优化web端写源 by Xwite
+
 **2022/09/17**
 
 * SDK暂时退回32,解决webView夜间模式不起作用的问题

+ 2 - 1
app/src/main/java/io/legado/app/service/CheckSourceService.kt

@@ -72,6 +72,7 @@ class CheckSourceService : BaseService() {
             IntentAction.start -> intent.getStringArrayListExtra("selectIds")?.let {
                 check(it)
             }
+
             IntentAction.resume -> upNotification()
             else -> stopSelf()
         }
@@ -154,7 +155,7 @@ class CheckSourceService : BaseService() {
                 }
             }
             //校验发现书籍
-            if (CheckSource.checkDiscovery) {
+            if (CheckSource.checkDiscovery && !source.exploreUrl.isNullOrBlank()) {
                 val exs = source.exploreKinds()
                 var url: String? = null
                 for (ex in exs) {

+ 8 - 2
app/src/main/java/io/legado/app/utils/WebSettingsExtensions.kt

@@ -13,8 +13,14 @@ import io.legado.app.help.config.AppConfig
 @SuppressLint("RequiresFeature")
 fun WebSettings.setDarkeningAllowed(allow: Boolean) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        WebSettingsCompat.setAlgorithmicDarkeningAllowed(this, allow)
-    } else if (AppConfig.isNightTheme) {
+        kotlin.runCatching {
+            WebSettingsCompat.setAlgorithmicDarkeningAllowed(this, allow)
+            return
+        }.onFailure {
+            it.printOnDebug()
+        }
+    }
+    if (AppConfig.isNightTheme) {
         if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK_STRATEGY)) {
             @Suppress("DEPRECATION")
             WebSettingsCompat.setForceDarkStrategy(