com.azerion.bluestack 3.0.3 → 3.1.0-preview2

package/Runtime/API/NativeAd/NativeAdInteractionHandler.cs

@@ -7,176 +7,179 @@ using UnityEngine;
 
 namespace Azerion.BlueStack.API
 {
-	public class NativeAdInteractionHandler
-	{
-		private INativeAdClient _nativeAdClient;
-		private List<NativeAdObject> _nativeAdObjects;
-		
-		private INativeAdInteractionHandlerClient _nativeAdInteractionHandlerClient;
-		
-		// public NativeAdInteractionHandler(INativeAdInteractionHandlerClient interactionHandlerClient)
-
-		private string _clickUrl;
-		public NativeAdInteractionHandler(INativeAdClient nativeAdClient)
-		{
-			// _nativeAdInteractionHandlerClient = interactionHandlerClient;
-			_nativeAdObjects = new List<NativeAdObject>();
-			_nativeAdClient = nativeAdClient;
-		}
-
-		public bool RegisterImageGameObjects(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Image);
-		}
-
-		public bool RegisterIconImageGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Icon, true);
-		}
-
-		public bool RegisterAdChoicesLogoGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.AdChoices);
-		}
-
-		public bool RegisterHeadlineTextGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Headline, true);
-		}
-
-		public bool RegisterBodyTextGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Body);
-		}
-
-		public bool RegisterCallToActionGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.CallToAction, true, true);
-		}
-
-		public bool RegisterAdvertiserTextGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Advertiser, true);
-		}
-
-		public bool RegisterPriceGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Price);
-		}
-
-		public bool RegisterStoreGameObject(GameObject gameObject)
-		{
-			return RegisterGameObject(gameObject, NativeAssetID.Store);
-		}
-
-		private bool RegisterGameObject(GameObject adObject, NativeAssetID assetID, bool isImpressive = false, bool isClickable = false)
-		{
-			return Register(adObject, assetID.Value, isImpressive, isClickable); // replace with GetAssetIDMappings
-		}
-
-		private bool Register(GameObject adObject, string assetID, bool isImpressive, bool isClickable)
-		{
-			NativeAdObject nativeAdObject = adObject.GetComponent<NativeAdObject>();
-			if (nativeAdObject != null)
-			{
-				UnityEngine.Object.DestroyImmediate(nativeAdObject);
-			}
-
-			nativeAdObject = adObject.AddComponent<NativeAdObject>();
-			_nativeAdObjects.Add(nativeAdObject);
-			nativeAdObject.OnAdDisplay += RecordImpression;
-			nativeAdObject.OnAdClick += RecordClick;
-			try
-			{
-				nativeAdObject.Initialize(assetID, isImpressive, isClickable);
-			}
-			catch (InvalidOperationException ex)
-			{
-				// Debug.LogWarning("Failed to Register " + assetID + " :" + ex.Message);
-				UnityEngine.Object.Destroy(nativeAdObject);
-				_nativeAdObjects.Remove(nativeAdObject);
-				return false;
-			}
-
-			return true;
-		}
-
-		private bool impressionComplete = false;
-		private bool clickComplete = false;
-
-		internal void SetClickUrl(string url)
-		{
-			_clickUrl = url;
-		}
-		
-		// Handle Ad Impression - Incomplete
-		private void RecordImpression(object sender, EventArgs eventArgs)
-		{
-			List<string> requiredAssets = NativeAssetInfo.RequiredAssets;
-			var successfulImpressiveAssets = _nativeAdObjects.Where(obj => requiredAssets.Contains(obj.ObjectTag) && obj.HasMadeImpression).Select(obj => obj.ObjectTag);
-			impressionComplete = requiredAssets.All(tag => successfulImpressiveAssets.Contains(tag));
-			// Debug.LogWarning("Is Impression check successful: " + impressionComplete);
-
-			if(!impressionComplete) return;
-				
-			if (sender is NativeAdObject nativeAdObject)
-			{
-				_nativeAdClient.OnNativeAdImpression += (sender, args) =>
-				{
-					// Debug.LogWarning("InteractionHandlerClient: OnNativeAdImpression!");
-					foreach (NativeAdObject adObject in _nativeAdObjects)
-					{
-						if (adObject != null)
-						{
-							AdsEventExecutor.ExecuteInUpdate(delegate { adObject.StopImpressionCheck(); });
-						}
-					}
-				};
-				_nativeAdClient.RecordImpression();
-
-				// if (_nativeAdInteractionHandlerClient.RecordImpression(NativeAdInteractionUtils.CreateImpressionSignal(nativeAdObject, _nativeAdObjects)))
-				// {
-				// 	foreach (NativeAdObject adObject in _nativeAdObjects)
-				// 	{
-				// 	}
-				// }
-			}
-		}
-		
-		// Handle Ad Clicked - Incomplete
-		private void RecordClick(object sender, ClickEventArgs clickEventArgs)
-		{
-			// clickComplete = true;
-			Debug.Log("Record Click!");
-			// Debug.Log("Record Click: " + NativeAdInteractionUtils.BuildVersionString(NativeUtils.Version));
-
-			if (sender is NativeAdObject nativeAdObject)
-			{
-				_nativeAdClient.OnNativeAdClicked += (sender, args) =>
-				{
-					// OpenURL();
-					Debug.LogWarning("InteractionHandlerClient: OnNativeAdClicked!");
-				};
-				_nativeAdClient.PerformClick();
-
-				// Dictionary<string, string> touchEventSignal =
-				// NativeAdInteractionUtils.CreateTouchEventSignal(clickEventArgs.startClick, clickEventArgs.endClick);
-				// Dictionary<string, object> clickSignal = 
-				// NativeAdInteractionUtils.CreateClickSignal(nativeAdObject, _nativeAdObjects, clickEventArgs.startClick, clickEventArgs.endClick);
-				// 	
-				// // _nativeAdInteractionHandlerClient.ReportTouchEvent(touchEventSignal);
-				// Debug.LogWarning("InteractionHandlerClient: ReportTouchEvent!");
-				// // _nativeAdInteractionHandlerClient.PerformClick(clickSignal);
-				// Debug.LogWarning("InteractionHandlerClient: PerformClick!");
-				// OpenURL();
-			}
-		}
-		
-		public void OpenURL()
-		{
-			Debug.Log("Opened URL");
-			Application.OpenURL(_clickUrl);
-		}
-
-	}
-}
+    public class NativeAdInteractionHandler
+    {
+        private INativeAdClient _nativeAdClient;
+        private List<NativeAdObject> _nativeAdObjects;
+
+        private INativeAdInteractionHandlerClient _nativeAdInteractionHandlerClient;
+
+        // public NativeAdInteractionHandler(INativeAdInteractionHandlerClient interactionHandlerClient)
+
+        private string _clickUrl;
+
+        public NativeAdInteractionHandler(INativeAdClient nativeAdClient)
+        {
+            // _nativeAdInteractionHandlerClient = interactionHandlerClient;
+            _nativeAdObjects = new List<NativeAdObject>();
+            _nativeAdClient = nativeAdClient;
+        }
+
+        public bool RegisterImageGameObjects(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Image);
+        }
+
+        public bool RegisterIconImageGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Icon, true);
+        }
+
+        public bool RegisterAdChoicesLogoGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.AdChoices);
+        }
+
+        public bool RegisterHeadlineTextGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Headline, true);
+        }
+
+        public bool RegisterBodyTextGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Body);
+        }
+
+        public bool RegisterCallToActionGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.CallToAction, true, true);
+        }
+
+        public bool RegisterAdvertiserTextGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Advertiser, true);
+        }
+
+        public bool RegisterPriceGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Price);
+        }
+
+        public bool RegisterStoreGameObject(GameObject gameObject)
+        {
+            return RegisterGameObject(gameObject, NativeAssetID.Store);
+        }
+
+        private bool RegisterGameObject(GameObject adObject, NativeAssetID assetID, bool isImpressive = false,
+            bool isClickable = false)
+        {
+            return Register(adObject, assetID.Value, isImpressive, isClickable); // replace with GetAssetIDMappings
+        }
+
+        private bool Register(GameObject adObject, string assetID, bool isImpressive, bool isClickable)
+        {
+            NativeAdObject nativeAdObject = adObject.GetComponent<NativeAdObject>();
+            if (nativeAdObject != null)
+            {
+                UnityEngine.Object.DestroyImmediate(nativeAdObject);
+            }
+
+            nativeAdObject = adObject.AddComponent<NativeAdObject>();
+            _nativeAdObjects.Add(nativeAdObject);
+            nativeAdObject.OnAdDisplay += RecordImpression;
+            nativeAdObject.OnAdClick += RecordClick;
+            try
+            {
+                nativeAdObject.Initialize(assetID, isImpressive, isClickable);
+            }
+            catch (InvalidOperationException ex)
+            {
+                // Debug.LogWarning("Failed to Register " + assetID + " :" + ex.Message);
+                UnityEngine.Object.Destroy(nativeAdObject);
+                _nativeAdObjects.Remove(nativeAdObject);
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool impressionComplete = false;
+        private bool clickComplete = false;
+
+        internal void SetClickUrl(string url)
+        {
+            _clickUrl = url;
+        }
+
+        // Handle Ad Impression - Incomplete
+        private void RecordImpression(object sender, EventArgs eventArgs)
+        {
+            List<string> requiredAssets = NativeAssetInfo.RequiredAssets;
+            var successfulImpressiveAssets = _nativeAdObjects
+                .Where(obj => requiredAssets.Contains(obj.ObjectTag) && obj.HasMadeImpression)
+                .Select(obj => obj.ObjectTag);
+            impressionComplete = requiredAssets.All(tag => successfulImpressiveAssets.Contains(tag));
+            // Debug.LogWarning("Is Impression check successful: " + impressionComplete);
+
+            if (!impressionComplete) return;
+
+            if (sender is NativeAdObject nativeAdObject)
+            {
+                _nativeAdClient.OnNativeAdImpression += (sender, args) =>
+                {
+                    // Debug.LogWarning("InteractionHandlerClient: OnNativeAdImpression!");
+                    foreach (NativeAdObject adObject in _nativeAdObjects)
+                    {
+                        if (adObject != null)
+                        {
+                            AdsEventExecutor.ExecuteInUpdate(delegate { adObject.StopImpressionCheck(); });
+                        }
+                    }
+                };
+                _nativeAdClient.RecordImpression();
+
+                // if (_nativeAdInteractionHandlerClient.RecordImpression(NativeAdInteractionUtils.CreateImpressionSignal(nativeAdObject, _nativeAdObjects)))
+                // {
+                // 	foreach (NativeAdObject adObject in _nativeAdObjects)
+                // 	{
+                // 	}
+                // }
+            }
+        }
+
+        // Handle Ad Clicked - Incomplete
+        private void RecordClick(object sender, ClickEventArgs clickEventArgs)
+        {
+            // clickComplete = true;
+            Debug.Log("Record Click!");
+            // Debug.Log("Record Click: " + NativeAdInteractionUtils.BuildVersionString(NativeUtils.Version));
+
+            if (sender is NativeAdObject nativeAdObject)
+            {
+                _nativeAdClient.OnNativeAdClicked += (sender, args) =>
+                {
+                    // OpenURL();
+                    Debug.LogWarning("InteractionHandlerClient: OnNativeAdClicked!");
+                };
+                _nativeAdClient.PerformClick();
+
+                // Dictionary<string, string> touchEventSignal =
+                // NativeAdInteractionUtils.CreateTouchEventSignal(clickEventArgs.startClick, clickEventArgs.endClick);
+                // Dictionary<string, object> clickSignal = 
+                // NativeAdInteractionUtils.CreateClickSignal(nativeAdObject, _nativeAdObjects, clickEventArgs.startClick, clickEventArgs.endClick);
+                // 	
+                // // _nativeAdInteractionHandlerClient.ReportTouchEvent(touchEventSignal);
+                // Debug.LogWarning("InteractionHandlerClient: ReportTouchEvent!");
+                // // _nativeAdInteractionHandlerClient.PerformClick(clickSignal);
+                // Debug.LogWarning("InteractionHandlerClient: PerformClick!");
+                // OpenURL();
+            }
+        }
+
+        public void OpenURL()
+        {
+            Debug.Log("Opened URL");
+            Application.OpenURL(_clickUrl);
+        }
+    }
+}

