com.amanotes.gdk 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.2.9 - 2023-06-15]
+### Show total init time
+### Show adapter version + status at init time
+### Remove AmaGDK version in debug log
+### Remove "Params" in analytics debug log
+### Check "event_name" early
+### Fix null exception in AmaGDKInstaller
+### Add csc.rsp to enable AMAGDK_DEV
+### Update Ads module
+
+## [0.2.8 - 2023-06-12]
+### Mute Appsflyer's init log on Editor
+### Clear analytics log in adapters
+### Check null event params before calling AddParam()
+### Export AmaPassport info
+
 ## [0.2.7 - 2023-06-09]
 ### Fix log single adapter
 

package/Runtime/AmaGDK.Ads.cs

@@ -134,8 +134,10 @@ namespace Amanotes.Core
                 _adapter?.rewardVideo.StartLoadAd();
             }
 
-            public static bool HasInterstitial => _adapter.interstitial.hasAd;
-            public static bool HasRewardedVideo => _adapter.rewardVideo.hasAd;
+            public static bool hasInterstitial => _adapter.interstitial.hasAd;
+            public static bool hasRewardedVideo => _adapter.rewardVideo.hasAd;
+            public static bool showingBanner => _showingBanner;
+            public static bool showingAd => context != null;
 
             public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
             {
@@ -272,13 +274,14 @@ namespace Amanotes.Core.Internal
             this.userData = userData;
             this.placementName = placementName;
             adCallback = AdCallback.None;
-            showCallAt = Time.time;
+            showCallAt = Time.realtimeSinceStartup;
             showFinishAt = 0;
         }
 
         public bool hasError => (adCallback & (AdCallback.Fail | AdCallback.Cancel)) != 0;
-        public bool hasCompleted => (adCallback & (AdCallback.Close | AdCallback.Reward | AdCallback.Cancel)) != 0;
+        public bool potentiallyCompleted => (adCallback & (AdCallback.Close | AdCallback.Reward | AdCallback.Cancel)) != 0;
         public bool hasReward => (adCallback & AdCallback.Reward) != 0;
+        public bool hasClosed => (adCallback & AdCallback.Close) != 0;
         public bool hasCancel => (adCallback & AdCallback.Cancel) != 0;
         public bool hasClicked => (adCallback & AdCallback.Click) != 0;
     }
@@ -374,7 +377,7 @@ namespace Amanotes.Core.Internal
         internal ShowAdsState _showState = ShowAdsState.None;
         private Coroutine _showAdRoutine;
         private bool _isRequesting;
-        internal bool isInterstitial => Ads.context.adType == AdType.Interstitial;
+        private bool _isInterstitial => adType == AdType.Interstitial;
 
         public void StartShowAd()
         {
@@ -429,7 +432,9 @@ namespace Amanotes.Core.Internal
 
                 if (!isAdReady)
                 {
+                    Ads.Events.OnShowTimeout?.Invoke();
                     _showState = ShowAdsState.ShowFail;
+                    ShowAdRoutineCompleted(false);
                     yield break;
                 }
             }
@@ -443,7 +448,8 @@ namespace Amanotes.Core.Internal
             }
 
             var context = Ads.context;
-            while (!context.hasCompleted)
+
+            while (!context.potentiallyCompleted)
             {
                 yield return wait1Sec;
             }
@@ -451,31 +457,49 @@ namespace Amanotes.Core.Internal
             if (adType == AdType.Interstitial)
             {
                 _showState = context.hasError ? ShowAdsState.ShowFail : ShowAdsState.ShowSuccess;
-                ShowCompleted(_showState == ShowAdsState.ShowSuccess);
+                ShowAdRoutineCompleted(_showState == ShowAdsState.ShowSuccess);
+                yield break;
+            }
+
+            if (context.hasCancel)
+            {
+                yield return wait1Sec; // wait for close (1s)
+                _showState = ShowAdsState.ShowFail;
+                ShowAdRoutineCompleted(false);
+                yield break;
+            }
+
+            if (context.hasClosed)
+            {
+                while (!context.hasCancel && !context.hasReward)
+                {
+                    yield return wait1Sec;
+                }
+
+                _showState = context.hasCancel ? ShowAdsState.ShowFail : ShowAdsState.ShowSuccess;
+                ShowAdRoutineCompleted(_showState == ShowAdsState.ShowSuccess);
                 yield break;
             }
 
