@24i/smartapps-bigscreen-rnv-build-engine 0.17.27-alpha.2774 → 0.17.27-alpha.2785

package/dist/templates/platforms/androidtv/project/app/build.gradle

@@ -85,7 +85,7 @@ android {
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -97,20 +97,20 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.7.0"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
 
-    implementation "com.google.dagger:dagger:2.48.1"
-    kapt "com.google.dagger:dagger-compiler:2.48.1"
+    implementation "com.google.dagger:dagger:2.56.1"
+    kapt "com.google.dagger:dagger-compiler:2.56.1"
 
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
-    implementation "com.squareup.okhttp3:okhttp:4.9.2"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.12.0"
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"
     if (useTheoPlayer) {
-        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.15"
-        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.15"
+        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.18"
+        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.18"
         implementation "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     } else {
-        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.15"
-        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.15"
+        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.18"
+        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.18"
         compileOnly "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     }
 
@@ -129,5 +129,6 @@ dependencies {
     }
 
     implementation project(':common')
-}
 
+    implementation "com.google.android.gms:play-services-ads-identifier:18.2.0"
+}

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeFromJavaScript.kt

@@ -8,15 +8,14 @@ import android.webkit.JavascriptInterface
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.TextTrack
 import com.twentyfouri.player.base.TrackKind
-import com.twentyfouri.tvbridge.webview.parser.SourceParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.PlaybackInfoParser.parse
-import com.twentyfouri.tvbridge.webview.parser.SourceParser
+import com.twentyfouri.tvbridge.webview.parser.SourceParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
 import com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Arrays
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
@@ -375,6 +374,18 @@ class BridgeFromJavaScript(
         return ""
     }
 
+    /***
+     * Bridget JS 2 Android to get advertising id
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetAdId() = viewModel.adId
+
+    /***
+     * Bridget JS 2 Android to get limit ad tracking info
+     */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetLimitAdTracking() = viewModel.limitAdTracking
+
     companion object {
         const val LOG_TAG = "JavaScriptBridge"
         val DISABLED_AUDIO_TRACK = JsonObject().apply {

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/bridge/BridgeToJavaScript.kt

@@ -59,9 +59,9 @@ class BridgeToJavaScript(
         textTracks: List<TextTrack>
     ) {
         val tracksJson = toJson(audioTracks, textTracks)
-        Log.d(LOG_TAG, tracksJson)
+        Log.d(LOG_TAG, "bridgeAndroidToJavaScript_MediaTrackEvent $tracksJson")
         val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.tracks='$tracksJson';document.dispatchEvent(evt);})())"
-        Log.v(LOG_TAG, mediaEventString)
+        Log.v(LOG_TAG, "bridgeAndroidToJavaScript_MediaTrackEvent $mediaEventString")
         executeJavaScript(mediaEventString)
     }
 
@@ -74,8 +74,8 @@ class BridgeToJavaScript(
         val adBreakJson = adBreak?.let { serializer.toPersistentMap(it).toString() } ?: ""
         val adJson = ad?.let { serializer.toPersistentMap(it).toString() } ?: ""
 
-        val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.adbreak='$adBreakJson';evt.adbreak='$adJson';document.dispatchEvent(evt);})())"
-        Log.v(LOG_TAG, mediaEventString)
+        val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.adbreak='$adBreakJson';evt.ad='$adJson';document.dispatchEvent(evt);})())"
+        Log.v(LOG_TAG, "bridgeAndroidToJavaScript_MediaAdEvent $mediaEventString")
         executeJavaScript(mediaEventString)
     }
 
@@ -87,7 +87,7 @@ class BridgeToJavaScript(
         val adsJson = JSONArray(timeline.map { serializer.toPersistentMap(it) }).toString()
 
         val mediaEventString = "javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('$mediaEventPrefix$mediaEvent',true,true);evt.ads='$adsJson';document.dispatchEvent(evt);})())"
-        Log.v(LOG_TAG, mediaEventString)
+        Log.v(LOG_TAG, "bridgeAndroidToJavaScript_MediaAdEvent $mediaEventString")
         executeJavaScript(mediaEventString)
     }
 

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/model/MediaEventType.kt

