com.amanotes.gdk 0.2.36 → 0.2.38

package/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## [0.2.38 - 2023-11-22]
+- Improve Ads API
+- Add Ad Quality
+
+## [0.2.37 - 2023-11-21]
+- Improve GDK logs
+- Banner will not show when ad adapter is not ready
+- Fix ama_device_id on Android
+
 ## [0.2.36 - 2023-11-15]
 - Add OnAdShowReadyStatus callback
-- Revive AdEventTracking
+- Revamp AdEventTracking
 
 ## [0.2.35 - 2023-11-14]
 - [Fix] Save UserID

package/Runtime/AmaGDK.Ads.cs

@@ -69,11 +69,23 @@ namespace Amanotes.Core
         public static IAdCallback OnAdResult(this IAdCallback ad, Action<bool> callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
-            Ads.context.onResult -= callback;
-            Ads.context.onResult += callback;
+            Ads.context.onAdResult -= callback;
+            Ads.context.onAdResult += callback;
             return ad;
         }
-
+        
+        /// <summary>
+        /// Call right before the ad actually open (that means Ad has already been cached & available to show).
+        /// This callback will not be triggered in case Ad is not available or no internet
+        /// </summary>
+        public static IAdCallback OnBeforeAdOpen(this IAdCallback ad, Action callback)
+        {
+            if (!MakeSureAdNotNull(ad)) return null;
+            Ads.context.onBeforeAdOpen -= callback;
+            Ads.context.onBeforeAdOpen += callback;
+            return ad;
+        }
+        
         private static bool MakeSureAdNotNull(IAdCallback ad)
         {
             bool isValid = (ad != null);
@@ -165,6 +177,8 @@ namespace Amanotes.Core
             internal static float _savedTimeScale = -1;
             
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
+            
+            public static AdAdapterConfig adConfig => _adConfig;
         }
 
         public partial class Ads // Public
@@ -175,6 +189,12 @@ namespace Amanotes.Core
                 _adConfig = ((AdapterContext)_adapter)?.GetAdapterConfig<AdAdapterConfig>();
                 _adapter?.interstitial.StartLoadAd();
                 _adapter?.rewardVideo.StartLoadAd();
+
+                if (_isBannerShowing)
+                {
+                    _isBannerShowing = false;
+                    ShowBanner(_showingBannerPosition);
+                }
             }
 
             public static bool HasInterstitial => _adapter.interstitial.hasAd;
@@ -245,19 +265,28 @@ namespace Amanotes.Core
             }
             
             private static bool _isBannerShowing;
+            private static BannerPosition? _showingBannerPosition = null;
+            
             public static void ShowBanner(BannerPosition? bannerPosition = null)
             {
                 if (_isBannerShowing) return;
                 _isBannerShowing = true;
-
-                if (bannerPosition.HasValue)
+                _showingBannerPosition = bannerPosition;
+                
+                if (_adapter == null)
                 {
-                    _adapter.ShowBanner(bannerPosition.Value);
+                    //Debug.LogWarning("Adapter not found???");
+                    return;
                 }
-                else
+
+                if (_adConfig == null)
                 {
-                    _adapter.ShowBanner(_adConfig.bannerPosition);
+                    //Debug.LogWarning("_adConfig not found???");
+                    return;
                 }
+
+                _showingBannerPosition = bannerPosition ?? _adConfig.bannerPosition;
+                _adapter.ShowBanner(_showingBannerPosition.Value);
             }
 
             public static void HideBanner()
@@ -277,7 +306,22 @@ namespace Amanotes.Core
                 else
                     _adapter.rewardVideo.StopShowAd();
             }
