diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs index 6eaa9c7..df9b207 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs @@ -148,7 +148,7 @@ namespace WZ #region 插页广告功能 public void LoadInterstitial() { - _admobBannerAdManager?.Destroy(); + _admobInterstitialAdManager?.Destroy(); _admobInterstitialAdManager = new AdmobInterstitialAdManager(); _admobInterstitialAdManager.InitializeAdUnits( _interstitialAdUnits, @@ -245,7 +245,7 @@ namespace WZ public bool IsSplashAvailable() { if (!_initialized) return false; - return _admobBannerAdManager.GetAvailableAdUnits().Count > 0; + return _admobSplashAdManager.GetAvailableAdUnits().Count > 0; } public void DisplaySplash() { @@ -324,7 +324,7 @@ namespace WZ public double GetNativeRevenue(string adUnitId) { - return _admobBannerAdManager.GetAdRevenue(adUnitId); + return _admobNativeAdManager.GetHighestPayingAdRevenue(); } #endregion diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs index 6bf969c..7089088 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/Utils/AdmobTools.cs @@ -17,11 +17,11 @@ namespace WZ { string responseInfoJson = responseInfo.ToString(); JObject responseInfoObj = JObject.Parse(responseInfoJson); - JToken loadedAdapterResponse = responseInfoObj["Response Extras"]; + JToken loadedAdapterResponse = responseInfoObj["Adapter Responses"]; if (loadedAdapterResponse != null) { - pubid = loadedAdapterResponse["mediation_group_name"]?.ToString(); + pubid = loadedAdapterResponse["Credentials"]?.ToString(); } } catch diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index 9a90d0f..b26ed5d 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -72,7 +72,7 @@ namespace WZ _showFailedCallback?.Invoke(); return; } - AdsSDKManager.Instance.otherAdsOnShow = true; + otherAdsOnShow = true; PlatformType result = GetBestPlatformType(false); BidPlatformManager.Instance.RecordBidSuccess(result, AdsType.Rewarded); if (result == PlatformType.AppLovin) @@ -222,7 +222,6 @@ namespace WZ { if (isInterstitial) { - LoggerUtils.Debug("yangwu max price"); AdPriceInfo priceInfo = new AdPriceInfo( maxPrice: MaxAdsManager.Instance.GetInterstitialRevenue(), admobPrice: AdmobAdsManager.Instance.GetInterstitialRevenue(), diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs index d4b1cf1..354b65b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs @@ -113,7 +113,7 @@ namespace WZ public bool IsRewardedAvailable() { - if (!_initialized) return false; + if (!_initialized || _rewardedAdManager == null) return false; return _rewardedAdManager.GetAvailableAdUnits().Count > 0; } @@ -127,6 +127,7 @@ namespace WZ public double GetRewardedRevenue() { + if (!_initialized || _rewardedAdManager == null) return -1; return _rewardedAdManager.GetHighestPayingAdRevenue(); } @@ -190,7 +191,7 @@ namespace WZ public bool IsInterstitialAvailable() { - if (!_initialized) return false; + if (!_initialized || _interstitialAdManager == null) return false; return _interstitialAdManager.GetAvailableAdUnits().Count > 0; } @@ -203,6 +204,7 @@ namespace WZ public double GetInterstitialRevenue() { + if (!_initialized || _interstitialAdManager == null) return -1; return _interstitialAdManager.GetHighestPayingAdRevenue(); } #endregion diff --git a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs index 5682a36..c0104c3 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Utils/AdsBidResult.cs @@ -31,7 +31,7 @@ namespace WZ private static object m_kwaiObj = "m_kwaiObj"; public static PlatformType GetPlatformType(AdPriceInfo priceInfo) { -#if UNITY_ANDROID && UNITY_EDITOR +#if UNITY_ANDROID && !UNITY_EDITOR using (AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) { AndroidJavaObject activity = unityPlayer.GetStatic("currentActivity"); diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs index e9f1d3a..22c8462 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseAnalyticsManager.cs @@ -13,6 +13,7 @@ namespace WZ /// public class FireBaseAnalyticsManager : D_MonoSingleton { + private const string KEY_SUPER_PROPERTIES = "KEY_SUPER_PROPERTIES"; private Dictionary superProperties = new Dictionary(); @@ -28,6 +29,7 @@ namespace WZ public void LogEvent(string eventName) { + if (!FireBaseRemoteConfigManager.Instance.IsInitialized) return; var superProperties = GetSuperProperties(); if (superProperties.Count > 0) { @@ -41,6 +43,7 @@ namespace WZ public void LogEvent(string eventName, string key1, object value1) { + if (!FireBaseRemoteConfigManager.Instance.IsInitialized) return; List parameters = new List(); parameters.Add(GetParameter(key1, value1)); @@ -54,6 +57,7 @@ namespace WZ public void LogEvent(string eventName, Dictionary dict) { + if (!FireBaseRemoteConfigManager.Instance.IsInitialized) return; List parameters = new List(); foreach (var item in dict) { @@ -72,6 +76,7 @@ namespace WZ public void LogEvent(string eventName, Dictionary dict) { + if (!FireBaseRemoteConfigManager.Instance.IsInitialized) return; List parameters = new List(); foreach (var item in dict) { @@ -162,6 +167,7 @@ namespace WZ /// 第几次展示该格式的广告 public void OnAdRevenueEvent(string ad_platform, string ad_source, string ad_unit_name, AdsType ad_format, double revenue, string position, int number) { + if (!FireBaseRemoteConfigManager.Instance.IsInitialized) return; var impressionParameters = new[] { new Firebase.Analytics.Parameter("ad_platform", ad_platform), new Firebase.Analytics.Parameter("ad_source", ad_source), diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs index 6e3d3fd..8fe66ba 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs @@ -8,35 +8,37 @@ namespace WZ { public class FireBaseRemoteConfigManager : D_MonoSingleton { + public bool IsInitialized { get; private set; } = false; public void FetchRemoteConfig() { // Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task => // { // if (task.Result == Firebase.DependencyStatus.Available) // { - Firebase.RemoteConfig.FirebaseRemoteConfig.DefaultInstance.FetchAsync(TimeSpan.Zero).ContinueWithOnMainThread(task => - { - FirebaseRemoteConfig.DefaultInstance.ActivateAsync().ContinueWithOnMainThread(task => - { - AdjustTrackEvent.Instance.UpdateEventToken(); - // 获取广告位信息 - AdConfigParser.Parse(GetRemoteConfigString("ad_config")); - // 刷新广告位信息 - AdsSDKManager.Instance.RefreshAdsData(); - //AB测试分组参数 - GroupSet(); + Firebase.RemoteConfig.FirebaseRemoteConfig.DefaultInstance.FetchAsync(TimeSpan.Zero).ContinueWithOnMainThread(task => + { + FirebaseRemoteConfig.DefaultInstance.ActivateAsync().ContinueWithOnMainThread(task => + { + IsInitialized = true; + AdjustTrackEvent.Instance.UpdateEventToken(); + // 获取广告位信息 + AdConfigParser.Parse(GetRemoteConfigString("ad_config")); + // 刷新广告位信息 + AdsSDKManager.Instance.RefreshAdsData(); + //AB测试分组参数 + GroupSet(); - // adjust卸载监控 + // adjust卸载监控 - /* 执行到这时，表示firebase接入正常，能获取到远端在线参数 */ + /* 执行到这时，表示firebase接入正常，能获取到远端在线参数 */ - // 设置 firebase 初始化成功 flag + // 设置 firebase 初始化成功 flag - // 初始化广告 + // 初始化广告 - // 检查Adjust归因 - }); - }); + // 检查Adjust归因 + }); + }); // } // }); }