Skip to content

Commit

Permalink
- fix init call back for AdUnit
Browse files Browse the repository at this point in the history
  • Loading branch information
@DucNV2000
DucNV2000 committed Jul 3, 2024
1 parent c8bbde5 commit 2662796
Show file tree
Hide file tree
Showing 12 changed files with 96 additions and 97 deletions.
4 changes: 4 additions & 0 deletions Runtime/Admob/AdmobAppOpenAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ public override void Init()
{
GetUnitTest();
}
#if VIRTUESKY_TRACKING
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
}

public override void Load()
Expand Down
4 changes: 4 additions & 0 deletions Runtime/Admob/AdmobBannerAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ public override void Init()
{
GetUnitTest();
}
#if VIRTUESKY_TRACKING
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
}

public override void Load()
Expand Down
20 changes: 6 additions & 14 deletions Runtime/Admob/AdmobClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ public override void Initialize()
// https://developers.google.com/admob/unity/quick-start#raise_ad_events_on_the_unity_main_thread
MobileAds.RaiseAdEventsOnUnityMainThread = true;

adSettings.AdmobBannerAdUnit.Init();
adSettings.AdmobInterstitialAdUnit.Init();
adSettings.AdmobRewardAdUnit.Init();
adSettings.AdmobRewardedInterstitialAdUnit.Init();
adSettings.AdmobAppOpenAdUnit.Init();

MobileAds.Initialize(initStatus =>
{
if (!adSettings.AdmobEnableTestMode) return;
Expand All @@ -32,13 +26,11 @@ public override void Initialize()
MobileAds.SetRequestConfiguration(configuration);
});

#if VIRTUESKY_TRACKING
adSettings.AdmobBannerAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.AdmobInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.AdmobRewardAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.AdmobRewardedInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.AdmobAppOpenAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
adSettings.AdmobBannerAdUnit.Init();
adSettings.AdmobInterstitialAdUnit.Init();
adSettings.AdmobRewardAdUnit.Init();
adSettings.AdmobRewardedInterstitialAdUnit.Init();
adSettings.AdmobAppOpenAdUnit.Init();

RegisterAppStateChange();
LoadInterstitial();
Expand All @@ -50,7 +42,7 @@ public override void Initialize()


#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
public void RegisterAppStateChange()
private void RegisterAppStateChange()
{
GoogleMobileAds.Api.AppStateEventNotifier.AppStateChanged += OnAppStateChanged;
}
Expand Down
4 changes: 4 additions & 0 deletions Runtime/Admob/AdmobInterstitialAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ public override void Init()
{
GetUnitTest();
}
#if VIRTUESKY_TRACKING
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
}

public override void Load()
Expand Down
4 changes: 4 additions & 0 deletions Runtime/Admob/AdmobRewardAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ public override void Init()
{
GetUnitTest();
}
#if VIRTUESKY_TRACKING
if (string.IsNullOrEmpty(Id)) return;
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
}

public bool IsEarnRewarded { get; private set; }
Expand Down
4 changes: 4 additions & 0 deletions Runtime/Admob/AdmobRewardedInterstitialAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ public override void Init()
{
GetUnitTest();
}
#if VIRTUESKY_TRACKING
if (string.IsNullOrEmpty(Id)) return;
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
}

public bool IsEarnRewarded { get; private set; }
Expand Down
10 changes: 0 additions & 10 deletions Runtime/Max/MaxAdClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@ public override void Initialize()
adSettings.MaxRewardAdUnit.Init();
adSettings.MaxAppOpenAdUnit.Init();
adSettings.MaxRewardedInterstitialAdUnit.Init();

#if VIRTUESKY_TRACKING
adSettings.MaxBannerAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.MaxInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.MaxRewardAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.MaxRewardedInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
adSettings.MaxAppOpenAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;

#endif

LoadInterstitial();
LoadRewarded();
LoadRewardedInterstitial();
Expand Down
27 changes: 13 additions & 14 deletions Runtime/Max/MaxAppOpenAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,28 @@ public class MaxAppOpenAdUnit : AdUnit
[Tooltip("Automatically show AppOpenAd when app status is changed")]
public bool autoShow = false;

private bool _registerCallback = false;

public override void Init()
{
_registerCallback = false;
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
#if VIRTUESKY_TRACKING
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
MaxSdkCallbacks.AppOpen.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.AppOpen.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.AppOpen.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.AppOpen.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.AppOpen.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.AppOpen.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.AppOpen.OnAdClickedEvent += OnAdClicked;
#endif
}

