[IOS-6797] Support in-feed Placement #17
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| #import "ALVungleMediationAdapter.h" | ||
| #import <VungleAdsSDK/VungleAdsSDK.h> | ||
|
|
||
| #define ADAPTER_VERSION @"7.4.0.0" | ||
|
|
||
| @interface ALVungleMediationAdapterInterstitialAdDelegate : NSObject <VungleInterstitialDelegate> | ||
| @property (nonatomic, weak) ALVungleMediationAdapter *parentAdapter; | ||
|
|
@@ -30,11 +30,12 @@ @interface ALVungleMediationAdapterRewardedAdDelegate : NSObject <VungleRewarded | |
| - (instancetype)initWithParentAdapter:(ALVungleMediationAdapter *)parentAdapter andNotify:(id<MARewardedAdapterDelegate>)delegate; | ||
| @end | ||
|
|
||
| @interface ALVungleMediationAdapterAdViewDelegate : NSObject <VungleBannerViewDelegate> | ||
| @property (nonatomic, weak) ALVungleMediationAdapter *parentAdapter; | ||
| @property (nonatomic, strong) MAAdFormat *adFormat; | ||
| @property (nonatomic, strong) id<MAAdapterResponseParameters> parameters; | ||
| @property (nonatomic, strong) id<MAAdViewAdapterDelegate> delegate; | ||
| @property (nonatomic, assign) BOOL isAdloadSuccess; | ||
| - (instancetype)initWithParentAdapter:(ALVungleMediationAdapter *)parentAdapter | ||
| format:(MAAdFormat *)adFormat | ||
| parameters:(id<MAAdapterResponseParameters>)parameters | ||
|
|
@@ -84,8 +85,7 @@ @interface ALVungleMediationAdapter () | |
| @property (nonatomic, strong) ALVungleMediationAdapterRewardedAdDelegate *rewardedAdDelegate; | ||
|
|
||
| // AdView | ||
| @property (nonatomic, strong) VungleBannerView *adView; | ||
| @property (nonatomic, strong) ALVungleMediationAdapterAdViewDelegate *adViewDelegate; | ||
|
|
||
| // Native Ad | ||
|
|
@@ -173,7 +173,6 @@ - (void)destroy | |
| self.adView.delegate = nil; | ||
| self.adView = nil; | ||
| self.adViewDelegate = nil; | ||
|
|
||
| [self.nativeAd unregisterView]; | ||
| self.nativeAd.delegate = nil; | ||
|
|
@@ -402,17 +401,14 @@ - (void)loadAdViewAdForParameters:(id<MAAdapterResponseParameters>)parameters ad | |
| } | ||
| else | ||
| { | ||
| VungleAdSize *adSize = [self adSizeFromAdFormat: adFormat parameters:parameters]; | ||
| self.adView = [[VungleBannerView alloc] initWithPlacementId: placementIdentifier vungleAdSize: adSize]; | ||
| self.adViewDelegate = [[ALVungleMediationAdapterAdViewDelegate alloc] initWithParentAdapter: self | ||
| format: adFormat | ||
| parameters: parameters | ||
| andNotify: delegate]; | ||
| self.adView.delegate = self.adViewDelegate; | ||
|
|
||
| [self.adView load: bidResponse]; | ||
| } | ||
| } | ||
|
|
@@ -518,24 +514,32 @@ - (void)loadVungleNativeAdForParameters:(id<MAAdapterResponseParameters>)paramet | |
| return clickableViews; | ||
| } | ||
|
|
||
| - (VungleAdSize *)adSizeFromAdFormat:(MAAdFormat *)adFormat | ||
| parameters:(id<MAAdapterParameters>)parameters | ||
| { | ||
| BOOL isAdaptiveBanner = [parameters.localExtraParameters al_boolForKey: @"adaptive_banner"]; | ||
| NSNumber *customWidth = [parameters.localExtraParameters al_numberForKey: @"adaptive_banner_width"] ? : 0; | ||
| NSNumber *customHight = [parameters.localExtraParameters al_numberForKey: @"adaptive_banner_height"] ? : 0; | ||
|
|
||
| if (!isAdaptiveBanner && customWidth && customWidth) { | ||
| return [VungleAdSize VungleAdSizeFromCGSize:(CGSizeMake(customWidth.floatValue, customHight.floatValue))]; | ||
| } | ||
| else if ( adFormat == MAAdFormat.banner ) | ||
| { | ||
| return [VungleAdSize VungleAdSizeBannerRegular]; | ||
| } | ||
| else if ( adFormat == MAAdFormat.leader ) | ||
| { | ||
| return [VungleAdSize VungleAdSizeLeaderboard]; | ||
| } | ||
| else if ( adFormat == MAAdFormat.mrec ) | ||
| { | ||
| return [VungleAdSize VungleAdSizeMREC]; | ||
| } | ||
| else | ||
| { | ||
| [NSException raise: NSInvalidArgumentException format: @"Unsupported ad format: %@", adFormat]; | ||
| return [VungleAdSize VungleAdSizeBannerRegular]; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -889,84 +893,92 @@ - (instancetype)initWithParentAdapter:(ALVungleMediationAdapter *)parentAdapter | |
| self.adFormat = adFormat; | ||
| self.parameters = parameters; | ||
| self.delegate = delegate; | ||
| self.isAdloadSuccess = NO; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)bannerAdDidLoad:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView loaded: %@", bannerView.placementId]; | ||
|
|
||
| self.isAdloadSuccess = YES; | ||
| NSMutableDictionary *extraInfo = [NSMutableDictionary dictionaryWithCapacity: 3]; | ||
| BOOL isExtraInfo = NO; | ||
|
There was a problem hiding this comment. i think MAX will comment on this. Check for ALSdk.versionCode >= 6150000 for if else. Thanks @ashinagawa |
||
| NSString *creativeIdentifier = bannerView.creativeId; | ||
| if ( [creativeIdentifier al_isValidString] ) | ||
| { | ||
| extraInfo[@"creative_id"] = creativeIdentifier; | ||
| isExtraInfo = YES; | ||
| } | ||
|
|
||
| CGSize adSize = [bannerView getBannerSize]; | ||
| if ( !CGSizeEqualToSize(CGSizeZero, adSize) ) | ||
| { | ||
ashinagawa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| extraInfo[@"ad_width"] = @(adSize.width); | ||
| extraInfo[@"ad_height"] = @(adSize.height); | ||
ashinagawa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| isExtraInfo = YES; | ||
| } | ||
|
|
||
| if (isExtraInfo) { | ||
| [self.delegate performSelector: @selector(didLoadAdForAdView:withExtraInfo:) | ||
| withObject: bannerView | ||
| withObject: extraInfo]; | ||
| } else { | ||
| [self.delegate didLoadAdForAdView: bannerView]; | ||
| } | ||
| } | ||
|
|
||
| - (void)bannerAdDidFail:(VungleBannerView *)bannerView withError:(NSError *)error | ||
| { | ||
| MAAdapterError *adapterError = [ALVungleMediationAdapter toMaxError: error isAdPresentError: NO]; | ||
| if ( self.isAdloadSuccess ) | ||
| { | ||
| [self.parentAdapter log: @"AdView failed to display with error: %@", adapterError]; | ||
| [self.delegate didFailToDisplayAdViewAdWithError: adapterError]; | ||
| } | ||
| else | ||
| { | ||
| [self.parentAdapter log: @"AdView failed to load with error: %@", adapterError]; | ||
| [self.delegate didFailToLoadAdViewAdWithError: adapterError]; | ||
| } | ||
| } | ||
|
|
||
| - (void)bannerAdWillPresent:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad will present %@", bannerView.placementId]; | ||
| } | ||
|
|
||
| - (void)bannerAdDidPresent:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad shown %@", bannerView.placementId]; | ||
| } | ||
|
|
||
| - (void)bannerAdDidTrackImpression:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad impression tracked %@", bannerView.placementId]; | ||
| [self.delegate didDisplayAdViewAd]; | ||
| } | ||
|
|
||
| - (void)bannerAdDidClick:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad clicked %@", bannerView.placementId]; | ||
| [self.delegate didClickAdViewAd]; | ||
| } | ||
|
|
||
| - (void)bannerAdWillLeaveApplication:(VungleBannerView *)bannerView | ||
| { | ||
|
There was a problem hiding this comment. We will not notify any ad presenting error to the mediation, right? or Might we move There was a problem hiding this comment. The callback method here has been changed from There was a problem hiding this comment. Now, it's taken care at There was a problem hiding this comment. u need to move this logic into bannerAdDidFail: callback. There was a problem hiding this comment. I have below in Do you know if we need There was a problem hiding this comment. its based on present error or load error. |
||
| [self.parentAdapter log: @"AdView ad will leave application %@", bannerView.placementId]; | ||
| } | ||
|
|
||
| - (void)bannerAdWillClose:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad will close %@", bannerView.placementId]; | ||
|
There was a problem hiding this comment. The callback method here has been changed from There was a problem hiding this comment. Now, it's taken care at |
||
| } | ||
|
|
||
| - (void)bannerAdDidClose:(VungleBannerView *)bannerView | ||
| { | ||
| [self.parentAdapter log: @"AdView ad hidden %@", bannerView.placementId]; | ||
| [self.delegate didHideAdViewAd]; | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can u move the line 521 and 522 inside here. and since u ave a default value as 0 which our sdk support u dont need to check customWidth && customWidth in if block.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch. Thanks!
Updated.