com.amanotes.gdk 0.2.28 → 0.2.29

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.29 - 2023-11-03]
+- Fix accumulated_count
+- Fix missing IDFA
+
 ## [0.2.28 - 2023-11-01]
 -  Ads: Set timescale to 0 after save
 

package/Runtime/AmaGDK.Analytics.cs

@@ -230,28 +230,7 @@ namespace Amanotes.Core
                     config.NeverSend = eventNames;
                 }
             }
-
-            public static void OnlySendAtCount(string eventName, List<int> listCount, bool withinSession = false, bool appendCountToEventName = false, string numberFormat = "00")
-            {
-                var config = new EventConfig
-                {
-                    listCount = listCount,
-                    withinSession = withinSession,
-                    appendCountToEventName = appendCountToEventName,
-                    numberFormat = numberFormat
-                };
-
-                if (sendAtCount.ContainsKey(eventName))
-                {
-                    LogWarning($"{eventName} has already been set list of count number to log.");
-                    sendAtCount[eventName] = config;
-                }
-                else
-                {
-                    sendAtCount.Add(eventName, config);
-                }
-            }
-            }
+        }
 
         //INTERNAL
         public static partial class Analytics
@@ -271,11 +250,14 @@ namespace Amanotes.Core
             internal static readonly List<AdapterContext> listAdapters = new List<AdapterContext>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
             internal static readonly SessionStat sessionStat = new SessionStat();
+            internal static AdapterContext primaryAdapter;
 
             internal static void Init()
             {
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter.FindAll<IAnalyticAdapter>());
+                if (listAdapters.Count != 0)
+                    primaryAdapter = listAdapters.Find(a => a.adapterId == AdapterID.FIREBASE_ANALYTICS) ?? listAdapters[0];
 
                 onFrameUpdate -= ProcessEventQueue;
                 onFrameUpdate += ProcessEventQueue;
@@ -294,10 +276,9 @@ namespace Amanotes.Core
                 while (eventQueue.Count > 0)
                 {
                     var eventData = eventQueue.Dequeue();
-                    var (countInSession, totalCount) = localData.IncreaseCounter(eventData.eventName);
-
                     if (!ShouldSendEvent(eventData)) continue;
-
+                    
+                    var (countInSession, totalCount) = localData.IncreaseCounter(eventData);
                     if (eventData.accumulated)
                     {
                         eventData.AddParam("accumulated_count", eventData.withinSession ? countInSession : totalCount);
@@ -315,22 +296,9 @@ namespace Amanotes.Core
                     var inUseAdapterIDs = new List<string>();
                     foreach (AdapterContext m in listAdapters)
                     {
+                        if (IsAdapterForbidden(m, eventData)) continue;
+                        
                         var api = m.GetAdapterApi<IAnalyticAdapter>();
-                        var config = m.GetAdapterConfig<AnalyticsAdapterConfig>();
-
-                        if (eventData.overrideConfig)
-                        {
-                            // IMPORTANT NOTE:
-                            //
-                            // Once set overrideConfig, we should skip the adapter config completely!!!
-                            //
-                            if (eventData.IsAdapterForbidden(m.adapterId)) continue;
-                        }
-                        else // Do not remove else
-                        {
-                            if (config.IsForbidden(eventData.eventName)) continue;
-                        }
-
                         api.LogEvent(eventNameToSend, eventData.parameters);
                         inUseAdapterIDs.Add(m.adapterId);
                     }
@@ -341,6 +309,27 @@ namespace Amanotes.Core
                 sessionStat.Save();
             }
 
+            internal static bool IsAdapterForbidden(AdapterContext adapterContext, EventParams eventData)
+            {
+                if (adapterContext == null) return false;
+                var config = adapterContext.GetAdapterConfig<AnalyticsAdapterConfig>();
+
+                if (eventData.overrideConfig)
+                {
+                    // IMPORTANT NOTE:
+                    //
+                    // Once set overrideConfig, we should skip the adapter config completely!!!
+                    //
+                    if (eventData.IsAdapterForbidden(adapterContext.adapterId)) return true;
+                }
+                else // Do not remove else
+                {
+                    if (config.IsForbidden(eventData.eventName)) return true;
+                }
+
+                return false;
+            }
+
             internal static string GetEventNameToSend(string eventName, int countInSession, int totalCount)
             {
                 if (!sendAtCount.TryGetValue(eventName, out var config)) return eventName;
@@ -529,9 +518,11 @@ namespace Amanotes.Core
                     return true;
                 }
 
-                internal (int countInSession, int totalCount) IncreaseCounter(string eventName)
+                internal (int countInSession, int totalCount) IncreaseCounter(EventParams eventParams)
                 {
-                    EventDetail result = GetEventDetail(eventName, true);
+                    EventDetail result = GetEventDetail(eventParams.eventName, true);
+                    if (IsAdapterForbidden(primaryAdapter, eventParams))
+                        return (result.countInSession, result.totalCount);
                     result.countInSession++;
                     result.totalCount++;
                     _dirty = true;

package/Runtime/AmaGDK.UserProfile.cs

@@ -57,8 +57,6 @@ namespace Amanotes.Core
             internal IEnumerator Init()
             {
                 User.LoadJsonFromFile();
-                if (IsAmaDeviceIdExist()) yield break;
-                
                 GetAdvertisingId();
 
                 float time = 0;
@@ -76,7 +74,7 @@ namespace Amanotes.Core
             {
                 if (!string.IsNullOrEmpty(amaDeviceId))
                 {
-                    Logging.Log($"AmaDeviceId is already exist: {amaDeviceId}");
+                    Logging.Log($"AmaDeviceId is already existed: {amaDeviceId}");
                     return true;
                 }
                 return false;

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.28";
+        public const string VERSION = "0.2.29";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -114,7 +114,7 @@ namespace Amanotes.Core
                 }
 
                 var adapterInfo = new AdapterInfo(adapter.adapterId, adapter.adapterVersion, adapter.IsReady);
-                _adapters.Add(adapter.adapterId, adapterInfo);
+                _adapters[adapter.adapterId] = adapterInfo;
                 _onAdapterReadyCallback?.Invoke(adapterInfo);
                 adapterAnnounce.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL",
                     adapter.adapterId, adapter.adapterVersion));

package/package.json

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