diff --git a/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs b/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs index f450560..8273da0 100644 --- a/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs +++ b/Runtime/GuruCore/Runtime/Adjust/AdjustService.cs @@ -24,25 +24,22 @@ namespace Guru } } - private static string _adujstId = ""; + private static string _adjustId = ""; public static string AdjustId { get { - if (string.IsNullOrEmpty(_adujstId)) _adujstId = Adjust.getAdid(); - return _adujstId; // Adjust AdId; + if (string.IsNullOrEmpty(_adjustId)) _adjustId = Adjust.getAdid(); + return _adjustId; // Adjust AdId; } } - - - - #region 启动服务 /// /// Adjust启动服务 /// + /// /// MIR 追踪 AppID public static void StartService(string appToken, string fbAppId = "") { @@ -60,10 +57,7 @@ namespace Guru config.setDelayStart(DelayTime); #if UNITY_ANDROID - if (!string.IsNullOrEmpty(fbAppId)) - { - config.setFbAppId(fbAppId); - } + if (!string.IsNullOrEmpty(fbAppId)) config.setFbAppId(fbAppId); // 注入 MIR ID #endif @@ -80,24 +74,10 @@ namespace Guru Adjust.start(config); // 缓存标准属性 - _adujstId = Adjust.getAdid(); // 获取AdjustID - // StandardProperties.AdjustId = _adujstId; - - // Loom.RunAsync(() => - // { - // Adjust.getGoogleAdId(gid => - // { - // if (!string.IsNullOrEmpty(gid)) - // { - // Loom.QueueOnMainThread(() => - // { - // StandardProperties.GoogleAdId = gid; // 获取Google AD ID - // }); - // } - // }); - // }); - - FetchGoogleAdId(); // 异步加载AdId + _adjustId = Adjust.getAdid(); // 获取AdjustID + + // 异步加载AdId + FetchGoogleAdId(); } public static void FetchGoogleAdId() @@ -126,8 +106,7 @@ namespace Guru ins.sendInBackground = true; } } - - + #endregion #region 关键属性上报 @@ -360,6 +339,22 @@ namespace Guru Adjust.trackEvent(adjustEvent); } + /// + /// 广告收入上报 (Adjust 特有的接口) + /// + /// + public static void TrackADRevenue(MaxSdkBase.AdInfo adInfo) + { + if (adInfo == null) + return; + + var adRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceAppLovinMAX); + adRevenue.setRevenue(adInfo.Revenue, "USD"); + adRevenue.setAdRevenueNetwork(adInfo.NetworkName); + adRevenue.setAdRevenueUnit(adInfo.AdUnitIdentifier); + adRevenue.setAdRevenuePlacement(adInfo.Placement); + Adjust.trackAdRevenue(adRevenue); + } #endregion @@ -391,7 +386,8 @@ namespace Guru } #endregion - + + #region 工具接口 private static AdjustEnvironment GetAdjustEnvironment() { @@ -411,17 +407,7 @@ namespace Guru #endif } - public static void TrackADRevenue(MaxSdkBase.AdInfo adInfo) - { - if (adInfo == null) - return; - - var adRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceAppLovinMAX); - adRevenue.setRevenue(adInfo.Revenue, "USD"); - adRevenue.setAdRevenueNetwork(adInfo.NetworkName); - adRevenue.setAdRevenueUnit(adInfo.AdUnitIdentifier); - adRevenue.setAdRevenuePlacement(adInfo.Placement); - Adjust.trackAdRevenue(adRevenue); - } + #endregion + } } \ No newline at end of file diff --git a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs index 753fb29..842249f 100644 --- a/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs +++ b/Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs @@ -74,10 +74,10 @@ namespace Guru } } - #region 关联FirebaseID 到 Adjust + #region 启动 Adjust 服务 /// - /// 关联FirebaseID到Adjust + /// 启动 Adjust 服务 /// private static void InitAdjustService() { @@ -97,7 +97,8 @@ namespace Guru // 启动 AdjustService string appToken = GuruSettings.Instance.AdjustSetting?.GetAppToken() ?? ""; - AdjustService.StartService(appToken); + string fbAppId = GuruSettings.Instance.IPMSetting.FacebookAppId; + AdjustService.StartService(appToken, fbAppId); }); }