public override void Load()
{
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
if (!_registerCallback)
{
MaxSdkCallbacks.AppOpen.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.AppOpen.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.AppOpen.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.AppOpen.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.AppOpen.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.AppOpen.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.AppOpen.OnAdClickedEvent += OnAdClicked;
_registerCallback = true;
}

MaxSdk.LoadAppOpenAd(Id);
#endif
}
Expand Down
31 changes: 16 additions & 15 deletions Runtime/Max/MaxBannerAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,33 @@ public class MaxBannerAdUnit : AdUnit
public BannerPosition position = BannerPosition.Bottom;

private bool _isBannerDestroyed = true;
private bool _registerCallback = false;
private bool _isBannerShowing;
private bool _previousBannerShowStatus;

public override void Init()
{
_registerCallback = false;
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
#if VIRTUESKY_TRACKING
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Banner.OnAdExpandedEvent += OnAdExpanded;
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Banner.OnAdCollapsedEvent += OnAdCollapsed;
MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnAdClicked;
if (size != BannerSize.Adaptive)
{
MaxSdk.SetBannerExtraParameter(Id, "adaptive_banner", "false");
}
#endif
}

public override void Load()
{
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
if (!_registerCallback)
{
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Banner.OnAdExpandedEvent += OnAdExpanded;
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Banner.OnAdCollapsedEvent += OnAdCollapsed;
MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnAdClicked;
if (size != BannerSize.Adaptive)
MaxSdk.SetBannerExtraParameter(Id, "adaptive_banner", "false");
_registerCallback = true;
}

if (_isBannerDestroyed)
{
MaxSdk.CreateBanner(Id, ConvertPosition());
Expand Down
27 changes: 13 additions & 14 deletions Runtime/Max/MaxInterstitialAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@ namespace VirtueSky.Ads
public class MaxInterstitialAdUnit : AdUnit
{
[NonSerialized] internal Action completedCallback;
private bool _registerCallback = false;


public override void Init()
{
_registerCallback = false;
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
#if VIRTUESKY_TRACKING
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnAdClicked;
#endif
}

public override void Load()
{
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
if (!_registerCallback)
{
MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnAdClicked;
_registerCallback = true;
}

MaxSdk.LoadInterstitial(Id);
#endif
}
Expand Down
29 changes: 14 additions & 15 deletions Runtime/Max/MaxRewardAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,31 @@ public class MaxRewardAdUnit : AdUnit
{
[NonSerialized] internal Action completedCallback;
[NonSerialized] internal Action skippedCallback;
private bool _registerCallback = false;
public bool IsEarnRewarded { get; private set; }


public override void Init()
{
_registerCallback = false;
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (string.IsNullOrEmpty(Id)) return;
#if VIRTUESKY_TRACKING
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
MaxSdkCallbacks.Rewarded.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Rewarded.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnAdReceivedReward;
MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnAdClicked;
#endif
}

public override void Load()
{
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (string.IsNullOrEmpty(Id)) return;
if (!_registerCallback)
{
MaxSdkCallbacks.Rewarded.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.Rewarded.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnAdReceivedReward;
MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnAdClicked;
_registerCallback = true;
}

MaxSdk.LoadRewardedAd(Id);
#endif
}
Expand Down
29 changes: 14 additions & 15 deletions Runtime/Max/MaxRewardedInterstitialAdUnit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,31 @@ public class MaxRewardedInterstitialAdUnit : AdUnit
{
[NonSerialized] internal Action completedCallback;
[NonSerialized] internal Action skippedCallback;
private bool _registerCallback = false;
public bool IsEarnRewarded { get; private set; }


public override void Init()
{
_registerCallback = false;
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (string.IsNullOrEmpty(Id)) return;
#if VIRTUESKY_TRACKING
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
#endif
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.RewardedInterstitial.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.RewardedInterstitial.OnAdReceivedRewardEvent += OnAdReceivedReward;
MaxSdkCallbacks.RewardedInterstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.RewardedInterstitial.OnAdClickedEvent += OnAdClicked;
#endif
}

public override void Load()
{
#if VIRTUESKY_ADS && VIRTUESKY_MAX
if (string.IsNullOrEmpty(Id)) return;
if (!_registerCallback)
{
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayedEvent += OnAdDisplayed;
MaxSdkCallbacks.RewardedInterstitial.OnAdHiddenEvent += OnAdHidden;
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadedEvent += OnAdLoaded;
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
MaxSdkCallbacks.RewardedInterstitial.OnAdReceivedRewardEvent += OnAdReceivedReward;
MaxSdkCallbacks.RewardedInterstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
MaxSdkCallbacks.RewardedInterstitial.OnAdClickedEvent += OnAdClicked;
_registerCallback = true;
}

MaxSdk.LoadRewardedInterstitialAd(Id);
#endif
}
Expand Down

0 comments on commit 2662796

Please sign in to comment.