Horis 2 лет назад
Родитель
Сommit
3456f5fad3

+ 3 - 16
app/src/main/java/io/legado/app/service/HttpReadAloudService.kt

@@ -17,6 +17,7 @@ import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor
 import androidx.media3.datasource.cache.SimpleCache
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.LoadControl.Parameters
 import androidx.media3.exoplayer.offline.DefaultDownloaderFactory
 import androidx.media3.exoplayer.offline.DownloadRequest
 import androidx.media3.exoplayer.offline.Downloader
@@ -596,22 +597,8 @@ class HttpReadAloudService : BaseReadAloudService(),
     }
 
     inner class CustomLoadControl : DefaultLoadControl() {
-        override fun shouldStartPlayback(
-            timeline: Timeline,
-            mediaPeriodId: MediaSource.MediaPeriodId,
-            bufferedDurationUs: Long,
-            playbackSpeed: Float,
-            rebuffering: Boolean,
-            targetLiveOffsetUs: Long
-        ): Boolean {
-            return super.shouldStartPlayback(
-                timeline,
-                mediaPeriodId,
-                bufferedDurationUs,
-                playbackSpeed,
-                rebuffering,
-                targetLiveOffsetUs
-            ) || bufferedPercentage == 100
+        override fun shouldStartPlayback(parameters: Parameters): Boolean {
+            return super.shouldStartPlayback(parameters) || bufferedPercentage == 100
         }
     }
 

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

@@ -292,7 +292,7 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         if (!ReadBook.inBookshelf) {
             viewModel.removeFromBookshelf(null)

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

@@ -93,9 +93,9 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         receiptIntent(intent)
     }
 
-    override fun onNewIntent(data: Intent?) {
-        super.onNewIntent(data)
-        receiptIntent(data)
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        receiptIntent(intent)
     }
 
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {

+ 1 - 1
app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt

@@ -8,7 +8,7 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContract
 
-fun ActivityResultLauncher<*>.launch() {
+fun <T> ActivityResultLauncher<T?>.launch() {
     launch(null)
 }
 

+ 1 - 1
gradle/libs.versions.toml

@@ -39,7 +39,7 @@ room = "2.6.1"
 splitties = "3.0.0"
 rhino = "1.7.15"
 
-activity = "1.8.2"
+activity = "1.9.1"
 kotlinxSerialization = "1.7.1"
 swiperefreshlayout = "1.1.0"
 viewpager2 = "1.1.0"