com.amanotes.gdk 0.2.36 → 0.2.37

package/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## [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

@@ -175,6 +175,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 +251,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()

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.37";
 
         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.37",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",