@24i/smartapps-bigscreen-rnv-build-engine 0.17.6-alpha.8 → 0.17.6

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

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import android.net.Uri
 import android.os.Build
 import android.util.Log
 import android.view.KeyEvent
@@ -13,15 +12,9 @@ import android.view.View
 import android.webkit.CookieManager
 import android.webkit.WebChromeClient
 import android.webkit.WebView
-import androidx.databinding.BaseObservable
-import androidx.databinding.Bindable
-import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.SeekParameters
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.twentyfouri.player.base.*
-import com.twentyfouri.player.exoplayer.PlayerExoPlayer
-import com.twentyfouri.tvbridge.BR
 import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.Flavor
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript
@@ -29,14 +22,12 @@ 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.PlayerFactoryVersion
 import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
-import com.twentyfouri.tvbridge.jump.JumpAnalytics
 import com.twentyfouri.tvbridge.webview.client.BridgeWebView
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient
 import com.twentyfouri.tvbridge.webview.client.BridgeWebViewClient.BridgeWebViewClientCallback
 import com.twentyfouri.tvbridge.webview.model.AnalyticsPlaybackInfo
-import com.twentyfouri.tvbridge.webview.model.ContentModel
-import com.twentyfouri.tvbridge.webview.model.DrmModel
 import com.twentyfouri.tvbridge.webview.model.MediaEventType
 import com.twentyfouri.tvbridge.webview.view.Mainview
 import com.twentyfouri.tvbridge.webview.view.PlayerCache
