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

package/Editor/Extra/GDKLocalBuild.cs

@@ -148,34 +148,7 @@ namespace Amanotes.Editor
         {
             var buildDir = new DirectoryInfo(buildFolder);
             if (!buildDir.Exists) Directory.CreateDirectory(buildDir.FullName);
-
-            // Check for existed build with the same name
-            if (info.overwrite == false)
-            {
-                if (info.target == BuildTarget.Android)
-                {
-                    string[] apkNames = info.GetAPKNames(buildFolder);
-                    for (var i = 0; i < apkNames.Length; i++)
-                    {
-                        string item = apkNames[i];
-                        if (!File.Exists(item)) continue;
-                        Debug.LogWarning("Exporting file existed! " + item);
-
-                        // return;
-                    }
-                } else
-                {
-                    string fullBuildPath = info.fullBuildPath(buildFolder);
-                    if (Directory.Exists(fullBuildPath))
-                    {
-                        Debug.LogWarning("Exporting target existed! " + fullBuildPath);
-                        EditorUtility.RevealInFinder(fullBuildPath);
-
-                        // return;
-                    }
-                }
-            }
-
+            
             RemoveUnusedAssets();
             if (info.target == BuildTarget.Android) keystore.Write();
 
@@ -322,9 +295,9 @@ namespace Amanotes.Editor
             public Texture2D buildIcon;
             public BuildTarget target;
 
-            public bool isAAB;
-            public bool splitAPK = true;
-            public bool overwrite = true;
+            // public bool isAAB;
+            // public bool splitAPK = true;
+            // public bool overwrite = true;
             public string buildVersion;
             public int buildNumber;
 
@@ -348,10 +321,10 @@ namespace Amanotes.Editor
                 if (isAndroid)
                 {
                     PlayerSettings.Android.bundleVersionCode = buildNumber;
-                    PlayerSettings.Android.buildApkPerCpuArchitecture = splitAPK;
+                    PlayerSettings.Android.buildApkPerCpuArchitecture = false;//splitAPK;
                     PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARM64 | AndroidArchitecture.ARMv7;
-                    
-                    EditorUserBuildSettings.buildAppBundle = isAAB;
+
+                    EditorUserBuildSettings.buildAppBundle = false;//isAAB;
                     EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
                     
                     #if UNITY_2021_1_OR_NEWER
@@ -368,7 +341,7 @@ namespace Amanotes.Editor
                         string tempName = apkName.Replace(buildName, Application.productName);
 
                         if (File.Exists(tempName)) File.Delete(tempName); // always delete temp file no matter what
-                        if (overwrite && File.Exists(apkName)) File.Delete(apkName);
+                        if (File.Exists(apkName)) File.Delete(apkName);
                     }
 
                     return;
@@ -377,8 +350,6 @@ namespace Amanotes.Editor
                 if (isIOS)
                 {
                     PlayerSettings.iOS.buildNumber = buildNumber.ToString();
-                    if (!overwrite) return;
-
                     string path = fullBuildPath(buildFolder);
                     if (Directory.Exists(path)) Directory.Delete(path, true);
                     return;
@@ -392,17 +363,17 @@ namespace Amanotes.Editor
                 var buildDir = new DirectoryInfo(buildFolder);
                 string fullName = buildDir.FullName;
 
-                if (isAAB)
-                    return new[]
-                    {
-                        Path.Combine(fullName, buildName + ".aab")
-                    };
-
-                if (splitAPK)
-                    return new[]
-                    {
-                        Path.Combine(fullName, buildName + ".arm64-v8a.apk"), Path.Combine(fullName, buildName + ".armeabi-v7a.apk")
-                    };
+                // if (isAAB)
+                //     return new[]
+                //     {
+                //         Path.Combine(fullName, buildName + ".aab")
+                //     };
+                //
+                // if (splitAPK)
+                //     return new[]
+                //     {
+                //         Path.Combine(fullName, buildName + ".arm64-v8a.apk"), Path.Combine(fullName, buildName + ".armeabi-v7a.apk")
+                //     };
 
                 return new[]
                 {
@@ -413,7 +384,7 @@ namespace Amanotes.Editor
             public void PostProcessBuild(string buildFolder)
             {
                 if (target != BuildTarget.Android) return;
-                if (isAAB) return;
+                // if (isAAB) return;
 
                 // var productName = Application.productName;
                 string[] listAPKNames = GetAPKNames(buildFolder);
@@ -439,8 +410,8 @@ namespace Amanotes.Editor
 
                 if (isAndroid)
                 {
-                    if (isAAB) return Path.Combine(buildDir.FullName, buildName + ".aab");
-                    if (splitAPK) return buildDir.FullName;
+                    // if (isAAB) return Path.Combine(buildDir.FullName, buildName + ".aab");
+                    // if (splitAPK) return buildDir.FullName;
                     return Path.Combine(buildDir.FullName, buildName + ".apk");
                 }
 
@@ -737,15 +708,11 @@ namespace Amanotes.Editor
                     {
                         new GDKLocalBuild.BuildInfo
                         {
-                            target = BuildTarget.Android, isAAB = false, splitAPK = true
-                        }.Read(),
-                        new GDKLocalBuild.BuildInfo
-                        {
-                            target = BuildTarget.Android, isAAB = true, splitAPK = true
+                            target = BuildTarget.Android
                         }.Read(),
                         new GDKLocalBuild.BuildInfo
                         {
-                            target = BuildTarget.iOS, isAAB = true, splitAPK = true
+                            target = BuildTarget.iOS
                         }.Read()
                     };
                 }

package/Editor/Extra/SDKVersionTracking.AirTable.cs

@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using Amanotes.Core.Internal;
+using UnityEditor;
+using UnityEditor.Callbacks;
+using UnityEngine;
+
+namespace Amanotes.Editor
+{
+    public partial class SDKVersionTracking
+    {
+        private const string AUTH_TOKEN = "pat1CmLr9XozLt6ZE";
+        private const string URL = "https://gdk.amanotes.io/gdkVersionTracking";
+
+        [PostProcessBuild(999)]
+        public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
+        {
+            var rawData = AllVersions;
+            rawData["UnityVersion"] = Application.unityVersion;
+#if UNITY_ANDROID
+            rawData["Platform"] = "Android";
+            rawData["Permissions"] = GetAllAndroidPermissions();
+            rawData["APILevel"] = (int)PlayerSettings.Android.targetSdkVersion;
+#elif UNITY_IOS
+            rawData["SKAdNetwork"] = GetSkAdNetworkCount($"{pathToBuiltProject}/Info.plist");
+            rawData["Platform"] = "iOS";
+#endif
+            
+            var buildInfo = new Dictionary<string, object>
+            {
+                {"GameName", Application.productName},
+                {"BuildVersion", PlayerSettings.bundleVersion},
+                {"BuildNumber", GetBuildNumber()},
+                {"BuildTime", GetBuildTime()},
+                {"AppId", PlayerSettings.applicationIdentifier },
+                {"RawData", rawData }
+            };
+            string json = JsonUtils.DictionaryToJson(buildInfo, false, false);
+            SendDataToAirTable(json);
+        }
+        
+        private static async Task SendDataToAirTable(string payload)
+        {
+            Debug.Log("AmaGDK | [SDKVersionTracking]: SendDataToAirTable ");
+            try
+            {
+                var client = new HttpClient();
+                var request = new HttpRequestMessage(HttpMethod.Post, URL);
+                request.Headers.Add("Authorization", AUTH_TOKEN);
+                request.Content = new StringContent(payload, Encoding.UTF8, "application/json");
+
+                var response = await client.SendAsync(request);
+                if (response.IsSuccessStatusCode)
+                {
+                    string responseData = await response.Content.ReadAsStringAsync();
+                    Debug.Log("AmaGDK | [SDKVersionTracking]: done " + responseData);
+                }
+                else
+                {
+                    Debug.LogError("AmaGDK | [SDKVersionTracking] Error: " + response.StatusCode);
+                    string errorData = await response.Content.ReadAsStringAsync();
+                    Debug.LogError("AmaGDK | [SDKVersionTracking] Error Response: " + errorData);
+                }
+            }
+            catch (HttpRequestException e)
+            {
+                Debug.LogError("AmaGDK | [SDKVersionTracking] Request Exception: " + e.Message);
+            }
+        }
+    }
+}

package/Editor/Extra/SDKVersionTracking.AirTable.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 53147bd64d3f47109e84b17644c5b1c2
+timeCreated: 1718186649

package/Editor/Extra/SDKVersionTracking.cs

@@ -0,0 +1,232 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
+
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
+
+namespace Amanotes.Editor
+{
+    public partial class SDKVersionTracking
+    {
+        private static Func<Dictionary<string, object>> _getExtraSDKVersion;
+        public static void SetSDKVersionHook(Func<Dictionary<string, object>> hook)
+        {
+            _getExtraSDKVersion = hook;
+        }
+
+    }
+    public partial class SDKVersionTracking : IPreprocessBuildWithReport
+    {
+        public static Dictionary<string, object> AllVersions
+        {
+            get
+            {
+                return _dicThirdPartyVersion
+                    .Concat(_dicExtraVersion)
+                    .Concat(_dicIronSourceAdapterVersion)
+                    .ToDictionary(x => x.Key, x => x.Value);
+            }
+        }
+        
+        private const int MAX_VERSION_KEY_LENGTH = 30;
+        private static Dictionary<string, object> _dicThirdPartyVersion = new Dictionary<string, object>();
+        private static Dictionary<string, object> _dicExtraVersion = new Dictionary<string, object>();
+        private static Dictionary<string, object> _dicIronSourceAdapterVersion = new Dictionary<string, object>();
+
+        private static string GetBuildNumber()
+        {
+#if UNITY_ANDROID
+            return PlayerSettings.Android.bundleVersionCode.ToString();
+#elif UNITY_IOS
+            return PlayerSettings.iOS.buildNumber;
+#else
+            return string.Empty;
+#endif
+        }
+
+        private static string GetBuildTime()
+        {
+            return DateTime.Now.ToString("dd/MM/yyyy HH:mm");
+        }
+        
+        public static int GetSkAdNetworkCount(string infoPlistPath)
+        {
+            int count = 0;
+#if UNITY_IOS
+                if (!File.Exists(infoPlistPath))
+                {
+                    Debug.LogWarning($"AmaGDK | [SDKVersionTracking] InfoPlist file is not exist!\n{infoPlistPath}\n");
+                    return count;
+                }
+
+                PlistDocument plist = new PlistDocument();
+                plist.ReadFromString(File.ReadAllText(infoPlistPath));
+                PlistElementDict rootDict = plist.root;
+                if (!rootDict.values.ContainsKey("SKAdNetworkItems"))
+                    return count;
+                
+                count = rootDict.values["SKAdNetworkItems"].AsArray().values.Count;
+                return count;
+#else
+            return count;
+#endif
+        }
+        
+        public static List<string> GetAllAndroidPermissions()
+        {
+#if UNITY_ANDROID
+            StringBuilder permissions = new StringBuilder();
+            string projectPath = Application.dataPath.Substring(0, Application.dataPath.Length - "Assets".Length);
+
+            List<string> manifestPaths = new List<string>();
+            GetAllManifestPaths(projectPath, manifestPaths);
+
+            HashSet<string> uniquePermissions = new HashSet<string>();
+
+            HashSet<string> removePermission = new HashSet<string>();
+
+            foreach (var path in manifestPaths)
+            {
+                XmlDocument xmlDoc = GetXML(path);
+                var permissionNodes = xmlDoc.SelectNodes("manifest/uses-permission");
+
+                if (permissionNodes == null)
+                    continue;
+
+                foreach (XmlNode node in permissionNodes)
+                {
+                    if (node.Attributes == null)
+                        continue;
+                    if(node.Attributes["android:name"] == null)
+                        continue;
+
+                    string permissionName = node.Attributes["android:name"].Value;
+
+                    XmlAttribute attribute = node.Attributes["tools:node"];
+                    
+                    if (attribute != null && attribute.Value.Trim().Equals("remove")) removePermission.Add(permissionName);
+
+                    uniquePermissions.Add(permissionName);
+                }
+            }
+
+            uniquePermissions.ExceptWith(removePermission);
+            
+            List<string> permissionList = uniquePermissions.ToList();
+            permissionList.Sort();
+            return permissionList;
+#else
+            return new List<string>();
+#endif
+        }
+
+        private static void GetAllManifestPaths(string directory, List<string> manifestPaths)
+        {
+            string[] manifestFiles = Directory.GetFiles(directory, "AndroidManifest.xml", SearchOption.AllDirectories);
+            manifestPaths.AddRange(manifestFiles);
+        }
+
+        private static XmlDocument GetXML(string path)
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            try
+            {
+                if (File.Exists(path))
+                {
+                    xmlDoc.LoadXml(File.ReadAllText(path));
+                }
+            }
+            catch (Exception exception)
+            {
+                Debug.LogError("Can't parse xml: " + path + "\n" + exception.Message);
+            }
+            return xmlDoc;
+        }
+
+        private static void AppendVersion(StringBuilder sb, string sectionName, Dictionary<string,object> dict)
+        {
+            if (dict == null || dict.Count == 0) return;
+            AppendVersion(sb, sectionName, dict
+                .Where(kvp=>kvp.Value != null)
+                .Select(kvp=> (kvp.Key, kvp.Value))
+                .OrderBy(kvp=>kvp.Key)
+            );
+        }
+        
+        private static void AppendVersion(StringBuilder sb, string sectionName, IEnumerable<(string, object)> list)
+        {
+            if (list == null) return;
+            sb.Append($"\n// {sectionName}\n");
+            sb.Append("//----------------------------------------------------\n");
+            
+            foreach ((string key, object value) in list)
+            {
+                sb.Append($"{key, -MAX_VERSION_KEY_LENGTH}\t=\t{value.ToString().Replace("'", "")}\n");
+            }
+        }
+
+        public static List<(string, object)> GetBuildInfo()
+        {
+            return new List<(string, object)>()
+            {
+                ("Version", Application.version),
+                ("BuildNumber", GetBuildNumber()),
+                ("BuildTime", GetBuildTime()),
+                ("UnityVersion", Application.unityVersion)
+#if UNITY_ANDROID
+                ,("API Level", (int)PlayerSettings.Android.targetSdkVersion)
+#endif
+            };
+        }
+
+        private static void WriteToStreamingAssets()
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.Append("// Automatically generated by AmaGDK after every build\n");
+
+                AppendVersion(sb, "BUILD INFO", GetBuildInfo());
+                AppendVersion(sb, "THIRD PARTY", _dicThirdPartyVersion);
+                AppendVersion(sb, "IS ADAPTER", _dicIronSourceAdapterVersion);
+                AppendVersion(sb, "EXTRA", _dicExtraVersion);
+                
+                string folderPath = Application.streamingAssetsPath;
+                string filePath = Path.Combine(folderPath, "SDKVersion.txt");
+
+                if (!Directory.Exists(folderPath))
+                {
+                    Directory.CreateDirectory(folderPath);
+                }
+
+                File.WriteAllText(filePath, sb.ToString());
+                Debug.Log("AmaGDK | [SDKVersionTracking] The third-party version logs have been written to: " + filePath);
+                AssetDatabase.Refresh();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError("AmaGDK | [SDKVersionTracking] Exception encountered while logging local third-party versions: " + e);
+            }
+        }
+
+        public int callbackOrder { get; }
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            _dicThirdPartyVersion = AmaGDKExtra.GetThirdPartyVersions();
+            _dicIronSourceAdapterVersion = AmaGDKExtra.GetIronSourceAdapterVersions();
+            _dicExtraVersion = _getExtraSDKVersion?.Invoke() ?? _dicExtraVersion;
+
+            WriteToStreamingAssets();
+        }
+        
+    }
+}

