@takeoffmedia/react-native-penthera 0.2.65 → 0.2.67

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/OfflineVideoEngine.kt

@@ -1,5 +1,5 @@
 package com.takeoffmediareactnativepenthera.virtuoso
-​
+
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
@@ -7,7 +7,7 @@ import android.util.Log
 import com.bitmovin.player.api.media.subtitle.SubtitleTrack
 import com.bitmovin.player.reactnative.PlayerModule
 import com.bitmovin.player.reactnative.converter.JsonConverter
-​
+
 import com.facebook.react.bridge.ReactApplicationContext
 import com.google.gson.Gson
 import com.penthera.common.Common.AuthenticationStatus
@@ -37,12 +37,10 @@ import java.io.IOException
 import java.net.HttpURLConnection
 import java.text.SimpleDateFormat
 import java.util.Calendar
-​
+
 class OfflineVideoEngine(private val context: ReactApplicationContext) {
-​
   lateinit var  virtuoso : Virtuoso
   private lateinit var queueObserver: AssetQueueObserver
-​
   var asset: IAsset? = null
   var assetId: MutableList<String> = mutableListOf()
   private val gson = Gson()
@@ -52,32 +50,32 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
   var valuePublicKey: String = ""
   var valuePrivateKey: String = ""
   private val client = OkHttpClient()
-​
+
   private val enginePauseObserver: Observers.IEngineObserver = object : EngineObserver() {
     override fun engineStatusChanged(status: Int) {
       Log.e("MiModulo", "<<<<<<<<<<status $status>>>>>>>>>>>>")
     }
   }
-​
+
   private fun getInstanceVirtuoso(): Virtuoso {
     virtuoso = Virtuoso(context)
     queueObserver = AssetQueueObserver(this, virtuoso)
     onResume()
     return virtuoso
   }
-​
+
   fun onResume() {
     virtuoso.onResume()
     virtuoso.addObserver(queueObserver)
     virtuoso.addObserver(enginePauseObserver)
   }
-​
+
   fun onPause() {
     virtuoso.onPause()
     virtuoso.removeObserver(queueObserver)
     virtuoso.removeObserver(enginePauseObserver)
   }
-​
+
   fun setup(
       userId: String = valueUserId,
       backplaneUrl: String = valueBackPlaneUrl,
@@ -90,9 +88,9 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       valueBackPlaneUrl = backplaneUrl
       valuePrivateKey = privateKey
       valuePublicKey = publicKey
-​
+
       val nameDevice = android.os.Build.MODEL
-​
+
       vir.startup(
           URL(valueBackPlaneUrl),
           valueUserId,
@@ -110,9 +108,9 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         ).let {
           promise?.resolve("Penthera initialization successfully")
         }
-​
+
   }
-​
+
   fun downloadAsset(newItem: String) {
     setup()
     val data = JSONObject(newItem)
@@ -140,7 +138,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         URL(url)
       )
     )
-​
+
     val subtitles = JSONArray(item["subtitles"] as String)
     for (i in 0 until subtitles.length()) {
       val subtitle = subtitles.getJSONObject(i)
@@ -156,7 +154,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         )
       )
     }
-​
+
     val params = MPDAssetBuilder().apply {
       assetId(item["id"].toString())
       manifestUrl(URL(url))
@@ -167,10 +165,10 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       setClientSideAdSupport(true)
       withAncillaryFiles(fileList)
     }.build()
-​
+
     virtuoso.assetManager.createMPDSegmentedAssetAsync(params)
   }
-​
+
   fun getDownloads(): String? {
     val completedList = mutableListOf<MutableMap<String, Any>>()
     val cursor = virtuoso.assetManager?.cursor
@@ -180,8 +178,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       return gson.toJson(completedList)
     }
     val columnNames = cursor?.columnNames
-​
-      while (cursor?.moveToNext() == true && columnNames != null) {
+     while (cursor?.moveToNext() == true && columnNames != null) {
         val dataMap = mutableMapOf<String, Any>()
         var eap = ""
         var ead = ""
@@ -229,29 +226,28 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
                 put("effectiveExpiryDate", if (value == "0") eadFormated else eapFormated)
               }
             }
-​
           }
         }
         dataMap["isPaused"] = false
         completedList.add(dataMap)
       }
     cursor?.close()
-​
+
     return gson.toJson(completedList)
   }
-​
+
   private fun dateToString(seconds: String): String {
     val secondsLong = seconds.toLong()
     val calendar = Calendar.getInstance()
     calendar.add(Calendar.SECOND, secondsLong.toInt())
-​
+
     val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
     return dateFormat.format(calendar.time)
   }
