From c56bb123d749f05843438f4145921f875c6e6502 Mon Sep 17 00:00:00 2001 From: mobileSDK Date: Tue, 20 Oct 2020 22:49:45 -0400 Subject: [PATCH 1/6] fixed the lazy load issue --- .../BannerAd/BannerAdViewController.m | 9 +++++++-- .../MultiAdRequest/MultiAdViewController.m | 16 ++++++++++++---- sdk/sourcefiles/internal/ANBannerAdView.m | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/BannerAd/BannerAdViewController.m b/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/BannerAd/BannerAdViewController.m index 1623b3ac2..63043a30e 100644 --- a/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/BannerAd/BannerAdViewController.m +++ b/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/BannerAd/BannerAdViewController.m @@ -53,15 +53,16 @@ - (void)viewDidLoad CGSize size = CGSizeMake(adWidth, adHeight); // Make a banner ad view. - //self.banner = [ANBannerAdView adViewWithFrame:rect placementId:adID adSize:size]; + self.banner = [ANBannerAdView adViewWithFrame:rect placementId:adID adSize:size]; // Needed for when we create our ad view. CGRect rect1 = CGRectMake(originX, originY, adWidth1, adHeight1); CGSize size1 = CGSizeMake(adWidth1, adHeight1); - self.banner = [[ANBannerAdView alloc] initWithFrame:rect1 memberId:memberID inventoryCode:inventoryCode adSize:size1]; + //self.banner = [[ANBannerAdView alloc] initWithFrame:rect1 memberId:memberID inventoryCode:inventoryCode adSize:size1]; self.banner.rootViewController = self; self.banner.delegate = self; + self.banner.enableLazyLoad = YES; [self.view addSubview:self.banner]; // Since this example is for testing, we'll turn on PSAs and verbose logging. @@ -80,6 +81,10 @@ - (void)adDidReceiveAd:(id)ad { NSLog(@"Updated Ad rendered at: %f", executionTime*1000); } +-(void) lazyAdDidReceiveAd:(id)ad { + [self.banner loadLazyAd]; +} + -(void)ad:(id)ad requestFailedWithError:(NSError *)error{ NSLog(@"Ad request Failed With Error"); self.processEnd = [NSDate date]; diff --git a/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/MultiAdRequest/MultiAdViewController.m b/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/MultiAdRequest/MultiAdViewController.m index ff483fcb3..78ada6ba0 100644 --- a/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/MultiAdRequest/MultiAdViewController.m +++ b/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/MultiAdRequest/MultiAdViewController.m @@ -48,9 +48,9 @@ - (void)viewDidLoad { self.marAdRequest = [[ANMultiAdRequest alloc] initWithMemberId:10094 andDelegate:self]; // Add Ad Units [self.marAdRequest addAdUnit:[self createBannerAd:self.bannerAdView]]; - [self.marAdRequest addAdUnit:[self createInterstitialAd]]; - [self.marAdRequest addAdUnit: [self createVideoAd]]; - [self.marAdRequest addAdUnit:[self createNativeAd]]; + //[self.marAdRequest addAdUnit:[self createInterstitialAd]]; + //[self.marAdRequest addAdUnit: [self createVideoAd]]; + //[self.marAdRequest addAdUnit:[self createNativeAd]]; // Load Ad Units [self.marAdRequest load]; @@ -61,7 +61,7 @@ - (void)viewDidLoad { // Create Banner Ad Object - (ANBannerAdView *)createBannerAd:(UIView *) adView { - self.bannerAd = [[ANBannerAdView alloc] initWithFrame:CGRectMake(0, 0, 300, 250) placementId:@"19212468" adSize:CGSizeMake(300, 250)]; + self.bannerAd = [[ANBannerAdView alloc] initWithFrame:CGRectMake(0, 0, 300, 250) placementId:@"15215010" adSize:CGSizeMake(300, 250)]; self.bannerAd.rootViewController =self; self.bannerAd.delegate =self; self.bannerAd.shouldResizeAdToFitContainer = YES; @@ -104,6 +104,10 @@ - (ANNativeAdRequest *)createNativeAd #pragma mark - Delegate methods exclusively for ANMultiAdRequest. - (void) multiAdRequestDidComplete:(nonnull ANMultiAdRequest *)mar{ NSLog(@"Multi Ad Request Did Complete"); + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 10 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{ + [self.marAdRequest load]; + }); } - (void) multiAdRequest:(nonnull ANMultiAdRequest *)mar didFailWithError:(nonnull NSError *)error{ @@ -130,6 +134,10 @@ - (void)ad:(id)ad requestFailedWithError:(NSError *)error{ } +-(void) lazyAdDidReceiveAd:(id)ad { + [self.bannerAd loadLazyAd]; +} + #pragma mark - Delegate methods exclusively for ANNativeAd. - (void)adRequest:(ANNativeAdRequest *)request didFailToLoadWithError:(NSError *)error withAdResponseInfo:(ANAdResponseInfo *)adResponseInfo{ NSLog(@"requestFailedWithError %@:",error); diff --git a/sdk/sourcefiles/internal/ANBannerAdView.m b/sdk/sourcefiles/internal/ANBannerAdView.m index 4c4b96cd5..97c3cb9f9 100644 --- a/sdk/sourcefiles/internal/ANBannerAdView.m +++ b/sdk/sourcefiles/internal/ANBannerAdView.m @@ -405,7 +405,7 @@ - (void)setContentView:(UIView *)newContentView { // Do not update lazy loaded webview unless the new webview candidate is defined. // - if (!newContentView && self.isLazySecondPassThroughAdUnit) { return; } + //if (!newContentView && self.isLazySecondPassThroughAdUnit) { return; } // if (newContentView != _contentView) From 215cd1ab710f81b2b16cedfeeffd668a89efb3df Mon Sep 17 00:00:00 2001 From: mobileSDK Date: Wed, 21 Oct 2020 12:24:02 -0400 Subject: [PATCH 2/6] modified the 2nd load logic --- sdk/sourcefiles/internal/ANBannerAdView.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/sourcefiles/internal/ANBannerAdView.m b/sdk/sourcefiles/internal/ANBannerAdView.m index 97c3cb9f9..66fa516ac 100644 --- a/sdk/sourcefiles/internal/ANBannerAdView.m +++ b/sdk/sourcefiles/internal/ANBannerAdView.m @@ -405,7 +405,7 @@ - (void)setContentView:(UIView *)newContentView { // Do not update lazy loaded webview unless the new webview candidate is defined. // - //if (!newContentView && self.isLazySecondPassThroughAdUnit) { return; } + if (!newContentView && self.isLazySecondPassThroughAdUnit) { return; } // if (newContentView != _contentView) @@ -662,11 +662,11 @@ - (void)universalAdFetcher:(ANUniversalAdFetcher *)fetcher didFinishRequestWithR if (trackersShouldBeFired) { [self fireTrackerAndOMID]; + //reset this property so that the refresh of banner doesnt get affected - https://jira.xandr-services.com/browse/MS-4573 + self.isLazySecondPassThroughAdUnit = NO; + [self adDidReceiveAd:self]; } - - [self adDidReceiveAd:self]; - - + // Process AdUnit according to class type of ANNativeAdResponse. // } else if ([adObject isKindOfClass:[ANNativeAdResponse class]]) { From beef436929358385a0ec132afc32962225e22282 Mon Sep 17 00:00:00 2001 From: mobileSDK Date: Wed, 21 Oct 2020 14:08:02 -0400 Subject: [PATCH 3/6] modified the 2nd load --- sdk/sourcefiles/internal/ANBannerAdView.m | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/sourcefiles/internal/ANBannerAdView.m b/sdk/sourcefiles/internal/ANBannerAdView.m index 66fa516ac..d16e8b1df 100644 --- a/sdk/sourcefiles/internal/ANBannerAdView.m +++ b/sdk/sourcefiles/internal/ANBannerAdView.m @@ -662,11 +662,12 @@ - (void)universalAdFetcher:(ANUniversalAdFetcher *)fetcher didFinishRequestWithR if (trackersShouldBeFired) { [self fireTrackerAndOMID]; - //reset this property so that the refresh of banner doesnt get affected - https://jira.xandr-services.com/browse/MS-4573 - self.isLazySecondPassThroughAdUnit = NO; - [self adDidReceiveAd:self]; } - + //reset this property so that the refresh of banner doesnt get affected - https://jira.xandr-services.com/browse/MS-4573 + self.isLazySecondPassThroughAdUnit = NO; + [self adDidReceiveAd:self]; + + // Process AdUnit according to class type of ANNativeAdResponse. // } else if ([adObject isKindOfClass:[ANNativeAdResponse class]]) { From b270a12faf7eeb1340b30ac826b64f941213204f Mon Sep 17 00:00:00 2001 From: mobileSDK Date: Thu, 22 Oct 2020 10:01:45 -0400 Subject: [PATCH 4/6] made changes as per review --- sdk/sourcefiles/internal/ANBannerAdView.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/sourcefiles/internal/ANBannerAdView.m b/sdk/sourcefiles/internal/ANBannerAdView.m index d16e8b1df..affe08ef9 100644 --- a/sdk/sourcefiles/internal/ANBannerAdView.m +++ b/sdk/sourcefiles/internal/ANBannerAdView.m @@ -405,7 +405,12 @@ - (void)setContentView:(UIView *)newContentView { // Do not update lazy loaded webview unless the new webview candidate is defined. // - if (!newContentView && self.isLazySecondPassThroughAdUnit) { return; } + if (!newContentView && self.isLazySecondPassThroughAdUnit) { + //reset this property so that the refresh of banner doesnt get affected - https://jira.xandr-services.com/browse/MS-4573 + _contentView = newContentView; + return; + + } // if (newContentView != _contentView) @@ -663,8 +668,6 @@ - (void)universalAdFetcher:(ANUniversalAdFetcher *)fetcher didFinishRequestWithR if (trackersShouldBeFired) { [self fireTrackerAndOMID]; } - //reset this property so that the refresh of banner doesnt get affected - https://jira.xandr-services.com/browse/MS-4573 - self.isLazySecondPassThroughAdUnit = NO; [self adDidReceiveAd:self]; From aaade6e4c277f829782c034c8ce1408d8873c7b7 Mon Sep 17 00:00:00 2001 From: Akash Verma Date: Thu, 22 Oct 2020 14:31:07 +0000 Subject: [PATCH 5/6] Merge pull request #655 in MOBILE-SDK/app_mobile-sdk-ios from MS-4574_CocoaPods_Support_1.10 to develop Squashed commit of the following: commit 0ea56e0b8bbaff3ef99b388165c07b30ff81757b Author: Akash.Verma Date: Wed Oct 21 16:39:18 2020 +0530 Fix Error : Resource ANBrowserViewController.nib not found --- sdk/AppNexusSDK.xcodeproj/project.pbxproj | 43 ++++++------------- .../ANBrowserViewController.xib | 0 .../ANBrowserViewController_SizeClasses.xib | 0 3 files changed, 12 insertions(+), 31 deletions(-) rename sdk/sourcefiles/Resources/{Base.lproj => }/ANBrowserViewController.xib (100%) rename sdk/sourcefiles/Resources/{Base.lproj => }/ANBrowserViewController_SizeClasses.xib (100%) diff --git a/sdk/AppNexusSDK.xcodeproj/project.pbxproj b/sdk/AppNexusSDK.xcodeproj/project.pbxproj index c2787bd72..9b226dbe9 100644 --- a/sdk/AppNexusSDK.xcodeproj/project.pbxproj +++ b/sdk/AppNexusSDK.xcodeproj/project.pbxproj @@ -60,8 +60,6 @@ 0E14220E22F99ACA006C597A /* UIButtonBarArrowLeft@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EAD5194B768A0069D934 /* UIButtonBarArrowLeft@2x.png */; }; 0E14220F22F99ACA006C597A /* UIButtonBarArrowRight.png in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EAD6194B768A0069D934 /* UIButtonBarArrowRight.png */; }; 0E14221022F99ACA006C597A /* UIButtonBarArrowRight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EAD7194B768A0069D934 /* UIButtonBarArrowRight@2x.png */; }; - 0E14221122F99AD4006C597A /* ANBrowserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FC210A302007D529002A9F0E /* ANBrowserViewController.xib */; }; - 0E14221222F99AD6006C597A /* ANBrowserViewController_SizeClasses.xib in Resources */ = {isa = PBXBuildFile; fileRef = FC210A332007D52C002A9F0E /* ANBrowserViewController_SizeClasses.xib */; }; 0E14221322F99AE2006C597A /* ANInterstitialAdViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EACC194B768A0069D934 /* ANInterstitialAdViewController.xib */; }; 0E14221422F99AE7006C597A /* anjam.js in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EACD194B768A0069D934 /* anjam.js */; }; 0E14221522F99AE9006C597A /* ANMRAID.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8A3EC16F19B8FDC70049CD29 /* ANMRAID.bundle */; }; @@ -94,6 +92,10 @@ 3850566C24DAD12F00D4B54D /* ANAdResponseCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3850566924DAD12F00D4B54D /* ANAdResponseCode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3850566D24DAD12F00D4B54D /* ANAdResponseCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 3850566A24DAD12F00D4B54D /* ANAdResponseCode.m */; }; 3850566E24DAD12F00D4B54D /* ANAdResponseCode.m in Sources */ = {isa = PBXBuildFile; fileRef = 3850566A24DAD12F00D4B54D /* ANAdResponseCode.m */; }; + 38975FF32540488D006C4578 /* ANBrowserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38975FF12540488D006C4578 /* ANBrowserViewController.xib */; }; + 38975FF42540488D006C4578 /* ANBrowserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38975FF12540488D006C4578 /* ANBrowserViewController.xib */; }; + 38975FF52540488D006C4578 /* ANBrowserViewController_SizeClasses.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38975FF22540488D006C4578 /* ANBrowserViewController_SizeClasses.xib */; }; + 38975FF62540488D006C4578 /* ANBrowserViewController_SizeClasses.xib in Resources */ = {isa = PBXBuildFile; fileRef = 38975FF22540488D006C4578 /* ANBrowserViewController_SizeClasses.xib */; }; 4F06400823A2E7D700E7920A /* ANAdFetcherBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 006F6B992295F70E003D2DF0 /* ANAdFetcherBase.m */; }; 4F06400923A2E7DC00E7920A /* ANAdFetcherBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 006F6B9D2295F72A003D2DF0 /* ANAdFetcherBase.h */; }; 4F5758B12303A8CB00AFF4B6 /* ANMultiAdRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F5758B02303A8CB00AFF4B6 /* ANMultiAdRequest.m */; }; @@ -268,8 +270,6 @@ F52F82EE2293367A00F4578C /* NSString+ANCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = ECE4EA96194B768A0069D934 /* NSString+ANCategory.h */; settings = {ATTRIBUTES = (Private, ); }; }; F52F82F1229338F100F4578C /* ANProxyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8ABC03D31C5AD3E100D7C789 /* ANProxyViewController.m */; }; F52F82F2229338FC00F4578C /* ANProxyViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8ABC03D21C5AD3E100D7C789 /* ANProxyViewController.h */; settings = {ATTRIBUTES = (Private, ); }; }; - F52F83142295DCA500F4578C /* ANBrowserViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FC210A302007D529002A9F0E /* ANBrowserViewController.xib */; }; - F52F83152295DCA500F4578C /* ANBrowserViewController_SizeClasses.xib in Resources */ = {isa = PBXBuildFile; fileRef = FC210A332007D52C002A9F0E /* ANBrowserViewController_SizeClasses.xib */; }; F52F83162295DCA500F4578C /* errors.strings in Resources */ = {isa = PBXBuildFile; fileRef = ECE4EACE194B768A0069D934 /* errors.strings */; }; F52F83172295DCA500F4578C /* omsdk.js in Resources */ = {isa = PBXBuildFile; fileRef = 0EEE97DA21764ACD007DADE6 /* omsdk.js */; }; F5731B3F228C8CA80012B134 /* ANNativeAdImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 8AB876201A0994310022D9A5 /* ANNativeAdImageCache.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -380,8 +380,6 @@ 0E35D4AC2088F67E000A6C27 /* ANGDPRSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANGDPRSettings.m; sourceTree = ""; }; 0E3E3E61241FB73500823D66 /* ANCSRNativeAdResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANCSRNativeAdResponse.h; sourceTree = ""; }; 0E3E3E62241FB73500823D66 /* ANCSRNativeAdResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ANCSRNativeAdResponse.m; sourceTree = ""; }; - 0E6D9AB220D1A943001FA1FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ANBrowserViewController.xib; sourceTree = ""; }; - 0E6D9AB320D1A943001FA1FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ANBrowserViewController_SizeClasses.xib; sourceTree = ""; }; 0E72F63A22D72C7700744B5E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0E7BC1C9229FC71D002F41FF /* ANNativeRenderingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ANNativeRenderingViewController.m; path = ../native/internal/NativeRendering/ANNativeRenderingViewController.m; sourceTree = ""; }; 0E7BC1CA229FC71D002F41FF /* ANNativeRenderingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ANNativeRenderingViewController.h; path = ../native/internal/NativeRendering/ANNativeRenderingViewController.h; sourceTree = ""; }; @@ -398,6 +396,8 @@ 381A0182245B17850093EBB2 /* ANAudioVolumeChangeListener.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ANAudioVolumeChangeListener.m; sourceTree = ""; }; 3850566924DAD12F00D4B54D /* ANAdResponseCode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANAdResponseCode.h; sourceTree = ""; }; 3850566A24DAD12F00D4B54D /* ANAdResponseCode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ANAdResponseCode.m; sourceTree = ""; }; + 38975FF12540488D006C4578 /* ANBrowserViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ANBrowserViewController.xib; sourceTree = ""; }; + 38975FF22540488D006C4578 /* ANBrowserViewController_SizeClasses.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ANBrowserViewController_SizeClasses.xib; sourceTree = ""; }; 4F131E8A1F71CCE50019FDAC /* ANAdFetcherResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANAdFetcherResponse.h; sourceTree = ""; }; 4F131E8B1F71CCE50019FDAC /* ANAdFetcherResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANAdFetcherResponse.m; sourceTree = ""; }; 4F403A6D2043C8CF00EF75A2 /* vastVideo.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = vastVideo.html; sourceTree = ""; }; @@ -973,9 +973,9 @@ isa = PBXGroup; children = ( ECE4EACF194B768A0069D934 /* images */, - FC210A302007D529002A9F0E /* ANBrowserViewController.xib */, - FC210A332007D52C002A9F0E /* ANBrowserViewController_SizeClasses.xib */, ECE4EACC194B768A0069D934 /* ANInterstitialAdViewController.xib */, + 38975FF22540488D006C4578 /* ANBrowserViewController_SizeClasses.xib */, + 38975FF12540488D006C4578 /* ANBrowserViewController.xib */, ECE4EACD194B768A0069D934 /* anjam.js */, 8A3EC16F19B8FDC70049CD29 /* ANMRAID.bundle */, 609733001E42EAFF0061EC0A /* ASTMediationManager.js */, @@ -1274,8 +1274,6 @@ 0E1421EC22F99AC9006C597A /* an_arrow_right.png in Resources */, 0E1421ED22F99AC9006C597A /* an_arrow_right@2x.png in Resources */, 0E1421EE22F99AC9006C597A /* an_arrow_right@3x.png in Resources */, - 0E14221122F99AD4006C597A /* ANBrowserViewController.xib in Resources */, - 0E14221222F99AD6006C597A /* ANBrowserViewController_SizeClasses.xib in Resources */, 0E14221322F99AE2006C597A /* ANInterstitialAdViewController.xib in Resources */, 0E14221422F99AE7006C597A /* anjam.js in Resources */, 0E14221522F99AE9006C597A /* ANMRAID.bundle in Resources */, @@ -1300,6 +1298,8 @@ 0E1421FA22F99AC9006C597A /* UIButtonBarArrowLeft@2x.png in Resources */, 0E1421FB22F99AC9006C597A /* UIButtonBarArrowRight.png in Resources */, 0E1421FC22F99AC9006C597A /* UIButtonBarArrowRight@2x.png in Resources */, + 38975FF52540488D006C4578 /* ANBrowserViewController_SizeClasses.xib in Resources */, + 38975FF32540488D006C4578 /* ANBrowserViewController.xib in Resources */, 0E14221C22F99B02006C597A /* vastVideo.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1312,10 +1312,10 @@ 0E1421FE22F99ACA006C597A /* an_arrow_left@2x.png in Resources */, 0E1421FF22F99ACA006C597A /* an_arrow_left@3x.png in Resources */, 0E14220022F99ACA006C597A /* an_arrow_right.png in Resources */, + 38975FF42540488D006C4578 /* ANBrowserViewController.xib in Resources */, 0E14220122F99ACA006C597A /* an_arrow_right@2x.png in Resources */, + 38975FF62540488D006C4578 /* ANBrowserViewController_SizeClasses.xib in Resources */, 0E14220222F99ACA006C597A /* an_arrow_right@3x.png in Resources */, - F52F83142295DCA500F4578C /* ANBrowserViewController.xib in Resources */, - F52F83152295DCA500F4578C /* ANBrowserViewController_SizeClasses.xib in Resources */, 0E14220322F99ACA006C597A /* appnexus_logo_icon.png in Resources */, 0E14220422F99ACA006C597A /* appnexus_logo_icon@2x.png in Resources */, 0E14220522F99ACA006C597A /* compass.png in Resources */, @@ -1478,25 +1478,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - FC210A302007D529002A9F0E /* ANBrowserViewController.xib */ = { - isa = PBXVariantGroup; - children = ( - 0E6D9AB220D1A943001FA1FA /* Base */, - ); - name = ANBrowserViewController.xib; - sourceTree = ""; - }; - FC210A332007D52C002A9F0E /* ANBrowserViewController_SizeClasses.xib */ = { - isa = PBXVariantGroup; - children = ( - 0E6D9AB320D1A943001FA1FA /* Base */, - ); - name = ANBrowserViewController_SizeClasses.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ 8A9AED9F1A1BE84F00C58BDA /* Debug */ = { isa = XCBuildConfiguration; diff --git a/sdk/sourcefiles/Resources/Base.lproj/ANBrowserViewController.xib b/sdk/sourcefiles/Resources/ANBrowserViewController.xib similarity index 100% rename from sdk/sourcefiles/Resources/Base.lproj/ANBrowserViewController.xib rename to sdk/sourcefiles/Resources/ANBrowserViewController.xib diff --git a/sdk/sourcefiles/Resources/Base.lproj/ANBrowserViewController_SizeClasses.xib b/sdk/sourcefiles/Resources/ANBrowserViewController_SizeClasses.xib similarity index 100% rename from sdk/sourcefiles/Resources/Base.lproj/ANBrowserViewController_SizeClasses.xib rename to sdk/sourcefiles/Resources/ANBrowserViewController_SizeClasses.xib From 10172b2a605caea785ad979475885bf663634756 Mon Sep 17 00:00:00 2001 From: abhisheksharma Date: Thu, 22 Oct 2020 20:54:12 +0530 Subject: [PATCH 6/6] vSDK7.7.1 --- AppNexusSDK.podspec | 2 +- RELEASE-NOTES.md | 5 +++++ sdk/AppNexusSDK.xcodeproj/project.pbxproj | 8 ++++---- sdk/sourcefiles/internal/ANGlobal.h | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/AppNexusSDK.podspec b/AppNexusSDK.podspec index 7d4890e9a..ff577c0f6 100644 --- a/AppNexusSDK.podspec +++ b/AppNexusSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "AppNexusSDK" - s.version = "7.7" + s.version = "7.7.1" s.platform = :ios, "9.0" s.summary = "AppNexus iOS Mobile Advertising SDK" diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 45598d15b..53a94d17f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,8 @@ +## 7.7.1 +### Improvements/Bug Fixes ++ MS-4573 Fixed banner refresh on Lazyload ++ MS-4574 Add support for Cocoapods version 1.10.0 + ## 7.7 ### New Feature + MS-4412 Added support for listening to Ad Expiry events for Native Ads [https://wiki.xandr.com/x/ugPyBg] diff --git a/sdk/AppNexusSDK.xcodeproj/project.pbxproj b/sdk/AppNexusSDK.xcodeproj/project.pbxproj index 9b226dbe9..62864de79 100644 --- a/sdk/AppNexusSDK.xcodeproj/project.pbxproj +++ b/sdk/AppNexusSDK.xcodeproj/project.pbxproj @@ -1507,7 +1507,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.7; + MARKETING_VERSION = 7.7.1; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1544,7 +1544,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.7; + MARKETING_VERSION = 7.7.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1696,7 +1696,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.7; + MARKETING_VERSION = 7.7.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.appnexus.AppNexusNativeSDK; @@ -1741,7 +1741,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.7; + MARKETING_VERSION = 7.7.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.appnexus.AppNexusNativeSDK; diff --git a/sdk/sourcefiles/internal/ANGlobal.h b/sdk/sourcefiles/internal/ANGlobal.h index 178e9ba7b..2b0ae187a 100644 --- a/sdk/sourcefiles/internal/ANGlobal.h +++ b/sdk/sourcefiles/internal/ANGlobal.h @@ -26,7 +26,7 @@ #define AN_ERROR_TABLE @"errors" #define AN_DEFAULT_PLACEMENT_ID @"default_placement_id" -#define AN_SDK_VERSION @"7.7" +#define AN_SDK_VERSION @"7.7.1" #define APPNEXUS_BANNER_SIZE CGSizeMake(320, 50)