com.amanotes.gdk 0.2.50 → 0.2.52

package/Runtime/AmaGDK.UserProfile.cs

@@ -200,14 +200,14 @@ namespace Amanotes.Core
 #elif UNITY_IOS
                 IDFV = SystemInfo.deviceUniqueIdentifier;
 #endif
-                
-                // Always get the latest advertising id
-                GetAdvertisingId();
+                GetAmaDeviceId();
+                UpdateUserId();
             }
             
             internal void StartModule()
             {
-                UpdateUserId();
+                // Always get the latest advertising id
+                GetAdvertisingId();
                 Logging.Log($"[UserProfile] user_id: {_userId}");
             }
 
@@ -231,39 +231,43 @@ namespace Amanotes.Core
                     GDKUtils.DelayCall(0, () =>
                     {
                         SetAdvertisingID(advertisingId);                
-                        switch (Application.platform)
-                        {
-                            case RuntimePlatform.IPhonePlayer:
-                                string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
-                                if (string.IsNullOrEmpty(v))
-                                {
-                                    v = Guid.NewGuid().ToString();
-                                    KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
-                                }
-                                AmaDeviceId = v;
-                                break;
-                
-                            case RuntimePlatform.Android:
-                                string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
-                                if (string.IsNullOrEmpty(cachedAmaDeviceId))
-                                {
-                                    cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
-                                    PlayerPrefs.SetString(AMA_DEVICE_ID_KEY, cachedAmaDeviceId);
-                                }
-                                AmaDeviceId = cachedAmaDeviceId;
-                                break;
-            
-                            default:
-                                AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
-                                break;
-                        }
-                    
-                        Logging.Log($"[UserProfile] ama_device_id: {_amaDeviceId}");
                         Save();
                     });
                 });
             }
 
+            private void GetAmaDeviceId()
+            {
+                if (!string.IsNullOrEmpty(AmaDeviceId)) return;
+                switch (Application.platform)
+                {
+                    case RuntimePlatform.IPhonePlayer:
+                        string v = KeyChain.GetKeyChain(AMA_DEVICE_ID_KEY);
+                        if (string.IsNullOrEmpty(v))
+                        {
+                            v = Guid.NewGuid().ToString();
+                            KeyChain.SetKeyChain(AMA_DEVICE_ID_KEY, v);
+                        }
+                        AmaDeviceId = v;
+                        break;
+                
+                    case RuntimePlatform.Android:
+                        string cachedAmaDeviceId = PlayerPrefs.GetString(AMA_DEVICE_ID_KEY);
+                        if (string.IsNullOrEmpty(cachedAmaDeviceId))
+                        {
+                            cachedAmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                        }
+                        AmaDeviceId = cachedAmaDeviceId;
+                        break;
+            
+                    default:
+                        AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
+                        break;
+                }
+                Logging.Log($"[UserProfile] Generate ama_device_id: {_amaDeviceId}");
+                Save();
+            }
+
             private string ValidateId (string id, string pattern)
             {
                 if (string.IsNullOrWhiteSpace(id)) return null;

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.50";
+        public const string VERSION = "0.2.52";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -182,12 +182,12 @@ namespace Amanotes.Core
             }
             
             float startTime = Time.realtimeSinceStartup;
-            yield return InitHook();
             
             dispatcher.Dispatch(Event.GDK_INIT_START);
             var sb = new StringBuilder();
             InitModules();
             
+            yield return InitHook();
             yield return WaitForManualInit();
             yield return InitAdapters(sb);
             

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -93,6 +93,27 @@ namespace Amanotes.Core.Internal
 
     public static class Forbidden
     {
+        private static bool presetShowAnalyticsLog;
+        private static bool presetEnableEventStat;
+        private static LogLevel presetLogLevel = LogLevel.Warning;
+        
+        public static void PresetConfig()
+        {
+            presetLogLevel = Config.common.logLevel;
+            Config.common.logLevel = LogLevel.Warning;
+            presetShowAnalyticsLog = Config.analytics.showAnalyticsLog;
+            Config.analytics.showAnalyticsLog = true;
+            presetEnableEventStat = Config.analytics.enableEventStat;
+            Config.analytics.enableEventStat = true;
+        }
+
+        public static void ReloadConfig()
+        {
+            Config.analytics.showAnalyticsLog = presetShowAnalyticsLog;
+            Config.analytics.enableEventStat = presetEnableEventStat;
+            Config.common.logLevel = presetLogLevel;
+        }
+        
         public static void DestroyAndReset()
         {
             if (_instance != null)
@@ -139,9 +160,12 @@ namespace Amanotes.Core.Internal
         public static void ClearAnalyticsData()
         {
             AnalyticsData analyticsData = localData;
+            analyticsData._dirty = true;
             analyticsData.funnelSignatures.Clear();
             analyticsData.eventDetails.Clear();
+            analyticsData.cachedEventDetails.Clear();
             analyticsData.migrationLog = new MigrationLog();
+            analyticsData.SaveIfDirty();
         }
     }
     

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -391,7 +392,6 @@ namespace Amanotes.Core.Internal
 
     internal interface IJsonFile { }
     
-
     internal static class JsonFileExtension
     {
         public static T LoadJsonFromFile<T>(this T instance) where T : IJsonFile, new()
@@ -569,4 +569,30 @@ namespace Amanotes.Core.Internal
         //    public T[] items;
         //}
     }
+    
+    internal class Pool<T> where T : new()
+    {
+        private readonly ConcurrentQueue<T> _pool;
+
+        public Pool(int initialCapacity)
+        {
+            _pool = new ConcurrentQueue<T>();
+            for (int i = 0; i < initialCapacity; i++)
+            {
+                _pool.Enqueue(new T());
+            }
+        }
+
+        public T Get()
+        {
+            return _pool.TryDequeue(out var obj) ? obj : new T();
+        }
+
+        public void Return(T obj)
+        {
+            _pool.Enqueue(obj);
+        }
+
+        public int Count => _pool.Count;
+    }
 }

package/package.json

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