-            // Should be rewardedVideo
-            if (!context.hasReward && !context.hasCancel) // no reward & no cancel: wait for the delayed reward callback
+            while (!context.hasClosed)
             {
                 yield return wait1Sec;
             }
 
-            _showState = context.hasError ? ShowAdsState.ShowFail : ShowAdsState.ShowSuccess;
-            ShowCompleted(_showState == ShowAdsState.ShowSuccess);
+            _showState = ShowAdsState.ShowSuccess;
+            ShowAdRoutineCompleted(true);
+
+            Ads.context = null;
+            _showState = ShowAdsState.None;
         }
 
-        private void ShowCompleted(bool isSuccess)
+        private void ShowAdRoutineCompleted(bool isSuccess)
         {
-            bool isInterstitial = adType == AdType.Interstitial;
-            var adapter = Ads._adapter;
-            if (isInterstitial)
-                adapter.interstitial.StartLoadAd();
-            else
-                adapter.rewardVideo.StartLoadAd();
+            StartLoadAd();
+            Ads.context.showFinishAt = Time.realtimeSinceStartup;
 
             var localData = Ads.localData;
-            var stat = isInterstitial ? localData.interstitial : localData.reward;
+            var stat = _isInterstitial ? localData.interstitial : localData.reward;
 
             if (isSuccess)
             {
@@ -490,7 +514,6 @@ namespace Amanotes.Core.Internal
             }
 
             localData.Save();
-
             RestoreVolume();
         }
 
@@ -505,9 +528,17 @@ namespace Amanotes.Core.Internal
         // Default implementation
         protected void OnAdClosed()
         {
-            Ads.context.adCallback |= AdCallback.Close;
-            Ads.context.onClosed?.Invoke();
-            if (isInterstitial)
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Close;
+                Ads.context.onClosed?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdClosed() Something wrong - No AdContext");
+            }
+
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialClosed?.Invoke();
             else
                 Ads.Events.OnRewardedClosed?.Invoke();
@@ -515,10 +546,17 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdClicked()
         {
-            Ads.context.adCallback |= AdCallback.Click;
-            Ads.context.onClicked?.Invoke();
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Click;
+                Ads.context.onClicked?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdClicked() Something wrong - No AdContext");
+            }
 
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialClicked?.Invoke();
             else
                 Ads.Events.OnRewardedClicked?.Invoke();
@@ -527,10 +565,17 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdShowFailed()
         {
-            Ads.context.adCallback |= AdCallback.Fail;
-            Ads.context.onShowFailed?.Invoke();
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Fail;
+                Ads.context.onShowFailed?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdShowFailed() Something wrong - No AdContext");
+            }
 
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialShowFailed?.Invoke();
             else
                 Ads.Events.OnRewardedShowFailed?.Invoke();
@@ -539,20 +584,34 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdShowSucceeded()
         {
-            Ads.context.adCallback |= AdCallback.Success;
-            Ads.context.onShowSuccess?.Invoke();
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Success;
+                Ads.context.onShowSuccess?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdShowSucceeded() Something wrong - No AdContext");
+            }
 
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialShowSucceeded?.Invoke();
 
         }
 
         protected void OnAdOpen()
         {
-            Ads.context.adCallback |= AdCallback.Open;
-            Ads.context.onOpened?.Invoke();
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Open;
+                Ads.context.onOpened?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdOpen() Something wrong - No AdContext");
+            }
 
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialOpened?.Invoke();
             else
                 Ads.Events.OnRewardedOpened?.Invoke();
@@ -560,10 +619,17 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdReward()
         {
-            Ads.context.adCallback |= AdCallback.Reward;
-            Ads.context.onRewardReceived?.Invoke();
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.Reward;
+                Ads.context.onRewardReceived?.Invoke();
+            }
+            else
+            {
+                LogWarning("OnAdReward() Something wrong - No AdContext");
+            }
 
-            if (!isInterstitial)
+            if (!_isInterstitial)
                 Ads.Events.OnRewardedReceived?.Invoke();
         }
 
