From 5672a11c1c43ca844355b85bc032b595e40a5b8d Mon Sep 17 00:00:00 2001 From: Dzmitry Paplauski Date: Thu, 24 Oct 2024 11:41:43 +0200 Subject: [PATCH] add missing banner methods implementations, set bridge methods private modifier --- .../ADs/Banner/BannerRequestiOSUnityBridge.cs | 8 +++---- .../InterstitialRequestiOSUnityBridge.cs | 6 ++--- .../Rewarded/RewardedRequestiOSUnityBridge.cs | 6 ++--- .../Platforms/IOS/BidMachineiOSUnityBridge.cs | 24 +++++++++---------- .../Platforms/IOS/Error/iOSErrorBridge.cs | 6 ++--- .../iOS/Ads/Banner/BidMachine+BannerAPI.swift | 18 ++++++++++++++ 6 files changed, 43 insertions(+), 25 deletions(-) diff --git a/Assets/BidMachine/Platforms/IOS/ADs/Banner/BannerRequestiOSUnityBridge.cs b/Assets/BidMachine/Platforms/IOS/ADs/Banner/BannerRequestiOSUnityBridge.cs index a2a1208..8536803 100644 --- a/Assets/BidMachine/Platforms/IOS/ADs/Banner/BannerRequestiOSUnityBridge.cs +++ b/Assets/BidMachine/Platforms/IOS/ADs/Banner/BannerRequestiOSUnityBridge.cs @@ -9,16 +9,16 @@ namespace BidMachineAds.Unity.iOS { public class BannerRequestiOSUnityBridge : MonoBehaviour, IiOSAdRequestBridge { [DllImport("__Internal")] - public static extern IntPtr BidMachineBannerGetAuctionResultUnmanagedPointer(); + private static extern IntPtr BidMachineBannerGetAuctionResultUnmanagedPointer(); [DllImport("__Internal")] - public static extern bool BidMachineBannerIsExpired(); + private static extern bool BidMachineBannerIsExpired(); [DllImport("__Internal")] - public static extern bool BidMachineBannerIsDestroyed(); + private static extern bool BidMachineBannerIsDestroyed(); [DllImport("__Internal")] - public static extern int BidMachineBannerGetSize(); + private static extern int BidMachineBannerGetSize(); public string GetAuctionResult() { diff --git a/Assets/BidMachine/Platforms/IOS/ADs/Interstitial/InterstitialRequestiOSUnityBridge.cs b/Assets/BidMachine/Platforms/IOS/ADs/Interstitial/InterstitialRequestiOSUnityBridge.cs index 98d9366..ba862a4 100644 --- a/Assets/BidMachine/Platforms/IOS/ADs/Interstitial/InterstitialRequestiOSUnityBridge.cs +++ b/Assets/BidMachine/Platforms/IOS/ADs/Interstitial/InterstitialRequestiOSUnityBridge.cs @@ -7,13 +7,13 @@ namespace BidMachineAds.Unity.iOS { public class InterstitialRequestiOSUnityBridge : MonoBehaviour, IiOSAdRequestBridge { [DllImport("__Internal")] - public static extern IntPtr BidMachineInterstitialGetAuctionResultUnmanagedPointer(); + private static extern IntPtr BidMachineInterstitialGetAuctionResultUnmanagedPointer(); [DllImport("__Internal")] - public static extern bool BidMachineInterstitialIsExpired(); + private static extern bool BidMachineInterstitialIsExpired(); [DllImport("__Internal")] - public static extern bool BidMachineInterstitialIsDestroyed(); + private static extern bool BidMachineInterstitialIsDestroyed(); public string GetAuctionResult() { diff --git a/Assets/BidMachine/Platforms/IOS/ADs/Rewarded/RewardedRequestiOSUnityBridge.cs b/Assets/BidMachine/Platforms/IOS/ADs/Rewarded/RewardedRequestiOSUnityBridge.cs index ad5c22f..d8a1c2f 100644 --- a/Assets/BidMachine/Platforms/IOS/ADs/Rewarded/RewardedRequestiOSUnityBridge.cs +++ b/Assets/BidMachine/Platforms/IOS/ADs/Rewarded/RewardedRequestiOSUnityBridge.cs @@ -7,13 +7,13 @@ namespace BidMachineAds.Unity.iOS { public class RewardedRequestiOSUnityBridge : MonoBehaviour, IiOSAdRequestBridge { [DllImport("__Internal")] - public static extern IntPtr BidMachineRewardedGetAuctionResultUnmanagedPointer(); + private static extern IntPtr BidMachineRewardedGetAuctionResultUnmanagedPointer(); [DllImport("__Internal")] - public static extern bool BidMachineRewardedIsExpired(); + private static extern bool BidMachineRewardedIsExpired(); [DllImport("__Internal")] - public static extern bool BidMachineRewardedIsDestroyed(); + private static extern bool BidMachineRewardedIsDestroyed(); public string GetAuctionResult() { diff --git a/Assets/BidMachine/Platforms/IOS/BidMachineiOSUnityBridge.cs b/Assets/BidMachine/Platforms/IOS/BidMachineiOSUnityBridge.cs index d9706f5..34be52e 100644 --- a/Assets/BidMachine/Platforms/IOS/BidMachineiOSUnityBridge.cs +++ b/Assets/BidMachine/Platforms/IOS/BidMachineiOSUnityBridge.cs @@ -5,40 +5,40 @@ public class BidMachineiOSUnityBridge : MonoBehaviour { [DllImport("__Internal")] - public static extern void BidMachineInitialize(string sellerId); + private static extern void BidMachineInitialize(string sellerId); [DllImport("__Internal")] - public static extern bool BidMachineIsInitialized(); + private static extern bool BidMachineIsInitialized(); [DllImport("__Internal")] - public static extern void BidMachineSetEndpoint(string url); + private static extern void BidMachineSetEndpoint(string url); [DllImport("__Internal")] - public static extern void BidMachineSetLoggingEnabled(bool logging); + private static extern void BidMachineSetLoggingEnabled(bool logging); [DllImport("__Internal")] - public static extern void BidMachineSetTestEnabled(bool test); + private static extern void BidMachineSetTestEnabled(bool test); [DllImport("__Internal")] - public static extern void BidMachineSetTargetingParams(string jsonString); + private static extern void BidMachineSetTargetingParams(string jsonString); [DllImport("__Internal")] - public static extern void BidMachineSetConsentConfig(string consentConfig, bool consent); + private static extern void BidMachineSetConsentConfig(string consentConfig, bool consent); [DllImport("__Internal")] - public static extern void BidMachineSetSubjectToGDPR(bool flag); + private static extern void BidMachineSetSubjectToGDPR(bool flag); [DllImport("__Internal")] - public static extern void BidMachineSetCoppa(bool coppa); + private static extern void BidMachineSetCoppa(bool coppa); [DllImport("__Internal")] - public static extern void BidMachineSetUSPrivacyString(string usPrivacyString); + private static extern void BidMachineSetUSPrivacyString(string usPrivacyString); [DllImport("__Internal")] - public static extern void BidMachineSetGPP(string gppString, int[] gppIds, int length); + private static extern void BidMachineSetGPP(string gppString, int[] gppIds, int length); [DllImport("__Internal")] - public static extern void BidMachineSetPublisher(string jsonString); + private static extern void BidMachineSetPublisher(string jsonString); public void Initialize(string sellerId) { diff --git a/Assets/BidMachine/Platforms/IOS/Error/iOSErrorBridge.cs b/Assets/BidMachine/Platforms/IOS/Error/iOSErrorBridge.cs index 76c2066..24b0d51 100644 --- a/Assets/BidMachine/Platforms/IOS/Error/iOSErrorBridge.cs +++ b/Assets/BidMachine/Platforms/IOS/Error/iOSErrorBridge.cs @@ -7,13 +7,13 @@ namespace BidMachineAds.Unity.iOS public class iOSErrorBridge { [DllImport("__Internal")] - public static extern int BidMachineGetErrorCode(IntPtr error); + private static extern int BidMachineGetErrorCode(IntPtr error); [DllImport("__Internal")] - public static extern IntPtr BidMachineGetErrorMessageUnmanagedPointer(IntPtr error); + private static extern IntPtr BidMachineGetErrorMessageUnmanagedPointer(IntPtr error); [DllImport("__Internal")] - public static extern IntPtr BidMachineGetErrorBriefUnmanagedPointer(IntPtr error); + private static extern IntPtr BidMachineGetErrorBriefUnmanagedPointer(IntPtr error); public static int GetErrorCode(IntPtr error) { diff --git a/Assets/Plugins/iOS/Ads/Banner/BidMachine+BannerAPI.swift b/Assets/Plugins/iOS/Ads/Banner/BidMachine+BannerAPI.swift index 8e98a2b..7b9a579 100644 --- a/Assets/Plugins/iOS/Ads/Banner/BidMachine+BannerAPI.swift +++ b/Assets/Plugins/iOS/Ads/Banner/BidMachine+BannerAPI.swift @@ -165,6 +165,24 @@ public func setBannerRequestCallbacks( ) } +// MARK: - Request + +@_cdecl("BidMachineBannerIsDestroyed") +public func bannerIsDestroyed() -> Bool { + iOSUnityBridge.bannerBridge.isDestroyed +} + +@_cdecl("BidMachineBannerIsExpired") +public func bannerIsExpired() -> Bool { + iOSUnityBridge.bannerBridge.isExpired +} + +@_cdecl("BidMachineBannerGetAuctionResultUnmanagedPointer") +public func bannerAuctionResult() -> UnsafeMutablePointer? { + let result = iOSUnityBridge.bannerBridge.auctionResult ?? "unknown" + return result.utf8UnmanagedPtrCopy +} + private extension BannerAdBridge.BannerSize { var placementFormat: PlacementFormat { switch self {