-
+            
+            /// <summary>
+            /// Capping for interstitial ad
+            /// - Time since last interstitial show success > interstitialCappingTime
+            /// - Time since last rewardedVideo show success > rewardVideoCappingTime (for interstitial)
+            /// </summary>
+            /// <param name="interstitialCappingTime"></param>
+            /// <param name="rewardedVideoCappingTime"></param>
+            /// <returns></returns>
+            public static bool IsCapped(float interstitialCappingTime = 0, float rewardedVideoCappingTime = 0)
+            {
+                bool interCapped = (interstitialCappingTime > 0) && TimeSinceLastInterstitialSucceed < interstitialCappingTime;
+                bool rewardCapped = (rewardedVideoCappingTime > 0) && TimeSinceLastVideoRewardSucceed < rewardedVideoCappingTime;
+                return interCapped || rewardCapped;
+            }
+            
             public static int TimeSinceLastInterstitialSucceed => localData.TimeSinceLastShowSuccess(AdType.Interstitial);
             public static int TimeSinceLastVideoRewardSucceed => localData.TimeSinceLastShowSuccess(AdType.VideoReward);
             public static int TimeSinceLastAdSucceed => Math.Min(TimeSinceLastInterstitialSucceed, TimeSinceLastVideoRewardSucceed) ;
@@ -373,6 +417,7 @@ namespace Amanotes.Core.Internal
         public readonly Dictionary<string, object> userData;
         public AdCallback adCallback;
         
+        internal Action onBeforeAdOpen;
         internal Action onOpened;
         internal Action onRewardReceived;
         internal Action onClicked;
@@ -380,7 +425,7 @@ namespace Amanotes.Core.Internal
         internal Action onShowFailed;
         internal Action onClosed;
         internal Action<AdShowReadyStatus> onAdShowReadyStatus;
-        internal Action<bool> onResult;
+        internal Action<bool> onAdResult;
 
         // Stats
         public float showCallAt;
@@ -623,8 +668,8 @@ namespace Amanotes.Core.Internal
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.None);
             
-            ShowAd();
             HandleBeforeAdShow();
+            ShowAd();
             
             ShowAdContext context = Ads.context;
             while (!context.potentiallyCompleted)
@@ -679,7 +724,7 @@ namespace Amanotes.Core.Internal
             
             // Extra callback
             Ads.context.showFinishAt = Time.realtimeSinceStartup;
-            Ads.context.onResult?.Invoke(isSuccess);
+            Ads.context.onAdResult?.Invoke(isSuccess);
             
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -725,6 +770,7 @@ namespace Amanotes.Core.Internal
                 Time.timeScale = 0;
             }
             
+            Ads.context.onBeforeAdOpen?.Invoke();
             Ads._adapter.HandleBeforeAdShow();
         }
         

package/Runtime/AmaGDK.Analytics.cs

@@ -289,7 +289,7 @@ namespace Amanotes.Core
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     if (common.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-                    if (showAnalyticsLog) Debug.Log($"AmaGDK | Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                    if (showAnalyticsLog) Debug.Log($"AmaGDK | [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
                     
                     common.quality.CheckEventQuality(eventData.eventName, eventData.parameters);
 
@@ -721,7 +721,7 @@ namespace Amanotes.Core
 
         private static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
         {
-            string eventName = (ap as EventParams).eventName;
+            string eventName = (ap as EventParams)?.eventName;
             if (string.IsNullOrWhiteSpace(key))
             {
                 LogWarning($"Param key is empty. Event name: {eventName}!");
@@ -729,7 +729,7 @@ namespace Amanotes.Core
             }
             if (value == null)
             {
-                LogWarning($"Param value is null. Event name: {eventName}!");
+                LogWarning($"Param value of key <{key}> is null. Event name: {eventName}!");
                 return false;
             }
 

package/Runtime/AmaGDK.UserProfile.cs

@@ -72,11 +72,23 @@ namespace Amanotes.Core
                 set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
             
+            #if UNITY_IOS
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
                 set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
             }
+            #endif
+            
+            #if UNITY_ANDROID
+            public string AmaDeviceId
+            {
+                get => _amaDeviceId;
+                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
+            }
+            #endif
+            
+            
             
             public string AppsFlyerId
             {
@@ -132,7 +144,7 @@ namespace Amanotes.Core
                     yield return waitForDuration;
                     time += WAIT_TIME;
                     if (time <= TIME_OUT) continue;
-                    Logging.LogWarning($"User init time out: {TIME_OUT}");
+                    Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
                     break;
                 }
             }

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.36";
+        public const string VERSION = "0.2.38";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.36",
+    "version": "0.2.38",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",