From acff632c8ba3ff70923cd861e171f993bf5a5790 Mon Sep 17 00:00:00 2001 From: huyufei Date: Mon, 5 Aug 2024 22:19:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E6=94=B9=20setUID=20?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=B7=B7=E4=B9=B1=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E8=87=AA=E6=89=93=E7=82=B9=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E3=80=82=20=E4=BB=8E=E8=80=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E8=87=AA=E6=89=93=E7=82=B9=E4=B8=8A=E6=8A=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huyufei --- Runtime/GuruAdjust/AdjustService.cs | 34 +-- .../Runtime/Script/GuruAnalytics.cs | 115 +++++----- .../Runtime/Analytics/Analytics.Custom.cs | 214 +++++++----------- .../GuruCore/Runtime/Analytics/Analytics.cs | 2 + .../GuruCore/Runtime/IPM/Scripts/IPMConfig.cs | 30 ++- .../IPM/Scripts/RequestData/DeviceData.cs | 2 +- 6 files changed, 185 insertions(+), 212 deletions(-) diff --git a/Runtime/GuruAdjust/AdjustService.cs b/Runtime/GuruAdjust/AdjustService.cs index 79dd0f0..3da6797 100644 --- a/Runtime/GuruAdjust/AdjustService.cs +++ b/Runtime/GuruAdjust/AdjustService.cs @@ -19,19 +19,20 @@ namespace Guru public const string K_SUB_PURCHASE = "sub_purchase"; // 固定点位事件 private static Action _onInitComplete; - + private static Action _onGetGoogleAdidHandler; - private static string _adId = ""; - public static string AdId + private static string _googleAdId = ""; + public static string GoogleAdId // GPS = Google Play Service { get { - if(string.IsNullOrEmpty(_adId)) FetchGoogleAdId(); - return _adId; // Google AdId + if(string.IsNullOrEmpty(_googleAdId)) FetchGoogleAdIdAsync(); + return _googleAdId; // Google AdId } } public static string IDFA => Adjust.getIdfa(); + public static string IDFV => Adjust.getIdfv(); private static string _adjustId = ""; public static string AdjustId @@ -53,12 +54,13 @@ namespace Guru /// /// /// MIR 追踪 AppID + /// /// /// 初始化完成的时候会返回 AdjustId /// - /// + /// public static void StartService(string appToken, string fbAppId = "", string firebaseId = "", string deviceId = "", - Action onInitComplete = null, Action onDeeplinkCallback = null) + Action onInitComplete = null, Action onDeeplinkCallback = null, Action onGetGoogleAdIdCallback = null) { if (string.IsNullOrEmpty(appToken)) { @@ -67,6 +69,7 @@ namespace Guru } _onInitComplete = onInitComplete; + _onGetGoogleAdidHandler = onGetGoogleAdIdCallback; InstallEvent(firebaseId, deviceId); // 注入启动参数 @@ -79,13 +82,11 @@ namespace Guru if(onDeeplinkCallback != null) config.setDeferredDeeplinkDelegate(onDeeplinkCallback); - - + #if UNITY_ANDROID if (!string.IsNullOrEmpty(fbAppId)) config.setFbAppId(fbAppId); // 注入 MIR ID #endif - #if UNITY_EDITOR || DEBUG config.setLogDelegate(log => LogI(LOG_TAG, log)); config.setEventSuccessDelegate(OnEventSuccessCallback); @@ -98,18 +99,22 @@ namespace Guru Adjust.start(config); // 异步加载AdId - FetchGoogleAdId(); + FetchGoogleAdIdAsync(); LogI(LOG_TAG, $"----- Start AdjustService[{Version}] AdjustVer:{AdjustVersion} -----"); } - public static void FetchGoogleAdId() + /// + /// 异步拉取 Google Ad Id + /// + private static void FetchGoogleAdIdAsync() { Adjust.getGoogleAdId(gid => { if (!string.IsNullOrEmpty(gid)) { - _adId = gid; // 获取Google AD ID + _googleAdId = gid; // 获取Google AD ID + _onGetGoogleAdidHandler?.Invoke(_googleAdId); // 返回 GSADID } }); } @@ -130,9 +135,6 @@ namespace Guru } } - - - #endregion #region 关键属性上报 diff --git a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs index 16a7d05..b525d22 100644 --- a/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs +++ b/Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs @@ -25,7 +25,7 @@ namespace Guru { if (_instance == null) { - throw new Exception("GuruAnalytics not initialized. Please call first."); + _instance = new GuruAnalytics(); } return _instance; } @@ -105,55 +105,50 @@ namespace Guru /// /// 初始化接口 /// - public static void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false, string firebaseId = "") + public void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false, string firebaseId = "") { Debug.Log($"{Tag} --- Guru Analytics [{Version}] initialing..."); - if (_instance == null) - { - _instance = new GuruAnalytics(); - string groupId = "not_set"; + if (_isReady) return; + + string groupId = "not_set"; #if UNITY_ANDROID - // 获取云控参数 - // TODO: 针对 GuruSDK 整体的云控值做一个分组的解决方案 - var guruInitParams = GuruAnalyticsConfigManager.GetInitParams(); - // 记录分组数据 - groupId = guruInitParams.groupId; - - if (!string.IsNullOrEmpty(firebaseId)) - { - // 设置 Firebase ID - _instance.Agent?.SetFirebaseId(firebaseId); - } - - if (guruInitParams.enabled && Instance.Agent is AnalyticsAgentAndroid androidAgent) - { - _instance.EnableErrorLog = true; - _instance._experimentGroupId = groupId; - // 强制转换为 Android 的自打点初始化接口 - androidAgent.InitAndroidConfig(appId, deviceInfo, - guruInitParams.baseUrl, guruInitParams.uploadIpAddress, // <--- Android 附加参数 - onInitComplete, isDebug); - } - else - { - // 外部(云控)如果关闭使用 Android 自打点附加参数, 则使用正常的启动接口 - _instance.Agent.Init(appId, deviceInfo, onInitComplete, isDebug); - } -#else - _instance.EnableErrorLog = false; - _instance._experimentGroupId = groupId; - // iOS 使用正常的启动接口 - _instance.Agent.Init(appId, deviceInfo, onInitComplete, isDebug); -#endif - - - _isReady = true; - - Debug.Log($"{Tag} --- Guru Analytics [{Version}] initialized."); - Debug.Log($"{Tag} --- GroupId: {groupId}"); + // 获取云控参数 + // TODO: 针对 GuruSDK 整体的云控值做一个分组的解决方案 + var guruInitParams = GuruAnalyticsConfigManager.GetInitParams(); + // 记录分组数据 + groupId = guruInitParams.groupId; + + if (!string.IsNullOrEmpty(firebaseId)) + { + // 设置 Firebase ID + Instance.Agent?.SetFirebaseId(firebaseId); } - } + if (guruInitParams.enabled && Instance.Agent is AnalyticsAgentAndroid androidAgent) + { + Instance.EnableErrorLog = true; + Instance._experimentGroupId = groupId; + // 强制转换为 Android 的自打点初始化接口 + androidAgent.InitAndroidConfig(appId, deviceInfo, + guruInitParams.baseUrl, guruInitParams.uploadIpAddress, // <--- Android 附加参数 + onInitComplete, isDebug); + } + else + { + // 外部(云控)如果关闭使用 Android 自打点附加参数, 则使用正常的启动接口 + Instance.Agent.Init(appId, deviceInfo, onInitComplete, isDebug); + } +#else + Instance.EnableErrorLog = false; + Instance._experimentGroupId = groupId; + // iOS 使用正常的启动接口 + Instance.Agent.Init(appId, deviceInfo, onInitComplete, isDebug); +#endif + + _isReady = true; + Debug.Log($"{Tag} --- Guru Analytics [{Version}] initialized."); + Debug.Log($"{Tag} --- GroupId: {groupId}"); + } /// /// 设置视图名称 @@ -161,8 +156,9 @@ namespace Guru /// public void SetScreen(string screenName) { + if (!_isReady) return; if (string.IsNullOrEmpty(screenName)) return; - CacheUserProperty($"screen_name", screenName); + // CacheUserProperty($"screen_name", screenName); Agent.SetScreen(screenName); } @@ -172,8 +168,9 @@ namespace Guru /// public void SetAdId(string id) { + if (!_isReady) return; if (string.IsNullOrEmpty(id)) return; - CacheUserProperty($"ad_id", id); + // CacheUserProperty($"ad_id", id); Agent.SetAdId(id); } @@ -184,8 +181,9 @@ namespace Guru /// public void SetUserProperty(string key, string value) { + if (!_isReady) return; if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; - CacheUserProperty(key, value); // 添加用户属性 + // CacheUserProperty(key, value); // 添加用户属性 // ReSharper disable once Unity.PerformanceCriticalCodeInvocation Agent.SetUserProperty(key, value); } @@ -195,8 +193,9 @@ namespace Guru /// public void SetFirebaseId(string id) { + if (!_isReady) return; if (string.IsNullOrEmpty(id)) return; - CacheUserProperty($"firebase_id", id); + // CacheUserProperty($"firebase_id", id); Agent.SetFirebaseId(id); } @@ -206,8 +205,9 @@ namespace Guru /// public void SetAdjustId(string id) { + if (!_isReady) return; if (string.IsNullOrEmpty(id)) return; - CacheUserProperty($"adjust_id", id); + // CacheUserProperty($"adjust_id", id); Agent.SetAdjustId(id); } @@ -217,28 +217,32 @@ namespace Guru /// public void SetDeviceId(string deviceId) { + if (!_isReady) return; if (string.IsNullOrEmpty(deviceId)) return; - CacheUserProperty($"device_id", deviceId); + // CacheUserProperty($"device_id", deviceId); Agent.SetDeviceId(deviceId); } public void SetAndroidID(string androidId) { + if (!_isReady) return; if (string.IsNullOrEmpty(androidId)) return; - CacheUserProperty(Analytics.PropertyAndroidID, androidId); + // CacheUserProperty(Analytics.PropertyAndroidID, androidId); } public void SetIDFV(string idfv) { + if (!_isReady) return; if (string.IsNullOrEmpty(idfv)) return; - CacheUserProperty(Analytics.PropertyIDFV, idfv); + // CacheUserProperty(Analytics.PropertyIDFV, idfv); } public void SetIDFA(string idfa) { + if (!_isReady) return; if (string.IsNullOrEmpty(idfa)) return; - CacheUserProperty(Analytics.PropertyIDFA, idfa); + // CacheUserProperty(Analytics.PropertyIDFA, idfa); } @@ -248,8 +252,9 @@ namespace Guru /// public void SetUid(string uid) { + if (!_isReady) return; if (string.IsNullOrEmpty(uid)) return; - CacheUserProperty($"uid", uid); + // CacheUserProperty($"uid", uid); Agent.SetUid(uid); } diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs index da169ce..4f3e6f3 100644 --- a/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs +++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs @@ -11,12 +11,14 @@ namespace Guru /// public partial class Analytics { - private static bool _hasGotFirebaseId; //已取得FirebaseId - private static bool _hasGotAdId; // 已取得AdId - private static bool _hasGotIDFA; // 已取得IDFA - private static bool _hasGotAdjustId; // 已取得AdjustId - private static bool _hasGotDeviceId; // 已取得DeviceId - private static bool _hasGotUid; // 已取得UID + private static bool _hasSetFirebaseId; //已取得FirebaseId + private static bool _hasSetAdId; // 已取得AdId + private static bool _hasSetIDFA; // 已取得IDFA + private static bool _hasSetAdjustId; // 已取得AdjustId + private static bool _hasSetDeviceId; // 已取得DeviceId + private static bool _hasSetUid; // 已取得UID + private static bool _hasSetIDFV; // 已经取得 IDFV + private static bool _hasSetAndroidId; // 已取得AndroidId private static DateTime _lastReportRateDate; //上次上报信息的日期 private static double _reportSuccessInterval; // 上报频率 #if UNITY_IOS @@ -36,23 +38,24 @@ namespace Guru string appId = IPMConfig.IPM_X_APP_ID; string deviceInfo = new DeviceInfoData().ToString(); - _hasGotFirebaseId = false; - _hasGotAdId = false; - _hasGotAdjustId = false; - _hasGotDeviceId = false; - _hasGotUid = false; + _hasSetFirebaseId = false; + _hasSetAdId = false; + _hasSetAdjustId = false; + _hasSetDeviceId = false; + _hasSetUid = false; _lastReportRateDate = DateTime.Now; _reportSuccessInterval = 120; // 2分钟上报一次 Debug.Log($"{TAG} [guru_analytic] --- InitGuruAnalyticService: IsDebug:{IsDebug} firebaseId:{firebaseId}"); - GuruAnalytics.Init(appId, deviceInfo, () => + GuruAnalytics.Instance.Init(appId, deviceInfo, () => { OnGuruAnalyticsInitComplete(); Debug.Log($"{TAG} [guru_analytic]--- Guru EXP: GroupId: {GuruAnalytics.Instance.ExperimentGroupId}"); SetUserProperty(GuruAnalyticsConfigManager.KEY_GURU_ANALYTICS_EXP, GuruAnalytics.Instance.ExperimentGroupId); + ApplyAllUserProperties(); }, IsDebug, firebaseId); // Android 初始化 - UpdateAllUserProperties(); + } catch (Exception ex) { @@ -66,57 +69,42 @@ namespace Guru /// /// 设置用户ID /// - private static void SetUid() + public static void SetUid(string uid) { - if (_hasGotUid) return; - - if (!string.IsNullOrEmpty(IPMConfig.IPM_UID)) - { - Debug.Log($"---[ANA] UID: {IPMConfig.IPM_UID}"); - GuruAnalytics.Instance.SetUid(IPMConfig.IPM_UID); - FirebaseAnalytics.SetUserProperty(PropertyUserID, IPMConfig.IPM_UID); - _hasGotUid = true; - } - + if (_hasSetUid) return; + if (string.IsNullOrEmpty(uid)) return; + Debug.Log($"---[ANA] UID: {uid}"); + GuruAnalytics.Instance.SetUid(uid); + FirebaseAnalytics.SetUserId(uid); + _hasSetUid = true; } /// /// 设置设备ID /// - private static void SetDeviceId() + private static void SetDeviceId(string deviceId) { - if (_hasGotDeviceId) return; + if (_hasSetDeviceId) return; - if (!string.IsNullOrEmpty(IPMConfig.IPM_DEVICE_ID)) + if (!string.IsNullOrEmpty(deviceId)) { - GuruAnalytics.Instance.SetDeviceId(IPMConfig.IPM_DEVICE_ID); - FirebaseAnalytics.SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID); - _hasGotDeviceId = true; + GuruAnalytics.Instance.SetDeviceId(deviceId); + FirebaseAnalytics.SetUserProperty(PropertyDeviceID, deviceId); + _hasSetDeviceId = true; } } /// /// 设置 AdjustId /// - private static void SetAdjustId() + private static void SetAdjustId(string adjustId) { - if (_hasGotAdjustId) return; + if (_hasSetAdjustId) return; -#if UNITY_EDITOR - string adjustId = "editor_fake_adjust_id"; -#else - string adjustId = AdjustService.AdjustId; -#endif - if (!string.IsNullOrEmpty(adjustId)) { - IPMConfig.ADJUST_ID = adjustId; - } - - if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID)) - { - GuruAnalytics.Instance.SetAdjustId(IPMConfig.ADJUST_ID); - _hasGotAdjustId = true; + GuruAnalytics.Instance.SetAdjustId(adjustId); + _hasSetAdjustId = true; } else { @@ -128,28 +116,14 @@ namespace Guru /// /// 设置 AdId /// - private static void SetAdId() + private static void SetAdId(string adId) { - if (_hasGotAdId) return; - -#if UNITY_ANDROID - var adId = AdjustService.AdId; - if (!string.IsNullOrEmpty(adId)) - { - // Debug.Log($"---[ANA] ADID: {adId}"); - IPMConfig.ADJUST_ADID = adId; - } -#else - // ============= ADID is not supported on Adjust iOS API ============== - IPMConfig.ADJUST_ADID = VALUE_NOT_FOR_IOS;; -#endif - - if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ADID)) - { - GuruAnalytics.Instance.SetAdId(IPMConfig.ADJUST_ADID); - _hasGotAdId = true; - } - + if (_hasSetAdId) return; + + if (string.IsNullOrEmpty(adId)) return; + GuruAnalytics.Instance.SetAdId(adId); + _hasSetAdId = true; + } @@ -159,18 +133,14 @@ namespace Guru /// /// 设置FirebaseId /// - private static void SetFirebaseId() + private static void SetFirebaseId(string firebaseId) { - if (_hasGotFirebaseId) return; + if (_hasSetFirebaseId) return; - if (!string.IsNullOrEmpty(IPMConfig.FIREBASE_ID)) + if (!string.IsNullOrEmpty(firebaseId)) { - GuruAnalytics.Instance.SetFirebaseId(IPMConfig.FIREBASE_ID); - _hasGotFirebaseId = true; - } - else - { - FetchFirebaseId(); + GuruAnalytics.Instance.SetFirebaseId(firebaseId); + _hasSetFirebaseId = true; } } @@ -200,68 +170,70 @@ namespace Guru /// /// 更新ATT状态 (Only IOS 有效) /// - private static void SetATTStatus() + private static void ApplyATTStatus() { string status = ATTManager.GetStatus(); GuruAnalytics.Instance.SetUserProperty(ParameterATTStatus, status); } - private static void SetIDFV() + private static void SetIDFV(string idfv) { - GuruAnalytics.Instance.SetIDFV(DeviceIDHelper.IDFV); + if(_hasSetIDFV) return; + if (string.IsNullOrEmpty(idfv)) return; + GuruAnalytics.Instance.SetIDFV(idfv); + _hasSetIDFV = true; } - private static void SetIDFA() + private static void SetIDFA(string idfa) { - if(_hasGotIDFA) return; - var idfa = AdjustService.IDFA; - - if (!string.IsNullOrEmpty(idfa)) - { - // Debug.Log($"---[ANA] ADID: {adId}"); - IPMConfig.ADJUST_IDFA = idfa; - } - - if (!string.IsNullOrEmpty(IPMConfig.ADJUST_IDFA)) - { - GuruAnalytics.Instance.SetIDFA(IPMConfig.ADJUST_IDFA); - _hasGotIDFA = true; - } + if(_hasSetIDFA) return; + if (string.IsNullOrEmpty(idfa)) return; + GuruAnalytics.Instance.SetIDFA(idfa); + _hasSetIDFA = true; } - #endif #if UNITY_ANDROID /// /// 更新 Android ID 的参数 /// - private static void SetAndroidId() + private static void SetAndroidId(string androidId) { - GuruAnalytics.Instance.SetAndroidID(DeviceIDHelper.AndroidID); + if (_hasSetAndroidId) return; + if (string.IsNullOrEmpty(androidId)) return; + GuruAnalytics.Instance.SetAndroidID(androidId); + _hasSetAndroidId = true; } #endif /// /// 上报中台打点的用户属性 /// - private static void UpdateAllUserProperties() + private static void ApplyAllUserProperties() { Debug.Log($"{TAG} --- UpdateAllValues"); - SetUid(); - SetDeviceId(); - SetAdjustId(); - SetFirebaseId(); - SetAdId(); + SetUid(IPMConfig.IPM_UID); + SetDeviceId(IPMConfig.IPM_DEVICE_ID); + SetAdjustId(IPMConfig.ADJUST_ID); + if (string.IsNullOrEmpty(IPMConfig.FIREBASE_ID)) + { + FetchFirebaseId(); + } + else + { + SetFirebaseId(IPMConfig.FIREBASE_ID); + } + SetAdId(IPMConfig.ADJUST_ADID); #if UNITY_ANDROID - SetAndroidId(); + SetAndroidId(DeviceIDHelper.AndroidID); #endif #if UNITY_IOS - SetATTStatus(); - SetIDFV(); - SetIDFA(); + ApplyATTStatus(); + SetIDFV(IPMConfig.ADJUST_IDFV); + SetIDFA(IPMConfig.ADJUST_IDFA); #endif ReportEventSuccessRate(); } @@ -281,34 +253,8 @@ namespace Guru #endregion - #region 自定义打点 - - /// - /// 自定义设置用户属性 - /// - /// - /// - private static void CustomSetUserProperty(string key, string value) - { - try - { - GuruAnalytics.Instance.SetUserProperty(key, value); - UpdateAllUserProperties(); // 同步所有的ID - } - catch (Exception ex) - { - if (IsFirebaseReady) - { - Crashlytics.LogException(ex); - } - else - { - Debug.LogException(ex); - } - } - - } - + #region 设置太极02 值 + /// /// 设置太极02阀值 /// diff --git a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs index b75089e..333e897 100644 --- a/Runtime/GuruCore/Runtime/Analytics/Analytics.cs +++ b/Runtime/GuruCore/Runtime/Analytics/Analytics.cs @@ -165,6 +165,8 @@ namespace Guru // 填充相关的追踪事件 _guruEventDriver.AddProperty(key, value); _firebaseEventDriver.AddProperty(key, value); + // 更新所有必要的用户属性 + ApplyAllUserProperties(); Debug.Log($"{TAG} --- SetUserProperty -> propertyName:{key}, propertyValue:{value}"); } catch (Exception ex) diff --git a/Runtime/GuruCore/Runtime/IPM/Scripts/IPMConfig.cs b/Runtime/GuruCore/Runtime/IPM/Scripts/IPMConfig.cs index 8d57a29..2445af1 100644 --- a/Runtime/GuruCore/Runtime/IPM/Scripts/IPMConfig.cs +++ b/Runtime/GuruCore/Runtime/IPM/Scripts/IPMConfig.cs @@ -221,13 +221,25 @@ namespace Guru public static string ADJUST_ID { - get => PlayerPrefs.GetString(nameof(ADJUST_ID), ""); + get + { +#if UNITY_EDITOR + return "editor_fake_adjust_id"; +#endif + return PlayerPrefs.GetString(nameof(ADJUST_ID), ""); + } set => PlayerPrefs.SetString(nameof(ADJUST_ID), value); } - + public static string ADJUST_ADID { - get => PlayerPrefs.GetString(nameof(ADJUST_ADID), ""); + get + { +#if UNITY_IOS + return "not_for_ios"; +#endif + return PlayerPrefs.GetString(nameof(ADJUST_ADID), ""); + } set => PlayerPrefs.SetString(nameof(ADJUST_ADID), value); } @@ -238,10 +250,16 @@ namespace Guru set => PlayerPrefs.SetString(nameof(ADJUST_IDFA), value); } - public static string ADJUST_GPSADID + public static string ADJUST_IDFV { - get => PlayerPrefs.GetString(nameof(ADJUST_GPSADID), ""); - set => PlayerPrefs.SetString(nameof(ADJUST_GPSADID), value); + get => PlayerPrefs.GetString(nameof(ADJUST_IDFV), ""); + set => PlayerPrefs.SetString(nameof(ADJUST_IDFV), value); + } + + public static string ADJUST_GOOGLE_ADID + { + get => PlayerPrefs.GetString(nameof(ADJUST_GOOGLE_ADID), ""); + set => PlayerPrefs.SetString(nameof(ADJUST_GOOGLE_ADID), value); } diff --git a/Runtime/GuruCore/Runtime/IPM/Scripts/RequestData/DeviceData.cs b/Runtime/GuruCore/Runtime/IPM/Scripts/RequestData/DeviceData.cs index 7166924..e58c882 100644 --- a/Runtime/GuruCore/Runtime/IPM/Scripts/RequestData/DeviceData.cs +++ b/Runtime/GuruCore/Runtime/IPM/Scripts/RequestData/DeviceData.cs @@ -61,7 +61,7 @@ namespace Guru firebaseAppInstanceId = IPMConfig.FIREBASE_ID; idfa = IPMConfig.ADJUST_IDFA; adid = IPMConfig.ADJUST_ADID; - gpsAdid = IPMConfig.ADJUST_GPSADID; + gpsAdid = IPMConfig.ADJUST_GOOGLE_ADID; userUuid = IPMConfig.IPM_UUID; }