@@ -44,7 +35,6 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.net.NetworkInterface
-import java.net.URI
 import javax.inject.Inject
 
 /**
@@ -56,7 +46,7 @@ class WebViewModel @Inject constructor(
         private val config: BridgeConfig,
         private val iapService: IapService,
         val playerFactory: PlayerFactoryBase
-) : BaseObservable(), EventListener {
+) : EventListener {
     var player: PlayerBase? = null
     private var view: Mainview? = null
     private val jsBridge = BridgeToJavaScript(config) { s: String? ->
@@ -64,12 +54,9 @@ class WebViewModel @Inject constructor(
     }
     private val iapCallback = InnerIapCallback()
     private val playerCache = PlayerCache()
-    private val jumpAnalytics = JumpAnalytics()
 
-    private var contentModel: ContentModel? = null
+    private var source: Source? = null
 
-    val videoTrack: VideoTrack?
-        get() = player?.selectedVideoTrack
     val audioTrack: AudioTrack?
         get() = player?.selectedAudioTrack
     val subtitleTrack: TextTrack?
@@ -77,17 +64,6 @@ class WebViewModel @Inject constructor(
 
     var appUrl: String? = null
 
-    var urlSetterVisible: Boolean = false
-        set(value) {
-            if (field == value) return
-            field = value
-            notifyPropertyChanged(BR.urlSetterVisibility)
-        }
-
-    @get:Bindable
-    val urlSetterVisibility: Int
-        get() = if (urlSetterVisible) View.VISIBLE else View.GONE
-
     fun attachView(view: Mainview?) {
         this.view = view
         if (view != null) {
@@ -142,52 +118,42 @@ class WebViewModel @Inject constructor(
 
     fun onClickGo() {
         view?.loadUrl(appUrl)
-        urlSetterVisible = false
         if (BuildConfig.DEBUG) {
             view?.hideKeyboard()
         }
     }
 
-    fun setVideo(contentModel: ContentModel) {
-        logContentModel(contentModel)
-        playDirectly(contentModel)
-    }
-
-    private fun logContentModel(contentModel: ContentModel) {
-        Log.i("BridgeVideo", "Url: " + contentModel.streamUrl)
-        val drmModel = contentModel.drmModel
-        if (drmModel != null) {
-            Log.i("BridgeVideo", "DRM: " + drmModel.drmSchemeUuid)
-            Log.i("BridgeVideo", "LicenseUrl: " + drmModel.drmLicenseUrl)
+    fun setVideo(source: Source) {
+        var adaptedSource = source
+        if (config.drm.shouldOverrideDrmCallback()) {
+            adaptedSource = SourceDrmOverridden.replaceSource(adaptedSource)
         }
+        logSource(adaptedSource)
+        playDirectly(adaptedSource)
     }
 
-    private fun playInExoPlayerDemoApp(contentModel: ContentModel) {
-        val intent = Intent("com.google.android.exoplayer.demo.action.VIEW", Uri.parse(contentModel.streamUrl))
-        val drmModel = contentModel.drmModel
-        if (drmModel != null) {
-            intent.putExtra("drm_scheme", drmModel.drmSchemeUuid)
-            intent.putExtra("drm_license_url", drmModel.drmLicenseUrl)
-        }
-        try {
-            context.startActivity(intent)
-        } catch (e: Exception) {
-            Log.w("WebViewModel", "Failed to start ExoPlayer demo app", e)
+    private fun logSource(source: Source) {
+        Log.i("BridgeVideo", "Url: ${source.url}")
+        when (val drmModel = source.drm.firstOrNull()) {
+            is SourceDrmWidevine -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
+            is SourceDrmPlayready -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
+            is SourceDrmOverridden -> {
+                Log.i("BridgeVideo", "DRM: " + drmModel.packageName)
+                Log.i("BridgeVideo", "LicenseUrl: " + drmModel.licenseServer)
+            }
         }
     }
 
-    private fun playDirectly(contentModel: ContentModel) {
-        this.contentModel = contentModel
-        (player as? PlayerExoPlayer)?.exoPlayer?.also { exoPlayer ->
-            jumpAnalytics.setVideoPlayer(exoPlayer)
-            exoPlayer.setSeekParameters(SeekParameters.CLOSEST_SYNC)
-        }
+    private fun playDirectly(source: Source) {
+        this.source = source
         player?.also { player ->
-            player.source = Source {
-                url = contentModel.streamUrl?.let { URI(it) }
-                mimeType = detectMimeType(contentModel)
-                contentModel.drmModel?.let { buildDrm(it) }?.also { drm.add(it) }
-            }
+            player.source = source
 
             if (isLowEndDevice) {
                 player.trackRestrictions = player.trackRestrictions.buildUpon {
@@ -207,43 +173,6 @@ class WebViewModel @Inject constructor(
         }
     }
 
-    private fun detectMimeType(contentModel: ContentModel) =
-            when (contentModel.streamType) {
-                null, "" -> null
-                ".mpd", "mpd", "dash" -> ManifestDash.mimeType
-                ".ism", "ism", "ss" -> ManifestSmoothStreaming.mimeType
-                ".m3u8", "m3u8", "hls" -> ManifestHls.mimeType
-                else -> null
-            }
-
-    private fun buildDrm(drmModel: DrmModel): SourceDrm? {
-        val drmScheme = drmModel.drmSchemeUuid
-        val useOverride = drmModel.overrideDrmCallback ?: config.drm.shouldOverrideDrmCallback()
-        val useWidevine = drmScheme == "widevine" || drmScheme == C.WIDEVINE_UUID.toString()
-        val usePlayReady = drmScheme == "playready" || drmScheme == C.PLAYREADY_UUID.toString()
-        return when {
-            drmScheme == null -> null
-            useOverride -> SourceDrmOverridden {
-                packageName = when {
-                    useWidevine -> DrmWidevine.packageName
-                    usePlayReady -> DrmPlayready.packageName
-                    else -> ""
-                }
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            useWidevine -> SourceDrmWidevine {
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            usePlayReady -> SourceDrmWidevine {
-                licenseServer = drmModel.drmLicenseUrl?.let { URI(it) }
-                forceLicenseServer = true
-            }
-            else -> SourceDrmUnrecognized(drmScheme)
-        }
-    }
-
     private val isLowEndDevice: Boolean
         get() = when (Build.MODEL) {
             "AFTB" -> true
@@ -256,9 +185,9 @@ class WebViewModel @Inject constructor(
     }
 
     fun resumePlayer() {
-        val savedContentModel = playerCache.savedContentModel
-        if (playerCache.loadFromCache && savedContentModel != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
-            setVideo(savedContentModel)
+        val savedSource = playerCache.savedSource
+        if (playerCache.loadFromCache && savedSource != null && playerCache.savedPlayerState !== PlayerCache.PlayerState.PAUSED) {
+            setVideo(savedSource)
             var position = playerCache.savedPlayerPosition
             val player = this.player ?: return
             if (player.live) {
@@ -283,26 +212,24 @@ class WebViewModel @Inject constructor(
 
     fun stopPlayer() {
         view?.setBlackCurtainVisibility(View.VISIBLE)
-        contentModel = null
+        source = null
 
         player?.also { player ->
             player.removeEventListener(Event.ALL, this)
             player.unload()
-            jumpAnalytics.setVideoPlayer(null)
         }
     }
 
     fun releasePlayer() {
         val player = this.player ?: return
-        if (contentModel != null) {
+        if (source != null) {
             playerCache.loadFromCache = true
-            playerCache.savedContentModel = contentModel
+            playerCache.savedSource = source
             playerCache.savedPlayerDuration = player.duration
             playerCache.savedPlayerPosition = player.currentTime
             playerCache.savedPlayerState = if (player.playing) PlayerCache.PlayerState.PLAYING else PlayerCache.PlayerState.PAUSED
         }
         player.unload()
-        jumpAnalytics.setVideoPlayer(null)
     }
 
     val currentPosition: Double
@@ -317,7 +244,7 @@ class WebViewModel @Inject constructor(
     val isPlayerPlaying: Boolean
         get() = player?.playing == true
     val isInPlayer: Boolean
-        get() = player != null && contentModel != null
+        get() = player != null && source != null
 
     fun loadUrl(url: String?) {
         view?.loadUrl(url)
@@ -359,6 +286,7 @@ class WebViewModel @Inject constructor(
             }
             is LoadedMetadataEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.LOADEDMETADATA)
+                jsBridge.bridgeAndroidToJavaScript_MediaTrackEvent(MediaEventType.TRACKS_CHANGED, player.audioTracks, player.textTracks)
             }
             is CanPlayEvent -> {
                 jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.CANPLAY)
@@ -389,13 +317,21 @@ class WebViewModel @Inject constructor(
                     jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.PAUSE)
                 }
             }
-            is LoadedMetadataEvent,
             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)
             }
+            is AdBreakStartedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_START)
+            }
+            is AdBreakEndedEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaEvent(MediaEventType.AD_BREAK_END)
+            }
+            is AdBreaksRescheduledEvent -> {
+                jsBridge.bridgeAndroidToJavaScript_MediaAdBreaksEvent(MediaEventType.AD_BREAKS_RESCHEDULED, player.timeline)
+            }
         }
     }
 
@@ -424,9 +360,7 @@ class WebViewModel @Inject constructor(
     }
 
     fun setPlaybackInfo(playbackInfo: AnalyticsPlaybackInfo) {
-        if ("JUMP" == playbackInfo.name) {
-            jumpAnalytics.setPlaybackInfo(playbackInfo)
-        }
+        // previously used for Jump analytics, not supported with THEO
     }
 
     fun showMessage(message: String?) {
@@ -524,11 +458,14 @@ class WebViewModel @Inject constructor(
     fun detectDeviceInfo(): JSONObject {
         val deviceInfo = JSONObject()
         try {
+            val engineVersion = PlayerFactoryVersion.from(playerFactory)
             deviceInfo.put("deviceBrand", Build.MANUFACTURER)
             deviceInfo.put("deviceModel", Build.MODEL)
             deviceInfo.put("osVersion", Build.VERSION.RELEASE)
             deviceInfo.put("appFlavor", BuildConfig.FLAVOR)
             deviceInfo.put("appVersion", BuildConfig.VERSION_NAME)
+            deviceInfo.put("engineName", engineVersion.engineName)
+            deviceInfo.put("engineVersion", engineVersion.engineVersion)
 
             val drmKeySystems = mutableSetOf<String>()
             playerFactory.getSupportedFormats(context).manifest.forEach { manifest ->

package/dist/templates/platforms/androidtv/project/app/src/main/res/layout/activity_web_view.xml

@@ -1,76 +1,28 @@
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
 
-    <data>
-
-        <variable
-            name="viewModel"
-            type="com.twentyfouri.tvbridge.webview.viewmodel.WebViewModel" />
-    </data>
+    <com.twentyfouri.player.base.PlayerView
+        android:id="@+id/player_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
-    <RelativeLayout
+    <View
+        android:id="@+id/black_curtain"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@android:color/black"
-        tools:context=".webview.ui.view.WebViewActivity">
-
-        <com.twentyfouri.player.base.PlayerView
-            android:id="@+id/exoplayer_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <View
-            android:id="@+id/black_curtain"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/black" />
-
-        <LinearLayout
-            android:id="@+id/url_setter"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_margin="80dp"
-            android:orientation="vertical"
-            app:visibility="@{viewModel.urlSetterVisibility}">
-
-            <EditText
-                android:id="@+id/url"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:nextFocusUp="@+id/url"
-                android:nextFocusLeft="@+id/url"
-                android:nextFocusRight="@+id/url"
-                android:textColor="@android:color/white"/>
-
-            <Button
-                android:id="@+id/button_go"
-                android:layout_width="100dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/button_focus"
-                android:textColor="@android:color/black"
-                android:nextFocusDown="@+id/button_go"
-                android:nextFocusLeft="@+id/button_go"
-                android:nextFocusRight="@+id/button_go"
-                android:onClick="@{() -> viewModel.onClickGo()}"
-                android:text="GO" />
-
-        </LinearLayout>
-
-        <com.twentyfouri.tvbridge.webview.client.BridgeWebView
-            android:id="@+id/webview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:background="@android:color/transparent"
-            android:visibility="gone"/>
-
-    </RelativeLayout>
-
-</layout>
-
+        android:background="@android:color/black" />
 
+    <com.twentyfouri.tvbridge.webview.client.BridgeWebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:background="@android:color/transparent"
+        android:visibility="gone" />
+
+</RelativeLayout>

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         versionCode 1
         versionName "1.0"

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

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
 
         versionCode 1
         versionName "1.0"

package/package.json

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

package/renative.engine.json

@@ -8,11 +8,13 @@
     "platforms": {
         "androidtv": {},
         "entone": {},
+        "firetv": {},
         "hbbtv": {},
         "kreatv": {},
         "saphi": {},
         "tizen": {},
         "vidaa": {},
+        "smartcast": {},
         "webos": {},
         "webtv": {},
         "xbox": {}