com.amanotes.gdk 0.2.45 → 0.2.46-2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [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
+- Add AmaGUI to centralize all GUI handles
+- [Fix] OnAdResult callback being looped through calling StopWaitForAd
+- [Fix] Exception while loading / parsing LoadJsonFromFile
+
 ## [0.2.45 - 2023-12-13]
 - [Fix] Able to assign ama_device_id in Editor
 

package/Editor/AmaGDKEditor.cs

@@ -7,7 +7,6 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
-using static Amanotes.Editor.AmaGUI;
 using static Amanotes.Core.AmaGDK.AdapterID;
 
 namespace Amanotes.Editor
@@ -67,7 +66,7 @@ namespace Amanotes.Editor
 
             GUILayout.BeginHorizontal();
             {
-                if (BigButton("CREATE", 40f, BLUE))
+                if (AmaGUI.BigButton("CREATE", 40f, BLUE))
                 {
                     try
                     {
@@ -94,13 +93,13 @@ namespace Amanotes.Editor
         {
             if (sdk.autoInit)
             {
-                Toggle("Auto Init", ref sdk.autoInit);
+                AmaGUI.Toggle("Auto Init", ref sdk.autoInit);
                 EditorUtility.SetDirty(sdk);
                 return;
             }
 
             EditorGUILayout.HelpBox("You disabled AmaGDK AutoInit\nMake sure to call AmaGDK.Init() manually!", MessageType.Warning);
-            if (BigButton("Enable AutoInit", 40f, BLUE))
+            if (AmaGUI.BigButton("Enable AutoInit", 40f, BLUE))
             {
                 sdk.autoInit = true;
                 EditorUtility.SetDirty(sdk);
@@ -128,17 +127,18 @@ namespace Amanotes.Editor
             
             adapterScanned = true;
             
-            var adapterPath = Directory.GetFiles(Res.PACKAGE_PATH, "*Adapter*.unitypackage", SearchOption.AllDirectories);
+            string[] adapterPath = Directory.GetFiles(Res.PACKAGE_PATH, "*Adapter*.unitypackage", SearchOption.AllDirectories);
 
-            for (int i = 0; i < adapterPath.Length; i++)
+            for (var i = 0; i < adapterPath.Length; i++)
             {
                 lstAdapter.Add(Path.GetFileName(adapterPath[i]));
             }
         }
+        
         private void DrawGUI_AdapterList()
         {
             UpdateListAdapter();
-            foreach (var adapter in lstAdapter)
+            foreach (string adapter in lstAdapter)
             {
                 if (GUILayout.Button(ObjectNames.NicifyVariableName(adapter)))
                 {
@@ -157,6 +157,7 @@ namespace Amanotes.Editor
                 AssetDatabase.ImportPackage(package, false);
             }
         }
+        
         private void DrawGUI_ColorPicker()
         {
             GUILayout.BeginHorizontal();
@@ -166,67 +167,55 @@ namespace Amanotes.Editor
             }
             GUILayout.EndHorizontal();
         }
-
+        
+        public void CopyVersion()
+        {
+            var sb = new StringBuilder();
+            sb.AppendLine("ID\tSDK VERSION\tADAPTER VERSION");
+            for (var i = 0; i < SDK_IDS.Length; i++)
+            {
+                var status = SDKStatus.Get(SDK_IDS[i]); 
+                sb.AppendLine(status.ToTSVString());
+                if (status.sdkId != IRONSOURCE) continue;
+                if (!status.sdkInstalled || !status.adapterInstalled) continue;
+                    
+                List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();
+                for (var j = 0; j < list.Count; j++)
+                {
+                    IronSourceSDKAdapter item = list[j];
+                    sb.AppendLine($"IS{item.name}Adapter\t{item.version}");    
+                }
+            }
+                
+            var tsv = sb.ToString();
+            EditorGUIUtility.systemCopyBuffer = tsv;
+            Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
+        }
+        
         public override void OnInspectorGUI()
         {
             if (sdk == null) return;
 
             // DrawGUI_ColorPicker();
-            SectionLabel($"<b>AmaGDK</b> <size=12><color=gray>v{AmaGDK.VERSION}</color></size>");
+            AmaGUI.SectionLabel($"<b>AmaGDK</b> <size=12><color=gray>v{AmaGDK.VERSION}</color></size>");
             EditorGUILayout.Space();
-
+            
             for (var i = 0; i < SDK_IDS.Length; i++)
             {
                 string id = SDK_IDS[i];
-                AmaGUI.DrawSDKStatus(SDK_IDS[i]);
-                
-                if (id == IRONSOURCE)
-                {
-                    var lastRect = GUILayoutUtility.GetLastRect();
-                    lastRect.width = 18f;
-                    lastRect.y += 2f;
-                    showIronSourceSDKAdapter = EditorGUI.Foldout(lastRect, showIronSourceSDKAdapter, "");
-                    if (showIronSourceSDKAdapter)
-                    {
-                        DrawIRSAdapterVersions();
-                    }
-                }
+                DrawAdapterDetail(id);
             }
             EditorGUILayout.Space();
-
-            if (GUILayout.Button("version_info.tsv -> Clipboard"))
-            {
-                var sb = new StringBuilder();
-                sb.AppendLine("ID\tSDK VERSION\tADAPTER VERSION");
-                for (var i = 0; i < SDK_IDS.Length; i++)
-                {
-                    var status = SDKStatus.Get(SDK_IDS[i]); 
-                    sb.AppendLine(status.ToTSVString());
-                    if (status.sdkId != IRONSOURCE) continue;
-                    if (!status.sdkInstalled || !status.adapterInstalled) continue;
-                    
-                    List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();
-                    for (var j = 0; j < list.Count; j++)
-                    {
-                        var item = list[j];
-                        sb.AppendLine($"IS{item.name}Adapter\t{item.version}");    
-                    }
-                }
-                
-                var tsv = sb.ToString();
-                EditorGUIUtility.systemCopyBuffer = tsv;
-                Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
-            }
-
+            
             if (configAsset == null)
             {
                 DrawGUI_ConfigMissing();
                 return;
             }
-
+            
             DrawGUI_AutoInit();
-            ToggleGroup("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
-            ToggleGroup("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
+            AmaGUI.Foldout("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
+            AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
 
             //("Example", ref showExampleDetail, DrawGUI_ExampleScene);
 
@@ -236,32 +225,71 @@ namespace Amanotes.Editor
             }
         }
 
-        private static void DrawVersion(string label, string version)
+        private static readonly Dictionary<string, bool> configOpen = new Dictionary<string, bool>();
+        private static void DrawAdapterDetail(string adapterId)
         {
-            EditorGUI.BeginDisabledGroup(true);
+            if (!configOpen.TryGetValue(adapterId, out bool isOpen))
             {
-                GUILayout.Label($"{label} v{version}", EditorStyles.largeLabel);
+                configOpen.Add(adapterId, isOpen = false);
             }
-            EditorGUI.EndDisabledGroup();
+            
+            SDKStatus status = SDKStatus.Get(adapterId);
+            bool changed = AmaGUI.Foldout(ObjectNames.NicifyVariableName(adapterId), ref isOpen, () =>
+            {
+                DrawSDKConfig(adapterId, status);
+            }, () =>
+            {
+                GUILayout.FlexibleSpace();
+                AmaGUI.DrawVersionTag(status.sdkVersion, status.adapterInstalled);
+            });
+            
+            if (changed) configOpen[adapterId] = isOpen;
         }
-        public static bool showIronSourceSDKAdapter = false;
         
-        public static void DrawIRSAdapterVersions()
+        private static void DrawSDKConfig(string adapterId, SDKStatus status)
+        {
+            if (!status.sdkInstalled)
+            {
+                EditorGUILayout.HelpBox($"{adapterId} SDK not installed", MessageType.Warning);
+                return;
+            }
+            if (!status.adapterInstalled)
+            {
+                EditorGUILayout.HelpBox($"{adapterId}-GDKAdapter not installed", MessageType.Warning);
+                return;
+            }
+                
+            if (adapterId == IRONSOURCE)
+            {
+                DrawIRSAdapterVersions();
+            } else
+            {
+                EditorGUILayout.HelpBox("Config for <" + adapterId + "> should be shown here!", MessageType.Info);
+            }
+        }
+
+        // private static void DrawVersion(string label, string version)
+        // {
+        //     EditorGUI.BeginDisabledGroup(true);
+        //     {
+        //         GUILayout.Label($"{label} v{version}", EditorStyles.largeLabel);
+        //     }
+        //     EditorGUI.EndDisabledGroup();
+        // }
+
+        public static void DrawInitOrder()
         {
-            SDKStatus status = SDKStatus.Get(IRONSOURCE);
-            if (!status.sdkInstalled) return;
-            if (!status.adapterInstalled) return;
-            if (!showIronSourceSDKAdapter) return;
             
-            // Get the list of installed SDK & versions
+        }
+        
+        public static void DrawIRSAdapterVersions()
+        {
             List<IronSourceSDKAdapter> list = ExtractVersion.IronSourceAdapter();
-
             var color = new Color(0.0f, .5f, .5f, 1f);
-            for (var i = 0; i < list.Count; i++)
+            AmaGUI.DrawListColumn(list, (item) =>
             {
-                var item = list[i];
-                SemVerGUI(item.name, item.semVer, color);
-            }
+                AmaGUI.SemVerGUI(item.name, item.semVer, color);
+            });
         }
     }
 }

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -26,9 +26,7 @@ namespace Amanotes.Editor
 
     [Serializable] public class SDKStatus
     {
-
         // 
-
         private static readonly Dictionary<string, SDKStatus> _cache = new Dictionary<string, SDKStatus>();
         public string sdkId;
         public SemVer adapterVersion;
@@ -184,7 +182,7 @@ namespace Amanotes.Editor
                     if (oType.Name.Equals("AdjustAndroid") || oType.Name.Equals("AdjustiOS") )
                     {
                         version = oType.GetField("sdkPrefix", BindingFlags.Static | BindingFlags.NonPublic)?.GetValue(null).ToString();
-                        version = version.StartsWith("unity") ? version.Substring(5) : "";
+                        version = version != null && version.StartsWith("unity") ? version.Substring(5) : "";
                     }
                 }
             }

package/Runtime/AmaGDK.Ads.cs

@@ -727,6 +727,14 @@ namespace Amanotes.Core.Internal
 
         private void ShowAdRoutineCompleted(bool isSuccess)
         {
+            ShowAdContext lastContext = Ads.context;
+            Ads.context = null;
+            if (lastContext == null)
+            {
+                LogWarning("Something wrong: lastContext == null!");
+                return;
+            }
+            
             if (_loadState == LoadAdsState.Ready)
             {
                 _loadState = isAdReady ? LoadAdsState.Ready : LoadAdsState.None;
@@ -736,8 +744,7 @@ namespace Amanotes.Core.Internal
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
             
             // Extra callback
-            Ads.context.showFinishAt = Time.realtimeSinceStartup;
-            Ads.context.onAdResult?.Invoke(isSuccess);
+            lastContext.showFinishAt = Time.realtimeSinceStartup;
             
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -756,9 +763,8 @@ namespace Amanotes.Core.Internal
             localData.Save();
             HandleAfterAdShow();
             
-            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
-            Ads.context = null;
-            _showState = ShowAdsState.None;
+            Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(lastContext)}");
+            lastContext.onAdResult?.Invoke(isSuccess);
         }
         
         private void HandleBeforeAdShow()

package/Runtime/AmaGDK.Analytics.cs

@@ -148,38 +148,40 @@ namespace Amanotes.Core
             {
                 var flag = IntegrityFlag.Ok;
 
-                foreach (string e in funnelEvents)
-                {
-                    if (localData.funnelSignatures.Contains(e)) continue;
-
-                    flag |= IntegrityFlag.NewFunnel;
-                    localData.AddFunnelSignature(e);
-                }
-
-                foreach (KeyValuePair<string, int> e in eventCountMap)
-                {
-                    EventDetail eventDetail = localData.GetEventDetail(e.Key);
-                    if (eventDetail == null)
+                if (funnelEvents != null)
+                    foreach (string e in funnelEvents)
                     {
-                        localData.eventDetails.Add(new EventDetail
-                        {
-                            eventName = e.Key,
-                            totalCount = e.Value
-                        });
-                        flag |= IntegrityFlag.NewEvent;
-                        continue;
-                    }
+                        if (localData.funnelSignatures.Contains(e)) continue;
 
-                    if (eventDetail.totalCount != e.Value)
-                    {
-                        flag |= IntegrityFlag.DifferentCount;
+                        flag |= IntegrityFlag.NewFunnel;
+                        localData.AddFunnelSignature(e);
                     }
 
-                    if (sumEventCount)
+                if (eventCountMap != null)
+                    foreach (KeyValuePair<string, int> e in eventCountMap)
                     {
-                        eventDetail.totalCount += e.Value;
+                        EventDetail eventDetail = localData.GetEventDetail(e.Key);
+                        if (eventDetail == null)
+                        {
+                            localData.eventDetails.Add(new EventDetail
+                            {
+                                eventName = e.Key,
+                                totalCount = e.Value
+                            });
+                            flag |= IntegrityFlag.NewEvent;
+                            continue;
+                        }
+
+                        if (eventDetail.totalCount != e.Value)
+                        {
+                            flag |= IntegrityFlag.DifferentCount;
+                        }
+
+                        if (sumEventCount)
+                        {
+                            eventDetail.totalCount += e.Value;
+                        }
                     }
-                }
 
                 return flag;
             }
@@ -279,12 +281,13 @@ namespace Amanotes.Core
                     if (!ShouldSendEvent(eventData)) continue;
                     
                     var (countInSession, totalCount) = localData.IncreaseCounter(eventData);
-                    if (eventData.accumulated)
+                    if (eventData.accumulated || eventData.parameters.ContainsKey("accumulated_count"))
                     {
-                        eventData.AddParam("accumulated_count", eventData.withinSession ? countInSession : totalCount);
+                        UpdateAccumulatedCount(eventData, countInSession, totalCount);
                     }
 
-                    eventData.AddParam("ama_device_id", User.AmaDeviceId);
+                    if (!eventData.parameters.ContainsKey("ama_device_id"))
+                        eventData.AddParam("ama_device_id", User.AmaDeviceId);
 
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     if (common.normalizeEventName) NormalizeEventName(ref eventNameToSend);
@@ -308,6 +311,30 @@ namespace Amanotes.Core
                 localData.SaveIfDirty();
                 sessionStat.Save();
             }
+            
+            internal static void UpdateAccumulatedCount(EventParams eventData, int countInSession, int totalCount)
+            {
+                var ACCUMULATED_COUNT = "accumulated_count";
+                var countByGDK = eventData.withinSession ? countInSession : totalCount;
+
+                if (!eventData.parameters.ContainsKey(ACCUMULATED_COUNT))
+                {
+                    eventData.AddParam(ACCUMULATED_COUNT, countByGDK);
+                    return;
+                }
+
+                int.TryParse(eventData.parameters[ACCUMULATED_COUNT].ToString(), out int oriAccCount);
+                if (oriAccCount != countByGDK)
+                {
+                    LogWarning($"[Analytics] event <{eventData.eventName}> has difference in accumulated count. Original count: {oriAccCount}. AmaGDK count: {countByGDK}");
+                    if (Config.common.migrateAccumulatedCount && !eventData.withinSession)
+                    {
+                        Log($"[Analytics] Update count of <{eventData.eventName}> from {countByGDK} to {oriAccCount}");
+                        eventData.EventDetail.totalCount = oriAccCount;
+                        localData._dirty = true;
+                    }
+                }
+            }
 
             internal static bool IsAdapterForbidden(AdapterContext adapterContext, EventParams eventData)
             {
@@ -760,6 +787,7 @@ namespace Amanotes.Core.Internal
         public bool showAnalyticsLog = true;
         public bool normalizeEventName = true;
         public bool checkMigrationIntegrity = true;
+        public bool migrateAccumulatedCount = true;
         public bool enableEventStat;
         public AnalyticQualityConfig quality;
     }

package/Runtime/AmaGDK.UserProfile.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using UnityEngine;
@@ -13,24 +14,28 @@ 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();
             }
         }
 
         public partial class UserProfile //PUBLIC
         {
+            public Dictionary<string, object> CollectAllUserIds()
+            {
+                var dic = new Dictionary<string, object>();
+                if (!string.IsNullOrWhiteSpace(IDFA)) dic["idfa"] = IDFA;
+                if (!string.IsNullOrWhiteSpace(IDFV)) dic["idfv"] = IDFV;
+                if (!string.IsNullOrWhiteSpace(GAId)) dic["gaid"] = GAId;
+                if (!string.IsNullOrWhiteSpace(AndroidId)) dic["android_id"] = AndroidId;
+                if (!string.IsNullOrWhiteSpace(PseudoId)) dic["pseudo_id"] = PseudoId;
+                if (!string.IsNullOrWhiteSpace(AmaDeviceId)) dic["ama_device_id"] = AmaDeviceId;
+                if (!string.IsNullOrWhiteSpace(AppsFlyerId)) dic["appsflyer_id"] = AppsFlyerId;
+                if (!string.IsNullOrWhiteSpace(InstallationId)) dic["installation_id"] = InstallationId;
+                return dic;
+            }
+            
             public string UserId
             {
                 get
@@ -101,6 +106,63 @@ namespace Amanotes.Core
                 get => _installationId;
                 set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
+            
+            public void UpdateUserId()
+            {
+#if UNITY_ANDROID
+                if (!string.IsNullOrWhiteSpace(_gaid))
+                {
+                    UserId = $"GAID-{_gaid}";
+                    return;
+                }
+#endif
+#if UNITY_IOS
+                if (!string.IsNullOrWhiteSpace(_idfa))
+                {
+                    UserId = $"IDFA-{_idfa}";
+                    return;
+                }
+#endif          
+                
+                if (!string.IsNullOrWhiteSpace(_pseudoId))
+                {
+                    UserId = $"FRB-{_pseudoId}";
+                    return;
+                }
+                
+#if UNITY_ANDROID
+                if (!string.IsNullOrWhiteSpace(_androidId))
+                {
+                    UserId = $"ADR-{_androidId}";
+                    return;
+                }
+#endif
+#if UNITY_IOS
+                if (!string.IsNullOrWhiteSpace(_idfv))
+                {
+                    UserId = $"IDFV-{_idfv}";
+                    return;
+                }
+#endif
+                
+                if (!string.IsNullOrWhiteSpace(_amaDeviceId))
+                {
+                    UserId = $"AMA-{_amaDeviceId}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_appsFlyerId))
+                {
+                    UserId = $"AF-{_appsFlyerId}";
+                    return;
+                }
+                
+                if (!string.IsNullOrWhiteSpace(_installationId))
+                {
+                    UserId = $"INS-{_installationId}";
+                    return;
+                }
+            }
         }
         
         public partial class UserProfile //INTERNAL
@@ -136,6 +198,14 @@ namespace Amanotes.Core
             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;
@@ -149,67 +219,6 @@ namespace Amanotes.Core
                 }
             }
 