-​
+
   class AssetParseObserver(activity: Context) : ISegmentedAssetFromParserObserver {
     private val mActivity: Context = activity
-​
+
     @SuppressLint("ShowToast")
     override fun complete(asset: ISegmentedAsset?, error: Int, addedToQueue: Boolean) {
 // Show a process when the asset to parsed and added to queue
@@ -266,17 +262,16 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
 //      }
     }
   }
-​
-​
+
+
   fun deleteMany(assetIds: ReadableArray, promise: Promise) {
     val assetManager = virtuoso.assetManager
     val result = Arguments.createMap()
-​
+
     for (i in 0 until assetIds.size()) {
       val idValue = assetIds.getString(i)
       val asset = assetManager.getByAssetId(idValue)
         .firstOrNull() as? IAsset
-​
       if (asset != null) {
         assetManager.delete(asset)
         result.putBoolean(idValue, true)
@@ -286,15 +281,15 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         assetId.remove(idValue)
       }
     }
-​
+
     promise.resolve(result);
   }
-​
-​
+
+
    fun getByAssetId(assetId: String): String? {
     //load asset if it has already been downloaded
     val list: MutableList<IIdentifier>? = getInstanceVirtuoso().assetManager.getByAssetId(assetId)
-​
+
     list?.let {
       if (it.isNotEmpty()) {
         asset = list[0] as VirtuosoSegmentedFile
@@ -307,13 +302,13 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         client.newCall(request).execute().use { response ->
           if (!response.isSuccessful) throw IOException("Unexpected code $response")
         }
-​
+
         val keyValueMap = HashMap<String, Any>()
         keyValueMap["offlineUrl"] = offlineUrl.toString()
         keyValueMap["metadata"] = asset?.metadata.toString()
-​
+
         val ancillaryFiles =  (asset as ISegmentedAsset).getAncillaryFiles(context)
-​
+
         //HERE THE ASSET MANIFEST IS REQUESTED
         keyValueMap["ancillary"] = ancillaryFiles
         return gson.toJson(keyValueMap)
@@ -321,50 +316,44 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     }
     return null
   }
-​
   fun updateUI() {}
-​
+
   fun loadBitmovinSourceManager(assetId: String, nativeId: String, startOffset: Double?, ancillaries: String , promise: Promise) {
-​
     getInstanceVirtuoso().assetManager?.getByAssetId(assetId)?.firstOrNull()?.let { asset ->
-​
       val sourceManager = BitmovinSourceManager(context, asset as ISegmentedAsset)
       val sourceItem = sourceManager.bitmovinSourceItem
       val playerModule = context.getNativeModule(PlayerModule::class.java)
       if (playerModule != null && sourceItem != null) {
-​
         var player = playerModule.getPlayer(nativeId)
         while(player == null) {
           Thread.sleep(100)
           player = playerModule.getPlayer(nativeId) as Nothing?
         }
-​
         if (player != null) {
           val metadata = JSONObject(asset.metadata)
           val subtitles = JSONArray(metadata["subtitles"] as String)
           val ancillaryFiles = JSONArray(ancillaries)
           for (i in 0 until subtitles.length()) {
+            val subtitleMap = Arguments.createMap()
             val subtitle = subtitles.getJSONObject(i)
-​
-            var url: String = ""
-​
+
             for (j in 0 until ancillaryFiles.length()) {
               val ancillary = ancillaryFiles.getJSONObject(j)
               if(ancillary.getString("description") == subtitle.getString("language")) {
-               url = ancillary.getString("playbackUrl")
+                subtitleMap.putString("url", ancillary.getString("playbackUrl").toString())
               }
             }
-            val language: String = subtitle.getString("language")
-            val label: String = subtitle.getString("label")
-            val format = "vtt"
-            sourceItem.addSubtitleTrack(SubtitleTrack(url, language, label, format))
-​
+            subtitleMap.putString("language",subtitle.getString("language"))
+            subtitleMap.putString("label",subtitle.getString("label"))
+            subtitleMap.putString("format","vtt")
+
+            JsonConverter.toSubtitleTrack(subtitleMap)?.let {
+              sourceItem.addSubtitleTrack(it)
+            }
           }
-​
           if(startOffset != null) {
             sourceItem.options.startOffset = startOffset
           }
-​
           player.load(sourceItem)
           promise.resolve(true)
         }
@@ -372,9 +361,8 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     }
     promise.reject("Error", "Error loading asset")
   }
-​
+
   private fun uiManager(): UIManagerModule? =
     context.getNativeModule(UIManagerModule::class.java)
-​
-​
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeoffmedia/react-native-penthera",
-  "version": "0.2.65",
+  "version": "0.2.67",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",