package/Editor/Extra/SDKVersionTracking.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5d8af764a90804bf98634a5939bffb90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Analytics.cs

@@ -439,6 +439,7 @@ namespace Amanotes.Core
                     m.LogEvent(eventNameToSend, eventParams.parameters);
                     inUseAdapterIDs?.Add(m.adapterId);
                 }
+                ForceQuit.OnLogEvent(eventNameToSend, eventParams.parameters);
 
                 return (eventNameToSend, inUseAdapterIDs);
             }
@@ -1099,8 +1100,14 @@ namespace Amanotes.Core.Internal
         [HideInNormalInspector] public bool checkMigrationIntegrity = true;
         [HideInNormalInspector] public bool migrateAccumulatedCount = true;
         [HideInNormalInspector] public bool enableEventStat;
-        [HideInNormalInspector] public List<string> immediatelyLoggedEvents = new List<string>(){"ad_impression", "ad_impression_ama"};
-        public AnalyticQualityConfig quality;
+        [HideInInspector] public List<string> immediatelyLoggedEvents = new List<string>()
+        {
+            "ad_impression",
+            "ad_impression_ama",
+            "fullads_impression",
+            "videoads_impression",
+        };
+        public AnalyticQualityConfig quality = new AnalyticQualityConfig();
     }
     
     [Serializable]
