@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/global/utils/SourceDrmOverridden.kt

@@ -1,7 +1,11 @@
 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(
@@ -33,6 +37,17 @@ 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
@@ -40,9 +55,36 @@ 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/webview/model/MediaEventType.kt

@@ -19,4 +19,7 @@ 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/SourceParser.kt

@@ -0,0 +1,89 @@
+package com.twentyfouri.tvbridge.webview.parser
+
+import com.twentyfouri.player.base.*
+import com.twentyfouri.tvbridge.global.utils.SourceDrmOverridden
+import org.json.JSONException
+import org.json.JSONObject
+import java.net.URI
+import java.util.UUID
+
+object SourceParser {
+    private val sourceSerializer = DefaultSourceSerializer()
+
+    fun stringToJson(jsonString: String?): Source? {
+        if (jsonString.isNullOrEmpty()) return null
+        if (jsonString.startsWith("http://") || jsonString.startsWith("https://")) {
+            return Source {
+                url = URI(jsonString)
+            }
+        }
+
+        try {
+            val jsonSource = JSONObject(jsonString)
+            if (jsonSource.has("streamUrl")) {
+                return parseContentModel(jsonSource)
+            }
+            return sourceSerializer.toSource(jsonSource)
+
+        } catch (e: JSONException) {
+            return null
+        }
+    }
+
+    private fun parseContentModel(jsonSource: JSONObject): Source? {
+        return Source {
+            val streamUrl = jsonSource.getString("streamUrl", null)
+            if (streamUrl.isNullOrEmpty()) return null
+            url = URI(streamUrl)
+
+            mimeType = jsonSource.getString("streamType", null)
+                ?.let { MimeType.parse(it) }
+
+            jsonSource.getObject("drmConfig") { parseDrmModel(it) }
+                ?.also { drm.add(it) }
+        }
+    }
+
+    private fun parseDrmModel(jsonDrm: JSONObject): SourceDrm? {
+        val drmSchemeUuid = jsonDrm.getString("drmSchemeUuid", null)
+        val drmLicenseUri = jsonDrm.getString("drmLicenseUrl", null)
+            ?.let { URI(it) }
+        val drmCustomData = jsonDrm.getObject("drmCustomData") { parseSourceAuthorization (it) }
+        val overrideDrmCallback = jsonDrm.getBoolean("overrideDrmCallback")
+
+        return if (overrideDrmCallback) {
+            SourceDrmOverridden {
+                packageName = when (drmSchemeUuid) {
+                    "widevine", WIDEVINE_UUID -> DrmWidevine.packageName
+                    "playready", PLAYREADY_UUID -> DrmPlayready.packageName
+                    else -> null
+                }
+                licenseServer = drmLicenseUri
+                authorization = drmCustomData
+            }
+        } else {
+            when (drmSchemeUuid) {
+                "widevine", WIDEVINE_UUID -> SourceDrmWidevine {
+                    licenseServer = drmLicenseUri
+                    authorization = drmCustomData
+                }
+                "playready", PLAYREADY_UUID -> SourceDrmPlayready {
+                    licenseServer = drmLicenseUri
+                    authorization = drmCustomData
+                }
+                else -> null
+            }
+        }
+    }
+
+    private fun parseSourceAuthorization(jsonMap: JSONObject): SourceAuthorization? {
+        return SourceAuthorizationHeaders {
+            jsonMap.keys().forEach { key ->
+                headers[key] = jsonMap.getString(key)
+            }
+        }
+    }
+
+    val WIDEVINE_UUID = "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed"
+    val PLAYREADY_UUID = "9a04f079-9840-4286-ab92-e65be0885f95"
+}

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

@@ -1,7 +1,5 @@
 package com.twentyfouri.tvbridge.webview.view
 
-import com.twentyfouri.player.base.PlayerBase
-
 /**
  * Created by destivar on 15/02/16.
  */
@@ -9,7 +7,6 @@ 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.tvbridge.webview.model.ContentModel
+import com.twentyfouri.player.base.Source
 
 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 savedContentModel: ContentModel? = null
+    var savedSource: Source? = null
 }

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

@@ -2,9 +2,6 @@ package com.twentyfouri.tvbridge.webview.view
 
 import android.annotation.SuppressLint
 import android.app.Activity
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.graphics.Point
 import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
@@ -14,10 +11,9 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.view.View.MeasureSpec
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.webkit.WebChromeClient
-import android.webkit.WebView
 import android.widget.RelativeLayout
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -25,7 +21,6 @@ import androidx.databinding.DataBindingUtil
 import androidx.media.AudioAttributesCompat
 import androidx.media.AudioFocusRequestCompat
 import androidx.media.AudioManagerCompat
-import com.twentyfouri.tvbridge.BuildConfig
 import com.twentyfouri.tvbridge.R
 import com.twentyfouri.tvbridge.configuration.BridgeConfig
 import com.twentyfouri.tvbridge.databinding.ActivityWebViewBinding
@@ -76,36 +71,14 @@ class WebViewActivity : AppCompatActivity(), Mainview {
             CookieHandler.setDefault(defaultCookieManager)
         }
 
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_web_view)
-        binding.viewModel = viewModel
-        binding.exoplayerView.playerFactory = viewModel.playerFactory
+        binding = ActivityWebViewBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.playerView.playerFactory = viewModel.playerFactory
         viewModel.attachView(this)
         viewModel.configureWebView(binding.webview)
