diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Data/KwaiAdsConfigParser.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Data/KwaiAdsConfigParser.cs index 1a9641c..9457299 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Data/KwaiAdsConfigParser.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Data/KwaiAdsConfigParser.cs @@ -16,6 +16,7 @@ namespace WZ if (string.IsNullOrEmpty(json)) { LoggerUtils.Error("KwaiBiddingConfig JSON string is null or empty"); + return; } if (isRv) @@ -37,56 +38,32 @@ namespace WZ public static bool GetKwaiRvFloorOpen() { - if (_rvConfig == null) - { - return false; - } - return _rvConfig.kwai_floor_open == 1; + return _rvConfig?.kwai_floor_open == 1; } public static int GetRvParallelRequests() { - if (_rvConfig == null) - { - return 0; - } - return _rvConfig.parallel_requests; + return _rvConfig?.parallel_requests ?? 0; } public static List GetRvFloorConfigs() { - if (_rvConfig == null) - { - return null; - } - return _rvConfig.floors; + return _rvConfig?.floors ?? null; } public static bool GetKwaiIvFloorOpen() { - if (_ivConfig == null) - { - return false; - } - return _ivConfig.kwai_floor_open == 1; + return _ivConfig?.kwai_floor_open == 1; } public static int GetIvParallelRequests() { - if (_ivConfig == null) - { - return 0; - } - return _ivConfig.parallel_requests; + return _ivConfig?.parallel_requests ?? 0; } public static List GetIvFloorConfigs() { - if (_ivConfig == null) - { - return null; - } - return _ivConfig.floors; + return _ivConfig?.floors ?? null; } public static string GetKwaiAppId() diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs index 716bc69..f8bd91e 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs @@ -38,7 +38,6 @@ namespace WZ public void Initialize() { - if (KwaiAdsConfigParser.GetKwaiRvFloorOpen()) { KwaiFloorRvManager.Instance.InitializeWithFloors(); @@ -60,7 +59,7 @@ namespace WZ } else { - + LoggerUtils.Debug("KwaiAdsManager RefreshAdsData" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId+ " init:" + _initialized); if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token) || _initialized) return; var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() .SetAppId(_appId) @@ -78,10 +77,12 @@ namespace WZ { _appId = AdConfigParser.GetKwaiAppId(); _token = AdConfigParser.GetKwaiAppToken(); + _rewardAdUnitId = AdConfigParser.GetKwaiAdUnits(AdsType.Rewarded).FirstOrDefault(); _interstitialAdUnitId = AdConfigParser.GetKwaiAdUnits(AdsType.Interstitial).FirstOrDefault(); - KwaiFloorRvManager.Instance.LoadKwaiBiddingConfig(); - KwaiFloorIvManager.Instance.LoadKwaiBiddingConfig(); + if (KwaiAdsConfigParser.GetKwaiRvFloorOpen()) KwaiFloorRvManager.Instance.LoadKwaiBiddingConfig(); + if (KwaiAdsConfigParser.GetKwaiIvFloorOpen()) KwaiFloorIvManager.Instance.LoadKwaiBiddingConfig(); + LoggerUtils.Debug("KwaiAdsManager RefreshAdsData" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId); }