From 5713b6572e910bf1c4759f7071a070a18be1b38b Mon Sep 17 00:00:00 2001 From: zefie Date: Wed, 9 Apr 2025 13:00:34 -0400 Subject: [PATCH] upgrade AGP and Gradlee --- app/src/main/java/com/zefie/zkiosk/MainActivity.kt | 4 ++-- app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt | 6 +++++- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/zefie/zkiosk/MainActivity.kt b/app/src/main/java/com/zefie/zkiosk/MainActivity.kt index 44b1e0c..4edc40a 100644 --- a/app/src/main/java/com/zefie/zkiosk/MainActivity.kt +++ b/app/src/main/java/com/zefie/zkiosk/MainActivity.kt @@ -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(R.id.durationSlider) setupSliderPopup(seekBar) diff --git a/app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt b/app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt index f982d4a..f1152f5 100644 --- a/app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt +++ b/app/src/main/java/com/zefie/zkiosk/VLCPlayer.kt @@ -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 } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0930cb9..e6851c0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2d5e63c..824f8a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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