-        viewModel.player = binding.exoplayerView.player
+        viewModel.player = binding.playerView.player
 
-        binding.url.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                viewModel.appUrl = s.toString()
-            }
-
-            override fun afterTextChanged(s: Editable) {}
-        })
-
-        val appUrl = config.baseUrl
-        if (config.customizableUrl) {
-            viewModel.urlSetterVisible = true
-            viewModel.appUrl = appUrl
-            setUrlToView(appUrl)
-        } else {
-            viewModel.urlSetterVisible = false
-            loadUrl(appUrl)
-        }
-
-        binding.root.viewTreeObserver.addOnGlobalFocusChangeListener { oldFocus: View, newFocus: View ->
-            Log.v("FOCUS", "global focus changed old = $oldFocus")
-            Log.v("FOCUS", "global focus changed new = $newFocus")
-        }
+        loadUrl(config.baseUrl)
 
         initialized = true
     }
@@ -170,13 +143,12 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     public override fun onDestroy() {
         if (initialized) {
             viewModel.releasePlayer()
-            binding.unbind()
         }
         super.onDestroy()
     }
 
     override fun goFullscreen() {
-        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = -1
         layoutParams.height = -1
         layoutParams.leftMargin = 0
@@ -187,8 +159,12 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         display.getSize(size)
         val width = size.x
         val height = size.y
-        binding.exoplayerView.layoutParams = layoutParams
-        binding.exoplayerView.layout(width, height, 0, 0)
+        binding.playerView.layoutParams = layoutParams
+        binding.playerView.measure(
+            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        )
+        binding.playerView.layout(width, height, 0, 0)
     }
 
     override fun launchIapPurchase(sku: String) {
@@ -196,37 +172,22 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     override fun exitFullscreen(width: Int, height: Int, left: Int, top: Int) {
-        val layoutParams = binding.exoplayerView.layoutParams as RelativeLayout.LayoutParams
+        val layoutParams = binding.playerView.layoutParams as RelativeLayout.LayoutParams
         layoutParams.width = width
         layoutParams.height = height
         layoutParams.leftMargin = left
         layoutParams.topMargin = top
 
         //set the layout inner and outer sizes
-        binding.exoplayerView.layoutParams = layoutParams
-        binding.exoplayerView.layout(width, height, left, top)
-    }
-
-    override fun setUrlToView(urlString: String?) {
-        binding.url.requestFocus()
-        binding.url.setText(urlString)
-        binding.url.setSelection(urlString?.length ?: 0)
+        binding.playerView.layoutParams = layoutParams
+        binding.playerView.layout(width, height, left, top)
     }
 
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         when (event.keyCode) {
-            KeyEvent.KEYCODE_DPAD_RIGHT, KeyEvent.KEYCODE_DPAD_LEFT -> changeFocus()
             KeyEvent.KEYCODE_DPAD_CENTER -> goToUrl()
-            KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_BUTTON_B, KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_MENU, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, KeyEvent.KEYCODE_MEDIA_PLAY, KeyEvent.KEYCODE_MEDIA_PAUSE, KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, KeyEvent.KEYCODE_MEDIA_REWIND -> {
-                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-                    // Send these key presses to the WebView, through a JavaScript bridge.
-                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
-                }
-            }
             else -> {
-                if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-                    viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
-                }
+                viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_DOWN)
             }
         }
         return super.onKeyDown(keyCode, event)
@@ -254,35 +215,19 @@ class WebViewActivity : AppCompatActivity(), Mainview {
     }
 
     private fun goToUrl() {
-        if (binding.buttonGo.hasFocus()) {
-            viewModel.onClickGo()
-        }
-    }
-
-    private fun changeFocus() {
-        if (binding.url.hasFocus()) {
-            binding.buttonGo.requestFocus()
-        } else if (binding.buttonGo.hasFocus()) {
-            binding.url.requestFocus()
-        }
+        viewModel.onClickGo()
     }
 
     override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-            // Send these key presses to the WebView, through a JavaScript bridge.
-            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
-            return true
-        }
-        return super.onKeyUp(keyCode, event)
+        // Send these key presses to the WebView, through a JavaScript bridge.
+        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_UP)
+        return true
     }
 
     override fun onKeyLongPress(keyCode: Int, event: KeyEvent): Boolean {
-        if (!binding.url.hasFocus() && !binding.buttonGo.hasFocus()) {
-            // Send these key presses to the WebView, through a JavaScript bridge.
-            viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
-            return true
-        }
-        return super.onKeyLongPress(keyCode, event)
+        // Send these key presses to the WebView, through a JavaScript bridge.
+        viewModel.sendKeyCode(event.keyCode, MediaEventType.KEY_PRESS)
+        return true
     }
 
     override fun loadUrl(url: String?) {
@@ -294,10 +239,6 @@ class WebViewActivity : AppCompatActivity(), Mainview {
         }
     }
 
-    override fun onBackPressed() {
-        super.onBackPressed()
-    }
-
     companion object {
         private val defaultCookieManager: CookieManager = CookieManager().apply {
             setCookiePolicy(CookiePolicy.ACCEPT_ALL)