zapstore-mirror/com.antoniegil.astronia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle HLS PlaylistStuckException

Browse Source
This commit is contained in:
tunbmoon
2026-02-26 20:26:34 +08:00
parent 4b6340e1c4
commit ef6511680d
3 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/antoniegil/astronia/player/Media3Player.kt
+1
View File
@@ -29,6 +29,7 @@ class Media3Player(private val context: Context) {
init {
NetworkUtils.setupAndroid7SSL()
state.context = context
createPlayer(true)
}
app/src/main/java/com/antoniegil/astronia/player/PlayerListeners.kt
+1 -1
View File
@@ -121,7 +121,7 @@ internal object PlayerListeners {
player?.prepare()
if (state.shouldPlayWhenReady) player?.play()
}
isPlaylistStuck && state.hasTriedM3u8Fix -> {
isPlaylistStuck -> {
state.context?.cacheDir?.listFiles()?.filter { it.name.startsWith("m3u8_") }?.forEach { it.delete() }
callbacks.onReloadOriginal()
}
app/src/main/java/com/antoniegil/astronia/ui/component/PlayerControls.kt
+53 -53
View File
@@ -156,71 +156,71 @@ fun PlayerControlsOverlay(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 8.dp, vertical = 8.dp)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth()
) {
IconButton(onClick = onPlayPauseClick) {
Icon(
imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,
contentDescription = if (isPlaying) stringResource(R.string.paused) else stringResource(
R.string.play
),
tint = Color.White,
modifier = Modifier.size(28.dp)
){
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.fillMaxWidth()
) {
IconButton(onClick = onPlayPauseClick) {
Icon(
imageVector = if (isPlaying) Icons.Default.Pause else Icons.Default.PlayArrow,
contentDescription = if (isPlaying) stringResource(R.string.paused) else stringResource(
R.string.play
),
tint = Color.White,
modifier = Modifier.size(28.dp)
)
}
Spacer(modifier = Modifier.width(8.dp))
ProgressBar(
modifier = Modifier.weight(1f),
isBuffering = isBuffering,
estimatedProgress = estimatedProgress
)
}
Spacer(modifier = Modifier.width(8.dp))
Spacer(modifier = Modifier.width(8.dp))
ProgressBar(
modifier = Modifier.weight(1f),
isBuffering = isBuffering,
estimatedProgress = estimatedProgress
)
Spacer(modifier = Modifier.width(8.dp))
if (enablePip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
IconButton(
onClick = {
activity?.let { act ->
if (act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
val aspectRatio = Rational(16, 9)
val builder = PictureInPictureParams.Builder()
.setAspectRatio(aspectRatio)
act.enterPictureInPictureMode(builder.build())
if (enablePip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
IconButton(
onClick = {
activity?.let { act ->
if (act.packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
val aspectRatio = Rational(16, 9)
val builder = PictureInPictureParams.Builder()
.setAspectRatio(aspectRatio)
act.enterPictureInPictureMode(builder.build())
}
}
}
},
modifier = Modifier.offset(x = 2.dp)
},
modifier = Modifier.offset(x = 2.dp)
) {
Icon(
imageVector = Icons.Default.PictureInPicture,
contentDescription = stringResource(R.string.pip),
tint = Color.White,
modifier = Modifier.size(22.dp)
)
}
}
IconButton(
onClick = onFullscreenClick,
modifier = Modifier.offset(x = if (enablePip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) (-2).dp else 0.dp)
) {
Icon(
imageVector = Icons.Default.PictureInPicture,
contentDescription = stringResource(R.string.pip),
imageVector = if (isFullscreen) Icons.Default.FullscreenExit else Icons.Default.Fullscreen,
contentDescription = if (isFullscreen) stringResource(R.string.exit_fullscreen) else stringResource(
R.string.fullscreen
),
tint = Color.White,
modifier = Modifier.size(22.dp)
modifier = Modifier.size(28.dp)
)
}
}
IconButton(
onClick = onFullscreenClick,
modifier = Modifier.offset(x = if (enablePip && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) (-2).dp else 0.dp)
) {
Icon(
imageVector = if (isFullscreen) Icons.Default.FullscreenExit else Icons.Default.Fullscreen,
contentDescription = if (isFullscreen) stringResource(R.string.exit_fullscreen) else stringResource(
R.string.fullscreen
),
tint = Color.White,
modifier = Modifier.size(28.dp)
)
}
}
}
}
}
}