react-native-theoplayer 11.4.1 → 11.6.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 +26 -1
- package/README.md +1 -0
- package/android/src/main/java/com/theoplayer/PlayerEventEmitter.kt +21 -0
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerContext.kt +58 -85
- package/android/src/main/java/com/theoplayer/ReactTHEOplayerPackage.kt +3 -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/player/PlayerModule.kt +0 -1
- package/android/src/main/java/com/theoplayer/presentation/PipUtils.kt +98 -93
- 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/ios/RCTBridgeModule+ViewHelpers.swift +59 -0
- package/ios/THEOplayerRCTBridge.m +17 -0
- package/ios/THEOplayerRCTDebug.swift +3 -0
- package/ios/THEOplayerRCTMainEventHandler.swift +18 -0
- package/ios/THEOplayerRCTPlayerAPI.swift +194 -254
- package/ios/THEOplayerRCTTypeUtils.swift +30 -0
- package/ios/THEOplayerRCTView.swift +22 -6
- package/ios/ads/THEOplayerRCTAdsAPI+DAI.swift +22 -21
- package/ios/ads/THEOplayerRCTAdsAPI+Omid.swift +4 -9
- package/ios/ads/THEOplayerRCTAdsAPI.swift +39 -50
- package/ios/backgroundAudio/THEOplayerRCTBackgroundAudioManager.swift +2 -2
- package/ios/backgroundAudio/THEOplayerRCTNowPlayingManager.swift +144 -47
- package/ios/backgroundAudio/THEOplayerRCTRemoteCommandsManager.swift +151 -68
- package/ios/backgroundAudio/THEOplayerRCTView+MediaControlConfig.swift +25 -11
- package/ios/casting/THEOplayerRCTCastAPI+Airplay.swift +20 -22
- package/ios/casting/THEOplayerRCTCastAPI+Chromecast.swift +28 -34
- package/ios/casting/THEOplayerRCTCastAPI.swift +5 -8
- package/ios/eventBroadcasting/THEOplayerRCTEventBroadcastAPI.swift +2 -4
- package/ios/mediaControl/THEOplayerRCTMediaControlAPI.swift +79 -0
- package/ios/mediaControl/THEOplayerRCTMediaControlManager.swift +38 -0
- package/ios/pip/THEOplayerRCTPipControlsManager.swift +9 -12
- package/ios/theoAds/THEOplayerRCTTHEOAdsAPI.swift +16 -18
- package/ios/theolive/THEOplayerRCTTHEOliveAPI.swift +14 -14
- package/lib/commonjs/api/error/ContentProtectionError.js +2 -0
- package/lib/commonjs/api/error/ContentProtectionError.js.map +1 -0
- package/lib/commonjs/api/error/barrel.js +11 -0
- package/lib/commonjs/api/error/barrel.js.map +1 -1
- package/lib/commonjs/api/event/PlayerEvent.js +16 -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/player/PlayerEventMap.js +2 -0
- package/lib/commonjs/api/player/PlayerEventMap.js.map +1 -1
- package/lib/commonjs/api/player/THEOplayer.js.map +1 -1
- package/lib/commonjs/internal/THEOplayerView.js +8 -0
- package/lib/commonjs/internal/THEOplayerView.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/commonjs/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/commonjs/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/commonjs/internal/adapter/WebEventForwarder.js +27 -0
- package/lib/commonjs/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/commonjs/internal/adapter/event/PlayerEvents.js +14 -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/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/error/ContentProtectionError.js +2 -0
- package/lib/module/api/error/ContentProtectionError.js.map +1 -0
- package/lib/module/api/error/barrel.js +1 -0
- package/lib/module/api/error/barrel.js.map +1 -1
- package/lib/module/api/event/PlayerEvent.js +18 -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/player/PlayerEventMap.js +2 -0
- package/lib/module/api/player/PlayerEventMap.js.map +1 -1
- package/lib/module/api/player/THEOplayer.js.map +1 -1
- package/lib/module/internal/THEOplayerView.js +9 -1
- package/lib/module/internal/THEOplayerView.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerAdapter.js +6 -0
- package/lib/module/internal/adapter/THEOplayerAdapter.js.map +1 -1
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js +9 -9
- package/lib/module/internal/adapter/THEOplayerWebAdapter.js.map +1 -1
- package/lib/module/internal/adapter/WebEventForwarder.js +28 -1
- package/lib/module/internal/adapter/WebEventForwarder.js.map +1 -1
- package/lib/module/internal/adapter/event/PlayerEvents.js +11 -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/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/api/error/ContentProtectionError.d.ts +53 -0
- package/lib/typescript/api/error/ContentProtectionError.d.ts.map +1 -0
- package/lib/typescript/api/error/barrel.d.ts +1 -0
- package/lib/typescript/api/error/barrel.d.ts.map +1 -1
- package/lib/typescript/api/event/PlayerEvent.d.ts +24 -1
- 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/player/PlayerEventMap.d.ts +12 -2
- package/lib/typescript/api/player/PlayerEventMap.d.ts.map +1 -1
- package/lib/typescript/api/player/THEOplayer.d.ts +5 -0
- package/lib/typescript/api/player/THEOplayer.d.ts.map +1 -1
- package/lib/typescript/internal/THEOplayerView.d.ts +2 -0
- package/lib/typescript/internal/THEOplayerView.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts +3 -1
- package/lib/typescript/internal/adapter/THEOplayerAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts +3 -2
- package/lib/typescript/internal/adapter/THEOplayerWebAdapter.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts +2 -0
- package/lib/typescript/internal/adapter/WebEventForwarder.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts +8 -1
- package/lib/typescript/internal/adapter/event/PlayerEvents.d.ts.map +1 -1
- package/lib/typescript/internal/adapter/event/native/NativePlayerEvent.d.ts +5 -1
- 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/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 +1 -1
- package/src/api/error/ContentProtectionError.ts +58 -0
- package/src/api/error/barrel.ts +1 -0
- package/src/api/event/PlayerEvent.ts +26 -1
- 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/player/PlayerEventMap.ts +14 -0
- package/src/api/player/THEOplayer.ts +6 -0
- package/src/internal/THEOplayerView.tsx +16 -0
- package/src/internal/adapter/THEOplayerAdapter.ts +9 -0
- package/src/internal/adapter/THEOplayerWebAdapter.ts +12 -9
- package/src/internal/adapter/WebEventForwarder.ts +26 -0
- package/src/internal/adapter/event/PlayerEvents.ts +18 -0
- package/src/internal/adapter/event/native/NativePlayerEvent.ts +7 -0
- package/src/internal/adapter/media/MediaControlNativeAdapter.ts +38 -0
- package/src/internal/adapter/media/MediaControlWebAdapter.ts +28 -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
|
@@ -42,6 +42,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
42
42
|
var remoteCommandsManager: THEOplayerRCTRemoteCommandsManager
|
|
43
43
|
var pipManager: THEOplayerRCTPipManager
|
|
44
44
|
var pipControlsManager: THEOplayerRCTPipControlsManager
|
|
45
|
+
var mediaControlManager: THEOplayerRCTMediaControlManager
|
|
45
46
|
var isApplicationInBackground: Bool = (UIApplication.shared.applicationState == .background)
|
|
46
47
|
|
|
47
48
|
var adsConfig = AdsConfig()
|
|
@@ -71,12 +72,13 @@ public class THEOplayerRCTView: UIView {
|
|
|
71
72
|
|
|
72
73
|
var mediaControlConfig = MediaControlConfig() {
|
|
73
74
|
didSet {
|
|
74
|
-
self.remoteCommandsManager.
|
|
75
|
+
self.remoteCommandsManager.updateRemoteCommands()
|
|
76
|
+
self.nowPlayingManager.updateNowPlayingInfo()
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
var pipConfig = PipConfig() {
|
|
78
80
|
didSet {
|
|
79
|
-
self.pipControlsManager.
|
|
81
|
+
self.pipControlsManager.updatePipControls()
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
var backgroundAudioConfig = BackgroundAudioConfig() {
|
|
@@ -115,6 +117,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
115
117
|
self.remoteCommandsManager = THEOplayerRCTRemoteCommandsManager()
|
|
116
118
|
self.pipManager = THEOplayerRCTPipManager()
|
|
117
119
|
self.pipControlsManager = THEOplayerRCTPipControlsManager()
|
|
120
|
+
self.mediaControlManager = THEOplayerRCTMediaControlManager()
|
|
118
121
|
super.init(frame: .zero)
|
|
119
122
|
|
|
120
123
|
self.setupAppStateObservers()
|
|
@@ -151,6 +154,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
151
154
|
self.pipControlsManager.destroy()
|
|
152
155
|
self.presentationModeManager.destroy()
|
|
153
156
|
self.backgroundAudioManager.destroy()
|
|
157
|
+
self.mediaControlManager.destroy()
|
|
154
158
|
|
|
155
159
|
self.destroyBackgroundAudio()
|
|
156
160
|
self.player?.removeAllIntegrations()
|
|
@@ -216,9 +220,9 @@ public class THEOplayerRCTView: UIView {
|
|
|
216
220
|
self.theoliveEventHandler.setPlayer(player)
|
|
217
221
|
self.theoadsEventHandler.setPlayer(player)
|
|
218
222
|
self.castEventHandler.setPlayer(player)
|
|
219
|
-
self.nowPlayingManager.setPlayer(player)
|
|
220
|
-
self.remoteCommandsManager.setPlayer(player)
|
|
221
|
-
self.pipControlsManager.setPlayer(player)
|
|
223
|
+
self.nowPlayingManager.setPlayer(player, view: self)
|
|
224
|
+
self.remoteCommandsManager.setPlayer(player, view: self)
|
|
225
|
+
self.pipControlsManager.setPlayer(player, view: self)
|
|
222
226
|
self.presentationModeManager.setPlayer(player, view: self)
|
|
223
227
|
self.backgroundAudioManager.setPlayer(player, view: self)
|
|
224
228
|
self.pipManager.setView(view: self)
|
|
@@ -305,7 +309,7 @@ public class THEOplayerRCTView: UIView {
|
|
|
305
309
|
}
|
|
306
310
|
|
|
307
311
|
// trigger different feature managers to reflect the current state
|
|
308
|
-
self.nowPlayingManager.
|
|
312
|
+
self.nowPlayingManager.updateNowPlayingInfo()
|
|
309
313
|
self.remoteCommandsManager.updateRemoteCommands()
|
|
310
314
|
self.pipControlsManager.updatePipControls()
|
|
311
315
|
}
|
|
@@ -470,6 +474,18 @@ public class THEOplayerRCTView: UIView {
|
|
|
470
474
|
if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeCanPlay prop set.") }
|
|
471
475
|
}
|
|
472
476
|
|
|
477
|
+
@objc(setOnNativeContentProtectionError:)
|
|
478
|
+
func setOnNativeContentProtectionError(nativeContentProtectionError: @escaping RCTDirectEventBlock) {
|
|
479
|
+
self.mainEventHandler.onNativeContentProtectionError = nativeContentProtectionError
|
|
480
|
+
if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeContentProtectionError prop set.") }
|
|
481
|
+
}
|
|
482
|
+
|
|
483
|
+
@objc(setOnNativeContentProtectionSuccess:)
|
|
484
|
+
func setOnNativeContentProtectionSuccess(nativeContentProtectionSuccess: @escaping RCTDirectEventBlock) {
|
|
485
|
+
self.mainEventHandler.onNativeContentProtectionSuccess = nativeContentProtectionSuccess
|
|
486
|
+
if DEBUG_VIEW { PrintUtils.printLog(logText: "[NATIVE] nativeContentProtectionSuccess prop set.") }
|
|
487
|
+
}
|
|
488
|
+
|
|
473
489
|
@objc(setOnNativeDimensionChange:)
|
|
474
490
|
func setOnNativeDimensionChange(nativeDimensionChange: @escaping RCTDirectEventBlock) {
|
|
475
491
|
self.mainEventHandler.onNativeDimensionChange = nativeDimensionChange
|
|
@@ -14,60 +14,61 @@ extension THEOplayerRCTAdsAPI {
|
|
|
14
14
|
#if canImport(THEOplayerGoogleIMAIntegration)
|
|
15
15
|
@objc(daiSnapback:resolver:rejecter:)
|
|
16
16
|
func daiSnapback(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
17
|
-
|
|
18
|
-
if let
|
|
19
|
-
let ads = theView.ads(),
|
|
20
|
-
let dai = ads.dai {
|
|
17
|
+
withViewAndAds(node) { _, ads in
|
|
18
|
+
if let dai = ads.dai {
|
|
21
19
|
resolve(dai.snapback)
|
|
22
20
|
} else {
|
|
23
21
|
reject(ERROR_CODE_DAI_ACCESS_FAILURE, ERROR_MESSAGE_DAI_ACCESS_FAILURE, nil)
|
|
24
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve dai snapback status (
|
|
22
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve dai snapback status (DAI module unavailable).") }
|
|
25
23
|
}
|
|
24
|
+
} onFailure: {
|
|
25
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
26
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve dai snapback status (ads module unavailable).") }
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
|
|
29
30
|
@objc(daiSetSnapback:enabled:)
|
|
30
31
|
func daiSetSnapback(_ node: NSNumber, enabled: Bool) -> Void {
|
|
31
|
-
|
|
32
|
-
if
|
|
33
|
-
let ads = theView.ads(),
|
|
34
|
-
var dai = ads.dai {
|
|
32
|
+
withViewAndAds(node) { _, ads in
|
|
33
|
+
if var dai = ads.dai {
|
|
35
34
|
dai.snapback = enabled
|
|
36
|
-
} else {
|
|
37
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not update dai snapback status (ads DAI module unavailable).") }
|
|
38
35
|
}
|
|
36
|
+
} onFailure: {
|
|
37
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not update dai snapback status (ads DAI module unavailable).") }
|
|
39
38
|
}
|
|
40
39
|
}
|
|
41
40
|
|
|
42
41
|
@objc(daiContentTimeForStreamTime:time:resolver:rejecter:)
|
|
43
42
|
func daiContentTimeForStreamTime(_ node: NSNumber, timeValue: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
44
|
-
|
|
45
|
-
if let
|
|
46
|
-
let ads = theView.ads(),
|
|
47
|
-
let dai = ads.dai {
|
|
43
|
+
withViewAndAds(node) { _, ads in
|
|
44
|
+
if let dai = ads.dai {
|
|
48
45
|
let streamTime = timeValue.doubleValue * 0.001 // msec -> sec
|
|
49
46
|
let contentTime = dai.contentTime(from: streamTime) * 1000.0 // sec -> msec
|
|
50
47
|
resolve(contentTime)
|
|
51
48
|
} else {
|
|
52
49
|
reject(ERROR_CODE_DAI_ACCESS_FAILURE, ERROR_MESSAGE_DAI_ACCESS_FAILURE, nil)
|
|
53
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert stream time to content time (
|
|
50
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert stream time to content time (DAI module unavailable).") }
|
|
54
51
|
}
|
|
52
|
+
} onFailure: {
|
|
53
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
54
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert stream time to content time (ads module unavailable).") }
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
@objc(daiStreamTimeForContentTime:time:resolver:rejecter:)
|
|
59
59
|
func daiStreamTimeForContentTime(_ node: NSNumber, timeValue: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
60
|
-
|
|
61
|
-
if let
|
|
62
|
-
let ads = theView.ads(),
|
|
63
|
-
let dai = ads.dai {
|
|
60
|
+
withViewAndAds(node) { _, ads in
|
|
61
|
+
if let dai = ads.dai {
|
|
64
62
|
let contentTime = timeValue.doubleValue * 0.001 // msec -> sec
|
|
65
63
|
let streamTime = dai.streamTime(from: contentTime) * 1000.0 // sec -> msec
|
|
66
64
|
resolve(streamTime)
|
|
67
65
|
} else {
|
|
68
66
|
reject(ERROR_CODE_DAI_ACCESS_FAILURE, ERROR_MESSAGE_DAI_ACCESS_FAILURE, nil)
|
|
69
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert content time to stream time (
|
|
67
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert content time to stream time (DAI module unavailable).") }
|
|
70
68
|
}
|
|
69
|
+
} onFailure: {
|
|
70
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
71
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not convert content time to stream time (ads module unavailable).") }
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
|
|
@@ -13,12 +13,10 @@ extension THEOplayerRCTAdsAPI {
|
|
|
13
13
|
#if canImport(THEOplayerGoogleIMAIntegration)
|
|
14
14
|
@objc(addFriendlyObstruction:obstruction:)
|
|
15
15
|
func addFriendlyObstruction(_ node: NSNumber, obstruction: NSDictionary) {
|
|
16
|
-
|
|
16
|
+
withViewAndAds(node) { _, ads in
|
|
17
17
|
if let obstructionNode = obstruction[PROP_OMID_VIEW] as? NSNumber,
|
|
18
18
|
let purposeString = obstruction[PROP_OMID_PURPOSE] as? String,
|
|
19
|
-
let
|
|
20
|
-
let obstructionView = self.bridge.uiManager.view(forReactTag: obstructionNode),
|
|
21
|
-
let ads = theView.ads() {
|
|
19
|
+
let obstructionView = self.bridge.uiManager.view(forReactTag: obstructionNode) {
|
|
22
20
|
let obstruction = OmidFriendlyObstruction(view: obstructionView,
|
|
23
21
|
purpose: THEOplayerRCTTypeUtils.omidFriendlyObstructionPurposeFromString(purposeString),
|
|
24
22
|
detailedReason: obstruction[PROP_OMID_REASON] as? String)
|
|
@@ -29,11 +27,8 @@ extension THEOplayerRCTAdsAPI {
|
|
|
29
27
|
|
|
30
28
|
@objc(removeAllFriendlyObstructions:)
|
|
31
29
|
func removeAllFriendlyObstructions(_ node: NSNumber) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
let ads = theView.ads() {
|
|
35
|
-
ads.omid.removeFriendlyObstructions()
|
|
36
|
-
}
|
|
30
|
+
withViewAndAds(node) { _, ads in
|
|
31
|
+
ads.omid.removeFriendlyObstructions()
|
|
37
32
|
}
|
|
38
33
|
}
|
|
39
34
|
|
|
@@ -38,90 +38,79 @@ class THEOplayerRCTAdsAPI: NSObject, RCTBridgeModule {
|
|
|
38
38
|
@objc(skip:)
|
|
39
39
|
func skip(_ node: NSNumber) -> Void {
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
} else {
|
|
46
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not skip ad (ads module unavailable).") }
|
|
47
|
-
}
|
|
41
|
+
withViewAndAds(node) { _, ads in
|
|
42
|
+
ads.skip()
|
|
43
|
+
} onFailure: {
|
|
44
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not skip ad (ads module unavailable).") }
|
|
48
45
|
}
|
|
49
46
|
}
|
|
50
47
|
|
|
51
48
|
@objc(playing:resolver:rejecter:)
|
|
52
49
|
func playing(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
59
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not skip ad (ads module unavailable).") }
|
|
60
|
-
}
|
|
50
|
+
withViewAndAds(node) { _, ads in
|
|
51
|
+
resolve(ads.playing)
|
|
52
|
+
} onFailure: {
|
|
53
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
54
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not skip ad (ads module unavailable).") }
|
|
61
55
|
}
|
|
62
56
|
}
|
|
63
57
|
|
|
64
58
|
@objc(currentAdBreak:resolver:rejecter:)
|
|
65
59
|
func currentAdBreak(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
66
|
-
|
|
67
|
-
if let
|
|
68
|
-
let ads = theView.ads(),
|
|
69
|
-
let currentAdBreak = ads.currentAdBreak {
|
|
60
|
+
withViewAndAds(node) { _, ads in
|
|
61
|
+
if let currentAdBreak = ads.currentAdBreak {
|
|
70
62
|
resolve(THEOplayerRCTAdAdapter.fromAdBreak(adBreak:currentAdBreak))
|
|
71
63
|
} else {
|
|
72
|
-
reject(
|
|
73
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current adbreak (
|
|
64
|
+
reject(ERROR_CODE_ADS_GET_CURRENT_ADBREAK_UNDEFINED, ERROR_MESSAGE_ADS_GET_CURRENT_ADBREAK_UNDEFINED, nil)
|
|
65
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current adbreak (no current adbreak).") }
|
|
74
66
|
}
|
|
67
|
+
} onFailure: {
|
|
68
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
69
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current adbreak (ads module unavailable).") }
|
|
75
70
|
}
|
|
76
71
|
}
|
|
77
72
|
|
|
78
73
|
@objc(currentAds:resolver:rejecter:)
|
|
79
74
|
func currentAds(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
for ad in currentAdsArray {
|
|
86
|
-
currentAds.append(THEOplayerRCTAdAdapter.fromAd(ad: ad))
|
|
87
|
-
}
|
|
88
|
-
resolve(currentAds)
|
|
89
|
-
} else {
|
|
90
|
-
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
91
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current ad (ads module unavailable).") }
|
|
75
|
+
withViewAndAds(node) { _, ads in
|
|
76
|
+
let currentAdsArray = ads.currentAds
|
|
77
|
+
var currentAds: [[String:Any]] = []
|
|
78
|
+
for ad in currentAdsArray {
|
|
79
|
+
currentAds.append(THEOplayerRCTAdAdapter.fromAd(ad: ad))
|
|
92
80
|
}
|
|
81
|
+
resolve(currentAds)
|
|
82
|
+
} onFailure: {
|
|
83
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
84
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current ad (ads module unavailable).") }
|
|
93
85
|
}
|
|
94
86
|
}
|
|
95
87
|
|
|
96
88
|
@objc(scheduledAdBreaks:resolver:rejecter:)
|
|
97
89
|
func scheduledAdBreaks(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
for adbreak in currentAdBreaksArray {
|
|
104
|
-
currentAdBreaks.append(THEOplayerRCTAdAdapter.fromAdBreak(adBreak: adbreak))
|
|
105
|
-
}
|
|
106
|
-
resolve(currentAdBreaks)
|
|
107
|
-
} else {
|
|
108
|
-
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
109
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current ad (ads module unavailable).") }
|
|
90
|
+
withViewAndAds(node) { _, ads in
|
|
91
|
+
let currentAdBreaksArray = ads.scheduledAdBreaks
|
|
92
|
+
var currentAdBreaks: [[String:Any]] = []
|
|
93
|
+
for adbreak in currentAdBreaksArray {
|
|
94
|
+
currentAdBreaks.append(THEOplayerRCTAdAdapter.fromAdBreak(adBreak: adbreak))
|
|
110
95
|
}
|
|
96
|
+
resolve(currentAdBreaks)
|
|
97
|
+
} onFailure: {
|
|
98
|
+
reject(ERROR_CODE_ADS_ACCESS_FAILURE, ERROR_MESSAGE_ADS_ACCESS_FAILURE, nil)
|
|
99
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not retrieve current ad (ads module unavailable).") }
|
|
111
100
|
}
|
|
112
101
|
}
|
|
113
102
|
|
|
114
103
|
@objc(schedule:ad:)
|
|
115
104
|
func schedule(_ node: NSNumber, adDict: NSDictionary) -> Void {
|
|
116
|
-
|
|
117
|
-
if let
|
|
118
|
-
let adData = adDict as? [String:Any],
|
|
119
|
-
let ads = theView.ads(),
|
|
105
|
+
withViewAndAds(node) { _, ads in
|
|
106
|
+
if let adData = adDict as? [String:Any],
|
|
120
107
|
let adDescription = THEOplayerRCTSourceDescriptionBuilder.buildSingleAdDescription(adData) {
|
|
121
108
|
ads.schedule(adDescription: adDescription)
|
|
122
109
|
} else {
|
|
123
|
-
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not schedule new ad.") }
|
|
110
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not schedule new ad (invalid ad description).") }
|
|
124
111
|
}
|
|
112
|
+
} onFailure: {
|
|
113
|
+
if DEBUG_ADS_API { PrintUtils.printLog(logText: "[NATIVE] Could not schedule new ad.") }
|
|
125
114
|
}
|
|
126
115
|
}
|
|
127
116
|
|
|
@@ -27,12 +27,12 @@ class THEOplayerRCTBackgroundAudioManager: NSObject, BackgroundPlaybackDelegate
|
|
|
27
27
|
let inPip = view.presentationModeManager.presentationMode == .pictureInPicture
|
|
28
28
|
|
|
29
29
|
if stopOnBackground && !inPip {
|
|
30
|
-
if
|
|
30
|
+
if DEBUG_THEOPLAYER_INTERACTION { PrintUtils.printLog(logText: "[NATIVE] Moved to background, not in pip and stopOnBackground is enabled => stopping playback") }
|
|
31
31
|
player.stop()
|
|
32
32
|
return false
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
-
view.nowPlayingManager.
|
|
35
|
+
view.nowPlayingManager.updateNowPlayingInfo()
|
|
36
36
|
return view.backgroundAudioConfig.enabled
|
|
37
37
|
}
|
|
38
38
|
return false
|