@@ -22,8 +22,9 @@ object MediaEventType {
     const val TRACKS_CHANGED = "trackschanged"
     const val AD_BREAK_START = "adbreakbegin"
     const val AD_BREAK_END = "adbreakend"
-    const val AD_BREAKS_RESCHEDULED = "admetadata"
+    const val AD_BREAKS_RESCHEDULED = "adcuepointschanged"
     const val AD_STARTED = "adbegin"
+    const val AD_ENDED = "adend"
     const val AD_ERROR = "aderror"
     const val AD_SKIPPED = "adskip"
 }

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/view/WebViewActivity.kt

@@ -17,11 +17,9 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.databinding.DataBindingUtil
 import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
-import com.twentyfouri.tvbridge.R
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.databinding.ActivityWebViewBinding
 import com.twentyfouri.tvbridge.global.BaseApplication

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/webview/viewmodel/WebViewModel.kt

@@ -6,12 +6,15 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Build
+import android.provider.Settings
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
@@ -23,7 +26,6 @@ import com.twentyfouri.tvbridge.bridge.BridgeToJavaScript
 import com.twentyfouri.tvbridge.common.*
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
-import com.twentyfouri.tvbridge.global.utils.PlayerFactoryTheoPlayerCustomized
 import com.twentyfouri.tvbridge.global.utils.PlayerFactoryVersion
 import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
 import com.twentyfouri.tvbridge.webview.client.BridgeWebView
@@ -59,6 +61,8 @@ class WebViewModel @Inject constructor(
 
     private var source: Source? = null
 
+    private var adStarted: Boolean = false
+
     val audioTrack: AudioTrack?
         get() = player?.selectedAudioTrack
     val subtitleTrack: TextTrack?
@@ -283,68 +287,136 @@ class WebViewModel @Inject constructor(
         when (event) {
             is ErrorEvent -> {
                 Log.e("AndroidPlayer", "Player error", event.error)
-                jsBridge.bridgeAndroidToJavaScript_ErrorEvent(MediaEventType.ERROR, "${event.error.message} - ${event.error.nativeCode}")
+                jsBridge.bridgeAndroidToJavaScript_ErrorEvent(
+                    MediaEventType.ERROR,
+                    "${event.error.message} - ${event.error.nativeCode}"
+                )
                 stopPlayer()
             }
+
             is LoadedMetadataEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.LOADEDMETADATA)
-                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
+                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(
+                    MediaEventType.TRACKS_CHANGED,
+                    player.audioTracks,
+                    player.textTracks
+                )
             }
+
             is LoadedDataEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.LOADEDDATA)
             }
+
             is CanPlayEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.CANPLAY)
             }
+
             is EndedEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.ENDED)
             }
+
             is WaitingEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.WAITING)
             }
+
             is PlayingEvent -> {
                 view?.setBlackCurtainVisibility(View.GONE)
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PLAYING)
             }
+
             is SeekingEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.SEEKING)
             }
+
             is SeekedEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.SEEKED)
             }
+
             is TimeUpdateEvent -> {
                 if (player.playing) {
                     jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.TIME_UPDATE)
                 }
             }
+
             is PauseEvent -> {
                 if (!player.playing) {
                     jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PAUSE)
                 }
             }
+
             is AddAudioTrackEvent, is AddTextTrackEvent,
             is RemoveAudioTrackEvent, is RemoveTextTrackEvent,
             is ChangeAudioTrackEvent, is ChangeTextTrackEvent -> {
                 Log.d("WebViewModel", "onTrackschanged: audio=$audioTrack subtitle=$subtitleTrack")
-                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
+                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(
+                    MediaEventType.TRACKS_CHANGED,
+                    player.audioTracks,
+                    player.textTracks
+                )
             }
+
             is AdBreaksRescheduledEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(
+                    MediaEventType.AD_BREAKS_RESCHEDULED,
+                    player.timeline
+                )
             }
