react-native-theoplayer 7.2.0 → 7.3.0

package/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.3.0] - 24-06-03
+
+### Changed
+
+- Disabled skip forward/backward remote control buttons by default for Live content on Android TV platforms.
+
+### Added
+
+- Added support for React Native 0.74 and upgraded the example application to depend on `react-native-tvos` 0.74.1.
+
+### Fixed
+
+- Fixed an issue where on the iOS bridge the wrong value was extracted from the CachingParameters to configure the bandwidth setting on the MediaCache.
+
 ## [7.2.0] - 24-05-12
 
 ### Added

package/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.2.2')}"
+    classpath "com.android.tools.build:gradle:${safeExtGet('gradlePluginVersion', '8.3.2')}"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.9.21')}"
   }
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt

@@ -7,7 +7,8 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.uimanager.events.ReactEventEmitter
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.common.ViewUtil
 import com.theoplayer.ads.AdEventAdapter
 import com.theoplayer.ads.AdEventAdapter.AdEventEmitter
 import com.theoplayer.android.api.THEOplayerGlobal
@@ -46,6 +47,7 @@ import com.theoplayer.track.*
 import com.theoplayer.util.PayloadBuilder
 import kotlin.math.floor
 
+
 private val TAG = PlayerEventEmitter::class.java.name
 
 private const val EVENT_PLAYER_READY = "onNativePlayerReady"
@@ -85,7 +87,7 @@ private const val EVENT_PROP_SUITE_VERSION = "playerSuiteVersion"
 
 @Suppress("UNCHECKED_CAST")
 class PlayerEventEmitter internal constructor(
-  reactContext: ReactApplicationContext,
+  private val reactContext: ReactApplicationContext,
   playerView: ReactTHEOplayerView
 ) {
   @Retention(AnnotationRetention.SOURCE)
@@ -156,7 +158,6 @@ class PlayerEventEmitter internal constructor(
     )
   }
 
-  private val eventEmitter: ReactEventEmitter
   private var viewId = View.NO_ID
   private val playerListeners = HashMap<EventType<*>, EventListener<*>>()
   private val textTrackListeners = HashMap<EventType<*>, EventListener<*>>()
@@ -174,7 +175,6 @@ class PlayerEventEmitter internal constructor(
   }
 
   init {
-    eventEmitter = ReactEventEmitter(reactContext)
     this.playerView = playerView
 
     // Create listeners
@@ -615,7 +615,8 @@ class PlayerEventEmitter internal constructor(
       } catch (ignore: RuntimeException) {
       }
     }
-    eventEmitter.receiveEvent(viewId, type, event)
+    val uiManager = UIManagerHelper.getUIManager(reactContext, ViewUtil.getUIManagerType(viewId))
+    uiManager?.receiveEvent(UIManagerHelper.getSurfaceId(reactContext), viewId, type, event)
   }
 
   private fun attachListeners(player: Player) {

package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt

@@ -155,10 +155,12 @@ class ReactTHEOplayerContext private constructor(
     // Reduce allowed set of remote control playback actions for ads & live streams.
     val isLive = player.duration.isInfinite()
     val isInAd = player.ads.isPlaying
-    mediaSessionConnector?.enabledPlaybackActions = if (isInAd || isLive && !isTV) {
-      0
-    } else {
-      ALLOWED_PLAYBACK_ACTIONS
+    mediaSessionConnector?.enabledPlaybackActions = when {
+      isInAd || isLive && !isTV -> 0
+      isLive && isTV -> ALLOWED_PLAYBACK_ACTIONS xor
+        PlaybackStateCompat.ACTION_FAST_FORWARD xor
+        PlaybackStateCompat.ACTION_REWIND
+      else -> ALLOWED_PLAYBACK_ACTIONS
     }
   }
 

package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt

@@ -53,23 +53,22 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
     playerContext = ReactTHEOplayerContext.create(
       reactContext,
       PlayerConfigAdapter(configProps)
-    )
-    playerContext?.let {
+    ).apply {
       if (BuildConfig.EXTENSION_ADS) {
-        adsApi.initialize(it.player, it.imaIntegration, it.daiIntegration)
+        adsApi.initialize(player, imaIntegration, daiIntegration)
       }
       val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
-      it.playerView.layoutParams = layoutParams
-      (it.playerView.parent as? ViewGroup)?.removeView(it.playerView)
-      addView(it.playerView, 0, layoutParams)
+      playerView.layoutParams = layoutParams
+      (playerView.parent as? ViewGroup)?.removeView(playerView)
+      addView(playerView, 0, layoutParams)
 
       presentationManager = PresentationManager(
-        it,
+        this,
         reactContext,
         eventEmitter
       )
 
-      eventEmitter.preparePlayer(it.player)
+      eventEmitter.preparePlayer(player)
     }
   }
 

package/ios/cache/THEOplayerRCTCachingParametersBuilder.swift

@@ -11,7 +11,7 @@ class THEOplayerRCTCachingParametersBuilder {
         if let expirationDateTimestamp = paramsData[CACHETASK_PROP_PARAMETERS_EXPIRATION_DATE] as? Double {
             expirationDate = Date(timeIntervalSince1970: expirationDateTimestamp * 0.001) // msec -> sec
         }
-        let bandWidth = paramsData[CACHETASK_PROP_PARAMETERS_EXPIRATION_DATE] as? Int
+        let bandWidth = paramsData[CACHETASK_PROP_PARAMETERS_BANDWIDTH] as? Int
         let cachingParameters = CachingParameters(expirationDate: expirationDate, bandwidth: bandWidth)
         let preferredTrackSelection = paramsData[CACHETASK_PROP_PARAMETERS_TRACK_SELECTION] as? [String:Any]
         cachingParameters.preferredTrackSelection = THEOplayerRCTCachingParametersBuilder.buildPreferredTrackSelection(preferredTrackSelection)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-theoplayer",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "description": "A THEOplayer video component for react-native.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -47,7 +47,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@react-native/eslint-config": "0.73.2",
+    "@react-native/eslint-config": "^0.74.83",
     "@types/react": "^18.2.24",
     "@types/react-native": "^0.73.0",
     "eslint": "^8.56.0",
@@ -55,9 +55,9 @@
     "pod-install": "^0.1.39",
     "prettier": "^3.2.5",
     "react": "^18.2.0",
-    "react-native": "^0.73.4",
+    "react-native": "^0.74.1",
     "react-native-builder-bob": "^0.23.2",
-    "theoplayer": "^7.0.0",
+    "theoplayer": "^7.4.1",
     "typedoc": "^0.25.12",
     "typedoc-plugin-external-resolver": "^1.0.3",
     "typedoc-plugin-mdn-links": "^3.1.18",

package/react-native-theoplayer.podspec

@@ -32,23 +32,23 @@ Pod::Spec.new do |s|
   s.dependency "React-Core"
   
   # THEOplayer core Dependency
-  s.dependency "THEOplayerSDK-core", "~> 7.2"
+  s.dependency "THEOplayerSDK-core", "~> 7.4"
   
   if theofeatures.include?("GOOGLE_IMA") 
 	puts "Adding THEOplayer-Integration-GoogleIMA"
-    s.dependency "THEOplayer-Integration-GoogleIMA/Base", "~> 7.2"
-	s.dependency "THEOplayer-Integration-GoogleIMA/Dependencies", "~> 7.2"
+    s.dependency "THEOplayer-Integration-GoogleIMA/Base", "~> 7.4"
+	s.dependency "THEOplayer-Integration-GoogleIMA/Dependencies", "~> 7.4"
   end
   
   if theofeatures.include?("CHROMECAST")
 	puts "Adding THEOplayer-Integration-GoogleCast"
-    s.ios.dependency "THEOplayer-Integration-GoogleCast/Base", "~> 7.2"
+    s.ios.dependency "THEOplayer-Integration-GoogleCast/Base", "~> 7.4"
 	s.ios.dependency "google-cast-sdk-dynamic-xcframework", "~> 4.8"
   end
   
   if theofeatures.include?("SIDELOADED_TEXTTRACKS") 
 	puts "Adding THEOplayer-Connector-SideloadedSubtitle"
-    s.dependency "THEOplayer-Connector-SideloadedSubtitle", "~> 7.1"
+    s.dependency "THEOplayer-Connector-SideloadedSubtitle", "~> 7.4"
   end
   
 end