package/Runtime/API/NativeAd/NativeAdLoader.cs

@@ -13,26 +13,23 @@ namespace Azerion.BlueStack.API
     {
         private IAdLoaderClient _adLoaderClient;
         public event EventHandler<BlueStackError> OnNativeAdFailedToLoad;
-        public event EventHandler<NativeAdEventArgs> OnNativeAdLoaded; 
+        public event EventHandler<NativeAdEventArgs> OnNativeAdLoaded;
 
         internal bool IsAdLoaded;
         internal GameObject AdGameObject;
         private NativeAd _nativeAd;
-            
+
         public NativeAdLoader(string adUnitId)
         {
-            AdUnitId = adUnitId; 
-             
+            AdUnitId = adUnitId;
+
             NativeUtils.CheckInitialization();
-            
+
             _nativeAd = new NativeAd(AdUnitId);
-            
-            _nativeAd.OnNativeAdDidFail += (sender, args) =>
-            {
-                OnNativeAdFailedToLoad?.Invoke(this, args);
-            };
-            
-            _nativeAd.OnNativeAdDidLoad +=(_sender, _args) =>
+
+            _nativeAd.OnNativeAdDidFail += (sender, args) => { OnNativeAdFailedToLoad?.Invoke(this, args); };
+
+            _nativeAd.OnNativeAdDidLoad += (_sender, _args) =>
             {
                 NativeAdEventArgs nativeAdEventArgs = new NativeAdEventArgs
                 {
@@ -47,10 +44,9 @@ namespace Azerion.BlueStack.API
         public HashSet<NativeAdType> AdTypes { get; private set; }
         public HashSet<string> FormatIds { get; private set; }
         internal int NumberOfAdsToLoad { get; private set; }
-    
+
         public void Load() => this._nativeAd.Load();
         public void Load(Preference preference) => this._nativeAd.Load(preference);
         public void Destroy() => this._nativeAd.Destroy();
     }
-
 }