@@ -1125,8 +1132,8 @@ namespace Amanotes.Core.Internal
     
     public abstract class AnalyticsAdapter : Adapter2
     {
-        [HideInNormalInspector] public List<string> NeverSend = new List<string>();
-        [HideInNormalInspector] public List<string> AlwaysSend = new List<string>();
+        [HideInInspector] public List<string> NeverSend = new List<string>();
+        [HideInInspector] public List<string> AlwaysSend = new List<string>();
         protected abstract bool SendEventByDefault { get; }
         
         public bool IsForbidden(string eventName)

package/Runtime/AmaGDK.Mono.cs

@@ -17,8 +17,6 @@ namespace Amanotes.Core
         
         private void Update()
         {
-            if (!isReady) return;
-            
             time = Time.time;
             realtimeSinceStartup = Time.realtimeSinceStartup;
 

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -39,9 +39,8 @@ namespace Amanotes.Core
             {
                 get
                 {
-                    if (_cacheExisted == null)
-                        _cacheExisted = GDKFileUtils.Exist(fileName);
-                    return _cacheExisted.GetValueOrDefault();
+                    _cacheExisted ??= GDKFileUtils.Exist(fileName);
+                    return _cacheExisted.Value;
                 }
             }
 
@@ -195,7 +194,7 @@ namespace Amanotes.Core
                 }
                 
                 _fetchState = FetchState.Fetch;
-                adapter.FetchConfig(HasCache, (isSuccess, result) =>
+                adapter.FetchConfig(!HasCache, (isSuccess, result) =>
                 {
                     if (!isSuccess)
                     {

package/Runtime/AmaGDK.UserProfile.cs

@@ -158,7 +158,7 @@ namespace Amanotes.Core
                 set
                 {
                     var pattern = ALPHANUMERIC_HYPHEN_PATTERN;
-#if UNITY_ANDROID && !UNITY_EDITOR
+#if UNITY_ANDROID && !UNITY_EDITOR_OSX
                     pattern = ALPHANUMERIC_PATTERN;
 #endif
                     if (!ValidateId(value, pattern))

package/Runtime/AmaGDK.cs

@@ -17,14 +17,16 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.66";
+        public const string VERSION = "0.2.65-3";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
         internal static readonly GDKGeoLocation GeoLocation = new GDKGeoLocation();
         internal static readonly GDKServerTime ServerTime = new GDKServerTime();
+        private static readonly ForceQuitMonitor ForceQuit = new ForceQuitMonitor();
         
         internal static bool _allowInit = false;
+        
         public bool autoInit = true;
         
         internal static partial class Event
@@ -100,6 +102,7 @@ namespace Amanotes.Core
                 Ads.InitModule();
                 IAP.InitModule();
                 RemoteConfig.InitModule();
+                Audio.InitModule();
             }
             Profiler.EndSample();
         }
@@ -186,6 +189,8 @@ namespace Amanotes.Core
                 ServerTime.UpdateTime();
             }
             
+            ForceQuit.Init();
+            
             _status = Status.Ready;
             dispatcher.Dispatch(Event.GDK_READY);