diff --git a/Assets/Editor/Heyzap.meta b/Assets/Editor/FairBid.meta similarity index 100% rename from Assets/Editor/Heyzap.meta rename to Assets/Editor/FairBid.meta diff --git a/Assets/Editor/Heyzap/HZmod_pbxproj.py b/Assets/Editor/FairBid/FYBmod_pbxproj.py similarity index 100% rename from Assets/Editor/Heyzap/HZmod_pbxproj.py rename to Assets/Editor/FairBid/FYBmod_pbxproj.py diff --git a/Assets/Editor/Heyzap/HZmod_pbxproj.py.meta b/Assets/Editor/FairBid/FYBmod_pbxproj.py.meta similarity index 100% rename from Assets/Editor/Heyzap/HZmod_pbxproj.py.meta rename to Assets/Editor/FairBid/FYBmod_pbxproj.py.meta diff --git a/Assets/Editor/Heyzap/HeyzapPostBuild.cs b/Assets/Editor/FairBid/FairBidPostBuild.cs similarity index 52% rename from Assets/Editor/Heyzap/HeyzapPostBuild.cs rename to Assets/Editor/FairBid/FairBidPostBuild.cs index e74995e3..e4c6a3ab 100644 --- a/Assets/Editor/Heyzap/HeyzapPostBuild.cs +++ b/Assets/Editor/FairBid/FairBidPostBuild.cs @@ -8,23 +8,21 @@ using System.IO; using System.Diagnostics; -public class HeyzapPostBuild : MonoBehaviour -{ +public class FairBidPostBuild : MonoBehaviour { [PostProcessBuild(101)] - private static void onPostProcessBuildPlayer( BuildTarget target, string pathToBuiltProject ) - { + private static void OnPostProcessBuildPlayer(BuildTarget target, string pathToBuiltProject) { if (target == BuildTarget.iOS) { - UnityEngine.Debug.Log ("Heyzap: started post-build script"); + UnityEngine.Debug.Log ("FairBid: started post-build script"); // grab the path to the postProcessor.py file - var scriptPath = Path.Combine( Application.dataPath, "Editor/Heyzap/HeyzapPostprocessBuildPlayer.py" ); + var scriptPath = Path.Combine(Application.dataPath, "Editor/FairBid/PostprocessBuildPlayer.py"); // sanity check - if( !File.Exists( scriptPath ) ) { - UnityEngine.Debug.LogError( "HZ post builder couldn't find python file. Did you accidentally delete it?" ); + if (!File.Exists(scriptPath)) { + UnityEngine.Debug.LogError("FairBid post builder couldn't find python file. Did you accidentally delete it?"); return; } else { - var args = string.Format( "\"{0}\" \"{1}\"", scriptPath, pathToBuiltProject ); + var args = string.Format( "\"{0}\" \"{1}\"", scriptPath, pathToBuiltProject); var proc = new Process { StartInfo = new ProcessStartInfo @@ -37,14 +35,14 @@ private static void onPostProcessBuildPlayer( BuildTarget target, string pathToB } }; - UnityEngine.Debug.Log(string.Format("Heyzap: starting HeyzapPostprocessBuildPlayer with args: {0}", args)); + UnityEngine.Debug.Log(string.Format("FairBid: starting HeyzapPostprocessBuildPlayer with args: {0}", args)); proc.Start(); proc.WaitForExit(); if (proc.ExitCode > 0) { - UnityEngine.Debug.LogError("Heyzap post-build script had an error(code=" + proc.ExitCode + "). See the editor log for more info & email a copy of it to support@heyzap.com for more help."); + UnityEngine.Debug.LogError("FairBid post-build script had an error(code=" + proc.ExitCode + "). See the editor log for more info & email a copy of it to support@heyzap.com for more help."); } - UnityEngine.Debug.Log( "Heyzap: Finished post-build script." ); + UnityEngine.Debug.Log("FairBid: Finished post-build script."); } } } diff --git a/Assets/Editor/Heyzap/HeyzapPostBuild.cs.meta b/Assets/Editor/FairBid/FairBidPostBuild.cs.meta similarity index 100% rename from Assets/Editor/Heyzap/HeyzapPostBuild.cs.meta rename to Assets/Editor/FairBid/FairBidPostBuild.cs.meta diff --git a/Assets/Editor/Heyzap/HeyzapPostprocessBuildPlayer.py b/Assets/Editor/FairBid/PostprocessBuildPlayer.py similarity index 78% rename from Assets/Editor/Heyzap/HeyzapPostprocessBuildPlayer.py rename to Assets/Editor/FairBid/PostprocessBuildPlayer.py index 5750e72d..fb117ba7 100644 --- a/Assets/Editor/Heyzap/HeyzapPostprocessBuildPlayer.py +++ b/Assets/Editor/FairBid/PostprocessBuildPlayer.py @@ -5,26 +5,26 @@ import subprocess from distutils import dir_util -from HZmod_pbxproj import XcodeProject +from FYBmod_pbxproj import XcodeProject def edit_pbxproj_file(): try: - print "Heyzap: HeyzapPostProcessBuildPlayer started." + print "FairBid: PostProcessBuildPlayer started." unityProjectTopDirectory = sys.argv[1] for xcodeproj in os.listdir(unityProjectTopDirectory): if not re.search('\.xcodeproj', xcodeproj): continue xcodeVersionString = subprocess.check_output("xcodebuild -version", shell=True) - print "Heyzap: using xcode version: ", xcodeVersionString + print "FairBid: using xcode version: ", xcodeVersionString xcodeproj = os.path.join(unityProjectTopDirectory, xcodeproj) - print "Heyzap: found xcode proj: ", xcodeproj + print "FairBid: found xcode proj: ", xcodeproj for pbxproj in os.listdir(xcodeproj): if not re.search('project\.pbxproj', pbxproj): continue pbxproj = os.path.join(xcodeproj, pbxproj) - print "Heyzap: found pbxproj: ", pbxproj + print "FairBid: found pbxproj: ", pbxproj # locate the id of the "Frameworks" group of the pbxproj file so that frameworks will go to that group frameworksGroupID = None @@ -34,14 +34,14 @@ def edit_pbxproj_file(): matches = re.findall("([0-9A-F]*) /\* Frameworks \*/ = \{\n\s*isa = PBXGroup;", filetext) try: frameworksGroupID = matches[0] - print "Heyzap: found frameworks group: ", frameworksGroupID + print "FairBid: found frameworks group: ", frameworksGroupID except: - print "Heyzap: did not find frameworks group." + print "FairBid: did not find frameworks group." pass - print "Heyzap: loading xcode project." + print "FairBid: loading xcode project." project = XcodeProject.Load(pbxproj) - print "Heyzap: done loading xcode project. Adding libs." + print "FairBid: done loading xcode project. Adding libs." # the below paths are relative to the SDKROOT, i.e.: `/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk/` # Add the Frameworks needed @@ -55,7 +55,7 @@ def edit_pbxproj_file(): project.add_file_if_doesnt_exist('System/Library/Frameworks/WebKit.framework', parent=frameworksGroupID, tree='SDKROOT') project.add_file_if_doesnt_exist('usr/lib/libz.dylib', parent=frameworksGroupID, tree='SDKROOT') - print "Heyzap: done adding libs, adding flags." + print "FairBid: done adding libs, adding flags." # Add -ObjC for the benefit of AppLovin/FAN project.add_other_ldflags("-ObjC") @@ -64,11 +64,11 @@ def edit_pbxproj_file(): project.add_other_buildsetting("CLANG_ENABLE_MODULES", "YES") project.save() - print "Heyzap: successfully modified file: ", pbxproj + print "FairBid: successfully modified file: ", pbxproj return 0 raise FileExistsError("Could not find the 'project.pbxproj' file to edit") except Exception as e: - print "Heyzap: ERROR modifying 'project.pbxproj', error: ", e + print "FairBid: ERROR modifying 'project.pbxproj', error: ", e return 1 sys.exit(edit_pbxproj_file()) diff --git a/Assets/Editor/Heyzap/HeyzapPostprocessBuildPlayer.py.meta b/Assets/Editor/FairBid/PostprocessBuildPlayer.py.meta similarity index 100% rename from Assets/Editor/Heyzap/HeyzapPostprocessBuildPlayer.py.meta rename to Assets/Editor/FairBid/PostprocessBuildPlayer.py.meta diff --git a/Assets/Fyber/Editor/Resources/FyberEditorSettings.asset b/Assets/Fyber/Editor/Resources/FyberEditorSettings.asset index da6a5b6a..854a50ae 100644 Binary files a/Assets/Fyber/Editor/Resources/FyberEditorSettings.asset and b/Assets/Fyber/Editor/Resources/FyberEditorSettings.asset differ diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index b7fc823b..7b5d71d2 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -1,15 +1,13 @@ - + - - + - @@ -20,192 +18,64 @@ - - - + - + - + - - - + - - + + - - + - - - - - - + + - - - - + + + - - + - - - - - - - + + - - - - - + + + + - - + + - - + - - - - + + + - - - + + - - - - - + + + + + + + + + - \ No newline at end of file diff --git a/Assets/Plugins/Heyzap.meta b/Assets/Plugins/FairBid.meta similarity index 100% rename from Assets/Plugins/Heyzap.meta rename to Assets/Plugins/FairBid.meta diff --git a/Assets/Plugins/Heyzap/HZBannerAd.cs b/Assets/Plugins/FairBid/Banner.cs similarity index 63% rename from Assets/Plugins/Heyzap/HZBannerAd.cs rename to Assets/Plugins/FairBid/Banner.cs index f65f6d9d..1015df81 100644 --- a/Assets/Plugins/Heyzap/HZBannerAd.cs +++ b/Assets/Plugins/FairBid/Banner.cs @@ -1,7 +1,4 @@ -// -// HZBannerAd.cs -// -// Copyright 2015 Heyzap, Inc. All Rights Reserved +// Copyright 2019 Fyber. All Rights Reserved // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -31,92 +28,92 @@ using System.Runtime.InteropServices; using System; -namespace Heyzap { +namespace FairBid { /// /// Use this class to show banner ads. /// - public class HZBannerAd : MonoBehaviour { - public delegate void AdDisplayListener(string state, string tag); + public class Banner : MonoBehaviour { + public delegate void AdDisplayListener(string state, string placement); private static AdDisplayListener adDisplayListener; - private static HZBannerAd _instance = null; + private static Banner _instance; // these are reproduced here for convenience since they were here in old SDK versions /// - /// Set `HZBannerShowOptions.Position` to this value to show ads at the top of the screen. + /// Set `BannerShowOptions.Position` to this value to show ads at the top of the screen. /// - [Obsolete("This constant has been relocated to HZBannerShowOptions")] - public const string POSITION_TOP = HZBannerShowOptions.POSITION_TOP; + [Obsolete("This constant has been relocated to BannerShowOptions")] + public const string POSITION_TOP = BannerShowOptions.POSITION_TOP; /// - /// Set `HZBannerShowOptions.Position` to this value to show ads at the bottom of the screen. + /// Set `BannerShowOptions.Position` to this value to show ads at the bottom of the screen. /// - [Obsolete("This constant has been relocated to HZBannerShowOptions")] - public const string POSITION_BOTTOM = HZBannerShowOptions.POSITION_BOTTOM; + [Obsolete("This constant has been relocated to BannerShowOptions")] + public const string POSITION_BOTTOM = BannerShowOptions.POSITION_BOTTOM; /// /// Shows a banner ad with the given options. /// /// The options with which to show the banner ad, or the defaults if null - public static void ShowWithOptions(HZBannerShowOptions showOptions) { + public static void ShowWithOptions(BannerShowOptions showOptions) { if (showOptions == null) { - showOptions = new HZBannerShowOptions(); + showOptions = new BannerShowOptions(); } #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZBannerAdAndroid.ShowWithOptions(showOptions); + BannerAndroid.ShowWithOptions(showOptions); #elif UNITY_IPHONE - HZBannerAdIOS.ShowWithOptions(showOptions); + BannerIOS.ShowWithOptions(showOptions); #endif #else - UnityEngine.Debug.LogWarning("Call received to show an HZBannerAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.SHOW_FAILED, showOptions.Tag)); + Debug.LogWarning("Call received to show an Banner, but the SDK does not function in the editor. You must use a device/emulator to request/show ads."); + _instance.StartCoroutine(InvokeCallbackNextFrame(FairBidSDK.NetworkCallback.SHOW_FAILED, showOptions.Placement)); #endif } /// - /// Gets the current banner ad's dimensions. + /// Hides the current banner ad, if there is one, from the view. The next call to ShowWithOptions will unhide the banner ad hidden by this method. /// - /// true, if the dimensions were successfully retrieved, false otherwise. - /// An out param where the dimensions of the current banner ad will be stored, if they are retrieved successfully. - public static bool GetCurrentBannerDimensions(out Rect banner){ + public static void Hide() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - return HZBannerAdAndroid.GetCurrentBannerDimensions(out banner); + BannerAndroid.Hide(); #elif UNITY_IPHONE - return HZBannerAdIOS.GetCurrentBannerDimensions(out banner); + BannerIOS.Hide(); #endif #else - banner = new Rect(0,0,0,0); - return false; #endif } /// - /// Hides the current banner ad, if there is one, from the view. The next call to ShowWithOptions will unhide the banner ad hidden by this method. + /// Destroys the current banner ad, if there is one. The next call to ShowWithOptions() will create a new banner ad. /// - public static void Hide() { + public static void Destroy() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZBannerAdAndroid.Hide(); + BannerAndroid.Destroy(); #elif UNITY_IPHONE - HZBannerAdIOS.Hide(); + BannerIOS.Destroy(); #endif #else #endif } /// - /// Destroys the current banner ad, if there is one. The next call to ShowWithOptions() will create a new banner ad. + /// Gets the current banner ad's dimensions. /// - public static void Destroy() { + /// true, if the dimensions were successfully retrieved, false otherwise. + /// An out param where the dimensions of the current banner ad will be stored, if they are retrieved successfully. + public static bool GetCurrentBannerDimensions(out Rect banner) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZBannerAdAndroid.Destroy(); + return BannerAndroid.GetCurrentBannerDimensions(out banner); #elif UNITY_IPHONE - HZBannerAdIOS.Destroy(); + return BannerIOS.GetCurrentBannerDimensions(out banner); #endif #else + banner = new Rect(0, 0, 0, 0); + return false; #endif } @@ -124,71 +121,71 @@ public static void Destroy() { /// Sets the AdDisplayListener for banner ads, which will receive callbacks regarding the state of banner ads. /// public static void SetDisplayListener(AdDisplayListener listener) { - HZBannerAd.adDisplayListener = listener; + adDisplayListener = listener; } #region Internal methods - public static void InitReceiver(){ + public static void InitReceiver() { if (_instance == null) { - GameObject receiverObject = new GameObject("HZBannerAd"); + GameObject receiverObject = new GameObject("Banner"); DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); + _instance = receiverObject.AddComponent(); } } public void SetCallback(string message) { string[] displayStateParams = message.Split(','); - HZBannerAd.SetCallbackStateAndTag(displayStateParams[0], displayStateParams[1]); + SetCallbackStateAndPlacement(displayStateParams[0], displayStateParams[1]); } - protected static void SetCallbackStateAndTag(string state, string tag) { - if (HZBannerAd.adDisplayListener != null) { - HZBannerAd.adDisplayListener(state, tag); + protected static void SetCallbackStateAndPlacement(string state, string placement) { + if (adDisplayListener != null) { + adDisplayListener(state, placement); } } - protected static IEnumerator InvokeCallbackNextFrame(string state, string tag) { + protected static IEnumerator InvokeCallbackNextFrame(string state, string placement) { yield return null; // wait a frame - HZBannerAd.SetCallbackStateAndTag(state, tag); + SetCallbackStateAndPlacement(state, placement); } #endregion } #region Platform-specific translations #if UNITY_IPHONE && !UNITY_EDITOR - public class HZBannerAdIOS : MonoBehaviour { + public class BannerIOS : MonoBehaviour { [DllImport ("__Internal")] - private static extern void hz_ads_show_banner(string position, string tag); + private static extern void fyb_sdk_show_banner(string position, string placement); [DllImport ("__Internal")] - private static extern bool hz_ads_hide_banner(); + private static extern bool fyb_sdk_hide_banner(); [DllImport ("__Internal")] - private static extern bool hz_ads_destroy_banner(); + private static extern bool fyb_sdk_destroy_banner(); [DllImport ("__Internal")] - private static extern string hz_ads_banner_dimensions(); + private static extern string fyb_sdk_banner_dimensions(); - public static void ShowWithOptions(HZBannerShowOptions showOptions) { - hz_ads_show_banner(showOptions.Position, showOptions.Tag); + public static void ShowWithOptions(BannerShowOptions showOptions) { + fyb_sdk_show_banner(showOptions.Position, showOptions.Placement); } public static bool Hide() { - return hz_ads_hide_banner(); + return fyb_sdk_hide_banner(); } public static void Destroy() { - hz_ads_destroy_banner(); + fyb_sdk_destroy_banner(); } - public static bool GetCurrentBannerDimensions(out Rect banner){ + public static bool GetCurrentBannerDimensions(out Rect banner) { banner = new Rect(0,0,0,0); // default value in error cases - string returnValue = hz_ads_banner_dimensions(); - if(returnValue == null || returnValue.Length == 0){ + string returnValue = fyb_sdk_banner_dimensions(); + if (returnValue == null || returnValue.Length == 0) { return false; } string[] split = returnValue.Split(' '); - if(split.Length != 4){ + if (split.Length != 4) { return false; } @@ -199,59 +196,58 @@ public static bool GetCurrentBannerDimensions(out Rect banner){ #endif #if UNITY_ANDROID && !UNITY_EDITOR - public class HZBannerAdAndroid : MonoBehaviour { - - public static bool GetCurrentBannerDimensions(out Rect banner){ - banner = new Rect(0,0,0,0); // default value in error cases - - if (Application.platform != RuntimePlatform.Android) { - return false; - } - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - string returnValue = jc.CallStatic("getBannerDimensions"); - if(returnValue == null || returnValue.Length == 0){ - return false; - } - - string[] split = returnValue.Split(' '); - if(split.Length != 4){ - return false; - } - - banner = new Rect(int.Parse(split[0]), int.Parse(split[1]), int.Parse(split[2]), int.Parse(split[3])); - return true; - } - } + public class BannerAndroid : MonoBehaviour { - public static void ShowWithOptions(HZBannerShowOptions showOptions) { - if(Application.platform != RuntimePlatform.Android) return; + public static void ShowWithOptions(BannerShowOptions showOptions) { + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showBanner", showOptions.Tag, showOptions.Position); + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("showBanner", showOptions.Placement, showOptions.Position); } } public static void Hide() { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("hideBanner"); } } public static void Destroy() { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("destroyBanner"); } } + public static bool GetCurrentBannerDimensions(out Rect banner) { + banner = new Rect(0, 0, 0, 0); // default value in error cases + + if (Application.platform != RuntimePlatform.Android) { + return false; + } + + AndroidJNIHelper.debug = false; + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + string returnValue = jc.CallStatic("getBannerDimensions"); + if (returnValue == null || returnValue.Length == 0) { + return false; + } + + string[] split = returnValue.Split(' '); + if (split.Length != 4) { + return false; + } + + banner = new Rect(int.Parse(split[0]), int.Parse(split[1]), int.Parse(split[2]), int.Parse(split[3])); + return true; + } + } } #endif #endregion diff --git a/Assets/Plugins/Heyzap/HZInterstitialAd.cs.meta b/Assets/Plugins/FairBid/Banner.cs.meta similarity index 71% rename from Assets/Plugins/Heyzap/HZInterstitialAd.cs.meta rename to Assets/Plugins/FairBid/Banner.cs.meta index ff67e22d..a1acc642 100644 --- a/Assets/Plugins/Heyzap/HZInterstitialAd.cs.meta +++ b/Assets/Plugins/FairBid/Banner.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 64959f833348d4e4ea972aa0919fb0cd -timeCreated: 1536245015 -licenseType: Free +guid: fe1cdc5b7946344eb872921ab4b3c6b5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Heyzap/HZDemographics.cs b/Assets/Plugins/FairBid/Demographics.cs similarity index 69% rename from Assets/Plugins/Heyzap/HZDemographics.cs rename to Assets/Plugins/FairBid/Demographics.cs index 1c96bbcb..d7ef6b4d 100644 --- a/Assets/Plugins/Heyzap/HZDemographics.cs +++ b/Assets/Plugins/FairBid/Demographics.cs @@ -1,7 +1,7 @@ +// +// Demographics.cs // -// HZDemographics.cs -// -// Copyright 2017 Heyzap, Inc. All Rights Reserved +// Copyright 2019 Fyber. All Rights Reserved // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -31,13 +31,13 @@ using System.Runtime.InteropServices; using System; -namespace Heyzap { +namespace FairBid { /// /// Use this class to pass information about a user to mediated ad networks that want the data. This kind of data is optional but can improve ad revenues. /// - public class HZDemographics : MonoBehaviour { + public class Demographics : MonoBehaviour { - private static HZDemographics _instance = null; + private static Demographics _instance; public enum Gender { UNKNOWN, @@ -49,12 +49,12 @@ public enum Gender { /// Set the gender of the user, if known, using the provided enum. /// public static void SetUserGender(Gender gender) { - if (System.Enum.IsDefined(typeof(Gender), gender)) { + if (Enum.IsDefined(typeof(Gender), gender)) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserGender(gender.ToString()); + DemographicsAndroid.SetUserGender(gender.ToString()); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserGender(gender.ToString()); + DemographicsIOS.SetUserGender(gender.ToString()); #endif #else #endif @@ -67,9 +67,9 @@ public static void SetUserGender(Gender gender) { public static void SetUserLocation(float latitude, float longitude, float horizontalAccuracy, float verticalAccuracy, float altitude, double timestamp) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserLocation(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); + DemographicsAndroid.SetUserLocation(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserLocation(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); + DemographicsIOS.SetUserLocation(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); #endif #else #endif @@ -81,9 +81,9 @@ public static void SetUserLocation(float latitude, float longitude, float horizo public static void SetUserPostalCode(string postalCode) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserPostalCode(postalCode); + DemographicsAndroid.SetUserPostalCode(postalCode); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserPostalCode(postalCode); + DemographicsIOS.SetUserPostalCode(postalCode); #endif #else #endif @@ -95,9 +95,9 @@ public static void SetUserPostalCode(string postalCode) { public static void SetUserHouseholdIncome(int householdIncome) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserHouseholdIncome(householdIncome); + DemographicsAndroid.SetUserHouseholdIncome(householdIncome); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserHouseholdIncome(householdIncome); + DemographicsIOS.SetUserHouseholdIncome(householdIncome); #endif #else #endif @@ -108,6 +108,7 @@ public enum MaritalStatus { SINGLE, MARRIED } + /// /// Set the marital status of the user, if known, using the provided enum. /// @@ -115,9 +116,9 @@ public static void SetUserMaritalStatus(MaritalStatus maritalStatus) { if (System.Enum.IsDefined(typeof(MaritalStatus), maritalStatus)) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserMaritalStatus(maritalStatus.ToString()); + DemographicsAndroid.SetUserMaritalStatus(maritalStatus.ToString()); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserMaritalStatus(maritalStatus.ToString()); + DemographicsIOS.SetUserMaritalStatus(maritalStatus.ToString()); #endif #else #endif @@ -135,6 +136,7 @@ public enum EducationLevel { GRADUATE_DEGREE, POSTGRADUATE_DEGREE } + /// /// Set the highest education level already achieved by the user, if known, using the provided enum. /// @@ -142,9 +144,9 @@ public static void SetUserEducationLevel(EducationLevel educationLevel) { if (System.Enum.IsDefined(typeof(EducationLevel), educationLevel)) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserEducationLevel(educationLevel.ToString()); + DemographicsAndroid.SetUserEducationLevel(educationLevel.ToString()); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserEducationLevel(educationLevel.ToString()); + DemographicsIOS.SetUserEducationLevel(educationLevel.ToString()); #endif #else #endif @@ -157,9 +159,9 @@ public static void SetUserEducationLevel(EducationLevel educationLevel) { public static void SetUserBirthDate(string yyyyMMdd_date) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapDemographicsAndroid.SetUserBirthDate(yyyyMMdd_date); + DemographicsAndroid.SetUserBirthDate(yyyyMMdd_date); #elif UNITY_IPHONE - HeyzapDemographicsIOS.SetUserBirthDate(yyyyMMdd_date); + DemographicsIOS.SetUserBirthDate(yyyyMMdd_date); #endif #else #endif @@ -168,11 +170,11 @@ public static void SetUserBirthDate(string yyyyMMdd_date) { #region Internal methods - public static void InitReceiver(){ + public static void InitReceiver() { if (_instance == null) { - GameObject receiverObject = new GameObject("HZDemographics"); + GameObject receiverObject = new GameObject("Demographics"); DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); + _instance = receiverObject.AddComponent(); } } @@ -182,70 +184,70 @@ public static void InitReceiver(){ #region Platform-specific translations #if UNITY_IPHONE && !UNITY_EDITOR - public class HeyzapDemographicsIOS : MonoBehaviour { + public class DemographicsIOS : MonoBehaviour { [DllImport ("__Internal")] - private static extern void hz_demo_set_gender(string gender); + private static extern void fyb_demo_set_gender(string gender); public static void SetUserGender(string gender) { - hz_demo_set_gender(gender); + fyb_demo_set_gender(gender); } [DllImport ("__Internal")] - private static extern void hz_demo_set_location(float latitude, float longitude, float horizontalAccuracy, float verticalAccuracy, float altitude, double timestamp); + private static extern void fyb_demo_set_location(float latitude, float longitude, float horizontalAccuracy, float verticalAccuracy, float altitude, double timestamp); public static void SetUserLocation(float latitude, float longitude, float horizontalAccuracy, float verticalAccuracy, float altitude, double timestamp) { - hz_demo_set_location(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); + fyb_demo_set_location(latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); } [DllImport ("__Internal")] - private static extern void hz_demo_set_postal_code(string postalCode); + private static extern void fyb_demo_set_postal_code(string postalCode); public static void SetUserPostalCode(string postalCode) { - hz_demo_set_postal_code(postalCode); + fyb_demo_set_postal_code(postalCode); } [DllImport ("__Internal")] - private static extern void hz_demo_set_household_income(int householdIncome); + private static extern void fyb_demo_set_household_income(int householdIncome); public static void SetUserHouseholdIncome(int householdIncome) { - hz_demo_set_household_income(householdIncome); + fyb_demo_set_household_income(householdIncome); } [DllImport ("__Internal")] - private static extern void hz_demo_set_marital_status(string maritalStatus); + private static extern void fyb_demo_set_marital_status(string maritalStatus); public static void SetUserMaritalStatus(string maritalStatus) { - hz_demo_set_marital_status(maritalStatus); + fyb_demo_set_marital_status(maritalStatus); } [DllImport ("__Internal")] - private static extern void hz_demo_set_education_level(string educationLevel); + private static extern void fyb_demo_set_education_level(string educationLevel); public static void SetUserEducationLevel(string educationLevel) { - hz_demo_set_education_level(educationLevel); + fyb_demo_set_education_level(educationLevel); } [DllImport ("__Internal")] - private static extern void hz_demo_set_birth_date(string yyyyMMdd_date); + private static extern void fyb_demo_set_birth_date(string yyyyMMdd_date); public static void SetUserBirthDate(string yyyyMMdd_date) { - hz_demo_set_birth_date(yyyyMMdd_date); + fyb_demo_set_birth_date(yyyyMMdd_date); } } #endif #if UNITY_ANDROID && !UNITY_EDITOR - public class HeyzapDemographicsAndroid : MonoBehaviour { + public class DemographicsAndroid : MonoBehaviour { public static void SetUserGender(string gender) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserGender", gender); } } public static void SetUserLocation(float latitude, float longitude, float horizontalAccuracy, float verticalAccuracy, float altitude, double timestamp) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserLocation", latitude, longitude, horizontalAccuracy, verticalAccuracy, altitude, timestamp); } @@ -253,50 +255,50 @@ public static void SetUserLocation(float latitude, float longitude, float horizo public static void SetUserPostalCode(string postalCode) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserPostalCode", postalCode); } } public static void SetUserHouseholdIncome(int householdIncome) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserHouseholdIncome", householdIncome); } } public static void SetUserMaritalStatus(string maritalStatus) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserMaritalStatus", maritalStatus); } } public static void SetUserEducationLevel(string educationLevel) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserEducationLevel", educationLevel); } } public static void SetUserBirthDate(string yyyyMMdd_date) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("setUserBirthDate", yyyyMMdd_date); } } diff --git a/Assets/Plugins/Heyzap/HZDemographics.cs.meta b/Assets/Plugins/FairBid/Demographics.cs.meta similarity index 77% rename from Assets/Plugins/Heyzap/HZDemographics.cs.meta rename to Assets/Plugins/FairBid/Demographics.cs.meta index c9ae2f67..41883a38 100644 --- a/Assets/Plugins/Heyzap/HZDemographics.cs.meta +++ b/Assets/Plugins/FairBid/Demographics.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 28bae634cde55462aa4bea2b67992b86 -timeCreated: 1536245015 +guid: 5ce66c985128c464aba340efbbfca3e2 +timeCreated: 1535874635 licenseType: Free MonoImporter: externalObjects: {} diff --git a/Assets/Plugins/Heyzap/HeyzapAds.cs b/Assets/Plugins/FairBid/FairBidSDK.cs similarity index 52% rename from Assets/Plugins/Heyzap/HeyzapAds.cs rename to Assets/Plugins/FairBid/FairBidSDK.cs index 7f180e3d..e917515d 100644 --- a/Assets/Plugins/Heyzap/HeyzapAds.cs +++ b/Assets/Plugins/FairBid/FairBidSDK.cs @@ -1,6 +1,6 @@ -// HeyzapAds.cs +// FairBid.cs // -// Copyright 2015 Heyzap, Inc. All Rights Reserved +// Copyright 2019 Fyber. All Rights Reserved // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -31,54 +31,41 @@ using System; using System.Linq; -namespace Heyzap { +namespace FairBid { /// - /// Heyzap wrapper for iOS and Android via Unity. For more information, see https://developers.heyzap.com/docs/unity_sdk_setup_and_requirements . + /// FairBid wrapper for iOS and Android via Unity. For more information, see https://developers.heyzap.com/docs/unity_sdk_setup_and_requirements . /// - public class HeyzapAds : MonoBehaviour { + public class FairBidSDK : MonoBehaviour { + public const string Version = "2.0.0"; public delegate void NetworkCallbackListener(string network, string callback); private static NetworkCallbackListener networkCallbackListener; - private static HeyzapAds _instance = null; - - #region Flags for the call to HeyzapAds.StartWithOptions() + private static FairBidSDK _instance; + + #region Flags for the call to FairBid.StartWithOptions() /// - /// Use this flag to start the Heyzap SDK with no extra configuration options. This is the default behavior if no options are passed when the SDK is started. + /// Use this flag to start the FairBid SDK with no extra configuration options. This is the default behavior if no options are passed when the SDK is started. /// public const int FLAG_NO_OPTIONS = 0 << 0; // 0 /// - /// Use this flag to disable automatic prefetching of ads. You must call a `Fetch` method for every ad unit before a matching call to a `Show` method. + /// Use this flag to disable automatic prefetching of ads. You must call a `Request` method for every ad type before a matching call to a `Show` method. /// - public const int FLAG_DISABLE_AUTOMATIC_FETCHING = 1 << 0; // 1 + public const int FLAG_DISABLE_AUTOMATIC_REQUESTING = 1 << 0; // 1 /// - /// Use this flag to disable all advertising functionality of the Heyzap SDK. This should only be used if you're integrating the SDK solely as an install tracker. + /// Use this flag to disable all advertising functionality of the FairBid SDK. This should only be used if you're integrating the SDK solely as an install tracker. /// public const int FLAG_INSTALL_TRACKING_ONLY = 1 << 1; // 2 /// - /// (Android only) Use this flag to tell the Heyzap SDK that this app is being distributed on the Amazon App Store. - /// - public const int FLAG_AMAZON = 1 << 2; // 4 - /// - /// Use this flag to disable the mediation features of the Heyzap SDK. Only Heyzap ads will be available. - /// You should set this flag if you are using Heyzap through another mediation tool to avoid potential conflicts. + /// Use this flag to disable the mediation features of the FairBid SDK. Only FairBid ads will be available. + /// You should set this flag if you are using FairBid through another mediation tool to avoid potential conflicts. /// public const int FLAG_DISABLE_MEDIATION = 1 << 3; // 8 /// - /// (iOS only) Use this flag to stop the Heyzap SDK from automatically recording in-app purchases. - /// - public const int FLAG_DISABLE_AUTOMATIC_IAP_RECORDING = 1 << 4; // 16 - /// - /// (Android only) Use this flag to disable all non-native ads & ad networks that don't support native ads. - /// - public const int FLAG_NATIVE_ADS_ONLY = 1 << 5; // 32 - /// /// Use this flag to to mark mediated ads as "child-directed". This value will be passed on to networks that support sending such an option (for purposes of the Children's Online Privacy Protection Act (COPPA)). - /// Currently, only AdMob, FAN, and Heyzap Exchange use this option's value. This value will be `OR`ed with the per-network server-side setting we provide on your Mediation Settings dashboard. + /// Currently, only AdMob and FAN use this option's value. This value will be `OR`ed with the per-network server-side setting we provide on your Mediation Settings dashboard. /// public const int FLAG_CHILD_DIRECTED_ADS = 1 << 6; // 64 #endregion - - public const string DEFAULT_TAG = "default"; #region String constants to expect in Ad Listener & network callbacks // `NetworkCallback` is a bit of a misnomer. The callback constants here are both for "network callbacks" and for ad listener callbacks. We should refactor these into two classes in the next major SDK. @@ -88,11 +75,11 @@ public static class NetworkCallback { public const string SHOW_FAILED = "failed"; public const string AVAILABLE = "available"; public const string HIDE = "hide"; - public const string FETCH_FAILED = "fetch_failed"; + public const string REQUEST_FAILED = "request_failed"; public const string CLICK = "click"; public const string DISMISS = "dismiss"; - public const string INCENTIVIZED_RESULT_COMPLETE = "incentivized_result_complete"; - public const string INCENTIVIZED_RESULT_INCOMPLETE = "incentivized_result_incomplete"; + public const string REWARDED_RESULT_COMPLETE = "rewarded_result_complete"; + public const string REWARDED_RESULT_INCOMPLETE = "rewarded_result_incomplete"; public const string AUDIO_STARTING = "audio_starting"; public const string AUDIO_FINISHED = "audio_finished"; @@ -101,7 +88,7 @@ public static class NetworkCallback { public const string BANNER_CLICK = "banner-click"; public const string BANNER_HIDE = "banner-hide"; public const string BANNER_DISMISS = "banner-dismiss"; - public const string BANNER_FETCH_FAILED = "banner-fetch_failed"; + public const string BANNER_REQUEST_FAILED = "banner-request_failed"; public const string LEAVE_APPLICATION = "leave_application"; @@ -112,78 +99,57 @@ public static class NetworkCallback { #region Network names public static class Network { - public const string HEYZAP = "heyzap"; - public const string HEYZAP_CROSS_PROMO = "heyzap_cross_promo"; - public const string HEYZAP_EXCHANGE = "heyzap_exchange"; - public const string FACEBOOK = "facebook"; - public const string UNITYADS = "unityads"; - public const string APPLOVIN = "applovin"; - public const string VUNGLE = "vungle"; - public const string CHARTBOOST = "chartboost"; public const string ADCOLONY = "adcolony"; public const string ADMOB = "admob"; - public const string IAD = "iad"; - public const string LEADBOLT = "leadbolt"; + public const string APPLOVIN = "applovin"; + public const string CHARTBOOST = "chartboost"; + public const string FACEBOOK = "facebook"; + public const string HYPRMX = "hyprmx"; public const string INMOBI = "inmobi"; - public const string DOMOB = "domob"; + public const string IRONSOURCE = "iron_source"; public const string MOPUB = "mopub"; - public const string FYBER_EXCHANGE = "fyber_exchange"; + public const string TAPJOY = "tapjoy"; + public const string UNITYADS = "unityads"; + public const string VUNGLE = "vungle"; } #endregion #region Public API /// - /// Starts the Heyzap SDK. Call this method as soon as possible in your app to ensure Heyzap has time to initialize before you want to show an ad. + /// Starts the FairBid SDK. Call this method as soon as possible in your app to ensure FairBid has time to initialize before you want to show an ad. /// - /// Your publisher ID. This can be found on your Heyzap dashboards - see https://developers.heyzap.com/docs/unity_sdk_setup_and_requirements for more information. - /// A bitmask of options you can pass to this call to change the way Heyzap will work. + /// Your publisher ID. This can be found on your FairBid dashboards - see https://developers.heyzap.com/docs/unity_sdk_setup_and_requirements for more information. + /// A bitmask of options you can pass to this call to change the way FairBid will work. public static void Start(string publisher_id, int options) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.Start(publisher_id, options); + FairBidAndroid.SetPluginVersion(Version); + FairBidAndroid.Start(publisher_id, options); #elif UNITY_IPHONE - HeyzapAdsIOS.Start(publisher_id, options); + FairBidIOS.SetPluginVersion(Version); + FairBidIOS.Start(publisher_id, options); #endif #else - UnityEngine.Debug.LogError("Call received to start the Heyzap SDK, but the SDK does not function in the editor. You must use a device/emulator to receive/test ads."); + Debug.LogError("Call received to start the FairBid SDK, but the SDK does not function in the editor. You must use a device/emulator to receive/test ads."); #endif - HeyzapAds.InitReceiver(); - HZInterstitialAd.InitReceiver(); - HZVideoAd.InitReceiver(); - HZIncentivizedAd.InitReceiver(); - HZBannerAd.InitReceiver(); - HZOfferWallAd.InitReceiver(); - HZDemographics.InitReceiver(); - } - - /// - /// Returns the remote data you've set on the Heyzap Dashboards, which will be a JSON dictionary in string format. - /// - public static string GetRemoteData(){ - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - return HeyzapAdsAndroid.GetRemoteData(); - #elif UNITY_IPHONE - return HeyzapAdsIOS.GetRemoteData(); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to retrieve remote data from the Heyzap SDK, but the SDK does not function in the editor. You must use a device/emulator to use the remote data feature."); - return "{}"; - #endif + InitReceiver(); + Interstitial.InitReceiver(); + Rewarded.InitReceiver(); + Banner.InitReceiver(); + Demographics.InitReceiver(); } /// /// Sets User's consent under GDPR. Fyber will only be able to show targeted advertising if the user consented. Only call this method if the user explicitly gave or denied consent. /// /// true if user gave consent to receive targeted advertisement, false otherwise - public static void SetGdprConsent(Boolean isGdprConsentGiven) - { + public static void SetGdprConsent(Boolean isGdprConsentGiven) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.SetGdprConsent(isGdprConsentGiven); + FairBidAndroid.SetGdprConsent(isGdprConsentGiven); #elif UNITY_IPHONE - HeyzapAdsIOS.SetGdprConsent(isGdprConsentGiven); + FairBidIOS.SetGdprConsent(isGdprConsentGiven); #endif #else UnityEngine.Debug.LogWarning("Call received to set the GDPR consent, but the SDK does not function in the editor. You must use a device/emulator to set the GDPR consent."); @@ -191,20 +157,16 @@ public static void SetGdprConsent(Boolean isGdprConsentGiven) } /// - /// Sets User's consent data under GDPR. Heyzap SDK will use this information to provide optimal targeted advertising without infringing GDPR. + /// Sets User's consent data under GDPR. FairBid SDK will use this information to provide optimal targeted advertising without infringing GDPR. /// - /// xA Dictionary of key-value pairs containing GDPR related information - static public void SetGdprConsentData(Dictionary gdprConsentData) - { + /// A Dictionary of key-value pairs containing GDPR related information + static public void SetGdprConsentData(Dictionary gdprConsentData) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) string gdprConsentDataAsJsonString = null; - if (gdprConsentData != null) - { + if (gdprConsentData != null) { Dictionary validatedGdprConsentData = new Dictionary(); - foreach(KeyValuePair entry in gdprConsentData) - { - if (entry.Value != null) - { + foreach(KeyValuePair entry in gdprConsentData) { + if (entry.Value != null) { validatedGdprConsentData.Add(entry.Key, entry.Value); } } @@ -212,9 +174,9 @@ static public void SetGdprConsentData(Dictionary gdprConsentData } #if UNITY_ANDROID - HeyzapAdsAndroid.SetGdprConsentData(gdprConsentDataAsJsonString); + FairBidAndroid.SetGdprConsentData(gdprConsentDataAsJsonString); #elif UNITY_IPHONE - HeyzapAdsIOS.SetGdprConsentData(gdprConsentDataAsJsonString); + FairBidIOS.SetGdprConsentData(gdprConsentDataAsJsonString); #endif #else UnityEngine.Debug.LogWarning("Call received to set the GDPR consent data, but the SDK does not function in the editor. You must use a device/emulator to set the GDPR consent data."); @@ -224,13 +186,12 @@ static public void SetGdprConsentData(Dictionary gdprConsentData /// /// Clears all GDPR related information. This means removing any GDPR consent Data and restoring the GDPR consent to "unknown" /// - static public void ClearGdprConsentData() - { + static public void ClearGdprConsentData() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.ClearGdprConsentData(); + FairBidAndroid.ClearGdprConsentData(); #elif UNITY_IPHONE - HeyzapAdsIOS.ClearGdprConsentData(); + FairBidIOS.ClearGdprConsentData(); #endif #else UnityEngine.Debug.LogWarning("Call received to clear the GDPR consent data, but the SDK does not function in the editor. You must use a device/emulator to set the GDPR consent data."); @@ -238,30 +199,30 @@ static public void ClearGdprConsentData() } /// - /// Shows the mediation test suite. + /// Shows the test suite. /// - public static void ShowMediationTestSuite() { + public static void ShowTestSuite() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.ShowMediationTestSuite(); + FairBidAndroid.ShowTestSuite(); #elif UNITY_IPHONE - HeyzapAdsIOS.ShowMediationTestSuite(); + FairBidIOS.ShowTestSuite(); #endif #else - UnityEngine.Debug.LogWarning("Call received to show the Heyzap SDK test suite, but the SDK does not function in the editor. You must use a device/emulator to use the test suite."); + Debug.LogWarning("Call received to show the FairBid SDK test suite, but the SDK does not function in the editor. You must use a device/emulator to use the test suite."); #endif } - + /// /// (Android only) Call this method in your back button pressed handler to make sure the back button does what the user should expect when ads are showing. /// - /// true, if Heyzap handled the back button press (in which case your code should not do anything else), and false if Heyzap did not handle the back button press (in which case your app may want to do something). + /// true, if FairBid handled the back button press (in which case your code should not do anything else), and false if FairBid did not handle the back button press (in which case your app may want to do something). public static Boolean OnBackPressed() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - return HeyzapAdsAndroid.OnBackPressed(); + return FairBidAndroid.OnBackPressed(); #elif UNITY_IPHONE - return HeyzapAdsIOS.OnBackPressed(); + return FairBidIOS.OnBackPressed(); #endif #else return false; @@ -269,16 +230,16 @@ public static Boolean OnBackPressed() { } /// - /// Returns whether or not the given network has been initialized by Heyzap yet. + /// Returns whether or not the given network has been initialized by FairBid yet. /// /// true if is network initialized the specified network; otherwise, false. - /// The name of the network in question. Use the strings in HeyzapAds.Network to ensure the name matches what we expect. + /// The name of the network in question. Use the strings in FairBid.Network to ensure the name matches what we expect. public static Boolean IsNetworkInitialized(string network) { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - return HeyzapAdsAndroid.IsNetworkInitialized(network); + return FairBidAndroid.IsNetworkInitialized(network); #elif UNITY_IPHONE - return HeyzapAdsIOS.IsNetworkInitialized(network); + return FairBidIOS.IsNetworkInitialized(network); #endif #else return false; @@ -286,57 +247,35 @@ public static Boolean IsNetworkInitialized(string network) { } /// - /// Sets the NetworkCallbackListener, which receives messages about specific networks, such as when a specific network fetches an ad. + /// Sets the NetworkCallbackListener, which receives messages about specific networks, such as when a specific network requests an ad. /// public static void SetNetworkCallbackListener(NetworkCallbackListener listener) { networkCallbackListener = listener; } - - /// - /// Pauses expensive work, like ad fetches, until ResumeExpensiveWork() is called. Note that calling this method will affect ad availability. - /// - public static void PauseExpensiveWork() { - #if UNITY_IPHONE && !UNITY_EDITOR - HeyzapAdsIOS.PauseExpensiveWork(); - #elif UNITY_ANDROID && !UNITY_EDITOR - HeyzapAdsAndroid.PauseExpensiveWork(); - #endif - } /// - /// Unpauses expensive work, like ad fetches. Only relevant after a call to PauseExpensiveWork(). - /// - public static void ResumeExpensiveWork() { - #if UNITY_IPHONE && !UNITY_EDITOR - HeyzapAdsIOS.ResumeExpensiveWork(); - #elif UNITY_ANDROID && !UNITY_EDITOR - HeyzapAdsAndroid.ResumeExpensiveWork(); - #endif - } - - /// - /// Enables verbose debug logging for the Heyzap SDK. For third party logging, . + /// Enables verbose debug logging for the FairBid SDK. For third party logging, . /// public static void ShowDebugLogs() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.ShowDebugLogs(); + FairBidAndroid.ShowDebugLogs(); #elif UNITY_IPHONE - HeyzapAdsIOS.ShowDebugLogs(); + FairBidIOS.ShowDebugLogs(); #endif #else #endif } /// - /// Hides all debug logs coming from the Heyzap SDK. For third party logging, . + /// Hides all debug logs coming from the FairBid SDK. For third party logging, . /// public static void HideDebugLogs() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HeyzapAdsAndroid.HideDebugLogs(); + FairBidAndroid.HideDebugLogs(); #elif UNITY_IPHONE - HeyzapAdsIOS.HideDebugLogs(); + FairBidIOS.HideDebugLogs(); #endif #else #endif @@ -344,11 +283,11 @@ public static void HideDebugLogs() { /// /// (iOS only currently) Enables verbose debug logging for all the mediated SDKs we can. - /// You should call this method before starting the Heyzap SDK if you wish to enable these logs, since some SDK implementations only consider this parameter when initialized. + /// You should call this method before starting the FairBid SDK if you wish to enable these logs, since some SDK implementations only consider this parameter when initialized. /// public static void ShowThirdPartyDebugLogs() { #if UNITY_IPHONE && !UNITY_EDITOR - HeyzapAdsIOS.ShowThirdPartyDebugLogs(); + FairBidIOS.ShowThirdPartyDebugLogs(); #endif } @@ -358,24 +297,7 @@ public static void ShowThirdPartyDebugLogs() { /// public static void HideThirdPartyDebugLogs() { #if UNITY_IPHONE && !UNITY_EDITOR - HeyzapAdsIOS.HideThirdPartyDebugLogs(); - #endif - } - - /// - /// Set the bundle ID (i.e.: `com.name.of.company.and.app`) on Android and iOS to something other than what you have set in the Unity Editor's Player Settings menu. - /// Note: This method MUST be called BEFORE calling `Start` on the SDK. - /// This method is mostly useful for debugging purposes; for instance, you might use this to use a test account & bundle ID on debug builds. - /// - /// The new bundle ID you want to use. This is how we link this app to your dashboard account on developers.heyzap.com . - public static void SetBundleIdentifier(string bundleID) { - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HeyzapAdsAndroid.SetBundleIdentifier(bundleID); - #elif UNITY_IPHONE - HeyzapAdsIOS.SetBundleIdentifier(bundleID); - #endif - #else + FairBidIOS.HideThirdPartyDebugLogs(); #endif } @@ -385,7 +307,7 @@ public static void SetBundleIdentifier(string bundleID) { /// The Device ID that FAN prints to the iOS console public static void AddFacebookTestDevice(string device_id) { #if UNITY_IPHONE && !UNITY_EDITOR - HeyzapAdsIOS.AddFacebookTestDevice(device_id); + FairBidIOS.AddFacebookTestDevice(device_id); #endif } #endregion @@ -402,25 +324,16 @@ protected static void SetNetworkCallback(string network, string callback) { } } - public static void InitReceiver(){ + public static void InitReceiver() { if (_instance == null) { - GameObject receiverObject = new GameObject("HeyzapAds"); + GameObject receiverObject = new GameObject("FairBid"); DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); - } - } - - public static string TagForString(string tag) { - if (tag == null) { - tag = HeyzapAds.DEFAULT_TAG; + _instance = receiverObject.AddComponent(); } - - return tag; } // Within Unity's .NET framework we don't have a stock solution for converting objets to Json so we need to implement a custom solution - static private string GetGdprConsentDataAsJsonString(Dictionary gdprConsentData) - { + static private string GetGdprConsentDataAsJsonString(Dictionary gdprConsentData) { var entries = gdprConsentData.Select(d => string.Format("\"{0}\": \"{1}\"", d.Key, d.Value) ); @@ -431,128 +344,114 @@ static private string GetGdprConsentDataAsJsonString(Dictionary #region Platform-specific translations #if UNITY_IPHONE && !UNITY_EDITOR - public class HeyzapAdsIOS : MonoBehaviour + public class FairBidIOS : MonoBehaviour { - - [DllImport ("__Internal")] - private static extern void hz_ads_start_app(string publisher_id, int flags); - [DllImport ("__Internal")] - private static extern void hz_ads_show_mediation_debug_view_controller(); + private static extern void fyb_sdk_set_plugin_version(string pluginVersion); [DllImport ("__Internal")] - private static extern string hz_ads_get_remote_data(); + private static extern void fyb_sdk_start_app(string publisher_id, int flags); [DllImport ("__Internal")] - private static extern void hz_ads_set_gdpr_consent(Boolean isGdprConsentGiven); + private static extern void fyb_sdk_show_test_suite(); [DllImport ("__Internal")] - private static extern void hz_ads_set_gdpr_consent_data(string gdprConsentData); + private static extern void fyb_sdk_set_gdpr_consent(Boolean isGdprConsentGiven); [DllImport ("__Internal")] - private static extern void hz_ads_clear_gdpr_consent_data(); + private static extern void fyb_sdk_set_gdpr_consent_data(string gdprConsentData); [DllImport ("__Internal")] - private static extern bool hz_ads_is_network_initialized(string network); + private static extern void fyb_sdk_clear_gdpr_consent_data(); [DllImport ("__Internal")] - private static extern void hz_pause_expensive_work(); + private static extern bool fyb_sdk_is_network_initialized(string network); [DllImport ("__Internal")] - private static extern void hz_resume_expensive_work(); + private static extern void fyb_sdk_hide_debug_logs(); [DllImport ("__Internal")] - private static extern void hz_ads_hide_debug_logs(); + private static extern void fyb_sdk_show_debug_logs(); [DllImport ("__Internal")] - private static extern void hz_ads_show_debug_logs(); + private static extern void fyb_sdk_hide_third_party_debug_logs(); [DllImport ("__Internal")] - private static extern void hz_ads_hide_third_party_debug_logs(); + private static extern void fyb_sdk_show_third_party_debug_logs(); [DllImport ("__Internal")] - private static extern void hz_ads_show_third_party_debug_logs(); + private static extern void fyb_add_facebook_test_device(string device_id); - [DllImport ("__Internal")] - private static extern void hz_ads_set_bundle_identifier(string bundleID); - - [DllImport ("__Internal")] - private static extern void hz_add_facebook_test_device(string device_id); + public static void SetPluginVersion(string pluginVersion) { + fyb_sdk_set_plugin_version(pluginVersion); + } public static void Start(string publisher_id, int options=0) { - hz_ads_start_app(publisher_id, options); + fyb_sdk_start_app(publisher_id, options); } - public static void ShowMediationTestSuite() { - hz_ads_show_mediation_debug_view_controller(); + public static void ShowTestSuite() { + fyb_sdk_show_test_suite(); } - public static Boolean OnBackPressed(){ + public static Boolean OnBackPressed() { return false; } public static bool IsNetworkInitialized(string network) { - return hz_ads_is_network_initialized(network); - } - - public static string GetRemoteData(){ - return hz_ads_get_remote_data(); + return fyb_sdk_is_network_initialized(network); } public static void SetGdprConsent(Boolean isGdprConsentGiven) { - hz_ads_set_gdpr_consent(isGdprConsentGiven); + fyb_sdk_set_gdpr_consent(isGdprConsentGiven); } public static void SetGdprConsentData(string gdprConsentData) { - hz_ads_set_gdpr_consent_data(gdprConsentData); + fyb_sdk_set_gdpr_consent_data(gdprConsentData); } public static void ClearGdprConsentData() { - hz_ads_clear_gdpr_consent_data(); - } - - public static void PauseExpensiveWork() { - hz_pause_expensive_work(); - } - - public static void ResumeExpensiveWork() { - hz_resume_expensive_work(); + fyb_sdk_clear_gdpr_consent_data(); } public static void ShowDebugLogs() { - hz_ads_show_debug_logs(); + fyb_sdk_show_debug_logs(); } public static void HideDebugLogs() { - hz_ads_hide_debug_logs(); + fyb_sdk_hide_debug_logs(); } public static void ShowThirdPartyDebugLogs() { - hz_ads_show_third_party_debug_logs(); + fyb_sdk_show_third_party_debug_logs(); } public static void HideThirdPartyDebugLogs() { - hz_ads_hide_third_party_debug_logs(); - } - - public static void SetBundleIdentifier(string bundleID) { - hz_ads_set_bundle_identifier(bundleID); + fyb_sdk_hide_third_party_debug_logs(); } public static void AddFacebookTestDevice(string device_id) { - hz_add_facebook_test_device(device_id); + fyb_add_facebook_test_device(device_id); } } #endif #if UNITY_ANDROID && !UNITY_EDITOR - public class HeyzapAdsAndroid : MonoBehaviour + public class FairBidAndroid : MonoBehaviour { + public static void SetPluginVersion(string pluginVersion) { + if (Application.platform != RuntimePlatform.Android) return; + AndroidJNIHelper.debug = false; + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("addCustomParameter", "plugin_version", pluginVersion); + } + } + public static void Start(string publisher_id, int options=0) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("start", publisher_id, options); } } @@ -561,35 +460,26 @@ public static Boolean IsNetworkInitialized(string network) { if (Application.platform != RuntimePlatform.Android) return false; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { return jc.CallStatic("isNetworkInitialized", network); } } public static Boolean OnBackPressed(){ - if(Application.platform != RuntimePlatform.Android) return false; + if (Application.platform != RuntimePlatform.Android) return false; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { return jc.CallStatic("onBackPressed"); } } - public static void ShowMediationTestSuite() { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showNetworkActivity"); - } - } + public static void ShowTestSuite() { + if (Application.platform != RuntimePlatform.Android) return; - public static string GetRemoteData() { - if(Application.platform != RuntimePlatform.Android) return "{}"; AndroidJNIHelper.debug = false; - - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - return jc.CallStatic("getCustomPublisherData"); + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("showTestSuite"); } } @@ -597,7 +487,7 @@ public static void SetGdprConsent(Boolean isGdprConsentGiven) { if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass javaClass = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass javaClass = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { javaClass.CallStatic("setGdprConsent", isGdprConsentGiven); } } @@ -606,7 +496,7 @@ public static void SetGdprConsentData(String gdprConsentData) { if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass javaClass = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass javaClass = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { javaClass.CallStatic("setGdprConsentData", gdprConsentData); } } @@ -615,45 +505,24 @@ public static void ClearGdprConsentData() { if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass javaClass = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass javaClass = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { javaClass.CallStatic("clearGdprConsentData"); } } public static void ShowDebugLogs() { if(Application.platform != RuntimePlatform.Android) return; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("showDebugLogs"); } } public static void HideDebugLogs() { if(Application.platform != RuntimePlatform.Android) return; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("hideDebugLogs"); } } - - public static void ResumeExpensiveWork() { - if(Application.platform != RuntimePlatform.Android) return; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("resumeExpensiveWork"); - } - } - - public static void PauseExpensiveWork() { - if(Application.platform != RuntimePlatform.Android) return; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("pauseExpensiveWork"); - } - } - - public static void SetBundleIdentifier(string bundleID) { - if(Application.platform != RuntimePlatform.Android) return; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.ads.HeyzapAds")) { - jc.CallStatic("setBundleId", bundleID); - } - } } #endif #endregion diff --git a/Assets/Plugins/Heyzap/HZBannerAd.cs.meta b/Assets/Plugins/FairBid/FairBidSDK.cs.meta similarity index 71% rename from Assets/Plugins/Heyzap/HZBannerAd.cs.meta rename to Assets/Plugins/FairBid/FairBidSDK.cs.meta index d59aa90f..e8cb0072 100644 --- a/Assets/Plugins/Heyzap/HZBannerAd.cs.meta +++ b/Assets/Plugins/FairBid/FairBidSDK.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 25a1dc327650847528640f0265582837 -timeCreated: 1536245015 -licenseType: Free +guid: 6441d0e2adda346b68e86fe95d6f4a37 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Heyzap/HZInterstitialAd.cs b/Assets/Plugins/FairBid/Interstitial.cs similarity index 52% rename from Assets/Plugins/Heyzap/HZInterstitialAd.cs rename to Assets/Plugins/FairBid/Interstitial.cs index e50c9e58..2f6091d6 100644 --- a/Assets/Plugins/Heyzap/HZInterstitialAd.cs +++ b/Assets/Plugins/FairBid/Interstitial.cs @@ -1,5 +1,4 @@ -// -// Copyright 2015 Heyzap, Inc. All Rights Reserved +// Copyright 2019 Fyber. All Rights Reserved // // Permission is hereby granted, free of charge, to any person // obtaining a copy of this software and associated documentation @@ -29,91 +28,69 @@ using System.Runtime.InteropServices; using System; -namespace Heyzap { +namespace FairBid +{ /// /// Use this class to show interstitial ads. Depending on the network and your settings, these can be static or video ads. /// - public class HZInterstitialAd : MonoBehaviour { + public class Interstitial : MonoBehaviour + { - public delegate void AdDisplayListener(string state, string tag); + public delegate void AdDisplayListener(string state, string placement); private static AdDisplayListener adDisplayListener; - private static HZInterstitialAd _instance = null; - - //provided since JS can't use default parameters - /// - /// Shows an ad with the default options. - /// - public static void Show() { - HZInterstitialAd.ShowWithOptions(null); - } + private static Interstitial _instance; /// - /// Shows an ad with the given options. + /// Requests an ad for the given placement name. /// - /// The options to show the ad with, or the default options if null - public static void ShowWithOptions(HZShowOptions showOptions) { - if (showOptions == null) { - showOptions = new HZShowOptions(); - } - + /// The placement name to request an ad for. + public static void Request(string placement) + { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZInterstitialAdAndroid.ShowWithOptions(showOptions); + InterstitialAndroid.Request(placement); #elif UNITY_IPHONE - HZInterstitialAdIOS.ShowWithOptions(showOptions); + InterstitialIOS.Request(placement); #endif #else - UnityEngine.Debug.LogWarning("Call received to show an HZInterstitalAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.SHOW_FAILED, showOptions.Tag)); + Debug.LogWarning("Call received to request an Interstitial, but the SDK does not function in the editor. You must use a device/emulator to request/show ads."); + _instance.StartCoroutine(InvokeCallbackNextFrame(FairBidSDK.NetworkCallback.REQUEST_FAILED, placement)); #endif } - //provided since JS can't use default parameters - /// - /// Fetches an ad for the default ad tag. - /// - public static void Fetch() { - HZInterstitialAd.Fetch(null); - } /// - /// Fetches an ad for the given ad tag. + /// Shows an ad with the given options. /// - /// The ad tag to fetch an ad for. - public static void Fetch(string tag) { - tag = HeyzapAds.TagForString(tag); - + /// The options to show the ad with, or the default options if null + public static void ShowWithOptions(ShowOptions showOptions) + { + if (showOptions == null) + { + showOptions = new ShowOptions(); + } #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZInterstitialAdAndroid.Fetch(tag); + InterstitialAndroid.ShowWithOptions(showOptions); #elif UNITY_IPHONE - HZInterstitialAdIOS.Fetch(tag); + InterstitialIOS.ShowWithOptions(showOptions); #endif #else - UnityEngine.Debug.LogWarning("Call received to fetch an HZInterstitialAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.FETCH_FAILED, tag)); + Debug.LogWarning("Call received to show an Interstitial, but the SDK does not function in the editor. You must use a device/emulator to request/show ads."); + _instance.StartCoroutine(InvokeCallbackNextFrame(FairBidSDK.NetworkCallback.SHOW_FAILED, showOptions.Placement)); #endif } - - //provided since JS can't use default parameters - /// - /// Returns whether or not an ad is available for the default ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable() { - return HZInterstitialAd.IsAvailable(null); - } + /// - /// Returns whether or not an ad is available for the given ad tag. + /// Returns whether or not an ad is available for the given placement name. /// /// true, if an ad is available, false otherwise. - public static bool IsAvailable(string tag) { - tag = HeyzapAds.TagForString(tag); - + public static bool IsAvailable(string placement) + { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - return HZInterstitialAdAndroid.IsAvailable(tag); + return InterstitialAndroid.IsAvailable(placement); #elif UNITY_IPHONE - return HZInterstitialAdIOS.IsAvailable(tag); + return InterstitialIOS.IsAvailable(placement); #endif #else return false; @@ -123,20 +100,22 @@ public static bool IsAvailable(string tag) { /// /// Sets the AdDisplayListener for interstitial ads, which will receive callbacks regarding the state of interstitial ads. /// - public static void SetDisplayListener(AdDisplayListener listener) { - HZInterstitialAd.adDisplayListener = listener; + public static void SetDisplayListener(AdDisplayListener listener) + { + adDisplayListener = listener; } #region Chartboost-specific methods /// - /// Fetches an ad from Chartboost for the given CBLocation. + /// Requests an ad from Chartboost for the given CBLocation. /// - public static void ChartboostFetchForLocation(string location) { + public static void ChartboostFetchForLocation(string location) + { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZInterstitialAdAndroid.chartboostFetchForLocation(location); + InterstitialAndroid.chartboostFetchForLocation(location); #elif UNITY_IPHONE - HZInterstitialAdIOS.chartboostFetchForLocation(location); + InterstitialIOS.chartboostFetchForLocation(location); #endif #else #endif @@ -145,12 +124,13 @@ public static void ChartboostFetchForLocation(string location) { /// /// Returns whether an ad is available at the given CBLocation. /// - public static bool ChartboostIsAvailableForLocation(string location) { + public static bool ChartboostIsAvailableForLocation(string location) + { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - return HZInterstitialAdAndroid.chartboostIsAvailableForLocation(location); + return InterstitialAndroid.chartboostIsAvailableForLocation(location); #elif UNITY_IPHONE - return HZInterstitialAdIOS.chartboostIsAvailableForLocation(location); + return InterstitialIOS.chartboostIsAvailableForLocation(location); #endif #else return false; @@ -160,148 +140,153 @@ public static bool ChartboostIsAvailableForLocation(string location) { /// /// Attempts to show an ad from Chartboost for the given CBLocation. /// - public static void ChartboostShowForLocation(string location) { + public static void ChartboostShowForLocation(string location) + { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) #if UNITY_ANDROID - HZInterstitialAdAndroid.chartboostShowForLocation(location); + InterstitialAndroid.chartboostShowForLocation(location); #elif UNITY_IPHONE - HZInterstitialAdIOS.chartboostShowForLocation(location); + InterstitialIOS.chartboostShowForLocation(location); #endif - #else + #else #endif } #endregion #region Internal methods - public static void InitReceiver(){ - if (_instance == null) { - GameObject receiverObject = new GameObject("HZInterstitialAd"); + public static void InitReceiver() + { + if (_instance == null) + { + GameObject receiverObject = new GameObject("Interstitial"); DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); + _instance = receiverObject.AddComponent(); } } - public void SetCallback(string message) { + public void SetCallback(string message) + { string[] displayStateParams = message.Split(','); - HZInterstitialAd.SetCallbackStateAndTag(displayStateParams[0], displayStateParams[1]); + SetCallbackStateAndPlacement(displayStateParams[0], displayStateParams[1]); } - protected static void SetCallbackStateAndTag(string state, string tag) { - if (HZInterstitialAd.adDisplayListener != null) { - HZInterstitialAd.adDisplayListener(state, tag); + protected static void SetCallbackStateAndPlacement(string state, string placement) + { + if (adDisplayListener != null) + { + adDisplayListener(state, placement); } } - protected static IEnumerator InvokeCallbackNextFrame(string state, string tag) { + protected static IEnumerator InvokeCallbackNextFrame(string state, string placement) + { yield return null; // wait a frame - HZInterstitialAd.SetCallbackStateAndTag(state, tag); + SetCallbackStateAndPlacement(state, placement); } #endregion } #region Platform-specific translations #if UNITY_IPHONE && !UNITY_EDITOR - public class HZInterstitialAdIOS { + public class InterstitialIOS { [DllImport ("__Internal")] - private static extern void hz_ads_show_interstitial(string tag); + private static extern void fyb_sdk_request_interstitial(string placement); [DllImport ("__Internal")] - private static extern void hz_ads_fetch_interstitial(string tag); + private static extern void fyb_sdk_show_interstitial(string placement); + [DllImport ("__Internal")] + private static extern bool fyb_sdk_interstitial_is_available(string placement); [DllImport ("__Internal")] - private static extern bool hz_ads_interstitial_is_available(string tag); + private static extern void fyb_fetch_chartboost_for_location(string location); [DllImport ("__Internal")] - private static extern void hz_fetch_chartboost_for_location(string location); + private static extern bool fyb_chartboost_is_available_for_location(string location); [DllImport ("__Internal")] - private static extern bool hz_chartboost_is_available_for_location(string location); - [DllImport ("__Internal")] - private static extern void hz_show_chartboost_for_location(string location); - + private static extern void fyb_show_chartboost_for_location(string location); - public static void ShowWithOptions(HZShowOptions showOptions) { - hz_ads_show_interstitial(showOptions.Tag); + public static void ShowWithOptions(ShowOptions showOptions) { + fyb_sdk_show_interstitial(showOptions.Placement); } - public static void Fetch(string tag) { - hz_ads_fetch_interstitial(tag); + public static void Request(string placement) { + fyb_sdk_request_interstitial(placement); } - public static bool IsAvailable(string tag) { - return hz_ads_interstitial_is_available(tag); + public static bool IsAvailable(string placement) { + return fyb_sdk_interstitial_is_available(placement); } - // Chartboost functions public static void chartboostFetchForLocation(string location) { - hz_fetch_chartboost_for_location(location); + fyb_fetch_chartboost_for_location(location); } public static bool chartboostIsAvailableForLocation(string location) { - return hz_chartboost_is_available_for_location(location); + return fyb_chartboost_is_available_for_location(location); } public static void chartboostShowForLocation(string location) { - hz_show_chartboost_for_location(location); + fyb_show_chartboost_for_location(location); } } #endif #if UNITY_ANDROID && !UNITY_EDITOR - public class HZInterstitialAdAndroid { - - public static void ShowWithOptions(HZShowOptions showOptions) { - if(Application.platform != RuntimePlatform.Android) return; + public class InterstitialAndroid { + + public static void Request(string placement) { + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showInterstitial", showOptions.Tag); + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("requestInterstitial", placement); } } - - public static void Fetch(string tag="default") { - if(Application.platform != RuntimePlatform.Android) return; + + public static void ShowWithOptions(ShowOptions showOptions) { + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("fetchInterstitial", tag); + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("showInterstitial", showOptions.Placement); } } - public static Boolean IsAvailable(string tag="default") { - if(Application.platform != RuntimePlatform.Android) return false; + public static Boolean IsAvailable(string placement) { + if (Application.platform != RuntimePlatform.Android) return false; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - return jc.CallStatic("isInterstitialAvailable", tag); + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + return jc.CallStatic("isInterstitialAvailable", placement); } } public static void chartboostShowForLocation(string location) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("chartboostLocationShow", location); } } public static Boolean chartboostIsAvailableForLocation(string location) { - if(Application.platform != RuntimePlatform.Android) return false; + if (Application.platform != RuntimePlatform.Android) return false; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { return jc.CallStatic("chartboostLocationIsAvailable", location); } } public static void chartboostFetchForLocation(string location) { - if(Application.platform != RuntimePlatform.Android) return; + if (Application.platform != RuntimePlatform.Android) return; AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { jc.CallStatic("chartboostLocationFetch", location); } } } #endif #endregion -} +} \ No newline at end of file diff --git a/Assets/Plugins/FairBid/Interstitial.cs.meta b/Assets/Plugins/FairBid/Interstitial.cs.meta new file mode 100644 index 00000000..b019ce29 --- /dev/null +++ b/Assets/Plugins/FairBid/Interstitial.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f68f9ded244554f4c99b0f8e01995748 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/FairBid/Rewarded.cs b/Assets/Plugins/FairBid/Rewarded.cs new file mode 100644 index 00000000..349684a5 --- /dev/null +++ b/Assets/Plugins/FairBid/Rewarded.cs @@ -0,0 +1,186 @@ +// Copyright 2019 Fyber. All Rights Reserved +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, +// copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following +// conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// + +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System; + +namespace FairBid { + /// + /// Use this class to show rewarded ads. + /// + public class Rewarded : MonoBehaviour { + + public delegate void AdDisplayListener(string state, string placement); + private static AdDisplayListener adDisplayListener; + private static Rewarded _instance; + + /// + /// Requests an ad for the given placement name. + /// + /// The placement name to request an ad for. + public static void Request(string placement) { + #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) + #if UNITY_ANDROID + RewardedAndroid.Request(placement); + #elif UNITY_IPHONE + RewardedIOS.Request(placement); + #endif + #else + UnityEngine.Debug.LogWarning("Call received to request an Rewarded, but the SDK does not function in the editor. You must use a device/emulator to request/show ads."); + _instance.StartCoroutine(InvokeCallbackNextFrame(FairBidSDK.NetworkCallback.REQUEST_FAILED, placement)); + #endif + } + + /// + /// Shows an ad with the given options. + /// + /// The options to show the ad with, or the default options if null + public static void ShowWithOptions(RewardedShowOptions showOptions) { + if (showOptions == null) { + showOptions = new RewardedShowOptions(); + } + + #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) + #if UNITY_ANDROID + RewardedAndroid.ShowWithOptions(showOptions); + #elif UNITY_IPHONE + RewardedIOS.ShowWithOptions(showOptions); + #endif + #else + UnityEngine.Debug.LogWarning("Call received to show an Rewarded, but the SDK does not function in the editor. You must use a device/emulator to request/show ads."); + _instance.StartCoroutine(InvokeCallbackNextFrame(FairBidSDK.NetworkCallback.SHOW_FAILED, showOptions.Placement)); + #endif + } + + /// + /// Returns whether or not an ad is available for the given placement name. + /// + /// true, if an ad is available, false otherwise. + public static bool IsAvailable(string placement) { + #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) + #if UNITY_ANDROID + return RewardedAndroid.IsAvailable(placement); + #elif UNITY_IPHONE + return RewardedIOS.IsAvailable(placement); + #endif + #else + return false; + #endif + } + + /// + /// Sets the AdDisplayListener for rewarded ads, which will receive callbacks regarding the state of rewarded ads. + /// + public static void SetDisplayListener(AdDisplayListener listener) { + adDisplayListener = listener; + } + + #region Internal methods + public static void InitReceiver(){ + if (_instance == null) { + GameObject receiverObject = new GameObject("Rewarded"); + DontDestroyOnLoad(receiverObject); + _instance = receiverObject.AddComponent(); + } + } + + public void SetCallback(string message) { + string[] displayStateParams = message.Split(','); + SetCallbackStateAndPlacement(displayStateParams[0], displayStateParams[1]); + } + + protected static void SetCallbackStateAndPlacement(string state, string placement) { + if (adDisplayListener != null) { + adDisplayListener(state, placement); + } + } + + protected static IEnumerator InvokeCallbackNextFrame(string state, string placement) { + yield return null; // wait a frame + SetCallbackStateAndPlacement(state, placement); + } + #endregion + } + + #region Platform-specific translations + #if UNITY_IPHONE && !UNITY_EDITOR + public class RewardedIOS : MonoBehaviour { + [DllImport ("__Internal")] + private static extern void fyb_sdk_request_rewarded(string placement); + [DllImport ("__Internal")] + private static extern void fyb_sdk_show_rewarded_with_custom_info(string placement, string rewardedInfo); + [DllImport ("__Internal")] + private static extern bool fyb_sdk_rewarded_is_available(string placement); + + + public static void ShowWithOptions(RewardedShowOptions showOptions) { + fyb_sdk_show_rewarded_with_custom_info(showOptions.Placement, showOptions.RewardedInfo); + } + + public static void Request(string placement) { + fyb_sdk_request_rewarded(placement); + } + + public static bool IsAvailable(string placement) { + return fyb_sdk_rewarded_is_available(placement); + } + } + #endif + + #if UNITY_ANDROID && !UNITY_EDITOR + public class RewardedAndroid : MonoBehaviour { + + public static void Request(string placement) { + if (Application.platform != RuntimePlatform.Android) return; + + AndroidJNIHelper.debug = false; + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("requestRewarded", placement); + } + } + + public static void ShowWithOptions(RewardedShowOptions showOptions) { + if (Application.platform != RuntimePlatform.Android) return; + + AndroidJNIHelper.debug = false; + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + jc.CallStatic("showRewarded", showOptions.Placement, showOptions.RewardedInfo); + } + } + + public static Boolean IsAvailable(string placement) { + if (Application.platform != RuntimePlatform.Android) return false; + + AndroidJNIHelper.debug = false; + using (AndroidJavaClass jc = new AndroidJavaClass("com.fyber.fairbid.sdk.extensions.unity3d.UnityHelper")) { + return jc.CallStatic("isRewardedAvailable", placement); + } + } + } + #endif + #endregion +} diff --git a/Assets/Plugins/FairBid/Rewarded.cs.meta b/Assets/Plugins/FairBid/Rewarded.cs.meta new file mode 100644 index 00000000..27b2f8d7 --- /dev/null +++ b/Assets/Plugins/FairBid/Rewarded.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26b31c930c2294f39b21a6f7c584cf51 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/FairBid/ShowOptions.cs b/Assets/Plugins/FairBid/ShowOptions.cs new file mode 100644 index 00000000..74c4f3af --- /dev/null +++ b/Assets/Plugins/FairBid/ShowOptions.cs @@ -0,0 +1,95 @@ +// Copyright 2019 Fyber. All Rights Reserved +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, +// copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following +// conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// + +namespace FairBid { + /// + /// A set of options that describes how to show an ad. + /// + public class ShowOptions { + + /// + /// An identifier for the location of the ad, which you can use to disable the ad from your dashboard. + /// + /// The placement name. + public string Placement { get; set; } + } + + /// + /// A set of options that describes how to show an rewarded ad. + /// + public class RewardedShowOptions : ShowOptions { + private const string DEFAULT_REWARDED_INFO = ""; + + /// + /// When an rewarded video is completed, this string will be sent to your server via our server-to-server callbacks. Set it to anything you want to pass to your server regarding this rewarded video view (i.e.: a username, user ID, level name, etc.), or leave it empty if you don't need to use it / aren't using server callbacks for rewarded video. + /// + public string RewardedInfo { + get { + return rewardedInfo; + } + set { + if (value != null) { + rewardedInfo = value; + } else { + rewardedInfo = DEFAULT_REWARDED_INFO; + } + } + } + private string rewardedInfo = DEFAULT_REWARDED_INFO; + } + + /// + /// A set of options that describes how to show a banner ad. + /// + public class BannerShowOptions : ShowOptions { + + /// + /// Set `BannerShowOptions.Position` to this value to show ads at the top of the screen. + /// + public const string POSITION_TOP = "top"; + /// + /// Set `BannerShowOptions.Position` to this value to show ads at the bottom of the screen. + /// + public const string POSITION_BOTTOM = "bottom"; + + private const string DEFAULT_POSITION = POSITION_BOTTOM; + + /// + /// Gets or sets the position for a banner ad. Can only be set to `BannerShowOptions.POSITION_TOP` or `BannerShowOptions.POSITION_BOTTOM`. + /// Guaranteed to be non-null. + /// + /// The position. + public string Position { + get { + return position; + } + set { + if (value == POSITION_TOP || value == POSITION_BOTTOM) { + position = value; + } + } + } + private string position = DEFAULT_POSITION; + } +} diff --git a/Assets/Plugins/Heyzap/HZIncentivizedAd.cs.meta b/Assets/Plugins/FairBid/ShowOptions.cs.meta similarity index 77% rename from Assets/Plugins/Heyzap/HZIncentivizedAd.cs.meta rename to Assets/Plugins/FairBid/ShowOptions.cs.meta index 30fc11be..6b9c8e12 100644 --- a/Assets/Plugins/Heyzap/HZIncentivizedAd.cs.meta +++ b/Assets/Plugins/FairBid/ShowOptions.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 37b6818a823c348b6a2d204e5ee0a83b -timeCreated: 1536245015 +guid: bbc60f2f830064cad9122ee278796335 +timeCreated: 1535874635 licenseType: Free MonoImporter: externalObjects: {} diff --git a/Assets/Plugins/FairBid/fairbid-sdk-release.aar b/Assets/Plugins/FairBid/fairbid-sdk-release.aar new file mode 100644 index 00000000..643e4d97 Binary files /dev/null and b/Assets/Plugins/FairBid/fairbid-sdk-release.aar differ diff --git a/Assets/Plugins/Heyzap/android-sdk-release.aar.meta b/Assets/Plugins/FairBid/fairbid-sdk-release.aar.meta similarity index 84% rename from Assets/Plugins/Heyzap/android-sdk-release.aar.meta rename to Assets/Plugins/FairBid/fairbid-sdk-release.aar.meta index 56d5229f..269e1e60 100644 --- a/Assets/Plugins/Heyzap/android-sdk-release.aar.meta +++ b/Assets/Plugins/FairBid/fairbid-sdk-release.aar.meta @@ -1,14 +1,14 @@ fileFormatVersion: 2 -guid: d57134f9ec926496da818e908ae9587e -timeCreated: 1536245019 -licenseType: Free +guid: 5b1c4686c31b54d02960a57c9c2c0184 PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 platformData: - first: Android: Android diff --git a/Assets/Plugins/FairBid/ia-mraid-kit-release.aar b/Assets/Plugins/FairBid/ia-mraid-kit-release.aar new file mode 100644 index 00000000..6255b1a5 Binary files /dev/null and b/Assets/Plugins/FairBid/ia-mraid-kit-release.aar differ diff --git a/Assets/Plugins/Heyzap/ia-mraid-kit-release.aar.meta b/Assets/Plugins/FairBid/ia-mraid-kit-release.aar.meta similarity index 100% rename from Assets/Plugins/Heyzap/ia-mraid-kit-release.aar.meta rename to Assets/Plugins/FairBid/ia-mraid-kit-release.aar.meta diff --git a/Assets/Plugins/FairBid/ia-native-kit-release.aar b/Assets/Plugins/FairBid/ia-native-kit-release.aar new file mode 100644 index 00000000..dc68bace Binary files /dev/null and b/Assets/Plugins/FairBid/ia-native-kit-release.aar differ diff --git a/Assets/Plugins/Heyzap/ia-native-kit-release.aar.meta b/Assets/Plugins/FairBid/ia-native-kit-release.aar.meta similarity index 100% rename from Assets/Plugins/Heyzap/ia-native-kit-release.aar.meta rename to Assets/Plugins/FairBid/ia-native-kit-release.aar.meta diff --git a/Assets/Plugins/FairBid/ia-sdk-core-release.aar b/Assets/Plugins/FairBid/ia-sdk-core-release.aar new file mode 100644 index 00000000..d9bb9906 Binary files /dev/null and b/Assets/Plugins/FairBid/ia-sdk-core-release.aar differ diff --git a/Assets/Plugins/Heyzap/ia-sdk-core-release.aar.meta b/Assets/Plugins/FairBid/ia-sdk-core-release.aar.meta similarity index 100% rename from Assets/Plugins/Heyzap/ia-sdk-core-release.aar.meta rename to Assets/Plugins/FairBid/ia-sdk-core-release.aar.meta diff --git a/Assets/Plugins/FairBid/ia-video-kit-release.aar b/Assets/Plugins/FairBid/ia-video-kit-release.aar new file mode 100644 index 00000000..a587da4b Binary files /dev/null and b/Assets/Plugins/FairBid/ia-video-kit-release.aar differ diff --git a/Assets/Plugins/Heyzap/ia-video-kit-release.aar.meta b/Assets/Plugins/FairBid/ia-video-kit-release.aar.meta similarity index 100% rename from Assets/Plugins/Heyzap/ia-video-kit-release.aar.meta rename to Assets/Plugins/FairBid/ia-video-kit-release.aar.meta diff --git a/Assets/Plugins/Heyzap/HZIncentivizedAd.cs b/Assets/Plugins/Heyzap/HZIncentivizedAd.cs deleted file mode 100644 index 1cc8ed2e..00000000 --- a/Assets/Plugins/Heyzap/HZIncentivizedAd.cs +++ /dev/null @@ -1,214 +0,0 @@ -// HZIncentivizedAd.cs -// -// Copyright 2015 Heyzap, Inc. All Rights Reserved -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using System; - -namespace Heyzap { - /// - /// Use this class to show incentivized (rewarded) video ads. - /// - public class HZIncentivizedAd : MonoBehaviour { - - public delegate void AdDisplayListener(string state, string tag); - private static AdDisplayListener adDisplayListener; - private static HZIncentivizedAd _instance = null; - - //provided since JS can't use default parameters - /// - /// Fetches an ad for the default ad tag. - /// - public static void Fetch() { - HZIncentivizedAd.Fetch(null); - } - /// - /// Fetches an ad for the given ad tag. - /// - /// The ad tag to fetch an ad for. - public static void Fetch(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZIncentivizedAdAndroid.Fetch(tag); - #elif UNITY_IPHONE - HZIncentivizedAdIOS.Fetch(tag); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to fetch an HZIncentivizedAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.FETCH_FAILED, tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Shows an ad with the default options. - /// - public static void Show() { - HZIncentivizedAd.ShowWithOptions(null); - } - /// - /// Shows an ad with the given options. - /// - /// The options to show the ad with, or the default options if null - public static void ShowWithOptions(HZIncentivizedShowOptions showOptions) { - if (showOptions == null) { - showOptions = new HZIncentivizedShowOptions(); - } - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZIncentivizedAdAndroid.ShowWithOptions(showOptions); - #elif UNITY_IPHONE - HZIncentivizedAdIOS.ShowWithOptions(showOptions); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to show an HZIncentivizedAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.SHOW_FAILED, showOptions.Tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Returns whether or not an ad is available for the default ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable() { - return HZIncentivizedAd.IsAvailable(null); - } - /// - /// Returns whether or not an ad is available for the given ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - return HZIncentivizedAdAndroid.IsAvailable(tag); - #elif UNITY_IPHONE - return HZIncentivizedAdIOS.IsAvailable(tag); - #endif - #else - return false; - #endif - } - - /// - /// Sets the AdDisplayListener for incentivized ads, which will receive callbacks regarding the state of incentivized ads. - /// - public static void SetDisplayListener(AdDisplayListener listener) { - HZIncentivizedAd.adDisplayListener = listener; - } - - #region Internal methods - public static void InitReceiver(){ - if (_instance == null) { - GameObject receiverObject = new GameObject("HZIncentivizedAd"); - DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); - } - } - - public void SetCallback(string message) { - string[] displayStateParams = message.Split(','); - HZIncentivizedAd.SetCallbackStateAndTag(displayStateParams[0], displayStateParams[1]); - } - - protected static void SetCallbackStateAndTag(string state, string tag) { - if (HZIncentivizedAd.adDisplayListener != null) { - HZIncentivizedAd.adDisplayListener(state, tag); - } - } - - protected static IEnumerator InvokeCallbackNextFrame(string state, string tag) { - yield return null; // wait a frame - HZIncentivizedAd.SetCallbackStateAndTag(state, tag); - } - #endregion - } - - #region Platform-specific translations - #if UNITY_IPHONE && !UNITY_EDITOR - public class HZIncentivizedAdIOS : MonoBehaviour { - [DllImport ("__Internal")] - private static extern void hz_ads_show_incentivized_with_custom_info(string tag, string incentivizedInfo); - [DllImport ("__Internal")] - private static extern void hz_ads_fetch_incentivized(string tag); - [DllImport ("__Internal")] - private static extern bool hz_ads_incentivized_is_available(string tag); - - - public static void ShowWithOptions(HZIncentivizedShowOptions showOptions) { - hz_ads_show_incentivized_with_custom_info(showOptions.Tag, showOptions.IncentivizedInfo); - } - - public static void Fetch(string tag) { - hz_ads_fetch_incentivized(tag); - } - - public static bool IsAvailable(string tag) { - return hz_ads_incentivized_is_available(tag); - } - } - #endif - - #if UNITY_ANDROID && !UNITY_EDITOR - public class HZIncentivizedAdAndroid : MonoBehaviour { - - public static void ShowWithOptions(HZIncentivizedShowOptions showOptions) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showIncentivized", showOptions.Tag, showOptions.IncentivizedInfo); - } - } - - public static void Fetch(string tag) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("fetchIncentivized", tag); - } - } - - public static Boolean IsAvailable(string tag) { - if(Application.platform != RuntimePlatform.Android) return false; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - return jc.CallStatic("isIncentivizedAvailable", tag); - } - } - } - #endif - #endregion -} diff --git a/Assets/Plugins/Heyzap/HZOfferwallAd.cs b/Assets/Plugins/Heyzap/HZOfferwallAd.cs deleted file mode 100644 index 5614d855..00000000 --- a/Assets/Plugins/Heyzap/HZOfferwallAd.cs +++ /dev/null @@ -1,305 +0,0 @@ -// -// HZOfferWallAd.cs -// -// Copyright 2017 Heyzap, Inc. All Rights Reserved -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using System; - -namespace Heyzap { - /// - /// Use this class to show offerwall ads. - /// - public class HZOfferWallAd : MonoBehaviour { - - public delegate void AdDisplayListener(string state, string tag); - private static AdDisplayListener adDisplayListener; - - public delegate void VirtualCurrencyResponseListener(VirtualCurrencyResponse response); - private static VirtualCurrencyResponseListener virtualCurrencyResponseListener; - - public delegate void VirtualCurrencyErrorListener(string errorMsg); - private static VirtualCurrencyErrorListener virtualCurrencyErrorListener; - - private static HZOfferWallAd _instance = null; - - //provided since JS can't use default parameters - /// - /// Shows an ad with the default options. - /// - public static void Show() { - HZOfferWallAd.ShowWithOptions(null); - } - /// - /// Shows an ad with the given options. - /// - /// The options to show the ad with, or the default options if null - public static void ShowWithOptions(HZOfferWallShowOptions showOptions) { - if (showOptions == null) { - showOptions = new HZOfferWallShowOptions(); - } - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZOfferWallAdAndroid.ShowWithOptions(showOptions); - #elif UNITY_IPHONE - HZOfferWallAdIOS.ShowWithOptions(showOptions); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to show an HZOfferWallAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.SHOW_FAILED, showOptions.Tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Fetches an ad for the default ad tag. - /// - public static void Fetch() { - HZOfferWallAd.Fetch(null); - } - /// - /// Fetches an ad for the given ad tag. - /// - /// The ad tag to fetch an ad for. - public static void Fetch(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZOfferWallAdAndroid.Fetch(tag); - #elif UNITY_IPHONE - HZOfferWallAdIOS.Fetch(tag); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to fetch an HZOfferWallAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.FETCH_FAILED, tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Returns whether or not an ad is available for the default ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable() { - return HZOfferWallAd.IsAvailable(null); - } - /// - /// Returns whether or not an ad is available for the given ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - return HZOfferWallAdAndroid.IsAvailable(tag); - #elif UNITY_IPHONE - return HZOfferWallAdIOS.IsAvailable(tag); - #endif - #else - return false; - #endif - } - - /// - /// Sends a request to the Virtual Currency Server to see if the user has earned virtual currency since the last request. - /// The `VirtualCurrencyResponseListener` or the `VirtualCurrencyErrorListener` will receive the response once received. - /// - /// The ID of the currency to request information about. Setting this to NULL will request the default currency. - public static void RequestDeltaOfCurrency(string currencyId) { - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZOfferWallAdAndroid.RequestDeltaOfCurrency(currencyId); - #elif UNITY_IPHONE - HZOfferWallAdIOS.RequestDeltaOfCurrency(currencyId); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to request a VCS update on HZOfferWallAd, but the SDK does not function in the editor. You must use a device/emulator to do this."); - _instance.StartCoroutine(InvokeVCSErrorNextFrame("only_works_on_device")); - #endif - } - - /// - /// Sets the AdDisplayListener for offerwall ads, which will receive callbacks regarding the state of offerwall ads. - /// - public static void SetDisplayListener(AdDisplayListener listener) { - HZOfferWallAd.adDisplayListener = listener; - } - - /// - /// Sets the VirtualCurrencyResponseListener for offerwall ads, which will receive callbacks in response to a request for a VCS update. - /// - public static void SetVirtualCurrencyResponseListener(VirtualCurrencyResponseListener listener) { - HZOfferWallAd.virtualCurrencyResponseListener = listener; - } - - /// - /// Sets the VirtualCurrencyErrorListener for offerwall ads, which will receive callbacks regarding errors received after requesting virtual currency updates from the server. - /// - public static void SetVirtualCurrencyErrorListener(VirtualCurrencyErrorListener listener) { - HZOfferWallAd.virtualCurrencyErrorListener = listener; - } - - #region Internal methods - public static void InitReceiver(){ - if (_instance == null) { - GameObject receiverObject = new GameObject("HZOfferWallAd"); - DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); - } - } - - // received from native SDK - public void SetCallback(string message) { - string[] displayStateParams = message.Split(','); - HZOfferWallAd.SetCallbackStateAndTag(displayStateParams[0], displayStateParams[1]); - } - protected static void SetCallbackStateAndTag(string state, string tag) { - if (HZOfferWallAd.adDisplayListener != null) { - HZOfferWallAd.adDisplayListener(state, tag); - } - } - - // used for in-editor functionality - protected static IEnumerator InvokeCallbackNextFrame(string state, string tag) { - yield return null; // wait a frame - HZOfferWallAd.SetCallbackStateAndTag(state, tag); - } - - // received from native SDK - public void VCSResponse(string jsonString) { - HZOfferWallAd.SendVCSResponse(jsonString); - } - protected static void SendVCSResponse(string jsonString) { - if (HZOfferWallAd.virtualCurrencyResponseListener != null) { - VirtualCurrencyResponse response = (VirtualCurrencyResponse)JsonUtility.FromJson(jsonString); - HZOfferWallAd.virtualCurrencyResponseListener(response); - } - } - - // received from native SDK - public void VCSError(string errorMsg) { - HZOfferWallAd.SendVCSError(errorMsg); - } - protected static void SendVCSError(string errorMsg) { - if (HZOfferWallAd.virtualCurrencyErrorListener != null) { - HZOfferWallAd.virtualCurrencyErrorListener(errorMsg); - } - } - - // used for in-editor functionality - protected static IEnumerator InvokeVCSErrorNextFrame(string errorMsg) { - yield return null; // wait a frame - HZOfferWallAd.SendVCSError(errorMsg); - } - #endregion - } - - #region Platform-specific translations - #if UNITY_IPHONE && !UNITY_EDITOR - public class HZOfferWallAdIOS : MonoBehaviour { - [DllImport ("__Internal")] - private static extern void hz_ads_show_offerwall(string tag, bool shouldCloseAfterFirstClick); - [DllImport ("__Internal")] - private static extern void hz_ads_fetch_offerwall(string tag); - [DllImport ("__Internal")] - private static extern bool hz_ads_offerwall_is_available(string tag); - [DllImport ("__Internal")] - private static extern bool hz_ads_virtual_currency_request(string currencyId); - - - public static void ShowWithOptions(HZOfferWallShowOptions showOptions) { - hz_ads_show_offerwall(showOptions.Tag, showOptions.ShouldCloseAfterFirstClick); - } - - public static void Fetch(string tag) { - hz_ads_fetch_offerwall(tag); - } - - public static bool IsAvailable(string tag) { - return hz_ads_offerwall_is_available(tag); - } - - public static void RequestDeltaOfCurrency(string currencyId) { - hz_ads_virtual_currency_request(currencyId); - } - } - #endif - - #if UNITY_ANDROID && !UNITY_EDITOR - public class HZOfferWallAdAndroid : MonoBehaviour { - - public static void ShowWithOptions(HZOfferWallShowOptions showOptions) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showOfferWall", showOptions.Tag, showOptions.ShouldCloseAfterFirstClick); - } - } - - public static void Fetch(string tag) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("fetchOfferWall", tag); - } - } - - public static Boolean IsAvailable(string tag) { - if(Application.platform != RuntimePlatform.Android) return false; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - return jc.CallStatic("isOfferWallAvailable", tag); - } - } - - public static void RequestDeltaOfCurrency(string currencyId) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("virtualCurrencyRequest", currencyId); - } - } - } - #endif - #endregion - - [Serializable] - public class VirtualCurrencyResponse { - public string LatestTransactionID; - public string CurrencyID; - public string CurrencyName; - public float DeltaOfCurrency; - } -} diff --git a/Assets/Plugins/Heyzap/HZOfferwallAd.cs.meta b/Assets/Plugins/Heyzap/HZOfferwallAd.cs.meta deleted file mode 100644 index add5d212..00000000 --- a/Assets/Plugins/Heyzap/HZOfferwallAd.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 69fcf5bc050d94853a6b8e3d7c2608a1 -timeCreated: 1536245015 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Heyzap/HZShowOptions.cs b/Assets/Plugins/Heyzap/HZShowOptions.cs deleted file mode 100644 index 482e90d8..00000000 --- a/Assets/Plugins/Heyzap/HZShowOptions.cs +++ /dev/null @@ -1,111 +0,0 @@ -using UnityEngine; -using System.Collections; - -namespace Heyzap { - /// - /// A set of options that describes how to show an ad. - /// - public class HZShowOptions { - - /// - /// An identifier for the location of the ad, which you can use to disable the ad from your dashboard. If not specified the tag "default" is always used. - /// Guaranteed to be non-null - will be set to the default value if the setter is called with `null`. - /// - /// The tag. - public string Tag { - get { - return tag; - } - set { - if (value != null) { - tag = value; - } else { - tag = HeyzapAds.DEFAULT_TAG; - } - } - } - private string tag = HeyzapAds.DEFAULT_TAG; - } - - /// - /// A set of options that describes how to show an incentivized ad. - /// - public class HZIncentivizedShowOptions : HZShowOptions { - private const string DEFAULT_INCENTIVIZED_INFO = ""; - - /// - /// When an incentivized video is completed, this string will be sent to your server via our server-to-server callbacks. Set it to anything you want to pass to your server regarding this incentivized video view (i.e.: a username, user ID, level name, etc.), or leave it empty if you don't need to use it / aren't using server callbacks for incentivized video. - /// More information about using this feature can be found at https://developers.heyzap.com/docs/advanced-publishing . - /// Guaranteed to be non-null - will be set to the default value if the setter is called with `null`. - /// - public string IncentivizedInfo { - get { - return incentivizedInfo; - } - set { - if (value != null) { - incentivizedInfo = value; - } else { - incentivizedInfo = HZIncentivizedShowOptions.DEFAULT_INCENTIVIZED_INFO; - } - } - } - private string incentivizedInfo = HZIncentivizedShowOptions.DEFAULT_INCENTIVIZED_INFO; - } - - /// - /// A set of options that describes how to show a banner ad. - /// - public class HZBannerShowOptions : HZShowOptions { - - /// - /// Set `HZBannerShowOptions.Position` to this value to show ads at the top of the screen. - /// - public const string POSITION_TOP = "top"; - /// - /// Set `HZBannerShowOptions.Position` to this value to show ads at the bottom of the screen. - /// - public const string POSITION_BOTTOM = "bottom"; - - private const string DEFAULT_POSITION = HZBannerShowOptions.POSITION_BOTTOM; - - /// - /// Gets or sets the position for a banner ad. Can only be set to `HZBannerShowOptions.POSITION_TOP` or `HZBannerShowOptions.POSITION_BOTTOM`. - /// Guaranteed to be non-null. - /// - /// The position. - public string Position { - get { - return position; - } - set { - if (value == HZBannerShowOptions.POSITION_TOP || value == HZBannerShowOptions.POSITION_BOTTOM) { - position = value; - } - } - } - private string position = HZBannerShowOptions.DEFAULT_POSITION; - } - - /// - /// A set of options that describes how to show an offerwall ad. - /// - public class HZOfferWallShowOptions : HZShowOptions { - private const bool DEFAULT_SHOULD_CLOSE_AFTER_FIRST_CLICK = true; - - /// - /// When an incentivized video is completed, this string will be sent to your server via our server-to-server callbacks. Set it to anything you want to pass to your server regarding this incentivized video view (i.e.: a username, user ID, level name, etc.), or leave it empty if you don't need to use it / aren't using server callbacks for incentivized video. - /// More information about using this feature can be found at https://developers.heyzap.com/docs/advanced-publishing . - /// Guaranteed to be non-null - will be set to the default value if the setter is called with `null`. - /// - public bool ShouldCloseAfterFirstClick { - get { - return shouldCloseAfterFirstClick; - } - set { - shouldCloseAfterFirstClick = value; - } - } - private bool shouldCloseAfterFirstClick = HZOfferWallShowOptions.DEFAULT_SHOULD_CLOSE_AFTER_FIRST_CLICK; - } -} \ No newline at end of file diff --git a/Assets/Plugins/Heyzap/HZShowOptions.cs.meta b/Assets/Plugins/Heyzap/HZShowOptions.cs.meta deleted file mode 100644 index 9c0b131b..00000000 --- a/Assets/Plugins/Heyzap/HZShowOptions.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 827013d160de44f5b9d253fb672a122f -timeCreated: 1536245015 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Heyzap/HZVideoAd.cs b/Assets/Plugins/Heyzap/HZVideoAd.cs deleted file mode 100644 index 560c7bbd..00000000 --- a/Assets/Plugins/Heyzap/HZVideoAd.cs +++ /dev/null @@ -1,215 +0,0 @@ -// -// HZVideoAd.cs -// -// Copyright 2015 Heyzap, Inc. All Rights Reserved -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// - -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using System; - -namespace Heyzap { - /// - /// Use this class to show video ads. - /// - public class HZVideoAd : MonoBehaviour { - - public delegate void AdDisplayListener(string state, string tag); - private static AdDisplayListener adDisplayListener; - private static HZVideoAd _instance = null; - - //provided since JS can't use default parameters - /// - /// Shows an ad with the default options. - /// - public static void Show() { - HZVideoAd.ShowWithOptions(null); - } - /// - /// Shows an ad with the given options. - /// - /// The options to show the ad with, or the default options if null - public static void ShowWithOptions(HZShowOptions showOptions) { - if (showOptions == null) { - showOptions = new HZShowOptions(); - } - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZVideoAdAndroid.ShowWithOptions(showOptions); - #elif UNITY_IPHONE - HZVideoAdIOS.ShowWithOptions(showOptions); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to show an HZVideoAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.SHOW_FAILED, showOptions.Tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Fetches an ad for the default ad tag. - /// - public static void Fetch() { - HZVideoAd.Fetch(null); - } - /// - /// Fetches an ad for the given ad tag. - /// - /// The ad tag to fetch an ad for. - public static void Fetch(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - HZVideoAdAndroid.Fetch(tag); - #elif UNITY_IPHONE - HZVideoAdIOS.Fetch(tag); - #endif - #else - UnityEngine.Debug.LogWarning("Call received to fetch an HZVideoAd, but the SDK does not function in the editor. You must use a device/emulator to fetch/show ads."); - _instance.StartCoroutine(InvokeCallbackNextFrame(HeyzapAds.NetworkCallback.FETCH_FAILED, tag)); - #endif - } - - //provided since JS can't use default parameters - /// - /// Returns whether or not an ad is available for the default ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable() { - return HZVideoAd.IsAvailable(null); - } - /// - /// Returns whether or not an ad is available for the given ad tag. - /// - /// true, if an ad is available, false otherwise. - public static bool IsAvailable(string tag) { - tag = HeyzapAds.TagForString(tag); - - #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) - #if UNITY_ANDROID - return HZVideoAdAndroid.IsAvailable(tag); - #elif UNITY_IPHONE - return HZVideoAdIOS.IsAvailable(tag); - #endif - #else - return false; - #endif - } - - /// - /// Sets the AdDisplayListener for video ads, which will receive callbacks regarding the state of video ads. - /// - public static void SetDisplayListener(AdDisplayListener listener) { - HZVideoAd.adDisplayListener = listener; - } - - #region Internal methods - public static void InitReceiver(){ - if (_instance == null) { - GameObject receiverObject = new GameObject("HZVideoAd"); - DontDestroyOnLoad(receiverObject); - _instance = receiverObject.AddComponent(); - } - } - - public void SetCallback(string message) { - string[] displayStateParams = message.Split(','); - HZVideoAd.SetCallbackStateAndTag(displayStateParams[0], displayStateParams[1]); - } - - protected static void SetCallbackStateAndTag(string state, string tag) { - if (HZVideoAd.adDisplayListener != null) { - HZVideoAd.adDisplayListener(state, tag); - } - } - - protected static IEnumerator InvokeCallbackNextFrame(string state, string tag) { - yield return null; // wait a frame - HZVideoAd.SetCallbackStateAndTag(state, tag); - } - #endregion - } - - #region Platform-specific translations - #if UNITY_IPHONE && !UNITY_EDITOR - public class HZVideoAdIOS : MonoBehaviour { - [DllImport ("__Internal")] - private static extern void hz_ads_show_video(string tag); - [DllImport ("__Internal")] - private static extern void hz_ads_fetch_video(string tag); - [DllImport ("__Internal")] - private static extern bool hz_ads_video_is_available(string tag); - - - public static void ShowWithOptions(HZShowOptions showOptions) { - hz_ads_show_video(showOptions.Tag); - } - - public static void Fetch(string tag) { - hz_ads_fetch_video(tag); - } - - public static bool IsAvailable(string tag) { - return hz_ads_video_is_available(tag); - } - } - #endif - - #if UNITY_ANDROID && !UNITY_EDITOR - public class HZVideoAdAndroid : MonoBehaviour { - - public static void ShowWithOptions(HZShowOptions showOptions) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("showVideo", showOptions.Tag); - } - } - - public static void Fetch(string tag) { - if(Application.platform != RuntimePlatform.Android) return; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - jc.CallStatic("fetchVideo", tag); - } - } - - public static Boolean IsAvailable(string tag) { - if(Application.platform != RuntimePlatform.Android) return false; - - AndroidJNIHelper.debug = false; - using (AndroidJavaClass jc = new AndroidJavaClass("com.heyzap.sdk.extensions.unity3d.UnityHelper")) { - return jc.CallStatic("isVideoAvailable", tag); - } - } - } - #endif - #endregion -} diff --git a/Assets/Plugins/Heyzap/HZVideoAd.cs.meta b/Assets/Plugins/Heyzap/HZVideoAd.cs.meta deleted file mode 100644 index 595b6e97..00000000 --- a/Assets/Plugins/Heyzap/HZVideoAd.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: b3fd6984a505949a2a9cb6552a21c45d -timeCreated: 1536245015 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Heyzap/HeyzapAds.cs.meta b/Assets/Plugins/Heyzap/HeyzapAds.cs.meta deleted file mode 100644 index d10cb9fe..00000000 --- a/Assets/Plugins/Heyzap/HeyzapAds.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 64e047fe970c246aeb90b1164b7c4e67 -timeCreated: 1536245015 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Heyzap/android-sdk-release.aar b/Assets/Plugins/Heyzap/android-sdk-release.aar deleted file mode 100644 index 6c950dfa..00000000 Binary files a/Assets/Plugins/Heyzap/android-sdk-release.aar and /dev/null differ diff --git a/Assets/Plugins/Heyzap/ia-mraid-kit-release.aar b/Assets/Plugins/Heyzap/ia-mraid-kit-release.aar deleted file mode 100644 index 84dd1179..00000000 Binary files a/Assets/Plugins/Heyzap/ia-mraid-kit-release.aar and /dev/null differ diff --git a/Assets/Plugins/Heyzap/ia-native-kit-release.aar b/Assets/Plugins/Heyzap/ia-native-kit-release.aar deleted file mode 100644 index 3bb357c0..00000000 Binary files a/Assets/Plugins/Heyzap/ia-native-kit-release.aar and /dev/null differ diff --git a/Assets/Plugins/Heyzap/ia-sdk-core-release.aar b/Assets/Plugins/Heyzap/ia-sdk-core-release.aar deleted file mode 100644 index ec1be9a6..00000000 Binary files a/Assets/Plugins/Heyzap/ia-sdk-core-release.aar and /dev/null differ diff --git a/Assets/Plugins/Heyzap/ia-video-kit-release.aar b/Assets/Plugins/Heyzap/ia-video-kit-release.aar deleted file mode 100644 index 4eb7a2ff..00000000 Binary files a/Assets/Plugins/Heyzap/ia-video-kit-release.aar and /dev/null differ diff --git a/Assets/Plugins/iOS/Heyzap.meta b/Assets/Plugins/iOS/FairBid.meta similarity index 57% rename from Assets/Plugins/iOS/Heyzap.meta rename to Assets/Plugins/iOS/FairBid.meta index 202e510d..a535848a 100644 --- a/Assets/Plugins/iOS/Heyzap.meta +++ b/Assets/Plugins/iOS/FairBid.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 0a77c6546ed504f58925f06544220f40 +guid: 9888d572eb2cf4cbcb575e3956fb3bac folderAsset: yes -timeCreated: 1459881000 -licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/Heyzap/HZBannerAd.h b/Assets/Plugins/iOS/FairBid/HZBannerAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZBannerAd.h rename to Assets/Plugins/iOS/FairBid/HZBannerAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZBannerAd.h.meta b/Assets/Plugins/iOS/FairBid/HZBannerAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZBannerAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZBannerAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZBannerAdOptions.h b/Assets/Plugins/iOS/FairBid/HZBannerAdOptions.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZBannerAdOptions.h rename to Assets/Plugins/iOS/FairBid/HZBannerAdOptions.h diff --git a/Assets/Plugins/iOS/Heyzap/HZBannerAdOptions.h.meta b/Assets/Plugins/iOS/FairBid/HZBannerAdOptions.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZBannerAdOptions.h.meta rename to Assets/Plugins/iOS/FairBid/HZBannerAdOptions.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZDemographics.h b/Assets/Plugins/iOS/FairBid/HZDemographics.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZDemographics.h rename to Assets/Plugins/iOS/FairBid/HZDemographics.h diff --git a/Assets/Plugins/iOS/Heyzap/HZDemographics.h.meta b/Assets/Plugins/iOS/FairBid/HZDemographics.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZDemographics.h.meta rename to Assets/Plugins/iOS/FairBid/HZDemographics.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZFetchOptions.h b/Assets/Plugins/iOS/FairBid/HZFetchOptions.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZFetchOptions.h rename to Assets/Plugins/iOS/FairBid/HZFetchOptions.h diff --git a/Assets/Plugins/iOS/Heyzap/HZFetchOptions.h.meta b/Assets/Plugins/iOS/FairBid/HZFetchOptions.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZFetchOptions.h.meta rename to Assets/Plugins/iOS/FairBid/HZFetchOptions.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZFyberVirtualCurrencyClient.h b/Assets/Plugins/iOS/FairBid/HZFyberVirtualCurrencyClient.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZFyberVirtualCurrencyClient.h rename to Assets/Plugins/iOS/FairBid/HZFyberVirtualCurrencyClient.h diff --git a/Assets/Plugins/iOS/Heyzap/HZFyberVirtualCurrencyClient.h.meta b/Assets/Plugins/iOS/FairBid/HZFyberVirtualCurrencyClient.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZFyberVirtualCurrencyClient.h.meta rename to Assets/Plugins/iOS/FairBid/HZFyberVirtualCurrencyClient.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZIncentivizedAd.h b/Assets/Plugins/iOS/FairBid/HZIncentivizedAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZIncentivizedAd.h rename to Assets/Plugins/iOS/FairBid/HZIncentivizedAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZIncentivizedAd.h.meta b/Assets/Plugins/iOS/FairBid/HZIncentivizedAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZIncentivizedAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZIncentivizedAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZInterstitialAd.h b/Assets/Plugins/iOS/FairBid/HZInterstitialAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZInterstitialAd.h rename to Assets/Plugins/iOS/FairBid/HZInterstitialAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZInterstitialAd.h.meta b/Assets/Plugins/iOS/FairBid/HZInterstitialAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZInterstitialAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZInterstitialAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZLog.h b/Assets/Plugins/iOS/FairBid/HZLog.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZLog.h rename to Assets/Plugins/iOS/FairBid/HZLog.h diff --git a/Assets/Plugins/iOS/Heyzap/HZLog.h.meta b/Assets/Plugins/iOS/FairBid/HZLog.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZLog.h.meta rename to Assets/Plugins/iOS/FairBid/HZLog.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAd.h b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAd.h rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAd.h.meta b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdManager.h b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAdManager.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdManager.h rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAdManager.h diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdManager.h.meta b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAdManager.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdManager.h.meta rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAdManager.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdViewRegisterer.h b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAdViewRegisterer.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdViewRegisterer.h rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAdViewRegisterer.h diff --git a/Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdViewRegisterer.h.meta b/Assets/Plugins/iOS/FairBid/HZMediatedNativeAdViewRegisterer.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediatedNativeAdViewRegisterer.h.meta rename to Assets/Plugins/iOS/FairBid/HZMediatedNativeAdViewRegisterer.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZMediationImports.m b/Assets/Plugins/iOS/FairBid/HZMediationImports.m similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediationImports.m rename to Assets/Plugins/iOS/FairBid/HZMediationImports.m diff --git a/Assets/Plugins/iOS/Heyzap/HZMediationImports.m.meta b/Assets/Plugins/iOS/FairBid/HZMediationImports.m.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZMediationImports.m.meta rename to Assets/Plugins/iOS/FairBid/HZMediationImports.m.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAd.h b/Assets/Plugins/iOS/FairBid/HZNativeAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAd.h rename to Assets/Plugins/iOS/FairBid/HZNativeAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAd.h.meta b/Assets/Plugins/iOS/FairBid/HZNativeAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZNativeAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdCollection.h b/Assets/Plugins/iOS/FairBid/HZNativeAdCollection.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdCollection.h rename to Assets/Plugins/iOS/FairBid/HZNativeAdCollection.h diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdCollection.h.meta b/Assets/Plugins/iOS/FairBid/HZNativeAdCollection.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdCollection.h.meta rename to Assets/Plugins/iOS/FairBid/HZNativeAdCollection.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdController.h b/Assets/Plugins/iOS/FairBid/HZNativeAdController.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdController.h rename to Assets/Plugins/iOS/FairBid/HZNativeAdController.h diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdController.h.meta b/Assets/Plugins/iOS/FairBid/HZNativeAdController.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdController.h.meta rename to Assets/Plugins/iOS/FairBid/HZNativeAdController.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdImage.h b/Assets/Plugins/iOS/FairBid/HZNativeAdImage.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdImage.h rename to Assets/Plugins/iOS/FairBid/HZNativeAdImage.h diff --git a/Assets/Plugins/iOS/Heyzap/HZNativeAdImage.h.meta b/Assets/Plugins/iOS/FairBid/HZNativeAdImage.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZNativeAdImage.h.meta rename to Assets/Plugins/iOS/FairBid/HZNativeAdImage.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZOfferwallAd.h b/Assets/Plugins/iOS/FairBid/HZOfferWallAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZOfferwallAd.h rename to Assets/Plugins/iOS/FairBid/HZOfferWallAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZOfferwallAd.h.meta b/Assets/Plugins/iOS/FairBid/HZOfferWallAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZOfferwallAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZOfferWallAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZOfferwallShowOptions.h b/Assets/Plugins/iOS/FairBid/HZOfferWallShowOptions.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZOfferwallShowOptions.h rename to Assets/Plugins/iOS/FairBid/HZOfferWallShowOptions.h diff --git a/Assets/Plugins/iOS/Heyzap/HZOfferwallShowOptions.h.meta b/Assets/Plugins/iOS/FairBid/HZOfferWallShowOptions.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZOfferwallShowOptions.h.meta rename to Assets/Plugins/iOS/FairBid/HZOfferWallShowOptions.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZShowOptions.h b/Assets/Plugins/iOS/FairBid/HZShowOptions.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZShowOptions.h rename to Assets/Plugins/iOS/FairBid/HZShowOptions.h diff --git a/Assets/Plugins/iOS/Heyzap/HZShowOptions.h.meta b/Assets/Plugins/iOS/FairBid/HZShowOptions.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZShowOptions.h.meta rename to Assets/Plugins/iOS/FairBid/HZShowOptions.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.h b/Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.h rename to Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.h diff --git a/Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.h.meta b/Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.h.meta rename to Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.m b/Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.m similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.m rename to Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.m diff --git a/Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.m.meta b/Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.m.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZUnityAdapterChartboostProxy.m.meta rename to Assets/Plugins/iOS/FairBid/HZUnityAdapterChartboostProxy.m.meta diff --git a/Assets/Plugins/iOS/Heyzap/HZVideoAd.h b/Assets/Plugins/iOS/FairBid/HZVideoAd.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZVideoAd.h rename to Assets/Plugins/iOS/FairBid/HZVideoAd.h diff --git a/Assets/Plugins/iOS/Heyzap/HZVideoAd.h.meta b/Assets/Plugins/iOS/FairBid/HZVideoAd.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HZVideoAd.h.meta rename to Assets/Plugins/iOS/FairBid/HZVideoAd.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapAds.h b/Assets/Plugins/iOS/FairBid/HeyzapAds.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapAds.h rename to Assets/Plugins/iOS/FairBid/HeyzapAds.h diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapAds.h.meta b/Assets/Plugins/iOS/FairBid/HeyzapAds.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapAds.h.meta rename to Assets/Plugins/iOS/FairBid/HeyzapAds.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.h b/Assets/Plugins/iOS/FairBid/HeyzapUnityAds.h similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.h rename to Assets/Plugins/iOS/FairBid/HeyzapUnityAds.h diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.h.meta b/Assets/Plugins/iOS/FairBid/HeyzapUnityAds.h.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.h.meta rename to Assets/Plugins/iOS/FairBid/HeyzapUnityAds.h.meta diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.mm b/Assets/Plugins/iOS/FairBid/HeyzapUnityAds.mm similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.mm rename to Assets/Plugins/iOS/FairBid/HeyzapUnityAds.mm diff --git a/Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.mm.meta b/Assets/Plugins/iOS/FairBid/HeyzapUnityAds.mm.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/HeyzapUnityAds.mm.meta rename to Assets/Plugins/iOS/FairBid/HeyzapUnityAds.mm.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_close@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_close@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_heart@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_heart@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Endcard_play@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Endcard_play@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Info.plist b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Info.plist similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Info.plist rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Info.plist diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Info.plist.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Info.plist.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/Info.plist.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/Info.plist.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/MRAIDClose@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/MRAIDClose@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserBack@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserBack@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserDismiss@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserDismiss@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/browserForward@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/browserForward@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/close@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/close@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreen@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreen@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/fullscreenSelected@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/fullscreenSelected@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButton@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButton@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/muteButtonSelected@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/muteButtonSelected@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/play@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/play@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/replay@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/replay@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@2x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@2x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@2x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@2x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@2x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@2x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@2x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@2x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@3x.png b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@3x.png similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@3x.png rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@3x.png diff --git a/Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@3x.png.meta b/Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@3x.png.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/IASDKResources.bundle/visitUs@3x.png.meta rename to Assets/Plugins/iOS/FairBid/IASDKResources.bundle/visitUs@3x.png.meta diff --git a/Assets/Plugins/iOS/Heyzap/libHeyzapAds.a b/Assets/Plugins/iOS/FairBid/libHeyzapAds.a similarity index 100% rename from Assets/Plugins/iOS/Heyzap/libHeyzapAds.a rename to Assets/Plugins/iOS/FairBid/libHeyzapAds.a diff --git a/Assets/Plugins/iOS/Heyzap/libHeyzapAds.a.meta b/Assets/Plugins/iOS/FairBid/libHeyzapAds.a.meta similarity index 100% rename from Assets/Plugins/iOS/Heyzap/libHeyzapAds.a.meta rename to Assets/Plugins/iOS/FairBid/libHeyzapAds.a.meta diff --git a/Assets/Scripts/AdManager.cs b/Assets/Scripts/AdManager.cs index b2f84a5e..071130da 100644 --- a/Assets/Scripts/AdManager.cs +++ b/Assets/Scripts/AdManager.cs @@ -1,41 +1,32 @@ -using UnityEngine; +using FairBid; +using UnityEngine; using UnityEngine.UI; -using UnityEngine.Assertions.Must; -using Heyzap; -using System.Collections; +using UnityEngine.Assertions; using System.Collections.Generic; public class AdManager : MonoBehaviour { [SerializeField] - private Text adTagTextField; + private Text placementTextField; [SerializeField] private GameObject bannerControls; [SerializeField] - private GameObject offerwallControls; - [SerializeField] private GameObject standardControls; [SerializeField] private ScrollingTextArea console; - [SerializeField] - private Toggle offerwallCloseOnFirstClickToggle; - [SerializeField] - private Text offerwallCurrencyIdTextField; private enum AdType { Interstitial, - Video, - Incentivized, - Banner, - Offerwall + Rewarded, + Banner } - private AdType _selectedAdType; + private AdType selectedAdType; private AdType SelectedAdType { - get { return _selectedAdType; } + get { return selectedAdType; } set { - _selectedAdType = value; - this.console.Append("AdType: " + value.ToString()); + selectedAdType = value; + console.Append("AdType: " + value.ToString()); ShowAdTypeControls(); } } @@ -43,259 +34,208 @@ private AdType SelectedAdType { private string bannerPosition; public void UpdateLocation(float latitude, float longitude, float horizAcc, float vertAcc, float alt, double timestamp) { - //HZDemographics.SetUserLocation(latitude, longitude, horizAcc, vertAcc, alt, timestamp); + //Demographics.SetUserLocation(latitude, longitude, horizAcc, vertAcc, alt, timestamp); } void Awake() { - this.adTagTextField.MustNotBeNull(); - this.bannerControls.MustNotBeNull(); - this.standardControls.MustNotBeNull(); - this.offerwallControls.MustNotBeNull(); - this.console.MustNotBeNull(); + Assert.IsNotNull(placementTextField); + Assert.IsNotNull(bannerControls); + Assert.IsNotNull(standardControls); + Assert.IsNotNull(console); } void Start () { - HeyzapAds.NetworkCallbackListener networkCallbackListener = delegate(string network, string callback) { - this.console.Append("[" + network + "]: " + callback); + FairBidSDK.NetworkCallbackListener networkCallbackListener = delegate(string network, string callback) { + console.Append("[" + network + "]: " + callback); }; - // HZDemographics.SetUserGender(HZDemographics.Gender.MALE); - // HZDemographics.SetUserPostalCode("94103"); - // HZDemographics.SetUserHouseholdIncome(100000); - // HZDemographics.SetUserMaritalStatus(HZDemographics.MaritalStatus.SINGLE); - // HZDemographics.SetUserEducationLevel(HZDemographics.EducationLevel.BACHELORS_DEGREE); - // HZDemographics.SetUserBirthDate("1990-08-05"); + // Demographics.SetUserGender(Demographics.Gender.MALE); + // Demographics.SetUserPostalCode("94103"); + // Demographics.SetUserHouseholdIncome(100000); + // Demographics.SetUserMaritalStatus(Demographics.MaritalStatus.SINGLE); + // Demographics.SetUserEducationLevel(Demographics.EducationLevel.BACHELORS_DEGREE); + // Demographics.SetUserBirthDate("1990-08-05"); // UnityEngine.Debug.Log ("calling loc service"); // TestLocationService locServ = new TestLocationService(); - // locServ.Start(this.console); + // locServ.Start(console); - HeyzapAds.SetNetworkCallbackListener(networkCallbackListener); - HeyzapAds.ShowDebugLogs(); - HeyzapAds.Start("ENTER_YOUR_PUBLISHER_ID_HERE", HeyzapAds.FLAG_NO_OPTIONS); + FairBidSDK.SetNetworkCallbackListener(networkCallbackListener); + FairBidSDK.ShowDebugLogs(); + FairBidSDK.Start("ENTER_YOUR_PUBLISHER_ID_HERE", FairBidSDK.FLAG_NO_OPTIONS); - HZBannerAd.SetDisplayListener(delegate(string adState, string adTag) { - this.console.Append("BANNER: " + adState + " Tag : " + adTag); + Banner.SetDisplayListener(delegate(string adState, string placement) { + console.Append("BANNER: " + adState + " Placement : " + placement); if (adState == "loaded") { Rect dimensions = new Rect(); - HZBannerAd.GetCurrentBannerDimensions(out dimensions); - this.console.Append(string.Format(" (x,y): ({0},{1}) - WxH: {2}x{3}", dimensions.x, dimensions.y, dimensions.width, dimensions.height)); + Banner.GetCurrentBannerDimensions(out dimensions); + console.Append(string.Format(" (x,y): ({0},{1}) - WxH: {2}x{3}", dimensions.x, dimensions.y, dimensions.width, dimensions.height)); } }); - HZInterstitialAd.SetDisplayListener(delegate(string adState, string adTag) { - this.console.Append("INTERSTITIAL: " + adState + " Tag : " + adTag); - }); - - HZIncentivizedAd.SetDisplayListener(delegate(string adState, string adTag) { - this.console.Append("INCENTIVIZED: " + adState + " Tag : " + adTag); - }); - - HZVideoAd.SetDisplayListener(delegate(string adState, string adTag) { - this.console.Append("VIDEO: " + adState + " Tag : " + adTag); + Interstitial.SetDisplayListener(delegate(string adState, string placement) { + console.Append("INTERSTITIAL: " + adState + " Placement : " + placement); }); - HZOfferWallAd.SetDisplayListener(delegate(string adState, string adTag) { - this.console.Append("OFFERWALL: " + adState + " Tag : " + adTag); - }); - - HZOfferWallAd.SetVirtualCurrencyResponseListener(delegate(VirtualCurrencyResponse response) { - this.console.Append("OFFERWALL VCS Response: id:" + response.CurrencyID + " name: '" + response.CurrencyName + "' amount : " + response.DeltaOfCurrency + " trans: " + response.LatestTransactionID); - }); - - HZOfferWallAd.SetVirtualCurrencyErrorListener(delegate(string errorMsg) { - this.console.Append("OFFERWALL VCS Error: " + errorMsg); + Rewarded.SetDisplayListener(delegate(string adState, string placement) { + console.Append("REWARDED: " + adState + " Placement : " + placement); }); // UI defaults - this.bannerPosition = HZBannerShowOptions.POSITION_TOP; - this.SelectedAdType = AdType.Interstitial; + bannerPosition = BannerShowOptions.POSITION_TOP; + SelectedAdType = AdType.Interstitial; - this.ShowAdTypeControls(); + ShowAdTypeControls(); } public void InterstitialSelected(bool selected) { if (selected) { - this.SelectedAdType = AdType.Interstitial; - } - } - - public void VideoSelected(bool selected) { - if (selected) { - this.SelectedAdType = AdType.Video; + SelectedAdType = AdType.Interstitial; } } - public void IncentivizedSelected(bool selected) { + public void RewardedSelected(bool selected) { if (selected) { - this.SelectedAdType = AdType.Incentivized; + SelectedAdType = AdType.Rewarded; } } public void BannerSelected(bool selected) { if (selected) { - this.SelectedAdType = AdType.Banner; - } - } - - public void OfferwallSelected(bool selected) { - if (selected) { - this.SelectedAdType = AdType.Offerwall; + SelectedAdType = AdType.Banner; } } public void IsAvailableButton() { - string tag = this.adTag(); + string placementName = GetPlacementName(); bool available = false; - switch (this.SelectedAdType) { - case AdType.Interstitial: - available = HZInterstitialAd.IsAvailable(tag); - break; - case AdType.Video: - available = HZVideoAd.IsAvailable(tag); - break; - case AdType.Incentivized: - available = HZIncentivizedAd.IsAvailable(tag); - break; - case AdType.Banner: - // Not applicable - break; - case AdType.Offerwall: - available = HZOfferWallAd.IsAvailable(tag); - break; + switch (SelectedAdType) { + case AdType.Interstitial: + available = Interstitial.IsAvailable(placementName); + break; + case AdType.Rewarded: + available = Rewarded.IsAvailable(placementName); + break; + case AdType.Banner: + // Not applicable + break; } string availabilityMessage = available ? "available" : "not available"; - this.console.Append(this.SelectedAdType.ToString() + " with tag: " + tag + " is " + availabilityMessage); + console.Append(SelectedAdType.ToString() + " with placement: " + placementName + " is " + availabilityMessage); } public void ShowButton() { - string tag = this.adTag(); - - HZShowOptions showOptions = new HZShowOptions(); - showOptions.Tag = tag; - - HZIncentivizedShowOptions incentivizedOptions = new HZIncentivizedShowOptions(); - incentivizedOptions.Tag = tag; - incentivizedOptions.IncentivizedInfo = "test app incentivized info!"; - - HZBannerShowOptions bannerOptions = new HZBannerShowOptions(); - bannerOptions.Tag = tag; - bannerOptions.Position = this.bannerPosition; - - HZOfferWallShowOptions offerwallOptions = new HZOfferWallShowOptions(); - offerwallOptions.ShouldCloseAfterFirstClick = offerwallCloseOnFirstClickToggle.isOn; - offerwallOptions.Tag = tag; - - this.console.Append("Showing " + this.SelectedAdType.ToString() + " with tag: " + tag); - switch (this.SelectedAdType) { - case AdType.Interstitial: - HZInterstitialAd.ShowWithOptions(showOptions); - break; - case AdType.Video: - HZVideoAd.ShowWithOptions(showOptions); - break; - case AdType.Incentivized: - HZIncentivizedAd.ShowWithOptions(incentivizedOptions); - break; - case AdType.Banner: - HZBannerAd.ShowWithOptions(bannerOptions); - break; - case AdType.Offerwall: - HZOfferWallAd.ShowWithOptions(offerwallOptions); - break; + string placementName = GetPlacementName(); + if (placementName == "") { + console.Append("Cannot show without providing a valid placement name"); + } else { + ShowOptions showOptions = new ShowOptions + { + Placement = placementName + }; + + RewardedShowOptions rewardedOptions = new RewardedShowOptions + { + Placement = placementName, + RewardedInfo = "test app rewarded info!" + }; + + BannerShowOptions bannerOptions = new BannerShowOptions + { + Placement = placementName, + Position = bannerPosition + }; + + console.Append("Showing " + SelectedAdType.ToString() + " with placement: " + placementName); + switch (SelectedAdType) { + case AdType.Interstitial: + Interstitial.ShowWithOptions(showOptions); + break; + case AdType.Rewarded: + Rewarded.ShowWithOptions(rewardedOptions); + break; + case AdType.Banner: + Banner.ShowWithOptions(bannerOptions); + break; + } } } - public void FetchButton() { - string tag = this.adTag(); - this.console.Append("Fetching " + this.SelectedAdType.ToString() + " with tag: " + tag); - switch(this.SelectedAdType) { - case AdType.Interstitial: - HZInterstitialAd.Fetch(tag); - break; - case AdType.Video: - HZVideoAd.Fetch(tag); - break; - case AdType.Incentivized: - HZIncentivizedAd.Fetch(tag); - break; - case AdType.Offerwall: - HZOfferWallAd.Fetch(tag); - break; + public void RequestButton() { + string placementName = GetPlacementName(); + if (placementName == "") { + console.Append("Cannot request without providing a valid placement name"); + } else { + console.Append("Requesting " + SelectedAdType.ToString() + " with placement : " + placementName); + switch (SelectedAdType) { + case AdType.Interstitial: + Interstitial.Request(placementName); + break; + case AdType.Rewarded: + Rewarded.Request(placementName); + break; + } } } public void HideButton() { - if (this.SelectedAdType == AdType.Banner) { - this.console.Append("Hiding Banner"); - HZBannerAd.Hide(); + if (SelectedAdType == AdType.Banner) { + console.Append("Hiding Banner"); + Banner.Hide(); } } public void DestroyButton() { - if (this.SelectedAdType == AdType.Banner) { - this.console.Append("Destroying Banner"); - HZBannerAd.Destroy(); + if (SelectedAdType == AdType.Banner) { + console.Append("Destroying Banner"); + Banner.Destroy(); } } - public void RemoteDataButton() { - this.console.Append("Remote data: " + HeyzapAds.GetRemoteData()); - } - public void DebugLogSwitch(bool on) { if (on) { - this.console.Append("Enabling debug logging"); - HeyzapAds.ShowDebugLogs(); + console.Append("Enabling debug logging"); + FairBidSDK.ShowDebugLogs(); } else { - this.console.Append("Disabling debug logging"); - HeyzapAds.HideDebugLogs(); + console.Append("Disabling debug logging"); + FairBidSDK.HideDebugLogs(); } } - public void AcceptGdprButton() - { - this.console.Append("Accepting GDPR"); - HeyzapAds.SetGdprConsent(true); + public void AcceptGdprButton() { + console.Append("Accepting GDPR"); + FairBidSDK.SetGdprConsent(true); } - public void RejectGdprButton() - { - this.console.Append("Rejecting GDPR"); - HeyzapAds.SetGdprConsent(false); + public void RejectGdprButton() { + console.Append("Rejecting GDPR"); + FairBidSDK.SetGdprConsent(false); } - public void SetGdprDataA() - { - this.console.Append("Set GDPR Data A: "); + public void SetGdprDataA() { + console.Append("Set GDPR Data A: "); SetGdprData(GetGdprConsentDataA()); } - public void SetGdprDataB() - { - this.console.Append("Set GDPR Data B: "); + public void SetGdprDataB() { + console.Append("Set GDPR Data B: "); SetGdprData(GetGdprConsentDataB()); } - public void ClearGdprData() - { - this.console.Append("Clearing GDPR Data"); - HeyzapAds.ClearGdprConsentData(); + public void ClearGdprData() { + console.Append("Clearing GDPR Data"); + FairBidSDK.ClearGdprConsentData(); } - private void SetGdprData(Dictionary gdprConsentData) - { + private void SetGdprData(Dictionary gdprConsentData) { string gdprConsentDataAsString = gdprConsentData != null ? gdprConsentData.ToString() : "null"; - this.console.Append(gdprConsentDataAsString); - HeyzapAds.SetGdprConsentData(gdprConsentData); + console.Append(gdprConsentDataAsString); + FairBidSDK.SetGdprConsentData(gdprConsentData); } - private Dictionary GetGdprConsentDataA() - { - - // return default data a dicitonary + private Dictionary GetGdprConsentDataA() { var data = new Dictionary(); data["key_A1"] = "value_A1"; @@ -304,10 +244,7 @@ private Dictionary GetGdprConsentDataA() return data; } - private Dictionary GetGdprConsentDataB() - { - - // return default data a dicitonary + private Dictionary GetGdprConsentDataB() { var data = new Dictionary(); data["key_B1"] = "value_B1"; return data; @@ -315,56 +252,45 @@ private Dictionary GetGdprConsentDataB() public void BannerPositionTop(bool selected) { if (selected) { - this.bannerPosition = HZBannerShowOptions.POSITION_TOP; + bannerPosition = BannerShowOptions.POSITION_TOP; } } public void BannerPositionBottom(bool selected) { if (selected) { - this.bannerPosition = HZBannerShowOptions.POSITION_BOTTOM; + bannerPosition = BannerShowOptions.POSITION_BOTTOM; } } - public void VCSRequestButton() { - HZOfferWallAd.RequestDeltaOfCurrency(this.currencyId()); - } - - public void ShowMediationTest() { - this.console.Append("Showing mediation test suite"); - HeyzapAds.ShowMediationTestSuite(); + public void ShowTestSuite() { + console.Append("Showing Test Suite"); + FairBidSDK.ShowTestSuite(); } private void ShowAdTypeControls() { - if (this.SelectedAdType == AdType.Banner) { - this.bannerControls.SetActive(true); - this.standardControls.SetActive(false); - this.offerwallControls.SetActive(false); - } else if (this.SelectedAdType == AdType.Offerwall) { - this.bannerControls.SetActive(false); - this.offerwallControls.SetActive(true); - this.standardControls.SetActive(false); - } else { - this.bannerControls.SetActive(false); - this.offerwallControls.SetActive(false); - this.standardControls.SetActive(true); - } - } - - private string adTag() { - string tag = this.adTagTextField.text; - if (tag == null || tag.Trim().Length == 0) { - return "default"; + if (SelectedAdType == AdType.Banner) { + bannerControls.SetActive(true); + standardControls.SetActive(false); } else { - return tag; + bannerControls.SetActive(false); + standardControls.SetActive(true); } } - private string currencyId() { - string currencyId = this.offerwallCurrencyIdTextField.text; - if (currencyId == null || tag.Trim().Length == 0) { - return null; + private string GetPlacementName() { + string placementName = placementTextField.text; + if (placementName == null || placementName.Trim().Length == 0) { + switch (SelectedAdType) { + case AdType.Interstitial: + return "interstitial"; + case AdType.Rewarded: + return "rewarded"; + case AdType.Banner: + return "banner"; + } + return ""; } else { - return currencyId; + return placementName; } } } diff --git a/Assets/Scripts/ScrollingTextArea.cs b/Assets/Scripts/ScrollingTextArea.cs index 7505e1cf..20266754 100644 --- a/Assets/Scripts/ScrollingTextArea.cs +++ b/Assets/Scripts/ScrollingTextArea.cs @@ -15,7 +15,7 @@ public class ScrollingTextArea : MonoBehaviour { private GUIStyle consoleTextStyle; private GUIStyle consoleBackgroundStyle; void Start () { - consoleBackgroundTexture = new Texture2D(1,1); + consoleBackgroundTexture = new Texture2D(1, 1); for(var i = 0; i < consoleBackgroundTexture.width; i++) { for(var j = 0; j < consoleBackgroundTexture.height; j++) @@ -23,8 +23,10 @@ void Start () { consoleBackgroundTexture.SetPixel(i, j, new Color(0f, 0f, 0f, 0.7f)); } } - consoleTextStyle = new GUIStyle(); - consoleTextStyle.fontSize = 28; + consoleTextStyle = new GUIStyle + { + fontSize = 28 + }; consoleTextStyle.normal.textColor = Color.white; consoleTextStyle.richText = true; consoleBackgroundStyle = new GUIStyle(); diff --git a/Assets/Scripts/TestLocationService.cs b/Assets/Scripts/TestLocationService.cs index 8c6078fe..dac682cd 100644 --- a/Assets/Scripts/TestLocationService.cs +++ b/Assets/Scripts/TestLocationService.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; using System.Collections; -using Heyzap; +using FairBid; public class TestLocationService : MonoBehaviour { diff --git a/Assets/TestScene.unity b/Assets/TestScene.unity index c52dc4d6..98e801c0 100644 Binary files a/Assets/TestScene.unity and b/Assets/TestScene.unity differ diff --git a/Packages/manifest.json b/Packages/manifest.json index 1342d0a7..16819bf7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,10 +1,11 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "2.0.16", - "com.unity.package-manager-ui": "1.9.11", + "com.unity.ads": "2.3.1", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.3", "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.2.4", + "com.unity.textmeshpro": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index d94561e3..c9e0d496 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d2b73bfc..21b7a028 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 75a11587..1b2cd94c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.6f1 +m_EditorVersion: 2018.3.6f1 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index a33c1346..51f2389c 100644 Binary files a/ProjectSettings/UnityConnectSettings.asset and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 00000000..99af3a01 Binary files /dev/null and b/ProjectSettings/VFXManager.asset differ