-            internal void UpdateUserId()
-            {
-                if (!string.IsNullOrWhiteSpace(_userId))
-                {
-                    OnUserIdChanged?.Invoke(_userId);
-                    return;
-                }
-                
-#if UNITY_ANDROID
-                if (!string.IsNullOrWhiteSpace(_gaid))
-                {
-                    UserId = $"GAID-{_gaid}";
-                    return;
-                }
-                
-                if (!string.IsNullOrWhiteSpace(_androidId))
-                {
-                    UserId = $"ADR-{_androidId}";
-                    return;
-                }
-#endif
-                
-#if UNITY_IOS
-                if (!string.IsNullOrWhiteSpace(_idfa))
-                {
-                    UserId = $"IDFA-{_idfa}";
-                    return;
-                }
-                
-                if (!string.IsNullOrWhiteSpace(_idfv))
-                {
-                    UserId = $"IDFV-{_idfv}";
-                    return;
-                }
-#endif
-                
-                if (!string.IsNullOrWhiteSpace(_pseudoId))
-                {
-                    UserId = $"FRB-{_pseudoId}";
-                    return;
-                }
-                
-                if (!string.IsNullOrWhiteSpace(_amaDeviceId))
-                {
-                    UserId = $"AMA-{_amaDeviceId}";
-                    return;
-                }
-                
-                if (!string.IsNullOrWhiteSpace(_appsFlyerId))
-                {
-                    UserId = $"AF-{_appsFlyerId}";
-                    return;
-                }
-                
-                if (!string.IsNullOrWhiteSpace(_installationId))
-                {
-                    UserId = $"INS-{_installationId}";
-                    return;
-                }
-            }
-            
             private bool IsAmaDeviceIdExist()
             {
                 if (!string.IsNullOrEmpty(_amaDeviceId))
@@ -226,14 +235,9 @@ namespace Amanotes.Core
                 {
                     case RuntimePlatform.IPhonePlayer:
                         IDFA = id;
-                        IDFV = SystemInfo.deviceUniqueIdentifier;
                         break;
                     case RuntimePlatform.Android:
                         GAId = id;
-                        AndroidId = SystemInfo.deviceUniqueIdentifier;
-                        break;
-                    default:
-                        Logging.LogWarning($"Unsupported platform: {Application.platform}");
                         break;
                 }
             }
