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

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

@@ -8,9 +8,8 @@ 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.ContentModelParser.stringToJson
 import com.twentyfouri.tvbridge.webview.parser.PlaybackInfoParser.parse
-import com.twentyfouri.tvbridge.webview.parser.SourceParser
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.audioFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.textFromJson
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
@@ -70,8 +69,19 @@ class BridgeFromJavaScript(
         Log.d(LOG_TAG, "bridgeJavaScriptToAndroid_SetVideoPath = $jsonString")
         try {
             viewModel.stopPlayer()
-            stringToJson(jsonString)?.also { source ->
-                viewModel.setVideo(source)
+            val contentModel = stringToJson(jsonString)
+            contentModel?.streamType = mimeType?.let {
+                when {
+                    mimeType.contains("application/dash+xml") -> "mpd"
+                    mimeType.contains("application/vnd.apple.mpegurl") -> "m3u8"
+                    mimeType.contains("video/mp4") -> "mp4"
+                    mimeType.contains("application/vnd.ms-sstr+xml") -> "ism"
+                    mimeType.contains("audio/mpeg") -> "mp3"
+                    else -> null
+                }
+            }
+            if (contentModel?.streamUrl != null) {
+                viewModel.setVideo(contentModel)
             }
         } catch (e: Exception) {
             Log.v(LOG_TAG, "bridgeJavaScriptToAndroid_SetVideoPathError - ${e.message}")
@@ -272,6 +282,50 @@ class BridgeFromJavaScript(
         viewModel.subtitleTrack?.let { toJson(it) } ?: DISABLED_SUBTITLE_TRACK
     }
 
+    /*
+        Returns VIDEO track BITRATE, if not available returns null
+    */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetBitrate(): Int? = runBlocking("bridgeJavaScriptToAndroid_GetBitrate") {
+        viewModel.videoTrack?.bitrate
+    }
+
+    /*
+        Returns VIDEO track RENDITION, if not available returns null
+    */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetRendition(): String? = runBlocking("bridgeJavaScriptToAndroid_GetRendition") {
+        viewModel.videoTrack?.run {
+            return@runBlocking "${width}x${height}${formatBitrate(bitrate)}"
+        }
+        null
+    }
+
+    private fun formatBitrate(bitrate: Int): String {
+        return when {
+            bitrate <= 0 -> ""
+            bitrate < 1e3 -> "@${bitrate}bps"
+            bitrate < 1e6 -> "@${(bitrate / 1e3).roundToInt()}Kbps"
+            else -> "@${(bitrate / 1e4).roundToInt() / 1e2}Mbps"
+        }
+    }
+
+    /*
+        Returns AUDIO track CODEC, if not available returns null
+    */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetAudioCodec(): String? = runBlocking("bridgeJavaScriptToAndroid_GetAudioCodec") {
+        viewModel.audioTrack?.codec
+    }
+
+    /*
+        Returns VIDEO track CODEC, if not available returns null
+    */
+    @JavascriptInterface
+    fun bridgeJavaScriptToAndroid_GetVideoCodec(): String? = runBlocking("bridgeJavaScriptToAndroid_GetVideoCodec") {
+        viewModel.videoTrack?.codec
+    }
+
     /*
       Set the cookies to localstorage
      */

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

@@ -2,13 +2,10 @@ package com.twentyfouri.tvbridge.bridge
 
 import android.util.Log
 import com.twentyfouri.player.base.AudioTrack
-import com.twentyfouri.player.base.DefaultSourceSerializer
 import com.twentyfouri.player.base.TextTrack
-import com.twentyfouri.player.base.TimelineEvent
 import com.twentyfouri.tvbridge.bridge.BridgeFromJavaScript.Companion.LOG_TAG
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.webview.parser.TrackJsonModelParser.toJson
-import org.json.JSONArray
 
 class BridgeToJavaScript(
     config: BridgeConfig,
@@ -63,18 +60,6 @@ class BridgeToJavaScript(
         executeJavaScript(mediaEventString)
     }
 
-    fun bridgeAndroidToJavaScript_MediaAdBreaksEvent(
-        mediaEvent: String,
-        timeline: List<TimelineEvent>
-    ) {
-        val serializer = DefaultSourceSerializer()
-        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)
-        executeJavaScript(mediaEventString)
-    }
-
     fun bridgeAndroidToJavaScript_IAPValidationError(message: String) {
         Log.d(LOG_TAG, "bridgeAndroidToJavaScript_IAPValidationError")
         executeJavaScript("javascript:((function dispatchEvent(){var evt = document.createEvent('Events');evt.initEvent('${iapEventPrefix}iapError',true,true);evt.message='$message';document.dispatchEvent(evt);})())")

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

@@ -3,7 +3,7 @@ package com.twentyfouri.tvbridge.configuration
 import com.twentyfouri.tvbridge.BuildConfig
 
 class BridgeConfig {
-    var baseUrl: String = BuildConfig.APP_URL
+    var baseUrl: String = "http://portal.24imedia.tv/"
     var userAgent: UserAgent = UserAgent()
     var drm: Drm = Drm()
     var isEnabledTouchSound: Boolean = false
@@ -13,5 +13,4 @@ class BridgeConfig {
     var iapEventPrefix: String = ""
     var customizableUrl: Boolean = BuildConfig.DEBUG
     var startWithHighVideoQuality: Boolean = false
-    var theoLicense: String = BuildConfig.THEO_LICENSE
 }

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

@@ -1,6 +1,9 @@
 package com.twentyfouri.tvbridge.global.di
 
 import android.app.Activity
+import com.twentyfouri.player.base.PlayerFactoryBase
+import com.twentyfouri.tvbridge.configuration.BridgeConfig
+import com.twentyfouri.tvbridge.global.utils.PlayerFactoryExoPlayerCustomized
 import dagger.Module
 import dagger.Provides
 

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

@@ -7,7 +7,7 @@ import com.twentyfouri.tvbridge.common.NullIapService
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.global.BaseApplication
 import com.twentyfouri.tvbridge.global.utils.LocalStorage
-import com.twentyfouri.tvbridge.global.utils.PlayerFactoryConfigured
+import com.twentyfouri.tvbridge.global.utils.PlayerFactoryExoPlayerCustomized
 import com.twentyfouri.tvbridge.sound.TouchPlayer
 import dagger.Module
 import dagger.Provides
@@ -46,6 +46,6 @@ class ApplicationModule(
     @Provides
     @Singleton
     fun providePlayerFactory(config: BridgeConfig): PlayerFactoryBase =
-        PlayerFactoryConfigured.buildFactory(config)
+        PlayerFactoryExoPlayerCustomized(config)
 
 }

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

@@ -2,7 +2,6 @@ package com.twentyfouri.tvbridge.global.utils
 
 import android.content.Context
 import com.google.android.exoplayer2.C
-import com.google.android.exoplayer2.ExoPlayerLibraryInfo
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager
 import com.google.android.exoplayer2.drm.DrmSessionManager
 import com.google.android.exoplayer2.drm.FrameworkMediaDrm
@@ -18,12 +17,7 @@ import com.twentyfouri.tvbridge.configuration.BridgeConfig
 
 class PlayerFactoryExoPlayerCustomized(
     private val config: BridgeConfig
-) : PlayerFactoryExoPlayer(), PlayerFactoryVersion {
-
-    override val engineName: String = "Exoplayer"
-
-    override val engineVersion: String = ExoPlayerLibraryInfo.VERSION
-
+) : PlayerFactoryExoPlayer() {
     override fun createSharedComponents(context: Context): SharedComponents =
             CustomizedSharedComponents(context)
 

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

@@ -1,11 +1,7 @@
 package com.twentyfouri.tvbridge.global.utils
 
-import com.twentyfouri.player.base.Source
 import com.twentyfouri.player.base.SourceAuthorization
 import com.twentyfouri.player.base.SourceDrm
-import com.twentyfouri.player.base.SourceDrmPlayready
-import com.twentyfouri.player.base.SourceDrmWidevine
-import com.twentyfouri.player.base.buildUpon
 import java.net.URI
 
 open class SourceDrmOverridden protected constructor(
@@ -37,17 +33,6 @@ open class SourceDrmOverridden protected constructor(
         var forceLicenseServer: Boolean = false
         var authorization: SourceAuthorization? = null
 
-        open fun applyFrom(source: SourceDrm) {
-            when (source) {
-                is SourceDrmOverridden -> applyFrom(source)
-                is SourceDrmWidevine -> applyFrom(source)
-                is SourceDrmPlayready -> applyFrom(source)
-                else -> {
-                    packageName = source.packageName
-                }
-            }
-        }
-
         open fun applyFrom(source: SourceDrmOverridden) {
             packageName = source.packageName
             licenseServer = source.licenseServer
@@ -55,36 +40,9 @@ open class SourceDrmOverridden protected constructor(
             authorization = source.authorization
         }
 
-        open fun applyFrom(source: SourceDrmWidevine) {
-            packageName = source.packageName
-            licenseServer = source.licenseServer
-            forceLicenseServer = source.forceLicenseServer
-            authorization = source.authorization
-        }
-
-        open fun applyFrom(source: SourceDrmPlayready) {
-            packageName = source.packageName
-            licenseServer = source.licenseServer
-            forceLicenseServer = source.forceLicenseServer
-            authorization = source.authorization
-        }
-
         override fun build() =
                 SourceDrmOverridden(this)
     }
-
-    companion object {
-        fun replaceSource(source: Source): Source {
-            if (source.drm.isEmpty()) return source
-            return source.buildUpon {
-                drm = drm.mapTo(mutableListOf()) { sourceDrm ->
-                    SourceDrmOverridden {
-                        applyFrom(sourceDrm)
-                    }
-                }
-            }
-        }
-    }
 }
 
 inline fun SourceDrmOverridden(block: SourceDrmOverridden.Builder.() -> Unit) =

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

@@ -0,0 +1,211 @@
+package com.twentyfouri.tvbridge.jump
+
+import android.util.Log
+import com.google.android.exoplayer2.ExoPlayer
+import com.google.android.exoplayer2.SimpleExoPlayer
+import com.google.gson.JsonObject
+import com.twentyfouri.tvbridge.BuildConfig
+import com.twentyfouri.tvbridge.webview.model.AnalyticsPlaybackInfo
+import jump.JumpKit
+import jump.insights.models.contextinformation.*
+import jump.insights.models.track.events.JKContentType
+import jump.insights.models.track.events.JKTransactionType
+import jump.libs.gson.annotations.SerializedName
+import java.util.*
+
+class JumpAnalytics {
+
+    private var started = false
+    private var hasContent = false
+
+    fun setPlaybackInfo(playbackInfo: AnalyticsPlaybackInfo) {
+        setApplicationId(playbackInfo.id ?: return)
+        setUserInfo(playbackInfo.userInfo)
+        setContentInfo(playbackInfo.contentInfo)
+    }
+
+    private fun setApplicationId(applicationId: String) {
+        if (started) return
+        started = true
+        JumpKit.setDebugMode(BuildConfig.DEBUG)
+        JumpKit.start(applicationId)
+    }
+
+    private fun setUserInfo(params: JsonObject?) {
+        JumpKit.insights.setUserInfo(parseUserInfo(params))
+    }
+
+    private fun setContentInfo(params: JsonObject?) {
+        val contentInfo = parseContentInfo(params)
+        jump.exoplayerextension.JumpKit.insights.setContentInfo(contentInfo)
+        hasContent = true
+    }
+
+    fun setVideoPlayer(player: ExoPlayer?) {
+        @Suppress("DEPRECATION")
+        if (player !is SimpleExoPlayer) {
+            /* NOTICE: passing null also causes insights.setContentInfo(null) */
+            jump.exoplayerextension.JumpKit.insights.setVideoPlayer(null)
+            hasContent = false
+        } else if (started && hasContent) {
+            jump.exoplayerextension.JumpKit.insights.setVideoPlayer(player)
+        } else if (started) {
+            Log.w("JumpAnalytics", "No content data available. Did you call SetPlaybackInfo before SetVideoPath?")
+        }
+    }
+
+    private fun parseUserInfo(params: JsonObject?): JKUserInfo {
+        return try {
+            var userType = parseEnum(params, "userType", JKUserType::class.java)
+            if (userType == null) userType = JKUserType.ANONYMOUS
+            val userId = parseString(params, "userId")
+            val userCountry = parseString(params, "userCountry")
+            val userBirthDate = parseString(params, "userBirthDate")
+            var userSex = parseEnum(params, "userSex", JKUserSex::class.java)
+            if (userSex == null) userSex = JKUserSex.UNDEFINED
+            val userProfileId = parseString(params, "userProfileId")
+            val userOperator = parseString(params, "userOperator")
+            if (userType == JKUserType.ANONYMOUS) JKUserInfo.anonymousInstance() else JKUserInfo(userType, userId, userCountry, userBirthDate, userSex, userProfileId, userOperator)
+        } catch (e: Exception) {
+            Log.w("JumpAnalytics", "Parsing userInfo failed. Falling back to ANONYMOUS", e)
+            JKUserInfo.anonymousInstance()
+        }
+    }
+
+    private fun parseCategory(params: JsonObject?, property: String): JKContextCategory? {
+        val jsonValue = params?.get(property) ?: return null
+        return if (!jsonValue.isJsonObject) null else parseCategory(jsonValue.asJsonObject)
+    }
+
+    private fun parseCategory(params: JsonObject): JKContextCategory {
+        return JKContextCategory(
+                parseString(params, "categoryId"),
+                parseString(params, "categoryName")
+        )
+    }
+
+    private fun parseSubCategory(params: JsonObject?, property: String): JKContextSubcategory? {
+        val jsonValue = params?.get(property) ?: return null
+        return if (!jsonValue.isJsonObject) null else parseSubCategory(jsonValue.asJsonObject)
+    }
+
+    private fun parseSubCategory(params: JsonObject): JKContextSubcategory {
+        return JKContextSubcategory(
+                parseString(params, "subcategoryId"),
+                parseString(params, "categoryId"),
+                parseString(params, "subcategoryName")
+        )
+    }
+
+    private fun parseGenre(params: JsonObject): JKContextGenre {
+        return JKContextGenre(
+                parseString(params, "genreId"),
+                parseString(params, "genreName"),
+                parseCategory(params, "categoryId"),
+                parseSubCategory(params, "subCategoryId")
+        )
+    }
+
+    private fun parseContentInfo(params: JsonObject?): JKContextContent {
+        return JKContextContent(
+                parseString(params, "contentId"),
+                parseString(params, "contentTitle"),
+                parseString(params, "contentSerieTitle"),
+                parseInteger(params, "contentEpisodeNumber"),
+                parseInteger(params, "contentSeasonNumber"),
+                parseString(params, "contentDescription"),
+                parseCategory(params, "contentCategory"),
+                parseSubCategory(params, "contentSubCategory"),
+                parseGenres(params, "contentGenres"),
+                parseString(params, "contentProvider"),
+                parseEnum(params, "contentTransactionType", JKTransactionType::class.java),
+                parseEnum(params, "contentType", JKContentType::class.java),
+                parseString(params, "contentLanguage")
+        )
+    }
+
+    private fun parseGenres(container: JsonObject?, property: String): List<JKContextGenre>? {
+        if (container == null) return null
+        val jsonValue = container[property] ?: return null
+        if (!jsonValue.isJsonArray) return null
+        val list = ArrayList<JKContextGenre>()
+        for (jsonElement in jsonValue.asJsonArray) {
+            if (!jsonElement.isJsonObject) continue
+            list.add(parseGenre(jsonElement.asJsonObject))
+        }
+        return list
+    }
+
+    private fun <T : Enum<T>> parseEnum(container: JsonObject?, property: String, type: Class<T>): T? {
+        if (container == null) return null
+        val jsonValue = container[property] ?: return null
+        if (!jsonValue.isJsonPrimitive) return null
+        val primitive = jsonValue.asJsonPrimitive
+        return when {
+            primitive.isString ->
+                parseEnum(type, jsonValue.asString)
+            primitive.isNumber ->
+                parseEnum(type, jsonValue.asInt)
+            else ->
+                null
+        }
+    }
+
+    private fun <T : Enum<T>> parseEnum(type: Class<T>, value: String): T? {
+        try {
+            for (constant in type.enumConstants ?: return null) {
+                val name = constant.name
+                if (name == value) {
+                    return constant
+                }
+                val annotation = type.getField(name).getAnnotation(SerializedName::class.java)
+                if (annotation != null) {
+                    if (annotation.value == value) {
+                        return constant
+                    }
+                }
+            }
+            return null
+        } catch (e: NoSuchFieldException) {
+            return null
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun <T : Enum<T>> parseEnum(type: Class<T>, value: Int): T? {
+        return try {
+            val map = type.getDeclaredField("mapper")[null] as Map<T, Int>
+            for ((key, value1) in map) {
+                if (value1 == value) {
+                    return key
+                }
+            }
+            null
+        } catch (e: ClassCastException) {
+            null
+        } catch (e: IllegalAccessException) {
+            null
+        } catch (e: NoSuchFieldException) {
+            null
+        }
+    }
+
+    private fun parseString(container: JsonObject?, property: String): String? {
+        if (container == null) return null
+        var jsonValue = container[property]
+        if (jsonValue == null && property.endsWith("Id")) {
+            // inconsistencies in SDK cause confusion, try uppercased xxxxID just in case
+            jsonValue = container[property.replace("Id", "ID")]
+        }
+        if (jsonValue == null) return null
+        if (!jsonValue.isJsonPrimitive) return null
+        return if (!jsonValue.asJsonPrimitive.isString) null else jsonValue.asString
+    }
+
+    private fun parseInteger(container: JsonObject?, property: String): Int? {
+        if (container == null) return null
+        val jsonValue = container[property] ?: return null
+        if (!jsonValue.isJsonPrimitive) return null
+        return if (!jsonValue.asJsonPrimitive.isNumber) null else jsonValue.asInt
+    }
+}

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

@@ -19,7 +19,4 @@ 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_END = "adbreakend"
-    const val AD_BREAKS_RESCHEDULED = "adbreaksrescheduled"
 }

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

@@ -0,0 +1,16 @@
+package com.twentyfouri.tvbridge.webview.parser
+
+import com.google.gson.Gson
+import com.twentyfouri.tvbridge.webview.model.ContentModel
+
+object ContentModelParser {
+    fun stringToJson(json: String?): ContentModel? = when {
+        json.isNullOrEmpty() -> null
+        json.startsWith("http://") || json.startsWith("https://") ->
+            ContentModel().apply {
+                streamUrl = json
+            }
+        else ->
+            Gson().fromJson(json, ContentModel::class.java)
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.twentyfouri.tvbridge.webview.parser
+
+import android.os.Build
+import org.json.JSONException
+import org.json.JSONObject
+
+object DeviceInfoParser {
+    // TODO Auto-generated catch block
+    val deviceInfoParsed: String
+        get() {
+            val deviceInfo = JSONObject()
+            try {
+                deviceInfo.put("deviceBrand", Build.MANUFACTURER)
+                deviceInfo.put("deviceModel", Build.MODEL)
+                deviceInfo.put("osVersion", Build.VERSION.RELEASE)
+            } catch (e: JSONException) {
+                // TODO Auto-generated catch block
+                e.printStackTrace()
+            }
+            return deviceInfo.toString()
+        }
+}

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

@@ -1,5 +1,7 @@
 package com.twentyfouri.tvbridge.webview.view
 
+import com.twentyfouri.player.base.PlayerBase
+
 /**
  * Created by destivar on 15/02/16.
  */
@@ -7,6 +9,7 @@ interface Mainview {
     fun loadUrl(url: String?)
     fun goFullscreen()
     fun exitFullscreen(width: Int, height: Int, left: Int, top: Int)
+    fun setUrlToView(urlString: String?)
     fun setBlackCurtainVisibility(visibility: Int)
     fun showMessage(message: String?)
     fun requestAudioFocus(): Int

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

@@ -1,6 +1,6 @@
 package com.twentyfouri.tvbridge.webview.view
 
-import com.twentyfouri.player.base.Source
+import com.twentyfouri.tvbridge.webview.model.ContentModel
 
 class PlayerCache {
     enum class PlayerState {
@@ -11,5 +11,5 @@ class PlayerCache {
     var savedPlayerPosition: Double = 0.0
     var savedPlayerDuration: Double = 0.0
     var savedPlayerState: PlayerState? = null
-    var savedSource: Source? = null
+    var savedContentModel: ContentModel? = null
 }