com.amanotes.gdk 0.2.46-1 → 0.2.46-3

package/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## [0.2.46-1 - 2024-01-18]
+## [0.2.46-3 - 2024-01-31]
+- Resolve early log events
+
+## [0.2.46-2 - 2024-01-18]
 - Update UserId every session
+- Migrate accumulated_count gradually
 
 ## [0.2.46 - 2023-12-19]
 - Cleaner UI interface for AmaGDK Inspector

package/Runtime/AmaGDK.Analytics.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using Amanotes.Core.Internal;
@@ -261,11 +262,17 @@ namespace Amanotes.Core
                 if (listAdapters.Count != 0)
                     primaryAdapter = listAdapters.Find(a => a.adapterId == AdapterID.FIREBASE_ANALYTICS) ?? listAdapters[0];
 
+                _instance.StartCoroutine(RegisterGDKUpdate());
+            }
+
+            static IEnumerator RegisterGDKUpdate()
+            {
+                yield return new WaitUntil(() => primaryAdapter.IsReady);
                 onFrameUpdate -= ProcessEventQueue;
                 onFrameUpdate += ProcessEventQueue;
                 
                 onFrameUpdate -= ProcessActionQueue;
-                onFrameUpdate += ProcessActionQueue;
+                onFrameUpdate += ProcessActionQueue;   
             }
 
             internal static void ProcessEventQueue()

package/Runtime/AmaGDK.UserProfile.cs

@@ -14,18 +14,8 @@ namespace Amanotes.Core
         [Serializable]
         public partial class UserProfile : IJsonFile
         {
-            private const string FILE_NAME = nameof(UserProfile);
-            [NonSerialized] internal bool _dirty;
-
             private void Save()
             {
-                GDKFileUtils.Save(FILE_NAME, JsonUtility.ToJson(this));
-            }
-
-            internal void SaveIfDirty()
-            {
-                if (!_dirty) return;
-                _dirty = false;
                 this.SaveJsonToFile();
             }
         }
@@ -116,63 +106,8 @@ namespace Amanotes.Core
                 get => _installationId;
                 set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
-        }
-        
-        public partial class UserProfile //INTERNAL
-        {
-            [SerializeField]
-            private string _userId;
-            [SerializeField]
-            private string _gaid;
-            [SerializeField]
-            private string _idfa;
-            [SerializeField]
-            private string _idfv;
-            [SerializeField]
-            private string _androidId;
-            [SerializeField]
-            private string _pseudoId;
-            [SerializeField]
-            private string _amaDeviceId;
-            [SerializeField] 
-            private string _appsFlyerId;
-            [SerializeField] 
-            private string _installationId;
-
-            private const string ALPHANUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])(?=.*-).+$";
-            private const string ALPHANUMERIC_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d]+$";
-            private const string NUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*-)[\d-]+$";
             
-            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
-            private const float TIME_OUT = 5f;
-            private const float WAIT_TIME = 0.5f;
-            private WaitForSecondsRealtime waitForDuration = new WaitForSecondsRealtime(WAIT_TIME);
-
-            internal IEnumerator Init()
-            {
-                User.LoadJsonFromFile();
-
-#if UNITY_ANDROID
-                AndroidId = SystemInfo.deviceUniqueIdentifier;
-#elif UNITY_IOS
-                IDFV = SystemInfo.deviceUniqueIdentifier;
-#endif
-                
-                // Always get the latest advertising id
-                GetAdvertisingId();
-
-                float time = 0;
-                while (!User.IsAmaDeviceIdExist())
-                {
-                    yield return waitForDuration;
-                    time += WAIT_TIME;
-                    if (time <= TIME_OUT) continue;
-                    Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
-                    break;
-                }
-            }
-
-            internal void UpdateUserId()
+            public void UpdateUserId()
             {
 #if UNITY_ANDROID
                 if (!string.IsNullOrWhiteSpace(_gaid))
@@ -228,7 +163,62 @@ namespace Amanotes.Core
                     return;
                 }
             }
+        }
+        
+        public partial class UserProfile //INTERNAL
+        {
+            [SerializeField]
+            private string _userId;
+            [SerializeField]
+            private string _gaid;
+            [SerializeField]
+            private string _idfa;
+            [SerializeField]
+            private string _idfv;
+            [SerializeField]
+            private string _androidId;
+            [SerializeField]
+            private string _pseudoId;
+            [SerializeField]
+            private string _amaDeviceId;
+            [SerializeField] 
+            private string _appsFlyerId;
+            [SerializeField] 
+            private string _installationId;
+
+            private const string ALPHANUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])(?=.*-).+$";
+            private const string ALPHANUMERIC_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d]+$";
+            private const string NUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*-)[\d-]+$";
             
+            private const string AMA_DEVICE_ID_KEY = "ama_device_id";
+            private const float TIME_OUT = 5f;
+            private const float WAIT_TIME = 0.5f;
+            private WaitForSecondsRealtime waitForDuration = new WaitForSecondsRealtime(WAIT_TIME);
+
+            internal IEnumerator Init()
+            {
+                User.LoadJsonFromFile();
+
+#if UNITY_ANDROID
+                AndroidId = SystemInfo.deviceUniqueIdentifier;
+#elif UNITY_IOS
+                IDFV = SystemInfo.deviceUniqueIdentifier;
+#endif
+                
+                // Always get the latest advertising id
+                GetAdvertisingId();
+
+                float time = 0;
+                while (!User.IsAmaDeviceIdExist())
+                {
+                    yield return waitForDuration;
+                    time += WAIT_TIME;
+                    if (time <= TIME_OUT) continue;
+                    Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
+                    break;
+                }
+            }
+
             private bool IsAmaDeviceIdExist()
             {
                 if (!string.IsNullOrEmpty(_amaDeviceId))

package/Runtime/AmaGDK.cs

@@ -15,7 +15,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.46-1";
+        public const string VERSION = "0.2.46-3";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;

package/package.json

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