com.amanotes.gdk 0.1.4 → 0.1.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.1.8 - 2023-02-15]
+### Release AmaGDK v0.1.8
+### Add AdapterID
+
+## [0.1.5 - 2023-02-13]
+### Release AmaSDK v0.1.5
+### Validate EventParams
+
 ## [0.1.4 - 2023-02-13]
 ### Release AmaSDK v0.1.4
 

package/Runtime/AmaGDK.Adapters.cs

@@ -20,7 +20,7 @@ namespace Amanotes.Core.Internal
         protected static T _instance;
         protected static Status _status = Status.None;
         public bool IsReady => _status == Status.Ready;
-        public string Id => typeof(T).ToString();
+        public string Id => typeof(T).Name.Replace("Adapter", string.Empty);
 
         public void Init()
         {

package/Runtime/AmaGDK.Analytics.cs

@@ -170,6 +170,7 @@ namespace Amanotes.Core
             internal static void ProcessEventQueue()
             {
                 if (eventQueue.Count <= 0) return;
+                bool showAnalyticsLog = Config.common.showAnalyticsLog;
 
                 while (eventQueue.Count > 0)
                 {
@@ -188,12 +189,14 @@ namespace Amanotes.Core
                         eventData.AddParam("accumulated_count", counter);
                     }
 
-                    Log($"Send {eventData.eventName}, count {counter}");
                     foreach (var m in listAdapters)
                     {
-                        if (eventData.ignoreAnalyticIds.Contains(((IAdapter)m).Id))
+                        var id = ((IAdapter)m).Id;
+                        if (eventData.ignoreAnalyticIds.Contains(id))
                             continue;
+
                         m.LogEvent(eventData);
+                        if (showAnalyticsLog) Debug.Log($"[{id}] Sent event <{eventData.eventName}> ({counter})");
                     }
                 }
 
@@ -385,6 +388,7 @@ namespace Amanotes.Core
         public static IEventParamsBuilder Except(this IEventParamsBuilder ap, params string[] analyticIds)
         {
             if (ap == null) return null;
+            if (analyticIds.Length == 0) return ap;
 
             EventParams eventData = ap as EventParams;
             foreach (var mId in analyticIds)
@@ -397,6 +401,7 @@ namespace Amanotes.Core
         public static IEventParamsBuilder OnlyTo(this IEventParamsBuilder ap, params string[] analyticIds)
         {
             if (ap == null) return null;
+            if (analyticIds.Length == 0) return ap;
 
             EventParams eventData = ap as EventParams;
             foreach (var mId in analyticIds)
@@ -409,6 +414,7 @@ namespace Amanotes.Core
         public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, string key, object value)
         {
             if (ap == null) return null;
+            if (!IsValidKeyValue(ap, key, value)) return ap;            
 
             var parameters = (ap as EventParams).parameters;
             if (parameters.ContainsKey(key))
@@ -424,14 +430,37 @@ namespace Amanotes.Core
         public static IEventParamsBuilder AddParam(this IEventParamsBuilder ap, Dictionary<string, object> dictParams)
         {
             if (ap == null) return null;
+            if (dictParams == null)
+            {
+                LogWarning($"Param dictionary is null. Event name: {(ap as EventParams).eventName}!");
+                return ap;
+            }
 
             foreach (var kvp in dictParams)
             {
-                ap.AddParam(kvp.Key, kvp.Value);
+                if (IsValidKeyValue(ap, kvp.Key, kvp.Value))
+                    ap.AddParam(kvp.Key, kvp.Value);
             }
             return ap;
         }
 
+        static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
+        {
+            string eventName = (ap as EventParams).eventName;
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                LogWarning($"Param key is empty. Event name: {eventName}!");
+                return false;
+            }
+            if (value == null)
+            {
+                LogWarning($"Param value is null. Event name: {eventName}!");
+                return false;
+            }
+
+            return true;
+        }
+
     }
 }
 
@@ -439,8 +468,9 @@ namespace Amanotes.Core.Internal
 {
     partial class SDKConfig
     {
-        public bool normalizeEventName;
-        public bool checkMigrationIntegrity;
+        public bool showAnalyticsLog = true;
+        public bool normalizeEventName = true;
+        public bool checkMigrationIntegrity = true;
     }
 
     public interface IAnalyticAdapter

package/Runtime/AmaGDK.Internal.cs

@@ -38,7 +38,7 @@ namespace Amanotes.Core.Internal
         public static readonly string[] AMAGDK_ADAPTERS = new string[]
         {
             "FirebaseAnalyticsAdapter_v9.1.0",
-            "AppsflyerAdapter_v6.5.4",
+            //"AppsflyerAdapter_v6.5.4",
         };
     }
 
@@ -65,7 +65,7 @@ namespace Amanotes.Core.Internal
         }
         public static void Log(string message)
         {
-            Debug.Log("[AmaGDK] " + message);
+            if (AmaGDK.Config.common.verboseLog) Debug.Log("[AmaGDK] " + message);
         }
     }
 

package/Runtime/AmaGDK.cs

@@ -12,7 +12,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.1.4";
+        public const string VERSION = "0.1.8";
 
         internal static AmaGDK _instance;
         private static ConfigAsset _config = null;
@@ -102,7 +102,7 @@ namespace Amanotes.Core
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
             _onReadyCallback = null;
-            Log(READY);
+            Debug.Log($"[AmaGDK] {READY}");
         }
 
         private void Update()
@@ -156,4 +156,16 @@ namespace Amanotes.Core
         }
 
     }
+
+    public partial class AmaGDK
+    {
+        public static class AdapterID
+        {
+            public const string FIREBASE_ANALYTICS = "FirebaseAnalytics";
+            public const string FIREBASE_REMOTE_CONFIG = "FirebaseRemoteConfig";
+            public const string APPSFLYER = "Appsflyer";
+            public const string IRONSOURCE = "ironSource";
+            public const string REVENUECAT = "RevenueCat";     
+        }
+    }
 }

package/package.json

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

package/Packages/AppsflyerAdapter_v6.5.4.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e116b2ceddfdc42a7a01d4ce86de20de
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: