Merge remote-tracking branch 'origin/master'

2 years ago · a1cd2d897a
parent 1487640c35 1102ec9dbc
commit a1cd2d897a
9 changed files with 21 additions and 25 deletions
--- a/app/src/main/assets/web/source/css/app.83214410.css
+++ b/app/src/main/assets/web/source/css/app.83214410.css
--- a/app/src/main/assets/web/source/index.html
+++ b/app/src/main/assets/web/source/index.html
@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./favicon.ico"><title>legado_web_source_editor</title><script defer="defer" src="./js/chunk-vendors.973d2b1d.js"></script><script defer="defer" src="./js/app.90e7caad.js"></script><link href="./css/app.177fcd98.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but legado_web_source_editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./favicon.ico"><title>legado_web_source_editor</title><script defer="defer" src="./js/chunk-vendors.dd84caa9.js"></script><script defer="defer" src="./js/app.48715b66.js"></script><link href="./css/app.83214410.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but legado_web_source_editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
--- a/app/src/main/assets/web/source/js/app.48715b66.js
+++ b/app/src/main/assets/web/source/js/app.48715b66.js
--- a/app/src/main/assets/web/source/js/app.90e7caad.js
+++ b/app/src/main/assets/web/source/js/app.90e7caad.js
--- a/app/src/main/assets/web/source/js/chunk-vendors.973d2b1d.js
+++ b/app/src/main/assets/web/source/js/chunk-vendors.973d2b1d.js
--- a/app/src/main/assets/web/source/js/chunk-vendors.dd84caa9.js
+++ b/app/src/main/assets/web/source/js/chunk-vendors.dd84caa9.js
--- a/app/src/main/java/io/legado/app/help/MediaHelp.kt
+++ b/app/src/main/java/io/legado/app/help/MediaHelp.kt
@ -8,6 +8,7 @@ import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
 import io.legado.app.R
+import splitties.systemservices.audioManager

 object MediaHelp {

@ -50,13 +51,8 @@ object MediaHelp {
    /**
     * @return 音频焦点
     */
-    fun requestFocus(
-        audioManager: AudioManager,
-        focusRequest: AudioFocusRequestCompat?
-    ): Boolean {
-        val request = focusRequest?.let {
-            AudioManagerCompat.requestAudioFocus(audioManager, focusRequest)
-        } ?: AudioManager.AUDIOFOCUS_REQUEST_GRANTED
+    fun requestFocus(focusRequest: AudioFocusRequestCompat): Boolean {
+        val request = AudioManagerCompat.requestAudioFocus(audioManager, focusRequest)
        return request == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
    }

--- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt
+++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
@ -560,7 +560,7 @@ class AudioPlayService : BaseService(),
        if (AppConfig.ignoreAudioFocus) {
            return true
        }
-        return MediaHelp.requestFocus(audioManager, mFocusRequest)
+        return MediaHelp.requestFocus(mFocusRequest)
    }

    /**
--- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
@ -239,7 +239,7 @@ abstract class BaseReadAloudService : BaseService(),
        if (AppConfig.ignoreAudioFocus) {
            return true
        }
-        val requestFocus = MediaHelp.requestFocus(audioManager, mFocusRequest)
+        val requestFocus = MediaHelp.requestFocus(mFocusRequest)
        if (!requestFocus) {
            toastOnUi("未获取到音频焦点")
        }