@@ -242,35 +246,40 @@ namespace Amanotes.Core
             {
                 AdvertisingIdFetcher.RequestAdvertisingId(advertisingId =>
                 {
-                    SetAdvertisingID(advertisingId);                
-                    switch (Application.platform)
+                    GDKUtils.DelayCall(0, () =>
                     {
-                        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($"Generate AmaDeviceId completed: {_amaDeviceId}");
-                    User.Save();
+                        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($"Generate AmaDeviceId completed: {_amaDeviceId}");
+                        User.Save();
+                    });
                 });
             }
 

package/Runtime/AmaGDK.cs

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

package/{Editor/Utils/AmaGDKEditor.GUI.cs → Runtime/Internal/AmaGDK.Internal.AmaGUI.cs}

@@ -1,8 +1,10 @@
-using System;
-using Amanotes.Core.Internal;
-using UnityEditor;
+using System;
 using UnityEngine;
-namespace Amanotes.Editor
+
+#if UNITY_EDITOR
+using System.Collections.Generic;
+using UnityEditor;
+namespace Amanotes.Core.Internal
 {
     internal static class AmaGUI
     {
@@ -11,10 +13,9 @@ namespace Amanotes.Editor
         private static readonly Color DARK = new Color(0.15f, 0.15f, 0.15f, 1f);
 
         private static GUIStyle BIG_LABEL;
-
-        private static readonly Texture2D TAG_0 = (Texture2D)EditorGUIUtility.IconContent("sv_label_0").image;
-        private static readonly Texture2D TAG_1 = (Texture2D)EditorGUIUtility.IconContent("sv_icon_dot1_pix16_gizmo").image;
-        private static GUIStyle versionStyle = new GUIStyle(EditorStyles.miniBoldLabel)
+        private static readonly Texture2D TAG_0 = (Texture2D) EditorGUIUtility.IconContent("sv_label_0").image;
+        private static readonly Texture2D TAG_1 = (Texture2D) EditorGUIUtility.IconContent("sv_icon_dot1_pix16_gizmo").image;
+        private static readonly GUIStyle versionStyle = new GUIStyle(EditorStyles.miniBoldLabel)
         {
             alignment = TextAnchor.MiddleCenter
         };
@@ -23,6 +24,82 @@ namespace Amanotes.Editor
             alignment = TextAnchor.MiddleCenter
         };
 
+        public static void DrawListColumn<T>(IList<T> list, Action<T> draw, float minColumnWidth = 300)
+        {
+            int nCols = Mathf.Max(1, Mathf.FloorToInt(Screen.width / minColumnWidth));
+            int n = Mathf.CeilToInt(list.Count / (float)nCols);
+            
+            GUILayout.BeginHorizontal();
+            {
+                for (var c = 0; c < nCols; c++)
+                {
+                    GUILayout.BeginVertical();
+                    {
+                        int min = c * n;
+                        int max = Mathf.Min(min + n, list.Count);
+                        
+                        for (int i = min; i < max; i++)
+                        {
+                            draw(list[i]);
+                        }
+                    }
+                    GUILayout.EndVertical();
+                    GUILayout.Space(4f);
+                }
+            }
+            GUILayout.EndHorizontal();
+        }
+        
+        
+        public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 1f)
+        {
+            rect.xMin += margin;
+            rect.xMax -= margin;
+            rect.yMin += margin;
+            rect.yMax -= margin;
+
+            tagColor.a = alpha;
+            GUI.DrawTexture(rect, Texture2D.whiteTexture, ScaleMode.StretchToFill, false, 1f, tagColor, 0f, 5f);
+
+            rect.xMin += 4f;
+            GUI.Label(rect, label, versionStyle);
+        }
+
+        public static void Draw9Slice(Rect rect, Texture2D texture, float l, float r, float t, float b)
+        {
+            float x = rect.x;
+            float y = rect.y;
+            float w = rect.width;
+            float h = rect.height;
+
+            float tw = texture.width;
+            float th = texture.height;
+
+            float lu = l / tw;
+            float ru = (tw - r) / tw;
+            float tv = (th - t) / th;
+            float bv = b / th;
+
+            // Calculate the sizes of the texture's center and corners.
+            float centerX = Mathf.Max(w - l - r, 0);
+            float centerY = Mathf.Max(h - t - b, 0);
+
+            // Draw the corners.
+            GUI.DrawTextureWithTexCoords(new Rect(x, y, l, t), texture, new Rect(0, tv, lu, t / th));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y, r, t), texture, new Rect(ru, tv, r / tw, t / th));
+            GUI.DrawTextureWithTexCoords(new Rect(x, y + h - b, l, b), texture, new Rect(0, 0, lu, bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + h - b, r, b), texture, new Rect(ru, 0, r / tw, bv));
+
+            // Draw the edges.
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y, centerX, t), texture, new Rect(lu, tv, ru - lu, t / th));
+            GUI.DrawTextureWithTexCoords(new Rect(x, y + t, l, centerY), texture, new Rect(0, bv, lu, tv - bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + t, r, centerY), texture, new Rect(ru, bv, r / tw, tv - bv));
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + h - b, centerX, b), texture, new Rect(lu, 0, ru - lu, bv));
+
+            // Draw the center.
+            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + t, centerX, centerY), texture, new Rect(lu, bv, ru - lu, tv - bv));
+        }
+
         public static void SectionLabel(string text)
         {
             if (BIG_LABEL == null)
@@ -31,13 +108,12 @@ namespace Amanotes.Editor
                 {
                     fontSize = 18,
                     alignment = TextAnchor.MiddleCenter,
-                    richText = true
+                    richText = true,
+                    normal = { textColor = Color.white }
                 };
-
-                BIG_LABEL.normal.textColor = Color.white;
             }
