@takeoffmedia/react-native-penthera 0.2.46 → 0.2.48

package/android/build.gradle

@@ -81,7 +81,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   //penthera
-  implementation 'com.penthera:cnc-android-sdk-debug:5.3.5'
+  implementation 'com.penthera:cnc-android-sdk-debug:5.3.9'
   implementation 'com.google.code.gson:gson:2.8.6'
   implementation "com.penthera:cnc-android-bitmovin-support:5.3.6-beta"
 

package/android/src/main/java/com/takeoffmediareactnativepenthera/AssetQueueObserver.kt

@@ -8,6 +8,7 @@ import com.penthera.virtuososdk.client.IIdentifier
 import com.penthera.virtuososdk.client.Observers
 import com.penthera.virtuososdk.client.Virtuoso
 import com.takeoffmediareactnativepenthera.virtuoso.OfflineVideoEngine
+import com.takeoffmediareactnativepenthera.virtuoso.errors.PentheraErrors
 
 class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso) : Observers.IQueueObserver {
 
@@ -37,11 +38,17 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
   }
 
   override fun engineEncounteredErrorDownloadingAsset(aAsset: IIdentifier) {
+    var asset = aAsset as IAsset
+    var limit = asset.assetDownloadLimit
+    if(limit == -1 || limit == 0){
+      EventEmitter.sharedInstance.dispatch("penthera", PentheraEvent.ERROR_DOWNLOAD, asset.assetId, PentheraErrors.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS)
+    }
     Log.e("MiModulo","<<<<<<<<<<engineEncounteredErrorDownloadingAsset>>>>>>>>>>>>")
     // The base implementation does nothing.  See class documentation.
   }
 
   override fun engineEncounteredErrorParsingAsset(mAssetId: String) {
+    var asset = mAssetId
     Log.e("MiModulo","<<<<<<<<<<engineEncounteredErrorParsingAsset>>>>>>>>>>>>")
   }
 
@@ -88,15 +95,15 @@ class AssetQueueObserver(mOfflineVideo : OfflineVideoEngine, virtuoso: Virtuoso)
             }
             Common.AssetStatus.DOWNLOAD_DENIED_ASSET -> {
               assetStatus = "Queued"
-              value = "The asset has already been downloaded as many times as permitted.  To download this asset again, administrative action is required."
+              value = ""
             }
             Common.AssetStatus.DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS -> {
               assetStatus = "Queued"
-              value = "There are already as many downloads as permitted on this account.  To continue downloading, the user must delete downloaded assets from one of their devices."
+              value = PentheraErrors.DOWNLOAD_DENIED_ASSET
             }
             Common.AssetStatus.DOWNLOAD_DENIED_COPIES -> {
               assetStatus = "Queued"
-              value = "There are already as many downloaded copies of this asset as permitted on this account.  To continue downloading, the user must delete a copy of this asset from one of their devices."
+              value = PentheraErrors.DOWNLOAD_DENIED_COPIES
             }
             Common.AssetStatus.DOWNLOAD_COMPLETE -> {
               assetStatus = "complete"

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

@@ -5,7 +5,9 @@ import android.app.Activity
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
+import com.bitmovin.player.api.ui.StyleConfig
 import com.bitmovin.player.reactnative.PlayerModule
+import com.bitmovin.player.reactnative.extensions.setProperty
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.google.gson.Gson
@@ -27,10 +29,9 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableArray
+import com.penthera.virtuososdk.client.AncillaryFile
 import org.json.JSONObject
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.TimeZone
+import java.util.Arrays
 
 class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
@@ -105,6 +106,27 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     val url = data["url"].toString()
     assetId = item["id"].toString()
     val metadata = item.toString()
+    val fileList: MutableList<AncillaryFile> = ArrayList()
+    val static = item["static"] as JSONObject
+    fileList.add(
+      AncillaryFile(
+        URL(static["js"] as String),
+        "js",
+        arrayOf("js"),
+        "js",
+        URL(url)
+      )
+    )
+    fileList.add(
+      AncillaryFile(
+        URL(static["css"] as String),
+        "css",
+        arrayOf("css"),
+        "css",
+        URL(url)
+      )
+    )
+
     val params = MPDAssetBuilder().apply {
       assetId(assetId)
       manifestUrl(URL(url))
@@ -113,12 +135,13 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       desiredVideoBitrate(Int.MAX_VALUE)
       withMetadata(metadata)
       setClientSideAdSupport(true)
+      withAncillaryFiles(fileList)
     }.build()
 
     virtuoso.assetManager.createMPDSegmentedAssetAsync(params)
   }
 
