APS Updates #89
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -442,4 +442,4 @@ extension DispatchGroup { | |
| return pairIds | ||
| } | ||
| } | ||
| #endif | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -32,8 +32,9 @@ public void InitializeNativeSDK() { | |
| _aps = new AndroidJavaClass(AndroidApsPackage); | ||
| _aps.CallStatic("initialize", _currentActivity, _appID); | ||
| foreach (var slot in _slotData) { | ||
| var (w, h) = AdTypeToDim(slot.APSAdUnitType); | ||
| if (slot.APSAdUnitType == APSAdUnitType.InterstitialVideo || | ||
| slot.APSAdUnitType == APSAdUnitType.RewardedVideo) { | ||
| _aps.CallStatic<bool>("addApsSlot", slot.SlotId, w, h, true); | ||
| continue; | ||
| } | ||
|
|
@@ -46,39 +47,77 @@ public void InitializeNativeSDK() { | |
| adRegistration.CallStatic("enableTesting", true); | ||
| } | ||
|
|
||
| private static Tuple<int, int> AdTypeToDim(APSAdUnitType type) { | ||
| switch (type) { | ||
| case APSAdUnitType.Display320X50: | ||
| return new Tuple<int, int>(320, 50); | ||
| case APSAdUnitType.Display300X250: | ||
| return new Tuple<int, int>(300, 250); | ||
| case APSAdUnitType.Display728X90: | ||
| return new Tuple<int, int>(728, 90); | ||
| case APSAdUnitType.InterstitialDisplay: | ||
| return new Tuple<int, int>(320, 480); | ||
| case APSAdUnitType.InterstitialVideo: | ||
| return new Tuple<int, int>(320, 480); | ||
| case APSAdUnitType.RewardedVideo: | ||
| return new Tuple<int, int>(Screen.width, Screen.height); | ||
| default: | ||
| return new Tuple<int, int>(0, 0); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| public string GetProviderRtbDataFromNativeSDK(AdUnitType type, bool isFullScreen, int width=0, int height=0) { | ||
| var found = false; | ||
| var interstitialVideo = false; | ||
| foreach (ApsSlotData slot in _slotData){ | ||
|
There was a problem hiding this comment. The previous for loop implementation for matching slots was fine since it was only checking a single condition but as the complexity has grown, this pattern becomes much harder to maintain as it is currently lacking adequate testing and will be prone to future error. Is it possible to replace this with the .Net Find function? |
||
| if (type == AdUnitType.Banner) | ||
| { | ||
| if (width == 320 && height == 50 && slot.APSAdUnitType == APSAdUnitType.Display320X50) | ||
| { | ||
| found = true; | ||
| break; | ||
| } | ||
| if (width == 300 && height == 250 && slot.APSAdUnitType == APSAdUnitType.Display300X250) | ||
| { | ||
| found = true; | ||
| break; | ||
| } | ||
| if (width == 728 && height == 90 && slot.APSAdUnitType == APSAdUnitType.Display728X90) | ||
| { | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if (type == AdUnitType.Interstitial) | ||
| { | ||
| if (slot.APSAdUnitType == APSAdUnitType.InterstitialDisplay || | ||
| slot.APSAdUnitType == APSAdUnitType.InterstitialVideo) | ||
| { | ||
| found = true; | ||
| interstitialVideo = (slot.APSAdUnitType == APSAdUnitType.InterstitialVideo); | ||
| break; | ||
| } | ||
| } | ||
| if (type == AdUnitType.Rewarded) | ||
| { | ||
| if (slot.APSAdUnitType == APSAdUnitType.RewardedVideo) | ||
| { | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!found) { | ||
| Debug.unityLogger.LogError("Nimbus", | ||
| "APS NOT FOUND"); | ||
| return null; | ||
| } | ||
|
|
||
| var w = width; | ||
| var h = height; | ||
| if (interstitialVideo || type == AdUnitType.Rewarded) { | ||
| w = 0; | ||
| h = 0; | ||
| isFullScreen = true; | ||
|
|
||
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
| @@ -1,9 +1,18 @@ | ||
| using System; | ||
| using UnityEngine; | ||
|
|
||
| namespace Nimbus.Internal.Interceptor.ThirdPartyDemand { | ||
| [Serializable] | ||
| public class ApsSlotData { | ||
| public string SlotId; | ||
| public APSAdUnitType APSAdUnitType; | ||
| } | ||
| public enum APSAdUnitType : byte { | ||
| Display320X50 = 0, | ||
| Display300X250 = 1, | ||
| Display728X90 = 2, | ||
| InterstitialDisplay = 3, | ||
| InterstitialVideo = 4, | ||
| RewardedVideo = 5 | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
If you were to store the width and height of the ad on the
ApsAdSlotyou could remove this function and reference those values directly.