-
-            var rect = GUILayoutUtility.GetRect(Screen.width, 32);
+            
+            Rect rect = GUILayoutUtility.GetRect(Screen.width, 32);
             rect.xMin -= 16f;
             EditorGUI.DrawRect(rect, DARK);
             EditorGUI.LabelField(rect, text, BIG_LABEL);
@@ -50,7 +126,7 @@ namespace Amanotes.Editor
             bool result;
             if (color != null)
             {
-                var c = colorMod < 0f ? Color.Lerp(color.Value, Color.black, -colorMod)
+                Color c = colorMod < 0f ? Color.Lerp(color.Value, Color.black, -colorMod)
                     : colorMod > 0f ? Color.Lerp(color.Value, Color.white, colorMod) : color.Value;
                 GUI.backgroundColor = c;
             }
@@ -67,13 +143,13 @@ namespace Amanotes.Editor
             EditorGUIUtility.labelWidth = 220f;
             bool newValue = EditorGUILayout.Toggle(label, value);
             EditorGUIUtility.labelWidth = lbWidth;
-            
+
             if (newValue == value) return false;
             value = newValue;
             return true;
         }
 
-        public static bool ToggleGroup(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
+        public static bool Foldout(string label, ref bool isOpen, Action drawFunc, Action titleFunc = null)
         {
             GUILayout.BeginHorizontal();
             bool newValue = EditorGUILayout.Foldout(isOpen, label);
@@ -93,92 +169,36 @@ namespace Amanotes.Editor
             isOpen = newValue;
             return true;
         }
-
+        
         public static void SemVerGUI(string title, SemVer version, Color? color1 = null, Color? color2 = null)
         {
             const int TAG_SIZE = 60;
-            var rect = GUILayoutUtility.GetRect(120, 16f);
-            var rect1 = rect;
+            Rect rect = GUILayoutUtility.GetRect(120, 16f);
+            Rect rect1 = rect;
 
             rect1.width /= 2;
-            var rect2 = rect1;
+            Rect rect2 = rect1;
             rect2.x += rect.width / 2f;
-            
+
             GUI.Box(rect, GUIContent.none);
-            rect2.xMin += (rect2.width-TAG_SIZE);
+            rect2.xMin += (rect2.width - TAG_SIZE);
             rect2.width = TAG_SIZE;
 
-            if (!color1.HasValue) color1 = LIGHT_BLUE;
-            if (!color2.HasValue) color2 = LIGHT_GRAY;
+            color1 ??= LIGHT_BLUE;
+            color2 ??= LIGHT_GRAY;
             DrawTag(rect2, version.ToString(), version.isValid ? color1.Value : color2.Value, 0.5f);
 
             rect1.xMin += 4f;
             rect1.width = rect.width - rect2.width;
             GUI.Label(rect1, title, versionStyle);
         }
-
-        public static void DrawSDKStatus(string sdkId)
-        {
-            var status = SDKStatus.Get(sdkId);
-            GUILayout.BeginHorizontal();
-            {
-                GUILayout.Label(ObjectNames.NicifyVariableName(sdkId), EditorStyles.boldLabel);
-                GUILayout.FlexibleSpace();
-                SemVerGUI("SDK", status.sdkVersion);
-                GUILayout.Space(4);
-                SemVerGUI("Adapter", status.adapterVersion);
-            }
-            GUILayout.EndHorizontal();
-        }
-
-        public static void DrawTag(Rect rect, string label, Color tagColor, float alpha = 1f, float margin = 1f)
-        {
-            rect.xMin += margin;
-            rect.xMax -= margin;
-            rect.yMin += margin;
-            rect.yMax -= margin;
-
-            tagColor.a = alpha;
-            GUI.DrawTexture(rect, Texture2D.whiteTexture, ScaleMode.StretchToFill, false, 1f, tagColor, 0f, 5f);
-
-            rect.xMin += 4f;
-            GUI.Label(rect, label, versionStyle);
-        }
-
-        public static void Draw9Slice(Rect rect, Texture2D texture,
-            float l, float r, float t, float b)
+        
+        public static void DrawVersionTag(SemVer version, bool? isValid = null)
         {
-            float x = rect.x;
-            float y = rect.y;
-            float w = rect.width;
-            float h = rect.height;
-
-            float tw = texture.width;
-            float th = texture.height;
-
-            float lu = l / tw;
-            float ru = (tw - r) / tw;
-            float tv = (th - t) / th;
-            float bv = b / th;
-
-            // Calculate the sizes of the texture's center and corners.
-            float centerX = Mathf.Max(w - l - r, 0);
-            float centerY = Mathf.Max(h - t - b, 0);
-
-            // Draw the corners.
-            GUI.DrawTextureWithTexCoords(new Rect(x, y, l, t), texture, new Rect(0, tv, lu, t / th));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y, r, t), texture, new Rect(ru, tv, r / tw, t / th));
-            GUI.DrawTextureWithTexCoords(new Rect(x, y + h - b, l, b), texture, new Rect(0, 0, lu, bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + h - b, r, b), texture, new Rect(ru, 0, r / tw, bv));
-
-            // Draw the edges.
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y, centerX, t), texture, new Rect(lu, tv, ru - lu, t / th));
-            GUI.DrawTextureWithTexCoords(new Rect(x, y + t, l, centerY), texture, new Rect(0, bv, lu, tv - bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + w - r, y + t, r, centerY), texture, new Rect(ru, bv, r / tw, tv - bv));
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + h - b, centerX, b), texture, new Rect(lu, 0, ru - lu, bv));
-
-            // Draw the center.
-            GUI.DrawTextureWithTexCoords(new Rect(x + l, y + t, centerX, centerY), texture, new Rect(lu, bv, ru - lu, tv - bv));
+            isValid ??= version.isValid;
+            Rect rect = GUILayoutUtility.GetRect(60f, 60f, 18f, 18f);
+            DrawTag(rect, version.ToString(), isValid.Value ? LIGHT_BLUE : LIGHT_GRAY, 0.5f);
         }
     }
 }
+#endif

package/{Editor/Utils/AmaGDKEditor.GUI.cs.meta → Runtime/Internal/AmaGDK.Internal.AmaGUI.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e22cadf10a36442f9c330cd96560105
+guid: af9c65abd69234ff6bc2f3c8b9f3d92f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/{AmaGDK.Utils.cs → Internal/AmaGDK.Utils.cs}

@@ -253,14 +253,21 @@ namespace Amanotes.Core.Internal
     {
         public static T LoadJsonFromFile<T>(this T instance) where T : IJsonFile, new()
         {
-            if (instance == null)
-            {
-                var result = new T();
-                instance = result;
-            }
+            instance ??= new T();
+            
             string fileName = instance.GetType().Name;
             string json = GDKFileUtils.Load(fileName);
-            JsonUtility.FromJsonOverwrite(json, instance);
+            if (!string.IsNullOrEmpty(json))
+            {
+                try
+                {
+                    JsonUtility.FromJsonOverwrite(json, instance);
+                } catch (Exception e)
+                {
+                    LogWarning("LoadJsonFromFile error: " + fileName + "\n" + e);
+                }
+            }
+            
             return instance;
         }
 

package/Runtime/Internal.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cdfa0e7b648474e318ef91524d78c99a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

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