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

package/dist/src/sdks/sdk-androidtv/sdkAndroidtv.js

@@ -200,6 +200,7 @@ const configureEntryUrl = (c) => {
         || rnv_1.Common.getConfigProp(c, c.platform, 'theoLicense', '');
     const npawAccountCode = process.env.NPAW_ACCOUNT_CODE
         || rnv_1.Common.getConfigProp(c, c.platform, 'npawAccountCode', '');
+    const enableImaSdk = !!rnv_1.Common.getConfigProp(c, c.platform, 'enableImaSdk', false);
     const injects = [{
             pattern: '{{APP_URL}}',
             override: entryUrl,
@@ -209,6 +210,9 @@ const configureEntryUrl = (c) => {
         }, {
             pattern: '{{NPAW_ACCOUNT_CODE}}',
             override: npawAccountCode,
+        }, {
+            pattern: '{{ENABLE_IMA_SDK}}',
+            override: enableImaSdk,
         }];
     rnv_1.Common.addSystemInjects(c, injects);
     rnv_1.FileUtils.writeCleanFile(buildGradleFilePath, buildGradleFilePath, injects, null, c);

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

@@ -6,6 +6,7 @@ def theoLicense = '{{THEO_LICENSE}}'
 def useTheoPlayer = theoLicense != ''
 def npawAccountCode = '{{NPAW_ACCOUNT_CODE}}'
 def useNpawPlugin = npawAccountCode != ''
+def useImaSdk = {{ENABLE_IMA_SDK}}
 
 android {
     namespace = 'com.twentyfouri.tvbridge'
@@ -104,12 +105,12 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"
     implementation "com.squareup.okhttp3:okhttp:4.9.2"
     if (useTheoPlayer) {
-        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.8"
-        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.8"
+        compileOnly "com.twentyfouri.player:exoplayer:0.8.0-alpha.15"
+        implementation "com.twentyfouri.player:theoplayer:0.8.0-alpha.15"
         implementation "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     } else {
-        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.8"
-        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.8"
+        implementation "com.twentyfouri.player:exoplayer:0.8.0-alpha.15"
+        compileOnly "com.twentyfouri.player:theoplayer:0.8.0-alpha.15"
         compileOnly "com.theoplayer.theoplayer-sdk-android:core:8.2.0"
     }
 
@@ -123,6 +124,10 @@ dependencies {
         compileOnly 'com.google.android.exoplayer:extension-okhttp:2.19.1'
     }
 
+    if (useImaSdk) {
+        implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.36.0'
+    }
+
     implementation project(':common')
 }
 

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

@@ -1,6 +1,8 @@
 package com.twentyfouri.tvbridge.bridge
 
 import android.util.Log
+import com.twentyfouri.player.base.Ad
+import com.twentyfouri.player.base.AdBreak
 import com.twentyfouri.player.base.AudioTrack
 import com.twentyfouri.player.base.DefaultSourceSerializer
 import com.twentyfouri.player.base.TextTrack
@@ -63,6 +65,20 @@ class BridgeToJavaScript(
         executeJavaScript(mediaEventString)
     }
 
+    fun bridgeAndroidToJavaScript_MediaAdEvent(
+        mediaEvent: String,
+        adBreak: AdBreak?,
+        ad: Ad?
+    ) {
+        val serializer = DefaultSourceSerializer()
+        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)
+        executeJavaScript(mediaEventString)
+    }
+
     fun bridgeAndroidToJavaScript_MediaAdBreaksEvent(
         mediaEvent: String,
         timeline: List<TimelineEvent>

package/dist/templates/platforms/androidtv/project/app/src/main/java/com/twentyfouri/tvbridge/global/utils/PlayerFactoryExoPlayerNpaw.kt

@@ -1,7 +1,6 @@
 package com.twentyfouri.tvbridge.global.utils
 
 import android.annotation.SuppressLint
-import android.app.Application
 import android.content.Context
 import android.content.ContextWrapper
 import android.os.Bundle
@@ -45,13 +44,16 @@ import com.npaw.analytics.video.VideoOptions
 import com.npaw.core.options.AnalyticsOptions
 import com.npaw.exoplayer.ExoPlayerAdapter
 import com.npaw.exoplayer.ExoPlayerBalancer
+import com.twentyfouri.player.base.BackgroundMode
 import com.twentyfouri.player.base.CastingEnded
 import com.twentyfouri.player.base.CastingStarted
+import com.twentyfouri.player.base.CastingType
 import com.twentyfouri.player.base.DrmPlayready
 import com.twentyfouri.player.base.DrmWidevine
 import com.twentyfouri.player.base.EventListenerDispose
 import com.twentyfouri.player.base.PlayerBase
 import com.twentyfouri.player.base.PlayerGesturesTarget
+import com.twentyfouri.player.base.PlayerProxy
 import com.twentyfouri.player.base.PlayerSurface
 import com.twentyfouri.player.base.ResizeEvent
 import com.twentyfouri.player.base.ScaleType
@@ -71,11 +73,11 @@ import com.twentyfouri.player.exoplayer.DrmSessionManagerProvider
 import com.twentyfouri.player.exoplayer.PlayerComponents
 import com.twentyfouri.player.exoplayer.PlayerExoPlayer
 import com.twentyfouri.player.exoplayer.PlayerFactoryExoPlayer
-import com.twentyfouri.player.exoplayer.PlayerProxy
 import com.twentyfouri.player.exoplayer.PlayerViewAdvertisement
 import com.twentyfouri.player.exoplayer.SharedComponents
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
+import java.util.WeakHashMap
 import com.npaw.core.util.extensions.Log as NpawLog
 
 class PlayerFactoryExoPlayerNpaw(
@@ -86,9 +88,11 @@ class PlayerFactoryExoPlayerNpaw(
 
     override val engineVersion: String = ExoPlayerLibraryInfo.VERSION
 
+    private val activePlayers = WeakHashMap<PlayerBase, Boolean>()
+
     override fun createSharedComponents(context: Context): SharedComponents =
             CustomizedSharedComponents(context)
-
+    
     override fun createView(parent: ViewGroup): View {
         return NpawPlayerView(parent.context).also {
             val basePlayer = createPlayer(parent.context)
@@ -97,7 +101,7 @@ class PlayerFactoryExoPlayerNpaw(
                         .sharedComponents as CustomizedSharedComponents
                     ).npawPlugin
             val npawPlayer = NpawPlayer(basePlayer, npawPlugin)
-            trackPlayer(npawPlayer)
+            activePlayers[npawPlayer] = true
             it.player = npawPlayer
         }
     }
@@ -111,10 +115,15 @@ class PlayerFactoryExoPlayerNpaw(
             ?: throw IllegalStateException("Player was not initialized by PlayerFactory")
     }
 
-    private inner class CustomizedSharedComponents(context: Context) : DefaultSharedComponents(context) {
+    override fun release() {
+        activePlayers.keys.forEach {
+            it.destroy()
+        }
+        activePlayers.clear()
+        super.release()
+    }
 
-        val application = context.applicationContext as? Application
-            ?: throw IllegalStateException("Missing application")
+    private inner class CustomizedSharedComponents(context: Context) : DefaultSharedComponents(context) {
 
         val npawPlugin: NpawPlugin = NpawPlugin
             .Builder(application, config.npawAccount)
@@ -335,6 +344,10 @@ class PlayerFactoryExoPlayerNpaw(
                 adOverlay.gesturesTarget = value
             }
 
+        override var supportsPictureInPicture: Boolean
+            get() = false
+            set(value) {}
+
         var player: PlayerBase? = null
             set(value) {
                 if (field == value) return
@@ -474,6 +487,23 @@ class PlayerFactoryExoPlayerNpaw(
             }
         }
 
+        override fun onUserLeaveHint() {
+            (player as? PlayerProxy)?.onUserLeaveHint()
+        }
+
+        override fun onPictureInPictureModeChanged(inPictureInPictureMode: Boolean) {
+        }
+
+        fun autoPauseByBackground() {
+            val player = this.player ?: return
+            if (player.live) {
+                player.stop()
+            } else {
+                player.pause()
+            }
+            pausedByBackground = true
+        }
+
         private inner class ComponentListener : TextOutput, Player.Listener,
             DefaultLifecycleObserver {
             override fun onCues(cueGroup: CueGroup) {
@@ -499,29 +529,46 @@ class PlayerFactoryExoPlayerNpaw(
                 this@NpawPlayerView.keepScreenOn = isPlaying
             }
 
-            override fun onPause(owner: LifecycleOwner) {
+            override fun onStop(owner: LifecycleOwner) {
                 val player = this@NpawPlayerView.player ?: return
                 player.asPlayerExoPlayer()?.also {
                     detachSurface(it)
                 }
-                if (!player.continueInBackground && !player.paused && player.state.source != null) {
-                    if (player.live) {
-                        player.stop()
-                    } else {
-                        player.pause()
+                if (
+                    !player.paused && player.state.source != null &&
+                    player.castingType == CastingType.NONE
+                ) {
+                    val shouldPause = when (player.continueInBackgroundMode) {
+                        BackgroundMode.PAUSE -> true
+                        BackgroundMode.PICTURE_IN_PICTURE -> when {
+                            player.isCastingHost -> false
+                            player.pictureInPicture -> false
+                            else -> true    // PiP disabled in system settings?
+                        }
+                        else -> false
+                    }
+                    if (shouldPause) {
+                        autoPauseByBackground()
                     }
-                    pausedByBackground = true
+                }
+                if (player is PlayerProxy) {
+                    player.onLifecycleStop()
                 }
             }
 
-            override fun onResume(owner: LifecycleOwner) {
+            override fun onStart(owner: LifecycleOwner) {
                 val player = this@NpawPlayerView.player ?: return
                 if (pausedByBackground) {
                     pausedByBackground = false
                     player.play()
                 }
+                if (player is PlayerProxy) {
+                    player.onLifecycleStart()
+                }
                 player.asPlayerExoPlayer()?.also {
-                    attachSurface(it)
+                    if (player.castingType == CastingType.NONE) {
+                        attachSurface(it)
+                    }
                 }
             }
 

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

@@ -20,7 +20,10 @@ object MediaEventType {
     const val KEY_UP = "keyup"
     const val KEY_DOWN = "keydown"
     const val TRACKS_CHANGED = "trackschanged"
-    const val AD_BREAK_START = "adbreakstart"
+    const val AD_BREAK_START = "adbreakbegin"
     const val AD_BREAK_END = "adbreakend"
-    const val AD_BREAKS_RESCHEDULED = "adbreaksrescheduled"
+    const val AD_BREAKS_RESCHEDULED = "admetadata"
+    const val AD_STARTED = "adbegin"
+    const val AD_ERROR = "aderror"
+    const val AD_SKIPPED = "adskip"
 }

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

@@ -328,14 +328,23 @@ class WebViewModel @Inject constructor(
                 Log.d("WebViewModel", "onTrackschanged: audio=$audioTrack subtitle=$subtitleTrack")
                 jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
+            is AdBreaksRescheduledEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
+            }
             is AdBreakStartedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_START)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_BREAK_START, player.currentAdBreak, player.currentAd)
             }
             is AdBreakEndedEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_END)
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_BREAK_END, player.currentAdBreak, player.currentAd)
             }
-            is AdBreaksRescheduledEvent -> {
-                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
+            is AdStartedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_STARTED, player.currentAdBreak, player.currentAd)
+            }
+            is AdErrorEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_ERROR, player.currentAdBreak, player.currentAd)
+            }
+            is AdSkippedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdEvent(MediaEventType.AD_SKIPPED, player.currentAdBreak, player.currentAd)
             }
         }
     }

package/package.json

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