diff --git a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar new file mode 100644 index 0000000..e6c1694 Binary files /dev/null and b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar differ diff --git a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar.meta b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar.meta new file mode 100644 index 0000000..224c196 --- /dev/null +++ b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics-1.10.1.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 4438c644309264b1babdb7f1fd0431b6 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar deleted file mode 100644 index 9e20434..0000000 Binary files a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar and /dev/null differ diff --git a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar.meta b/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar.meta deleted file mode 100644 index 5c40e68..0000000 --- a/Runtime/GuruAnalytics/Plugins/Android/U3DAnalytics_1.9.0.aar.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 979b8da6b92542e990e6038f43f1835d -timeCreated: 1710317078 \ No newline at end of file diff --git a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar new file mode 100644 index 0000000..dc8fc89 Binary files /dev/null and b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar differ diff --git a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar.meta b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar.meta new file mode 100644 index 0000000..8734aa8 --- /dev/null +++ b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics-1.0.0.aar.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 93255faba714a477da458107e107b535 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar deleted file mode 100644 index 63e9496..0000000 Binary files a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar and /dev/null differ diff --git a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar.meta b/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar.meta deleted file mode 100644 index b412a2e..0000000 --- a/Runtime/GuruAnalytics/Plugins/Android/guru_analytics_0.3.2.aar.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7d0a7721c57840829fad465c4c33e846 -timeCreated: 1710317052 \ No newline at end of file diff --git a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs index affabe9..0b392ce 100644 --- a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs +++ b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs @@ -1,21 +1,21 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using UnityEngine; - namespace Guru { + using System; + using System.Collections; + using System.Collections.Generic; + using System.Globalization; + using System.Linq; + using System.Text; + using Newtonsoft.Json; + using Newtonsoft.Json.Linq; + using UnityEngine; + public class GuruAnalytics { // Plugin Version - public const string Version = "1.9.0"; + public const string Version = "1.10.1"; public static readonly string Tag = "[ANA]"; private static readonly string ActionName = "logger_error"; @@ -93,6 +93,7 @@ namespace Guru /// public static void SetScreen(string screenName) { + if (string.IsNullOrEmpty(screenName)) return; CacheUserProperty($"screen_name", screenName); Agent?.SetScreen(screenName); } @@ -103,6 +104,7 @@ namespace Guru /// public static void SetAdId(string id) { + if (string.IsNullOrEmpty(id)) return; CacheUserProperty($"ad_id", id); Agent?.SetAdId(id); } @@ -114,6 +116,7 @@ namespace Guru /// public static void SetUserProperty(string key, string value) { + if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; CacheUserProperty(key, value); // 添加用户属性 Agent?.SetUserProperty(key, value); } @@ -123,6 +126,7 @@ namespace Guru /// public static void SetFirebaseId(string id) { + if (string.IsNullOrEmpty(id)) return; CacheUserProperty($"firebase_id", id); Agent?.SetFirebaseId(id); } @@ -133,6 +137,7 @@ namespace Guru /// public static void SetAdjustId(string id) { + if (string.IsNullOrEmpty(id)) return; CacheUserProperty($"adjust_id", id); Agent?.SetAdjustId(id); } @@ -143,6 +148,7 @@ namespace Guru /// public static void SetDeviceId(string deviceId) { + if (string.IsNullOrEmpty(deviceId)) return; CacheUserProperty($"device_id", deviceId); Agent?.SetDeviceId(deviceId); } @@ -150,18 +156,15 @@ namespace Guru public static void SetAndroidID(string androidId) { + if (string.IsNullOrEmpty(androidId)) return; CacheUserProperty(Analytics.PropertyAndroidID, androidId); } public static void SetIDFV(string idfv) { + if (string.IsNullOrEmpty(idfv)) return; CacheUserProperty(Analytics.PropertyIDFV, idfv); } - - public static void SetIDFA(string idfa) - { - CacheUserProperty(Analytics.PropertyIDFA, idfa); - } /// @@ -170,6 +173,7 @@ namespace Guru /// public static void SetUid(string uid) { + if (string.IsNullOrEmpty(uid)) return; CacheUserProperty($"uid", uid); Agent?.SetUid(uid); } @@ -375,7 +379,11 @@ namespace Guru { Analytics.LogCrashlytics($"{Tag} --- Json:{msg} Ex:{ex}"); } - } + + string sap = "msg\":"; + OnLoggerErrorEvent((int)AnalyticsCode.Unknown, + msg.Substring(msg.IndexOf(sap, StringComparison.Ordinal) + sap.Length)); + } /// /// 上报错误信息 diff --git a/Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentAndroid.cs b/Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentAndroid.cs index d050737..b4fa7a9 100644 --- a/Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentAndroid.cs +++ b/Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentAndroid.cs @@ -1,8 +1,10 @@ -using System; -using UnityEngine; + namespace Guru { + using System; + using UnityEngine; + public class AnalyticsAgentAndroid: IAnalyticsAgent { @@ -15,6 +17,8 @@ namespace Guru #endif private static bool _isDebug = false; public static bool UseWorker = true; + public static bool UseCronet = false; + public static string BaseUrl = ""; #region 工具方法 @@ -71,13 +75,14 @@ namespace Guru #endregion #region 接口实现 - + public void Init(string appId, string deviceInfo, bool isDebug = false) { _isDebug = isDebug; string bundleId = Application.identifier; - CallStatic("init", appId, deviceInfo, bundleId, UseWorker, isDebug); // 调用接口 + CallStatic("init", appId, deviceInfo, bundleId, UseWorker, isDebug, UseCronet, BaseUrl); // 调用接口 } + public void SetScreen(string screenName) { if (string.IsNullOrEmpty(screenName)) return; @@ -94,7 +99,6 @@ namespace Guru if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; CallStatic("setUserProperty", key, value); } - public void SetFirebaseId(string id) { if (string.IsNullOrEmpty(id)) return;