zefie/android_zkiosk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade AGP and Gradlee

Browse Source
This commit is contained in:
zefie
2025-04-09 13:00:34 -04:00
parent 4381016e57
commit 5713b6572e
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/zefie/zkiosk/MainActivity.kt
View File

@@ -51,8 +51,8 @@ class MainActivity : AppCompatActivity() {
videoLayout1 = findViewById(R.id.videoLayout1)
videoLayout2 = findViewById(R.id.videoLayout2)
restartButton = findViewById(R.id.restartButton)
vlcPlayer1 = VLCPlayer(this, videoLayout1)
vlcPlayer2 = VLCPlayer(this, videoLayout2)
vlcPlayer1 = VLCPlayer(this, videoLayout1, 1)
vlcPlayer2 = VLCPlayer(this, videoLayout2, 2)
val seekBar = findViewById<SeekBar>(R.id.durationSlider)
setupSliderPopup(seekBar)

6
app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt
View File

@@ -4,12 +4,13 @@ import android.content.Context
import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.widget.Toast
import org.videolan.libvlc.LibVLC
import org.videolan.libvlc.Media
import org.videolan.libvlc.MediaPlayer
import org.videolan.libvlc.util.VLCVideoLayout
class VLCPlayer(context: Context, private val videoLayout: VLCVideoLayout) {
class VLCPlayer(private val context: Context, private val videoLayout: VLCVideoLayout, private val streamId: Int) {
private val libVLC: LibVLC = LibVLC(context, arrayListOf("--rtsp-tcp",
"--quiet",
"--no-drop-late-frames",
@@ -65,6 +66,9 @@ class VLCPlayer(context: Context, private val videoLayout: VLCVideoLayout) {
if (stalled) {
val freezeDuration = now - lastProgressCheck
if (freezeDuration > 8000) {
handler.post {
Toast.makeText(context, "Watchdog triggered: Stream ${streamId} stalled, restarting...", Toast.LENGTH_SHORT).show()
}
restartStream()
return
}

2
gradle/libs.versions.toml
View File

@@ -1,5 +1,5 @@
[versions]
agp = "8.8.2"
agp = "8.9.1"
appcompat = "1.7.0"
kotlin = "2.0.0"
coreKtx = "1.15.0"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Sun Mar 02 16:14:47 EST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists