react-native-theoplayer 11.5.0 → 11.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +32 -1
- package/README.md +70 -0
- package/android/build.gradle +1 -0
- package/android/src/main/java/com/theoplayer/PlayerConfigAdapter.kt +6 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +11 -2
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +95 -93
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +6 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerView.kt +51 -3
- package/android/src/main/java/com/theoplayer/ads/AdEventAdapter.kt +4 -0
- package/android/src/main/java/com/theoplayer/ads/AdsModule.kt +6 -6
- package/android/src/main/java/com/theoplayer/integration/Integration.kt +72 -0
- package/android/src/main/java/com/theoplayer/integration/IntegrationRegistration.kt +68 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacade.kt +187 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdState.kt +19 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAds.kt +73 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeAdsBridge.kt +112 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEventSubscription.kt +11 -0
- package/android/src/main/java/com/theoplayer/integration/PlayerFacadeEvents.kt +139 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlModule.kt +102 -0
- package/android/src/main/java/com/theoplayer/media/MediaControlProxy.kt +376 -0
- package/android/src/main/java/com/theoplayer/media/MediaNotificationBuilder.kt +78 -34
- package/android/src/main/java/com/theoplayer/media/MediaPlaybackService.kt +53 -20
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfig.kt +6 -6
- package/android/src/main/java/com/theoplayer/media/MediaSessionConfigAdapter.kt +23 -20
- package/android/src/main/java/com/theoplayer/metrics/MetricsModule.kt +37 -0
- package/android/src/main/java/com/theoplayer/player/PlayerModule.kt +0 -1
- package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
- package/android/src/main/java/com/theoplayer/theoads/THEOadsModule.kt +1 -1
- package/android/src/main/java/com/theoplayer/util/ReadableExtension.kt +14 -0
- package/android/src/main/res/drawable/ic_next.xml +9 -0
- package/android/src/main/res/drawable/ic_prev.xml +9 -0
- package/android/src/main/res/values/strings.xml +4 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeAdsBridgeTest.kt +250 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeConfigurationTest.kt +30 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTest.kt +507 -0
- package/android/src/test/java/com/theoplayer/integration/PlayerFacadeTestHost.kt +104 -0
- package/ios/THEOplayerRCTBridge.m +35 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +17 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +31 -0
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +15 -5
- package/ios/Theoplayer-Bridging-Header.h +0 -1
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +1 -1
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +49 -3
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/metrics/THEOplayerRCTMetricsAPI.swift +31 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/lib/commonjs/api/barrel.js +31 -20
- package/lib/commonjs/api/barrel.js.map +1 -1
- package/lib/commonjs/api/event/PlayerEvent.js +8 -0
- package/lib/commonjs/api/event/PlayerEvent.js.map +1 -1
- package/lib/commonjs/api/media/MediaControlAPI.js +14 -0
- package/lib/commonjs/api/media/MediaControlAPI.js.map +1 -0
- package/lib/commonjs/api/media/barrel.js +11 -0
- package/lib/commonjs/api/media/barrel.js.map +1 -1
- package/lib/commonjs/api/metrics/MetricsAPI.js +2 -0
- package/lib/commonjs/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/commonjs/api/metrics/barrel.js +17 -0
- package/lib/commonjs/api/metrics/barrel.js.map +1 -0
- package/lib/commonjs/api/player/Integration.js +2 -0
- package/lib/commonjs/api/player/Integration.js.map +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js +1 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/api/player/barrel.js +11 -0
- package/lib/commonjs/api/player/barrel.js.map +1 -1
- package/lib/commonjs/api/track/MediaTrack.js +16 -0
- package/lib/commonjs/api/track/MediaTrack.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +6 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.web.js +3 -1
- package/lib/commonjs/internal/THEOplayerView.web.js.map +1 -1
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/commonjs/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +6 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +7 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js +42 -0
- package/lib/commonjs/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js +32 -0
- package/lib/commonjs/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js +18 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js +16 -0
- package/lib/commonjs/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js +6 -0
- package/lib/commonjs/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js +258 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js +114 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js +6 -0
- package/lib/commonjs/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/commonjs/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/commonjs/manifest.json +1 -1
- package/lib/module/api/barrel.js +1 -0
- package/lib/module/api/barrel.js.map +1 -1
- package/lib/module/api/event/PlayerEvent.js +9 -0
- package/lib/module/api/event/PlayerEvent.js.map +1 -1
- package/lib/module/api/media/MediaControlAPI.js +10 -0
- package/lib/module/api/media/MediaControlAPI.js.map +1 -0
- package/lib/module/api/media/barrel.js +1 -0
- package/lib/module/api/media/barrel.js.map +1 -1
- package/lib/module/api/metrics/MetricsAPI.js +2 -0
- package/lib/module/api/metrics/MetricsAPI.js.map +1 -0
- package/lib/module/api/metrics/barrel.js +4 -0
- package/lib/module/api/metrics/barrel.js.map +1 -0
- package/lib/module/api/player/Integration.js +2 -0
- package/lib/module/api/player/Integration.js.map +1 -0
- package/lib/module/api/player/PlayerEventMap.js +1 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/api/player/barrel.js +1 -0
- package/lib/module/api/player/barrel.js.map +1 -1
- package/lib/module/api/track/MediaTrack.js +16 -0
- package/lib/module/api/track/MediaTrack.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +7 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/THEOplayerView.web.js +3 -1
- package/lib/module/internal/THEOplayerView.web.js.map +1 -1
- package/lib/module/internal/adapter/DefaultNativePlayerState.js +1 -0
- package/lib/module/internal/adapter/DefaultNativePlayerState.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +24 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +29 -12
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +7 -2
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +5 -0
- package/lib/module/internal/adapter/event/PlayerEvents.js.map +1 -1
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js +37 -0
- package/lib/module/internal/adapter/media/MediaControlNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js +27 -0
- package/lib/module/internal/adapter/media/MediaControlWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js +13 -0
- package/lib/module/internal/adapter/metrics/MetricsNativeAdapter.js.map +1 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js +11 -0
- package/lib/module/internal/adapter/metrics/MetricsWebAdapter.js.map +1 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js +4 -0
- package/lib/module/internal/adapter/web/IntegrationRegistration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js +253 -0
- package/lib/module/internal/adapter/web/PlayerFacade.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAPI.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js +109 -0
- package/lib/module/internal/adapter/web/PlayerFacadeAdsEvents.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeIntegration.js.map +1 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js +4 -0
- package/lib/module/internal/adapter/web/PlayerFacadeTypes.js.map +1 -0
- package/lib/module/internal/adapter/web/WebMediaSession.js +78 -16
- package/lib/module/internal/adapter/web/WebMediaSession.js.map +1 -1
- package/lib/module/manifest.json +1 -1
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacade.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts +2 -0
- package/lib/typescript/__tests__/PlayerFacadeWebAdapter.test.d.ts.map +1 -0
- package/lib/typescript/__tests__/index.test.d.ts +13 -0
- package/lib/typescript/__tests__/index.test.d.ts.map +1 -1
- package/lib/typescript/api/THEOplayerView.d.ts +4 -0
- package/lib/typescript/api/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/api/barrel.d.ts +1 -0
- package/lib/typescript/api/barrel.d.ts.map +1 -1
- package/lib/typescript/api/config/PlayerConfiguration.d.ts +15 -0
- package/lib/typescript/api/config/PlayerConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/event/AdEvent.d.ts +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +9 -0
- package/lib/typescript/api/event/PlayerEvent.d.ts.map +1 -1
- package/lib/typescript/api/media/MediaControlAPI.d.ts +30 -0
- package/lib/typescript/api/media/MediaControlAPI.d.ts.map +1 -0
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts +5 -1
- package/lib/typescript/api/media/MediaControlConfiguration.d.ts.map +1 -1
- package/lib/typescript/api/media/barrel.d.ts +1 -0
- package/lib/typescript/api/media/barrel.d.ts.map +1 -1
- package/lib/typescript/api/metrics/MetricsAPI.d.ts +21 -0
- package/lib/typescript/api/metrics/MetricsAPI.d.ts.map +1 -0
- package/lib/typescript/api/metrics/barrel.d.ts +2 -0
- package/lib/typescript/api/metrics/barrel.d.ts.map +1 -0
- package/lib/typescript/api/player/Integration.d.ts +88 -0
- package/lib/typescript/api/player/Integration.d.ts.map +1 -0
- package/lib/typescript/api/player/PlayerEventMap.d.ts +7 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +24 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/api/player/barrel.d.ts +1 -0
- package/lib/typescript/api/player/barrel.d.ts.map +1 -1
- package/lib/typescript/api/track/MediaTrack.d.ts +21 -4
- package/lib/typescript/api/track/MediaTrack.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +1 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/DefaultNativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts +1 -0
- package/lib/typescript/internal/adapter/NativePlayerState.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +8 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +8 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +1 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +4 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +1 -0
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts +12 -0
- package/lib/typescript/internal/adapter/media/MediaControlNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts +14 -0
- package/lib/typescript/internal/adapter/media/MediaControlWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts +7 -0
- package/lib/typescript/internal/adapter/metrics/MetricsNativeAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts +8 -0
- package/lib/typescript/internal/adapter/metrics/MetricsWebAdapter.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts +53 -0
- package/lib/typescript/internal/adapter/web/IntegrationRegistration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts +26 -0
- package/lib/typescript/internal/adapter/web/PlayerFacade.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts +33 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAPI.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts +21 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeAdsEvents.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts +43 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeIntegration.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts +13 -0
- package/lib/typescript/internal/adapter/web/PlayerFacadeTypes.d.ts.map +1 -0
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts +10 -3
- package/lib/typescript/internal/adapter/web/WebMediaSession.d.ts.map +1 -1
- package/package.json +3 -3
- package/react-native-theoplayer.podspec +7 -7
- package/src/__tests__/PlayerFacade.test.ts +579 -0
- package/src/__tests__/PlayerFacadeWebAdapter.test.ts +193 -0
- package/src/__tests__/index.test.tsx +15 -1
- package/src/api/THEOplayerView.ts +5 -0
- package/src/api/barrel.ts +1 -0
- package/src/api/config/PlayerConfiguration.ts +16 -0
- package/src/api/event/AdEvent.ts +1 -1
- package/src/api/event/PlayerEvent.ts +10 -0
- package/src/api/media/MediaControlAPI.ts +33 -0
- package/src/api/media/MediaControlConfiguration.ts +5 -1
- package/src/api/media/barrel.ts +1 -0
- package/src/api/metrics/MetricsAPI.ts +20 -0
- package/src/api/metrics/barrel.ts +1 -0
- package/src/api/player/Integration.ts +97 -0
- package/src/api/player/PlayerEventMap.ts +7 -0
- package/src/api/player/THEOplayer.ts +27 -0
- package/src/api/player/barrel.ts +1 -0
- package/src/api/track/MediaTrack.ts +21 -4
- package/src/internal/THEOplayerView.tsx +10 -2
- package/src/internal/THEOplayerView.web.tsx +2 -2
- package/src/internal/adapter/DefaultNativePlayerState.ts +1 -0
- package/src/internal/adapter/NativePlayerState.ts +1 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +33 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +38 -12
- package/src/internal/adapter/WebEventForwarder.ts +12 -3
- package/src/internal/adapter/event/PlayerEvents.ts +10 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +2 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -0
- package/src/internal/adapter/metrics/MetricsNativeAdapter.ts +12 -0
- package/src/internal/adapter/metrics/MetricsWebAdapter.ts +14 -0
- package/src/internal/adapter/web/IntegrationRegistration.ts +57 -0
- package/src/internal/adapter/web/PlayerFacade.ts +281 -0
- package/src/internal/adapter/web/PlayerFacadeAPI.ts +35 -0
- package/src/internal/adapter/web/PlayerFacadeAdsEvents.ts +119 -0
- package/src/internal/adapter/web/PlayerFacadeIntegration.ts +45 -0
- package/src/internal/adapter/web/PlayerFacadeTypes.ts +14 -0
- package/src/internal/adapter/web/WebMediaSession.ts +85 -21
- package/src/manifest.json +1 -1
- package/android/src/main/java/com/theoplayer/media/MediaQueueNavigator.kt +0 -33
|
@@ -2,8 +2,10 @@ package com.theoplayer
|
|
|
2
2
|
|
|
3
3
|
import android.annotation.SuppressLint
|
|
4
4
|
import android.util.Log
|
|
5
|
+
import android.view.View
|
|
5
6
|
import android.view.ViewGroup
|
|
6
7
|
import android.widget.FrameLayout
|
|
8
|
+
import androidx.annotation.MainThread
|
|
7
9
|
import com.facebook.react.bridge.*
|
|
8
10
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
9
11
|
import com.theoplayer.android.api.ads.wrapper.AdsApiWrapper
|
|
@@ -11,6 +13,9 @@ import com.theoplayer.android.api.cast.Cast
|
|
|
11
13
|
import com.theoplayer.android.api.error.THEOplayerException
|
|
12
14
|
import com.theoplayer.android.api.player.Player
|
|
13
15
|
import com.theoplayer.broadcast.EventBroadcastAdapter
|
|
16
|
+
import com.theoplayer.integration.Integration
|
|
17
|
+
import com.theoplayer.integration.IntegrationRegistration
|
|
18
|
+
import com.theoplayer.integration.PlayerFacadeAdsBridge
|
|
14
19
|
import com.theoplayer.presentation.PresentationManager
|
|
15
20
|
import com.theoplayer.source.SourceAdapter
|
|
16
21
|
|
|
@@ -31,7 +36,9 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
31
36
|
private set
|
|
32
37
|
private var config: PlayerConfigAdapter? = null
|
|
33
38
|
|
|
39
|
+
/** Native source-specific Ads adapter and event sink. Use [player]'s Ads API for integration-owned state. */
|
|
34
40
|
val adsApi: AdsApiWrapper
|
|
41
|
+
internal val adBridge: PlayerFacadeAdsBridge
|
|
35
42
|
|
|
36
43
|
val castApi: Cast?
|
|
37
44
|
get() = playerContext?.playerView?.cast
|
|
@@ -39,9 +46,31 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
39
46
|
val player: Player?
|
|
40
47
|
get() = playerContext?.player
|
|
41
48
|
|
|
49
|
+
/**
|
|
50
|
+
* Registers playback and advertising overrides on the player facade.
|
|
51
|
+
*
|
|
52
|
+
* Experimental API: subject to change or removal without notice.
|
|
53
|
+
*
|
|
54
|
+
* Enable `config.usePlayerFacade` before creating the player and wait until this view is initialized.
|
|
55
|
+
* Only one integration can be registered at a time; close its registration before replacing it.
|
|
56
|
+
*
|
|
57
|
+
* @param integration The hooks and optional Ads API to use until registration closes.
|
|
58
|
+
* @return The registration used to dispatch events, intercept native events, and unregister.
|
|
59
|
+
* @throws IllegalStateException if the view is uninitialized, the facade is disabled or closed,
|
|
60
|
+
* or another integration is already registered.
|
|
61
|
+
*/
|
|
62
|
+
@MainThread
|
|
63
|
+
fun registerIntegration(integration: Integration): IntegrationRegistration {
|
|
64
|
+
val context = checkNotNull(playerContext) { "The player view has not been initialized." }
|
|
65
|
+
return checkNotNull(context.playerFacade) {
|
|
66
|
+
"Set config.usePlayerFacade to true at player creation before registering an integration."
|
|
67
|
+
}.registerIntegration(integration)
|
|
68
|
+
}
|
|
69
|
+
|
|
42
70
|
init {
|
|
43
71
|
reactContext.addLifecycleEventListener(this)
|
|
44
72
|
adsApi = AdsApiWrapper()
|
|
73
|
+
adBridge = PlayerFacadeAdsBridge(adsApi)
|
|
45
74
|
}
|
|
46
75
|
|
|
47
76
|
fun initialize(config: PlayerConfigAdapter) {
|
|
@@ -63,11 +92,12 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
63
92
|
config
|
|
64
93
|
)
|
|
65
94
|
playerContext?.apply {
|
|
66
|
-
|
|
95
|
+
adBridge.initialize(player, imaIntegration, daiIntegration)
|
|
67
96
|
val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
|
|
68
97
|
playerView.layoutParams = layoutParams
|
|
69
98
|
(playerView.parent as? ViewGroup)?.removeView(playerView)
|
|
70
99
|
addView(playerView, 0, layoutParams)
|
|
100
|
+
measureAndLayoutPlayerView()
|
|
71
101
|
presentationManager = PresentationManager(
|
|
72
102
|
this,
|
|
73
103
|
reactContext,
|
|
@@ -82,6 +112,24 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
82
112
|
if (!isInitialized && BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
|
|
83
113
|
config?.let { initialize(it) }
|
|
84
114
|
}
|
|
115
|
+
measureAndLayoutPlayerView()
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
|
|
119
|
+
super.onSizeChanged(w, h, oldw, oldh)
|
|
120
|
+
measureAndLayoutPlayerView()
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
private fun measureAndLayoutPlayerView() {
|
|
124
|
+
val playerView = playerContext?.playerView ?: return
|
|
125
|
+
if (width == 0 || height == 0) return
|
|
126
|
+
if (playerView.width == width && playerView.height == height) return
|
|
127
|
+
|
|
128
|
+
playerView.measure(
|
|
129
|
+
View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
|
|
130
|
+
View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY)
|
|
131
|
+
)
|
|
132
|
+
playerView.layout(0, 0, width, height)
|
|
85
133
|
}
|
|
86
134
|
|
|
87
135
|
override fun setId(id: Int) {
|
|
@@ -128,7 +176,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
128
176
|
Log.d(TAG, "releasePlayer")
|
|
129
177
|
}
|
|
130
178
|
reactContext.removeLifecycleEventListener(this)
|
|
131
|
-
|
|
179
|
+
adBridge.destroy()
|
|
132
180
|
|
|
133
181
|
if (isInitialized) {
|
|
134
182
|
eventEmitter.removeListeners(player)
|
|
@@ -141,7 +189,7 @@ class ReactTHEOplayerView(private val reactContext: ThemedReactContext) :
|
|
|
141
189
|
fun setSource(source: ReadableMap?) {
|
|
142
190
|
try {
|
|
143
191
|
val sourceDescription = SourceAdapter().parseSourceFromJS(source)
|
|
144
|
-
|
|
192
|
+
adBridge.setSource(sourceDescription)
|
|
145
193
|
player?.source = sourceDescription
|
|
146
194
|
} catch (exception: THEOplayerException) {
|
|
147
195
|
Log.e(TAG, exception.message ?: "")
|
|
@@ -51,6 +51,8 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
|
|
|
51
51
|
|
|
52
52
|
init {
|
|
53
53
|
adsApi.addAllEventsListener(eventListener)
|
|
54
|
+
adsApi.addEventListener(AdsEventTypes.AD_CLICKED, eventListener)
|
|
55
|
+
adsApi.addEventListener(AdsEventTypes.AD_TAPPED, eventListener)
|
|
54
56
|
}
|
|
55
57
|
|
|
56
58
|
companion object {
|
|
@@ -131,5 +133,7 @@ class AdEventAdapter(private val adsApi: AdsApiWrapper, eventEmitter: AdEventEmi
|
|
|
131
133
|
|
|
132
134
|
fun destroy() {
|
|
133
135
|
adsApi.removeAllEventsListener(eventListener)
|
|
136
|
+
adsApi.removeEventListener(AdsEventTypes.AD_CLICKED, eventListener)
|
|
137
|
+
adsApi.removeEventListener(AdsEventTypes.AD_TAPPED, eventListener)
|
|
134
138
|
}
|
|
135
139
|
}
|
|
@@ -45,7 +45,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
45
45
|
fun schedule(tag: Int, ad: ReadableMap) {
|
|
46
46
|
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
47
47
|
try {
|
|
48
|
-
view?.
|
|
48
|
+
view?.adBridge?.schedule(sourceHelper.parseAdDescriptionFromJS(ad))
|
|
49
49
|
} catch (exception: THEOplayerException) {
|
|
50
50
|
Log.e(NAME, exception.message ?: ERR_SCHEDULE_AD)
|
|
51
51
|
}
|
|
@@ -56,7 +56,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
56
56
|
@ReactMethod
|
|
57
57
|
fun currentAdBreak(tag: Int, promise: Promise) {
|
|
58
58
|
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
59
|
-
promise.resolve(if (view == null) Arguments.createMap() else AdAdapter.fromAdBreak(view.
|
|
59
|
+
promise.resolve(if (view == null) Arguments.createMap() else AdAdapter.fromAdBreak(view.adBridge.currentAdBreak))
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
|
|
@@ -64,7 +64,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
64
64
|
@ReactMethod
|
|
65
65
|
fun currentAds(tag: Int, promise: Promise) {
|
|
66
66
|
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
67
|
-
promise.resolve(if (view == null) Arguments.createArray() else AdAdapter.fromAds(view.
|
|
67
|
+
promise.resolve(if (view == null) Arguments.createArray() else AdAdapter.fromAds(view.adBridge.currentAds))
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
|
|
@@ -72,7 +72,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
72
72
|
@ReactMethod
|
|
73
73
|
fun scheduledAdBreaks(tag: Int, promise: Promise) {
|
|
74
74
|
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
75
|
-
promise.resolve(if (view == null) Arguments.createArray() else AdAdapter.fromAdBreaks(view.
|
|
75
|
+
promise.resolve(if (view == null) Arguments.createArray() else AdAdapter.fromAdBreaks(view.adBridge.scheduledAdBreaks))
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
|
|
@@ -80,7 +80,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
80
80
|
@ReactMethod
|
|
81
81
|
fun playing(tag: Int, promise: Promise) {
|
|
82
82
|
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? ->
|
|
83
|
-
promise.resolve(view?.
|
|
83
|
+
promise.resolve(view?.adBridge?.isPlaying ?: false)
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
|
|
@@ -88,7 +88,7 @@ class AdsModule(context: ReactApplicationContext) : ReactContextBaseJavaModule(c
|
|
|
88
88
|
// NOTE: This will have no effect when the current linear ad is not (yet) skippable.
|
|
89
89
|
@ReactMethod
|
|
90
90
|
fun skip(tag: Int) {
|
|
91
|
-
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? -> view?.
|
|
91
|
+
viewResolver.resolveViewByTag(tag) { view: ReactTHEOplayerView? -> view?.adBridge?.skip() }
|
|
92
92
|
}
|
|
93
93
|
|
|
94
94
|
@ReactMethod
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import androidx.annotation.MainThread
|
|
4
|
+
import com.theoplayer.android.api.ads.Ads
|
|
5
|
+
import com.theoplayer.android.api.event.ads.AdEvent
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Optional playback and advertising overrides for [PlayerFacade].
|
|
9
|
+
*
|
|
10
|
+
* Experimental API: subject to change or removal without notice.
|
|
11
|
+
*
|
|
12
|
+
* Enable `usePlayerFacade` at player creation and register through [com.theoplayer.ReactTHEOplayerView.registerIntegration].
|
|
13
|
+
* Unimplemented hooks delegate to the content player. The integration owns playback synchronization,
|
|
14
|
+
* advertising lifecycle, and events describing its public state. All hooks run on the main thread.
|
|
15
|
+
*
|
|
16
|
+
* Custom advertising must not overlap ongoing native IMA/DAI playback. Replacing or filtering native
|
|
17
|
+
* advertising events can suspend the React Native bridge's native DAI bookkeeping; fresh native state
|
|
18
|
+
* after hidden native playback is not guaranteed. Finish or reset native advertising before taking over.
|
|
19
|
+
*/
|
|
20
|
+
@MainThread
|
|
21
|
+
interface Integration {
|
|
22
|
+
/** Returns a finite, non-negative time in seconds, or null to delegate. Invalid times also delegate. */
|
|
23
|
+
fun getCurrentTime(): Double? = null
|
|
24
|
+
|
|
25
|
+
/** Seeks to [currentTime] in seconds. Returns true if handled, or false to seek the content player. */
|
|
26
|
+
fun setCurrentTime(currentTime: Double): Boolean = false
|
|
27
|
+
|
|
28
|
+
/** Starts or resumes playback. Returns true if handled, or false to play the content player. */
|
|
29
|
+
fun play(): Boolean = false
|
|
30
|
+
|
|
31
|
+
/** Pauses playback. Returns true if handled, or false to pause the content player. */
|
|
32
|
+
fun pause(): Boolean = false
|
|
33
|
+
|
|
34
|
+
/** Returns the paused state, or null to use the content player's state. */
|
|
35
|
+
fun isPaused(): Boolean? = null
|
|
36
|
+
|
|
37
|
+
/** Returns the seeking state, or null to use the content player's state. */
|
|
38
|
+
fun isSeeking(): Boolean? = null
|
|
39
|
+
|
|
40
|
+
/** Returns the duration in seconds, or null to delegate. Infinity and NaN are preserved. */
|
|
41
|
+
fun getDuration(): Double? = null
|
|
42
|
+
|
|
43
|
+
/** Returns the muted state, or null to use the content player's state. */
|
|
44
|
+
fun getMuted(): Boolean? = null
|
|
45
|
+
|
|
46
|
+
/** Sets [muted]. Returns true if handled, or false to update the content player. */
|
|
47
|
+
fun setMuted(muted: Boolean): Boolean = false
|
|
48
|
+
|
|
49
|
+
/** Returns the volume between 0 and 1, or null to use the content player's volume. */
|
|
50
|
+
fun getVolume(): Double? = null
|
|
51
|
+
|
|
52
|
+
/** Sets [volume] between 0 and 1. Returns true if handled, or false to update the content player. */
|
|
53
|
+
fun setVolume(volume: Double): Boolean = false
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* The Ads API and event source behind the stable facade Ads object, or null to retain native Ads.
|
|
57
|
+
* Keep this object stable until registration closes. Existing listeners migrate on registration and close.
|
|
58
|
+
*/
|
|
59
|
+
val ads: Ads? get() = null
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Returns advertising state without replacing the native Ads API, or null to delegate.
|
|
63
|
+
* Ignored when [ads] is supplied. State is never derived from dispatched events.
|
|
64
|
+
*/
|
|
65
|
+
fun getAdState(): PlayerFacadeAdState? = null
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* Returns true to consume a native Ads [event] for all facade listeners, or false to forward it.
|
|
69
|
+
* Called once per subscribed event. Integration-generated events bypass this hook.
|
|
70
|
+
*/
|
|
71
|
+
fun shouldConsumeAdEvent(event: AdEvent<*>): Boolean = false
|
|
72
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import androidx.annotation.MainThread
|
|
4
|
+
import com.theoplayer.android.api.event.EventType
|
|
5
|
+
import com.theoplayer.android.api.event.ads.AdEvent
|
|
6
|
+
import com.theoplayer.android.api.event.player.PlayerEvent
|
|
7
|
+
import java.io.Closeable
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Controls event delivery and the lifetime of an Android facade integration.
|
|
11
|
+
*
|
|
12
|
+
* Experimental API: subject to change or removal without notice.
|
|
13
|
+
*
|
|
14
|
+
* Only the active registration can dispatch events or install interceptors. All operations run on the main thread.
|
|
15
|
+
* Closing a registration restores native delegation without destroying either playback engine.
|
|
16
|
+
*/
|
|
17
|
+
@MainThread
|
|
18
|
+
class IntegrationRegistration internal constructor(
|
|
19
|
+
private val facade: PlayerFacade,
|
|
20
|
+
integration: Integration,
|
|
21
|
+
) : Closeable {
|
|
22
|
+
internal var integration: Integration? = integration
|
|
23
|
+
private set
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Delivers [event] only to facade player listeners, bypassing native-event interceptors.
|
|
27
|
+
* Does not emit on the raw content player. Calls after this registration closes have no effect.
|
|
28
|
+
*/
|
|
29
|
+
fun dispatchEvent(event: PlayerEvent<*>) = facade.dispatchPlayerEvent(this, event)
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Delivers [event] only to facade Ads listeners without deriving advertising state from it.
|
|
33
|
+
* Bypasses native-ad filtering. Calls after this registration closes have no effect.
|
|
34
|
+
*/
|
|
35
|
+
fun dispatchEvent(event: AdEvent<*>) = facade.dispatchAdEvent(this, event)
|
|
36
|
+
|
|
37
|
+
/** Compatibility entry point for player events, equivalent to [dispatchEvent]. */
|
|
38
|
+
fun dispatchPlayerEvent(event: PlayerEvent<*>) = dispatchEvent(event)
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Intercepts native events of [type], even without facade listeners, before catch-all interceptors.
|
|
42
|
+
* [interceptor] runs once per event; return true to consume it or false to continue delivery.
|
|
43
|
+
*
|
|
44
|
+
* The returned [Closeable] removes the interceptor. It must be closed explicitly: interception survives
|
|
45
|
+
* unregistering so queued native events can drain. Closed registrations return a no-op disposer.
|
|
46
|
+
*/
|
|
47
|
+
fun <T : PlayerEvent<*>> interceptPlayerEvent(type: EventType<T>, interceptor: (T) -> Boolean): Closeable =
|
|
48
|
+
if (facade.isCurrent(this)) facade.playerEvents.intercept(type, interceptor) else Closeable {}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Intercepts all subscribed native player events after type-specific interceptors, including future subscriptions.
|
|
52
|
+
* Return true from [interceptor] to consume the event. Does not subscribe to otherwise unobserved event types.
|
|
53
|
+
*
|
|
54
|
+
* The returned [Closeable] has the same explicit lifetime as [interceptPlayerEvent].
|
|
55
|
+
* Integration-dispatched events bypass interception. Consuming native destruction never prevents facade cleanup.
|
|
56
|
+
*/
|
|
57
|
+
fun interceptPlayerEvents(interceptor: (PlayerEvent<*>) -> Boolean): Closeable =
|
|
58
|
+
if (facade.isCurrent(this)) facade.playerEvents.interceptAll(interceptor) else Closeable {}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* Restores native playback and Ads delegation without destroying the content player. Idempotent.
|
|
62
|
+
* Existing player-event interceptors remain until their disposers or the facade are closed.
|
|
63
|
+
*/
|
|
64
|
+
override fun close() {
|
|
65
|
+
integration = null
|
|
66
|
+
facade.unregister(this)
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import androidx.annotation.MainThread
|
|
4
|
+
import com.theoplayer.android.api.ads.Ads
|
|
5
|
+
import com.theoplayer.android.api.ads.dai.GoogleDaiIntegration
|
|
6
|
+
import com.theoplayer.android.api.ads.dai.dai as sdkDai
|
|
7
|
+
import com.theoplayer.android.api.ads.ima.GoogleImaIntegration
|
|
8
|
+
import com.theoplayer.android.api.ads.ima.ima as sdkIma
|
|
9
|
+
import com.theoplayer.android.api.ads.theoads.TheoAdsIntegration
|
|
10
|
+
import com.theoplayer.android.api.ads.theoads.theoAds as sdkTheoAds
|
|
11
|
+
import com.theoplayer.android.api.event.EventListener
|
|
12
|
+
import com.theoplayer.android.api.event.EventType
|
|
13
|
+
import com.theoplayer.android.api.event.ads.AdEvent
|
|
14
|
+
import com.theoplayer.android.api.event.player.PlayerEvent
|
|
15
|
+
import com.theoplayer.android.api.event.player.PlayerEventTypes
|
|
16
|
+
import com.theoplayer.android.api.player.Player
|
|
17
|
+
import java.io.Closeable
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Stable player surface with integration-owned playback, advertising state, and event interception.
|
|
21
|
+
*
|
|
22
|
+
* Experimental API: subject to change or removal without notice.
|
|
23
|
+
*
|
|
24
|
+
* Enable `usePlayerFacade` at player creation to expose this surface through [com.theoplayer.ReactTHEOplayerView.player].
|
|
25
|
+
* Unhandled operations delegate to [contentPlayer]; the facade never owns playback or advertising lifecycle.
|
|
26
|
+
*
|
|
27
|
+
* @property contentPlayer Raw playback engine, unaffected by integration overrides or event interception.
|
|
28
|
+
*/
|
|
29
|
+
@MainThread
|
|
30
|
+
class PlayerFacade internal constructor(val contentPlayer: Player) : Player by contentPlayer, Closeable {
|
|
31
|
+
companion object {
|
|
32
|
+
internal fun create(contentPlayer: Player, enabled: Boolean): Player =
|
|
33
|
+
if (enabled) PlayerFacade(contentPlayer) else contentPlayer
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
private val nativeAds = contentPlayer.ads
|
|
37
|
+
private var registration: IntegrationRegistration? = null
|
|
38
|
+
private var closed = false
|
|
39
|
+
private val integration: Integration? get() = registration?.integration
|
|
40
|
+
internal val playerEvents = PlayerFacadeEvents(
|
|
41
|
+
source = { contentPlayer },
|
|
42
|
+
after = { event -> if (event.type == PlayerEventTypes.DESTROY) close() },
|
|
43
|
+
)
|
|
44
|
+
internal val adEvents = PlayerFacadeEvents(
|
|
45
|
+
source = { integration?.ads ?: nativeAds },
|
|
46
|
+
isIntegrationSource = { integration?.ads?.let { it !== nativeAds } == true },
|
|
47
|
+
consume = { event ->
|
|
48
|
+
val current = integration
|
|
49
|
+
(current?.ads == null || current.ads === nativeAds) && current?.shouldConsumeAdEvent(event) == true
|
|
50
|
+
},
|
|
51
|
+
)
|
|
52
|
+
private val adsFacade = PlayerFacadeAds(nativeAds, { integration }, adEvents)
|
|
53
|
+
|
|
54
|
+
init {
|
|
55
|
+
playerEvents.retain(PlayerEventTypes.DESTROY)
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
/** Native THEOads integration, resolved on the raw content player rather than this facade. */
|
|
59
|
+
val theoAds: TheoAdsIntegration get() = contentPlayer.sdkTheoAds
|
|
60
|
+
|
|
61
|
+
/** Returns the stable Ads facade. Existing references survive integration registration and removal. */
|
|
62
|
+
override fun getAds(): PlayerFacadeAds = adsFacade
|
|
63
|
+
|
|
64
|
+
/** Returns integration time in seconds when finite and non-negative, or the content player's time. */
|
|
65
|
+
override fun getCurrentTime(): Double = integration?.getCurrentTime()?.takeIf { it.isFinite() && it >= 0 } ?: contentPlayer.currentTime
|
|
66
|
+
|
|
67
|
+
/** Seeks to [currentTime] in seconds, delegating to the content player unless the integration handles it. */
|
|
68
|
+
override fun setCurrentTime(currentTime: Double) {
|
|
69
|
+
if (integration?.setCurrentTime(currentTime) != true) contentPlayer.currentTime = currentTime
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/** Starts or resumes playback, delegating to the content player unless the integration handles it. */
|
|
73
|
+
override fun play() {
|
|
74
|
+
if (integration?.play() != true) contentPlayer.play()
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** Pauses playback, delegating to the content player unless the integration handles it. */
|
|
78
|
+
override fun pause() {
|
|
79
|
+
if (integration?.pause() != true) contentPlayer.pause()
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
/** Returns the integration's paused state, or the native state when the hook returns null. */
|
|
83
|
+
override fun isPaused(): Boolean = integration?.isPaused() ?: contentPlayer.isPaused
|
|
84
|
+
|
|
85
|
+
/** Returns the integration's seeking state, or the native state when the hook returns null. */
|
|
86
|
+
override fun isSeeking(): Boolean = integration?.isSeeking() ?: contentPlayer.isSeeking
|
|
87
|
+
|
|
88
|
+
/** Returns duration in seconds, delegating on null. Infinity and NaN remain unchanged. */
|
|
89
|
+
override fun getDuration(): Double = integration?.getDuration() ?: contentPlayer.duration
|
|
90
|
+
|
|
91
|
+
/** Returns the integration's muted state, or the native state when the hook returns null. */
|
|
92
|
+
override fun isMuted(): Boolean = integration?.getMuted() ?: contentPlayer.isMuted
|
|
93
|
+
|
|
94
|
+
/** Sets [muted], delegating to the content player unless the integration handles it. */
|
|
95
|
+
override fun setMuted(muted: Boolean) {
|
|
96
|
+
if (integration?.setMuted(muted) != true) contentPlayer.isMuted = muted
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** Returns the integration's volume between 0 and 1, or the native volume when the hook returns null. */
|
|
100
|
+
override fun getVolume(): Double = integration?.getVolume() ?: contentPlayer.volume
|
|
101
|
+
|
|
102
|
+
/** Sets [volume] between 0 and 1, delegating unless the integration handles it. */
|
|
103
|
+
override fun setVolume(volume: Double) {
|
|
104
|
+
if (integration?.setVolume(volume) != true) contentPlayer.volume = volume
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Adds [listener] for [type] after integration interception. Duplicate listeners are ignored. */
|
|
108
|
+
override fun <T : PlayerEvent<*>> addEventListener(type: EventType<T>, listener: EventListener<in T>) = playerEvents.addEventListener(type, listener)
|
|
109
|
+
|
|
110
|
+
/** Removes [listener] for [type]. Removing an absent listener has no effect. */
|
|
111
|
+
override fun <T : PlayerEvent<*>> removeEventListener(type: EventType<T>, listener: EventListener<in T>) = playerEvents.removeEventListener(type, listener)
|
|
112
|
+
|
|
113
|
+
/**
|
|
114
|
+
* Registers [integration] and migrates existing Ads listeners to its optional Ads API.
|
|
115
|
+
*
|
|
116
|
+
* @return The registration used to dispatch events, intercept native events, and unregister.
|
|
117
|
+
* @throws IllegalStateException if the facade is closed or another integration is registered.
|
|
118
|
+
*/
|
|
119
|
+
fun registerIntegration(integration: Integration): IntegrationRegistration {
|
|
120
|
+
check(!closed) { "The player facade has been closed." }
|
|
121
|
+
check(registration == null) { "Unregister the previous integration first." }
|
|
122
|
+
val current = IntegrationRegistration(this, integration)
|
|
123
|
+
registration = current
|
|
124
|
+
try {
|
|
125
|
+
adEvents.rebind()
|
|
126
|
+
} catch (error: Exception) {
|
|
127
|
+
current.close()
|
|
128
|
+
throw error
|
|
129
|
+
}
|
|
130
|
+
return current
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
internal val integrationAds: Ads? get() = integration?.ads
|
|
134
|
+
|
|
135
|
+
internal fun adStateOverride(): PlayerFacadeAdState? {
|
|
136
|
+
val current = integration
|
|
137
|
+
return current?.ads?.let { PlayerFacadeAdState(it.isPlaying, it.currentAds, it.currentAdBreak) } ?: current?.getAdState()
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
internal fun destroyContent(destroy: () -> Unit) {
|
|
141
|
+
try {
|
|
142
|
+
destroy()
|
|
143
|
+
} finally {
|
|
144
|
+
close()
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
internal fun isCurrent(current: IntegrationRegistration): Boolean = !closed && registration === current
|
|
149
|
+
|
|
150
|
+
internal fun dispatchPlayerEvent(current: IntegrationRegistration, event: PlayerEvent<*>) {
|
|
151
|
+
if (isCurrent(current)) playerEvents.dispatch(event) { isCurrent(current) }
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
internal fun dispatchAdEvent(current: IntegrationRegistration, event: AdEvent<*>) {
|
|
155
|
+
if (isCurrent(current)) adEvents.dispatch(event, true) { isCurrent(current) }
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
internal fun unregister(current: IntegrationRegistration) {
|
|
159
|
+
if (registration !== current) return
|
|
160
|
+
registration = null
|
|
161
|
+
if (!closed) adEvents.rebind()
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/**
|
|
165
|
+
* Releases facade listeners, interceptors, and the active registration. Idempotent.
|
|
166
|
+
* Does not destroy the content player. Native destruction also closes the facade, even when intercepted.
|
|
167
|
+
*/
|
|
168
|
+
override fun close() {
|
|
169
|
+
if (closed) return
|
|
170
|
+
closed = true
|
|
171
|
+
registration?.close()
|
|
172
|
+
playerEvents.close()
|
|
173
|
+
adEvents.close()
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/** Resolves THEOads on the native content player when this player is a facade. */
|
|
178
|
+
val Player.theoAds: TheoAdsIntegration
|
|
179
|
+
get() = if (this is PlayerFacade) this.theoAds else this.sdkTheoAds
|
|
180
|
+
|
|
181
|
+
/** Resolves IMA on the native Ads API when this object is a facade. */
|
|
182
|
+
val Ads.ima: GoogleImaIntegration
|
|
183
|
+
get() = if (this is PlayerFacadeAds) this.ima else this.sdkIma
|
|
184
|
+
|
|
185
|
+
/** Resolves DAI on the native Ads API when this object is a facade. */
|
|
186
|
+
val Ads.dai: GoogleDaiIntegration
|
|
187
|
+
get() = if (this is PlayerFacadeAds) this.dai else this.sdkDai
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import com.theoplayer.android.api.ads.Ad
|
|
4
|
+
import com.theoplayer.android.api.ads.AdBreak
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Advertising state supplied by [Integration.getAdState], independent of dispatched events.
|
|
8
|
+
*
|
|
9
|
+
* Experimental API: subject to change or removal without notice.
|
|
10
|
+
*
|
|
11
|
+
* @property playing Whether a linear advertisement is playing.
|
|
12
|
+
* @property currentAds The currently active advertisements.
|
|
13
|
+
* @property currentAdBreak The active ad break, or null. Null does not fall back to the native ad break.
|
|
14
|
+
*/
|
|
15
|
+
data class PlayerFacadeAdState(
|
|
16
|
+
val playing: Boolean,
|
|
17
|
+
val currentAds: List<Ad>,
|
|
18
|
+
val currentAdBreak: AdBreak?,
|
|
19
|
+
)
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
package com.theoplayer.integration
|
|
2
|
+
|
|
3
|
+
import androidx.annotation.MainThread
|
|
4
|
+
import com.theoplayer.android.api.ads.Ad
|
|
5
|
+
import com.theoplayer.android.api.ads.AdBreak
|
|
6
|
+
import com.theoplayer.android.api.ads.Ads
|
|
7
|
+
import com.theoplayer.android.api.ads.Omid
|
|
8
|
+
import com.theoplayer.android.api.ads.ServerSideAdIntegrationFactory
|
|
9
|
+
import com.theoplayer.android.api.ads.dai.GoogleDaiIntegration
|
|
10
|
+
import com.theoplayer.android.api.ads.dai.dai as sdkDai
|
|
11
|
+
import com.theoplayer.android.api.ads.ima.GoogleImaIntegration
|
|
12
|
+
import com.theoplayer.android.api.ads.ima.ima as sdkIma
|
|
13
|
+
import com.theoplayer.android.api.event.EventListener
|
|
14
|
+
import com.theoplayer.android.api.event.EventType
|
|
15
|
+
import com.theoplayer.android.api.event.ads.AdEvent
|
|
16
|
+
import com.theoplayer.android.api.source.addescription.AdDescription
|
|
17
|
+
|
|
18
|
+
/**
|
|
19
|
+
* Stable advertising API whose state, controls, and event source follow the current [Integration].
|
|
20
|
+
* Advertising lifecycle is owned by the integration, never inferred from dispatched events.
|
|
21
|
+
*
|
|
22
|
+
* Experimental API: subject to change or removal without notice.
|
|
23
|
+
*/
|
|
24
|
+
@MainThread
|
|
25
|
+
class PlayerFacadeAds internal constructor(
|
|
26
|
+
private val nativeAds: Ads,
|
|
27
|
+
private val integration: () -> Integration?,
|
|
28
|
+
private val events: PlayerFacadeEvents<AdEvent<*>>,
|
|
29
|
+
) : Ads {
|
|
30
|
+
private val backing: Ads get() = integration()?.ads ?: nativeAds
|
|
31
|
+
|
|
32
|
+
/** Native IMA integration, resolved on the raw Ads API rather than this facade. */
|
|
33
|
+
val ima: GoogleImaIntegration get() = nativeAds.sdkIma
|
|
34
|
+
|
|
35
|
+
/** Native DAI integration, resolved on the raw Ads API rather than this facade. */
|
|
36
|
+
val dai: GoogleDaiIntegration get() = nativeAds.sdkDai
|
|
37
|
+
|
|
38
|
+
/** Returns whether the integration or native Ads API is playing a linear advertisement. */
|
|
39
|
+
override fun isPlaying(): Boolean = integration()?.let { it.ads?.isPlaying ?: it.getAdState()?.playing } ?: nativeAds.isPlaying
|
|
40
|
+
|
|
41
|
+
/** Returns the current advertisements from the integration or native Ads API. */
|
|
42
|
+
override fun getCurrentAds(): List<Ad> = integration()?.let { it.ads?.currentAds ?: it.getAdState()?.currentAds } ?: nativeAds.currentAds
|
|
43
|
+
|
|
44
|
+
/** Returns the active ad break. An integration's explicit null does not fall back to native Ads. */
|
|
45
|
+
override fun getCurrentAdBreak(): AdBreak? {
|
|
46
|
+
val current = integration()
|
|
47
|
+
current?.ads?.let { return it.currentAdBreak }
|
|
48
|
+
current?.getAdState()?.let { return it.currentAdBreak }
|
|
49
|
+
return nativeAds.currentAdBreak
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
/** Returns advertisements scheduled by the currently delegated Ads API. */
|
|
53
|
+
override fun getScheduledAds(): List<Ad> = backing.scheduledAds
|
|
54
|
+
|
|
55
|
+
/** Schedules [adDescription] through the currently delegated Ads API. */
|
|
56
|
+
override fun schedule(adDescription: AdDescription) = backing.schedule(adDescription)
|
|
57
|
+
|
|
58
|
+
/** Skips the current advertisement through the currently delegated Ads API. */
|
|
59
|
+
override fun skip() = backing.skip()
|
|
60
|
+
|
|
61
|
+
/** Returns the Open Measurement API of the currently delegated Ads API. */
|
|
62
|
+
override fun getOmid(): Omid = backing.omid
|
|
63
|
+
|
|
64
|
+
/** Registers [factory] for [integrationId] on the currently delegated Ads API. */
|
|
65
|
+
override fun registerServerSideIntegration(integrationId: String, factory: ServerSideAdIntegrationFactory) =
|
|
66
|
+
backing.registerServerSideIntegration(integrationId, factory)
|
|
67
|
+
|
|
68
|
+
/** Adds [listener] for [type], preserving the subscription across integration changes. Duplicate listeners are ignored. */
|
|
69
|
+
override fun <T : AdEvent<*>> addEventListener(type: EventType<T>, listener: EventListener<in T>) = events.addEventListener(type, listener)
|
|
70
|
+
|
|
71
|
+
/** Removes [listener] for [type]. Removing an absent listener has no effect. */
|
|
72
|
+
override fun <T : AdEvent<*>> removeEventListener(type: EventType<T>, listener: EventListener<in T>) = events.removeEventListener(type, listener)
|
|
73
|
+
}
|