Compare commits

..

No commits in common. "567c688b808d3ea56661ca1b6d75feeeaab70ac5" and "d90bb4c3321c3ba4df5027c8a55a4eba32538ae6" have entirely different histories.

1 changed files with 6 additions and 30 deletions

View File

@ -64,15 +64,11 @@ namespace WZ
LoggerUtils.Debug($"[Admob] Native Ad unit {adUnitId} load end, timingRefresh {timingRefresh}. {ad} error {error}"); LoggerUtils.Debug($"[Admob] Native Ad unit {adUnitId} load end, timingRefresh {timingRefresh}. {ad} error {error}");
if (error != null || ad == null) if (error != null || ad == null)
{ {
if (!timingRefresh) if (!_retryCounters.TryAdd(adUnitId, 0))
{ {
if (!_retryCounters.TryAdd(adUnitId, 0)) _retryCounters[adUnitId]++;
{
_retryCounters[adUnitId]++;
}
} }
var adSource = ""; var adSource = "";
if (ad != null) if (ad != null)
{ {
@ -93,21 +89,8 @@ namespace WZ
Time.realtimeSinceStartup - _adStartLoadTimes[adUnitId], Time.realtimeSinceStartup - _adStartLoadTimes[adUnitId],
reason); reason);
// 定时任务的刷新,由定时任务自己去刷新
if (timingRefresh)
{
if (!showingNativeAds.ContainsKey(adUnitId))
{
LoggerUtils.Debug($"[Admob] Native Ad unit {adUnitId}, 已经隐藏了失败了也不需要在重新load了");
return;
}
TimingRefresh(adUnitId);
return;
}
var retryDelay = Math.Pow(2, Math.Min(6, _retryCounters[adUnitId])); var retryDelay = Math.Pow(2, Math.Min(6, _retryCounters[adUnitId]));
TimerUtils.Instance.DelayExecute((float)retryDelay, () => { LoadAd(adUnitId); }); TimerUtils.Instance.DelayExecute((float)retryDelay, () => { LoadAd(adUnitId, timingRefresh); });
LoggerUtils.Error($"[Admob] Native Ad unit {adUnitId}, timingRefresh {timingRefresh} ad failed to load an ad with error : " + error + " \n retryDelay :" + retryDelay); LoggerUtils.Error($"[Admob] Native Ad unit {adUnitId}, timingRefresh {timingRefresh} ad failed to load an ad with error : " + error + " \n retryDelay :" + retryDelay);
return; return;
} }
@ -172,18 +155,12 @@ namespace WZ
{ {
if (showingNativeAds.TryGetValue(adUnitId, out var showing)) if (showingNativeAds.TryGetValue(adUnitId, out var showing))
{ {
var showingNativeOverlayAd = showing.NativeOverlayAd;
if (showingNativeOverlayAd != tempAd)
{
LoggerUtils.Error("[Admob] Native ad Error!!!! showing.NativeOverlayAd != tempAd");
}
LoggerUtils.Warning("[Admob] Native ad timing refresh , show ad"); LoggerUtils.Warning("[Admob] Native ad timing refresh , show ad");
ShowAd(showing.Position, adUnitId, tempAd, showingNativeOverlayAd); ShowAd(showing.Position, adUnitId, tempAd);
} }
else else
{ {
LoggerUtils.Warning($"[Admob] Native ad timing refresh , show fail , showing native ads not ad unit id , {adUnitId} , 广告已经隐藏了,刷新成功,不需要再去显示出来"); LoggerUtils.Warning($"[Admob] Native ad timing refresh , show fail , showing native ads not ad unit id , {adUnitId}");
} }
} }
}); });
@ -203,7 +180,7 @@ namespace WZ
} }
// 显示特定广告位的广告 // 显示特定广告位的广告
public void ShowAd(NativeAdPosition position, string adUnitId, NativeOverlayAd lastAd = null, NativeOverlayAd lastShowAd = null) public void ShowAd(NativeAdPosition position, string adUnitId, NativeOverlayAd lastAd = null)
{ {
if (!AdmobAdsManager.Instance.FindAdsID(AdsType.Native, adUnitId)) if (!AdmobAdsManager.Instance.FindAdsID(AdsType.Native, adUnitId))
{ {
@ -236,7 +213,6 @@ namespace WZ
showingNativeAds[adUnitId] = new ShowNativePosition(ad, position); showingNativeAds[adUnitId] = new ShowNativePosition(ad, position);
ad.Show(); ad.Show();
lastAd?.Hide(); lastAd?.Hide();
lastShowAd?.Hide();
TimingRefresh(adUnitId); TimingRefresh(adUnitId);
} }
} }