+
             is AdBreakStartedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_BREAK_START, player.currentAdBreak, player.currentAd)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                    MediaEventType.AD_BREAK_START,
+                    player.currentAdBreak,
+                    player.currentAd
+                )
             }
+
             is AdBreakEndedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_BREAK_END, player.currentAdBreak, player.currentAd)
+                if (adStarted) {
+                    jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                        MediaEventType.AD_ENDED,
+                        player.currentAdBreak,
+                        null
+                    )
+                }
+                adStarted = false
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                    MediaEventType.AD_BREAK_END,
+                    player.currentAdBreak,
+                    player.currentAd
+                )
             }
+
             is AdStartedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_STARTED, player.currentAdBreak, player.currentAd)
+                if (adStarted) {
+                    jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                        MediaEventType.AD_ENDED,
+                        player.currentAdBreak,
+                        null
+                    )
+                } else {
+                    adStarted = true
+                }
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                    MediaEventType.AD_STARTED,
+                    player.currentAdBreak,
+                    player.currentAd
+                )
             }
+
             is AdErrorEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_ERROR, player.currentAdBreak, player.currentAd)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                    MediaEventType.AD_ERROR,
+                    player.currentAdBreak,
+                    player.currentAd
+                )
             }
+
             is AdSkippedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_SKIPPED, player.currentAdBreak, player.currentAd)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(
+                    MediaEventType.AD_SKIPPED,
+                    player.currentAdBreak,
+                    player.currentAd
+                )
             }
         }
     }
@@ -557,6 +629,30 @@ class WebViewModel @Inject constructor(
         }
     }
 
+    val adId get() = try {
+        // Let's try Google first
+        AdvertisingIdClient.getAdvertisingIdInfo(context).id
+    } catch (e: GooglePlayServicesNotAvailableException) {
+        // Probably Amazon
+        try {
+            Settings.Secure.getString(context.contentResolver, "advertising_id")
+        } catch (snfe: Settings.SettingNotFoundException) {
+            null
+        }
+    }
+
+    val limitAdTracking get() = try {
+        // Let's try Google first
+        AdvertisingIdClient.getAdvertisingIdInfo(context).isLimitAdTrackingEnabled
+    } catch (e: GooglePlayServicesNotAvailableException) {
+        // Probably Amazon
+        try {
+            Settings.Secure.getInt(context.contentResolver, "limit_ad_tracking") != 0
+        } catch (snfe: Settings.SettingNotFoundException) {
+            null
+        }
+    }
+
     private inner class InnerIapCallback : IapCallback {
         override fun checkNewPurchasesFinished(result: List<IapPurchase>) {
             // not actually used at the moment

package/dist/templates/platforms/androidtv/project/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.9.22'
+    ext.kotlin_version = '2.1.20'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'

package/dist/templates/platforms/androidtv/project/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 02 10:20:44 CEST 2022
+#Tue Apr 08 16:51:49 CEST 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

package/dist/templates/platforms/tizen/project/config.xml

@@ -13,6 +13,7 @@
     <tizen:privilege name="http://developer.samsung.com/privilege/productinfo"/>
     <tizen:privilege name="http://tizen.org/privilege/internet"/>
     <tizen:privilege name="http://tizen.org/privilege/tv.inputdevice"/>
+    <tizen:privilege name="http://developer.samsung.com/privilege/adinfo"/>
     <tizen:setting screen-orientation="landscape" context-menu="enable" background-support="disable" encryption="disable" install-location="auto" hwkey-event="enable"/>
     <tizen:metadata key="http://samsung.com/tv/metadata/use.voiceguide" value="false"/>
 </widget>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@24i/smartapps-bigscreen-rnv-build-engine",
-	"version": "0.17.27-alpha.2774",
+	"version": "0.17.27-alpha.2785",
 	"description": "Package with build engine for SmartApps BIGscreen projects...",
 	"main": "dist/src/index.js",
 	"scripts": {