Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/dai support native i os sdk #167

Merged
merged 3 commits into from
Jul 26, 2023
Merged

Feature/dai support native i os sdk #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3909022
Add support for DAI through THEOplayerGoogleIMAIntegration when using…
wvanhaevre Jun 27, 2023
7c0010b
Update changelog
wvanhaevre Jun 27, 2023
2a07f69
Update changelog
tvanlaerhoven Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

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.0.0/)
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).

## [Unreleased]

### Added

- Added DAI support through iOS Native pipeline, using new THEOplayerGoogleIMAIntegration functionality

## [2.10.0] - 23-07-25

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion ios/ads/THEOplayerRCTAdsAPI+DAI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let ERROR_MESSAGE_DAI_GET_SNAPBACK_UNDEFINED = "Undefined dai snapback"

extension THEOplayerRCTAdsAPI {

#if GOOGLE_DAI
#if GOOGLE_DAI || canImport(THEOplayerGoogleIMAIntegration)
@objc(daiSnapback:resolver:rejecter:)
func daiSnapback(_ node: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
DispatchQueue.main.async {
Expand Down
2 changes: 1 addition & 1 deletion ios/ads/THEOplayerRCTSourceDescriptionBuilder+Ads.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ extension THEOplayerRCTSourceDescriptionBuilder {
}

static func buildDAITypedSource(_ typedSourceData: [String:Any], contentProtection: MultiplatformDRMConfiguration?) -> TypedSource? {
#if GOOGLE_DAI
#if GOOGLE_DAI || canImport(THEOplayerGoogleIMAIntegration)
// check for alternative Google DAI SSAI
if let ssaiData = typedSourceData[SD_PROP_SSAI] as? [String:Any] {
if let integration = ssaiData[SD_PROP_INTEGRATION] as? String,
Expand Down
2 changes: 1 addition & 1 deletion ios/ads/THEOplayerRCTView+AdsConfig.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extension THEOplayerRCTView {

func parseAdsConfig(configDict: NSDictionary) {}

#if GOOGLE_IMA || canImport(THEOplayerGoogleIMAIntegration)
#if (GOOGLE_IMA || GOOGLE_DAI) || canImport(THEOplayerGoogleIMAIntegration)
func playerAdsConfiguration() -> AdsConfiguration? { return AdsConfiguration() }
#else
func playerAdsConfiguration() -> AdsConfiguration? { return nil }
Expand Down
Loading