@@ -575,13 +641,13 @@ namespace Amanotes.Core.Internal
             }
 
             _isRequesting = false;
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialLoadSucceeded?.Invoke();
         }
 
         protected void OnAdLoadFailed(string error)
         {
-            if (isInterstitial)
+            if (_isInterstitial)
                 Ads.Events.OnInterstitialLoadFailed?.Invoke(error);
         }
     }
@@ -601,5 +667,7 @@ namespace Amanotes.Core.Internal
         public Action OnInterstitialClosed;
         public Action OnInterstitialLoadSucceeded;
         public Action<string> OnInterstitialLoadFailed;
+
+        public Action OnShowTimeout;
     }
 }

package/Runtime/AmaGDK.AmaPassport.cs

@@ -103,6 +103,7 @@ namespace Amanotes.Core
             public string idfa;
             public string gaid;
             public string idfv;
+            public string deviceUniqueId;
         }
 
         [Serializable]
@@ -327,7 +328,15 @@ namespace Amanotes.Core
             private static bool isInQueue;
 
             public static string AmaId => User.amaPassport.device.amaId;
-            
+            public static string GAId => User.amaPassport.device.gaid;
+            public static string IDFA => User.amaPassport.device.idfa;
+            public static string IDFV => User.amaPassport.device.idfv;
+            public static string AndroidId => User.amaPassport.device.androidId;
+            public static string AmaDeviceId => User.amaPassport.device.amaDeviceId;
+            public static string IpAddress => User.amaPassport.device.ipAddress;
+            public static string Country => User.amaPassport.device.country;
+            public static string DeviceUniqueId => User.amaPassport.device.deviceUniqueId;
+
             internal static void Init()
             {
                 var adapter = Adapter.GetSingleAdapter<IAmaPassportAdapter>();
@@ -413,6 +422,7 @@ namespace Amanotes.Core
                 device.graphicsDeviceId = SystemInfo.graphicsDeviceID;
                 device.graphicsDeviceVendorId = SystemInfo.graphicsDeviceVendorID;
                 device.operatingSystem = SystemInfo.operatingSystem;
+                device.deviceUniqueId = SystemInfo.deviceUniqueIdentifier;
                 if (Application.platform == RuntimePlatform.Android)
                     device.androidId = SystemInfo.deviceUniqueIdentifier;
                 else if (Application.platform == RuntimePlatform.IPhonePlayer) device.idfv = SystemInfo.deviceUniqueIdentifier;

package/Runtime/AmaGDK.Analytics.cs

@@ -80,12 +80,7 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName)
             {
-                if (string.IsNullOrWhiteSpace(eventName))
-                {
-                    LogWarningOnce($"Invalid EventName: <{eventName}> ");
-                    return null;
-                }
-
+                NormalizeEventName(ref eventName, true);
                 var result = new EventParams(eventName);
                 eventQueue.Enqueue(result);
                 return result;
@@ -93,12 +88,14 @@ namespace Amanotes.Core
 
             public static IEventParamsBuilder LogEvent(string eventName, Dictionary<string, object> parameters)
             {
+                if (parameters == null) return LogEvent(eventName);
                 return LogEvent(eventName).AddParam(parameters);
             }
 
             public static IEventParamsBuilder LogEvent(string eventName, params (string, object)[] parameters)
             {
                 IEventParamsBuilder result = LogEvent(eventName);
+                if (parameters == null) return result;
                 for (var i = 0; i < parameters.Length; i++)
                 {
                     result.AddParam(parameters[i].Item1, parameters[i].Item2);
@@ -316,10 +313,9 @@ namespace Amanotes.Core
                     }
 
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
-                    NormalizeEventName(ref eventNameToSend);
+                    if (Config.common.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-					if (showAnalyticsLog) Debug.Log($"[AmaGDK] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n" +
-                            $"Params:\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+					if (showAnalyticsLog) Debug.Log($"AmaGDK v{AmaGDK.VERSION} | Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
 
                     var inUseAdapterIDs = new List<string>();
                     foreach (AdapterContext m in listAdapters)
@@ -358,7 +354,7 @@ namespace Amanotes.Core
                 return $"{eventName}_{(config.withinSession ? countInSession : totalCount).ToString(config.numberFormat)}";
             }
 
-            internal static void NormalizeEventName(ref string eventName)
+            internal static void NormalizeEventName(ref string eventName, bool dryRun = false)
             {
                 StringBuilder sb = tmpWarningSB;
                 sb.Clear();
@@ -375,7 +371,7 @@ namespace Amanotes.Core
 
                 if (eventName != normalizedEventName)
                 {
-                    if (Config.common.normalizeEventName)
+                    if (!dryRun)
                     {
                         eventName = normalizedEventName;
                     }
@@ -387,7 +383,7 @@ namespace Amanotes.Core
 
                 if (!char.IsLetter(eventName[0])) sb.AppendLine($" - EventName must start with a letter: <{eventName}> ");
                 if (eventName.Length > 40) sb.AppendLine($" - EventName is too long ({eventName.Length} > 40): <{eventName}> ");
-                if (sb.Length > 0) LogWarningOnce(sb.ToString(), $"NormalizeEventName<{eventName}>");
+                if (sb.Length > 0 && dryRun) LogWarningOnce(sb.ToString(), $"NormalizeEventName<{eventName}>");
             }
 
             internal static bool ShouldSendEvent(EventParams eventData)

package/Runtime/AmaGDK.Internal.cs

@@ -4,6 +4,7 @@ using System.Text;
 using UnityEngine;
 using UnityObject = UnityEngine.Object;
 using static Amanotes.Core.AmaGDK.Analytics;
+using static Amanotes.Core.AmaGDK;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -21,7 +22,7 @@ namespace Amanotes.Core.Internal
 
     public static class Messsage
     {
-        public const string READY = "init success!";
+        public const string READY = "init success";
         public const string SDK_INIT_CALLED = "init has been called!";
         public const string MULTIPLE_INSTANCE = "multiple instance found!";
         public const string CONFIG_NOT_FOUND = "AmaGDKConfig not found in Resources!";
@@ -78,19 +79,19 @@ namespace Amanotes.Core.Internal
             if (string.IsNullOrEmpty(key)) key = message;
             if (logWarningDict.Contains(key)) return;
             logWarningDict.Add(key);
-            Debug.LogWarning("[AmaGDK] " + message);
+            Debug.LogWarning($"AmaGDK {message}");
         }
         public static void LogWarning(string message)
         {
-            Debug.LogWarning("[AmaGDK] " + message);
+            Debug.LogWarning($"AmaGDK {message}");
         }
         public static void LogError(string message)
         {
-            Debug.LogError("[AmaGDK] " + message);
+            Debug.LogError($"AmaGDK {message}");
         }
         public static void Log(string message)
         {
-            if (AmaGDK.Config.common.verboseLog) Debug.Log("[AmaGDK] " + message);
+            if (AmaGDK.Config.common.verboseLog) Debug.Log($"AmaGDK {message}");
         }
     }
 

package/Runtime/AmaGDK.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Text;
 using Amanotes.Core.Internal;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
@@ -9,7 +10,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.7";
+        public const string VERSION = "0.2.9";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -75,6 +76,8 @@ namespace Amanotes.Core
             }
 
             _status = Status.Initialize;
+            float startTime = Time.realtimeSinceStartup;
+            StringBuilder adapterInfo = new StringBuilder();
 
             // sort on priority
             Adapter.listAdapters.Sort((a1, a2) => a1.initOrder.CompareTo(a2.initOrder));
@@ -94,8 +97,8 @@ namespace Amanotes.Core
                     LogWarning($"{adapter.adapterId} init time out: {timeout}");
                     break;
                 }
-
-                Log($"Adapter {adapter.adapterId} {(adapter.IsReady ? "initiated!" : "is not ready!")}");
+                
+                adapterInfo.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL", adapter.adapterId, adapter.adapterVersion));
             }
 
             // Init modules (Adapter managers)
@@ -106,7 +109,7 @@ namespace Amanotes.Core
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
             _onReadyCallback = null;
-            Debug.Log($"[AmaGDK] {READY}");
+            Debug.Log($"AmaGDK v{VERSION} | {READY} in {Time.realtimeSinceStartup - startTime}s\n\n{adapterInfo.ToString()}");
         }
 
         void RegisterUnityCallback(AdapterContext adapter)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.7",
+    "version": "0.2.9",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",