-   fun getDownloads(): String? {
+  fun getDownloads(): String? {
     val completedList = mutableListOf<MutableMap<String, Any>>()
     val cursor = virtuoso.assetManager?.cursor
     val count = cursor?.count
@@ -131,8 +154,6 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       while (cursor?.moveToNext() == true && columnNames != null) {
         val assetManager = virtuoso.assetManager
         val dataMap = mutableMapOf<String, Any>()
-        var eap = ""
-        var ead = ""
         for (columnName in columnNames) {
           val columnIndex = cursor.getColumnIndex(columnName)
           if (columnIndex >= 0) {
@@ -159,20 +180,6 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
                 put("estimatedSize", value)
               }
             }
-            if (columnName == "ead") {
-              ead = value
-            }
-            if (columnName == "eap") {
-              eap = value
-            }
-            if (columnName == "firstPlayTime") {
-              var eadFormated = dateToString(ead)
-              var eapFormated = dateToString(eap)
-              dataMap["data"] = (dataMap["data"] as? MutableMap<String, Any> ?: mutableMapOf()).apply {
-                put("effectiveExpiryDate", if (value == "0") eadFormated else eapFormated)
-              }
-            }
-
           }
         }
         dataMap["isCompleted"] = dataMap["currentSize"] == dataMap["expectedSize"]
@@ -184,15 +191,6 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
     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
 
@@ -244,6 +242,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
         val keyValueMap = HashMap<String, Any>()
         keyValueMap["offlineUrl"] = offlineUrl
         keyValueMap["metadata"] = asset?.metadata.toString()
+        keyValueMap["ancillary"] = (asset as ISegmentedAsset).getAncillaryFiles(context)
         return gson.toJson(keyValueMap)
       }
     }
@@ -252,6 +251,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
 
   fun updateUI() {}
 
+
   fun loadBitmovinSourceManager(assetId: String, nativeId: String): Boolean {
     virtuoso.assetManager?.getByAssetId(assetId)?.firstOrNull()?.let { asset ->
       val sourceManager = BitmovinSourceManager(context, asset as ISegmentedAsset)
@@ -259,6 +259,7 @@ class OfflineVideoEngine(private val context: ReactApplicationContext) {
       val playerModule = context.getNativeModule(PlayerModule::class.java)
       if (playerModule != null && sourceItem != null) {
         val player = playerModule.getPlayer(nativeId)
+
         if (player != null) {
           player.load(sourceItem)
           return true

package/android/src/main/java/com/takeoffmediareactnativepenthera/virtuoso/errors/ErrorsMapped.kt

@@ -0,0 +1,7 @@
+package com.takeoffmediareactnativepenthera.virtuoso.errors
+
+object PentheraErrors {
+  const val DOWNLOAD_DENIED_ASSET = "The asset has already been downloaded as many times as permitted.  To download this asset again, administrative action is required."
+  const val DOWNLOAD_DENIED_COPIES = "There are already as many downloaded copies of this asset as permitted on this account.  To continue downloading, the user must delete a copy of this asset from one of their devices."
+  const val DOWNLOAD_DENIED_MAX_DEVICE_DOWNLOADS = "There are already as many downloads as permitted on this account.  To continue downloading, the user must delete downloaded assets from one of their devices."
+}

package/ios/Penthera.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/Penthera.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/Penthera.xcodeproj/xcuserdata/joseguerreroot.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "3AE98629-7421-4561-B12C-C06B8B6A3023"
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "A5D166B0-3C57-4F4D-A845-BDB81498DA0F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "18"
+            endingLineNumber = "18"
+            landmarkName = "Penthera"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5D7AE47B-D5FC-4468-A75B-C414F3F8A58C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "updateStatusInfo()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E3C50B30-46CF-4D56-8C49-C257C70E0ACC"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "updateStatusInfo()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "75EF43BF-56FF-4727-B372-E1A0EBC02C61"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "101"
+            endingLineNumber = "101"
+            landmarkName = "initializeSdk(user:backplaneUrl:publicKey:privateKey:resolve:reject:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "EF36B51B-4FC2-4989-A791-180E3212EFE3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "149"
+            endingLineNumber = "149"
+            landmarkName = "getDownloadedAsset(assetID:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "C467C00E-2428-4D24-843A-E7CDF28CB553"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Penthera.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "148"
+            endingLineNumber = "148"
+            landmarkName = "getDownloadedAsset(assetID:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>

package/ios/Penthera.xcodeproj/xcuserdata/joseguerreroot.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Penthera.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

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