Skip to content

Commit 2662796

Browse files
DucNV2000DucNV2000
committed
- fix init call back for AdUnit
1 parent c8bbde5 commit 2662796

12 files changed

+96
-97
lines changed

‎Runtime/Admob/AdmobAppOpenAdUnit.cs

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ public override void Init()
2727
{
2828
GetUnitTest();
2929
}
30+
#if VIRTUESKY_TRACKING
31+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
32+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
33+
#endif
3034
}
3135

3236
public override void Load()

‎Runtime/Admob/AdmobBannerAdUnit.cs

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ public override void Init()
3030
{
3131
GetUnitTest();
3232
}
33+
#if VIRTUESKY_TRACKING
34+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
35+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
36+
#endif
3337
}
3438

3539
public override void Load()

‎Runtime/Admob/AdmobClient.cs

+6-14
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ public override void Initialize()
1818
// https://developers.google.com/admob/unity/quick-start#raise_ad_events_on_the_unity_main_thread
1919
MobileAds.RaiseAdEventsOnUnityMainThread = true;
2020

21-
adSettings.AdmobBannerAdUnit.Init();
22-
adSettings.AdmobInterstitialAdUnit.Init();
23-
adSettings.AdmobRewardAdUnit.Init();
24-
adSettings.AdmobRewardedInterstitialAdUnit.Init();
25-
adSettings.AdmobAppOpenAdUnit.Init();
26-
2721
MobileAds.Initialize(initStatus =>
2822
{
2923
if (!adSettings.AdmobEnableTestMode) return;
@@ -32,13 +26,11 @@ public override void Initialize()
3226
MobileAds.SetRequestConfiguration(configuration);
3327
});
3428

35-
#if VIRTUESKY_TRACKING
36-
adSettings.AdmobBannerAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
37-
adSettings.AdmobInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
38-
adSettings.AdmobRewardAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
39-
adSettings.AdmobRewardedInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
40-
adSettings.AdmobAppOpenAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
41-
#endif
29+
adSettings.AdmobBannerAdUnit.Init();
30+
adSettings.AdmobInterstitialAdUnit.Init();
31+
adSettings.AdmobRewardAdUnit.Init();
32+
adSettings.AdmobRewardedInterstitialAdUnit.Init();
33+
adSettings.AdmobAppOpenAdUnit.Init();
4234

4335
RegisterAppStateChange();
4436
LoadInterstitial();
@@ -50,7 +42,7 @@ public override void Initialize()
5042

5143

5244
#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
53-
public void RegisterAppStateChange()
45+
private void RegisterAppStateChange()
5446
{
5547
GoogleMobileAds.Api.AppStateEventNotifier.AppStateChanged += OnAppStateChanged;
5648
}

‎Runtime/Admob/AdmobInterstitialAdUnit.cs

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ public override void Init()
2121
{
2222
GetUnitTest();
2323
}
24+
#if VIRTUESKY_TRACKING
25+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
26+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
27+
#endif
2428
}
2529

2630
public override void Load()

‎Runtime/Admob/AdmobRewardAdUnit.cs

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ public override void Init()
2121
{
2222
GetUnitTest();
2323
}
24+
#if VIRTUESKY_TRACKING
25+
if (string.IsNullOrEmpty(Id)) return;
26+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
27+
#endif
2428
}
2529

2630
public bool IsEarnRewarded { get; private set; }

‎Runtime/Admob/AdmobRewardedInterstitialAdUnit.cs

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ public override void Init()
2121
{
2222
GetUnitTest();
2323
}
24+
#if VIRTUESKY_TRACKING
25+
if (string.IsNullOrEmpty(Id)) return;
26+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
27+
#endif
2428
}
2529

2630
public bool IsEarnRewarded { get; private set; }

‎Runtime/Max/MaxAdClient.cs

-10
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,6 @@ public override void Initialize()
1313
adSettings.MaxRewardAdUnit.Init();
1414
adSettings.MaxAppOpenAdUnit.Init();
1515
adSettings.MaxRewardedInterstitialAdUnit.Init();
16-
17-
#if VIRTUESKY_TRACKING
18-
adSettings.MaxBannerAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
19-
adSettings.MaxInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
20-
adSettings.MaxRewardAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
21-
adSettings.MaxRewardedInterstitialAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
22-
adSettings.MaxAppOpenAdUnit.paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
23-
24-
#endif
25-
2616
LoadInterstitial();
2717
LoadRewarded();
2818
LoadRewardedInterstitial();

‎Runtime/Max/MaxAppOpenAdUnit.cs

+13-14
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,28 @@ public class MaxAppOpenAdUnit : AdUnit
1010
[Tooltip("Automatically show AppOpenAd when app status is changed")]
1111
public bool autoShow = false;
1212

13-
private bool _registerCallback = false;
1413

1514
public override void Init()
1615
{
17-
_registerCallback = false;
16+
#if VIRTUESKY_ADS && VIRTUESKY_MAX
17+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
18+
#if VIRTUESKY_TRACKING
19+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
20+
#endif
21+
MaxSdkCallbacks.AppOpen.OnAdDisplayedEvent += OnAdDisplayed;
22+
MaxSdkCallbacks.AppOpen.OnAdHiddenEvent += OnAdHidden;
23+
MaxSdkCallbacks.AppOpen.OnAdLoadedEvent += OnAdLoaded;
24+
MaxSdkCallbacks.AppOpen.OnAdDisplayFailedEvent += OnAdDisplayFailed;
25+
MaxSdkCallbacks.AppOpen.OnAdLoadFailedEvent += OnAdLoadFailed;
26+
MaxSdkCallbacks.AppOpen.OnAdRevenuePaidEvent += OnAdRevenuePaid;
27+
MaxSdkCallbacks.AppOpen.OnAdClickedEvent += OnAdClicked;
28+
#endif
1829
}
1930

2031
public override void Load()
2132
{
2233
#if VIRTUESKY_ADS && VIRTUESKY_MAX
2334
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
24-
if (!_registerCallback)
25-
{
26-
MaxSdkCallbacks.AppOpen.OnAdDisplayedEvent += OnAdDisplayed;
27-
MaxSdkCallbacks.AppOpen.OnAdHiddenEvent += OnAdHidden;
28-
MaxSdkCallbacks.AppOpen.OnAdLoadedEvent += OnAdLoaded;
29-
MaxSdkCallbacks.AppOpen.OnAdDisplayFailedEvent += OnAdDisplayFailed;
30-
MaxSdkCallbacks.AppOpen.OnAdLoadFailedEvent += OnAdLoadFailed;
31-
MaxSdkCallbacks.AppOpen.OnAdRevenuePaidEvent += OnAdRevenuePaid;
32-
MaxSdkCallbacks.AppOpen.OnAdClickedEvent += OnAdClicked;
33-
_registerCallback = true;
34-
}
35-
3635
MaxSdk.LoadAppOpenAd(Id);
3736
#endif
3837
}

‎Runtime/Max/MaxBannerAdUnit.cs

+16-15
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,33 @@ public class MaxBannerAdUnit : AdUnit
1010
public BannerPosition position = BannerPosition.Bottom;
1111

1212
private bool _isBannerDestroyed = true;
13-
private bool _registerCallback = false;
1413
private bool _isBannerShowing;
1514
private bool _previousBannerShowStatus;
1615

1716
public override void Init()
1817
{
19-
_registerCallback = false;
18+
#if VIRTUESKY_ADS && VIRTUESKY_MAX
19+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
20+
#if VIRTUESKY_TRACKING
21+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
22+
#endif
23+
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnAdLoaded;
24+
MaxSdkCallbacks.Banner.OnAdExpandedEvent += OnAdExpanded;
25+
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnAdLoadFailed;
26+
MaxSdkCallbacks.Banner.OnAdCollapsedEvent += OnAdCollapsed;
27+
MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnAdRevenuePaid;
28+
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnAdClicked;
29+
if (size != BannerSize.Adaptive)
30+
{
31+
MaxSdk.SetBannerExtraParameter(Id, "adaptive_banner", "false");
32+
}
33+
#endif
2034
}
2135

2236
public override void Load()
2337
{
2438
#if VIRTUESKY_ADS && VIRTUESKY_MAX
2539
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
26-
if (!_registerCallback)
27-
{
28-
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnAdLoaded;
29-
MaxSdkCallbacks.Banner.OnAdExpandedEvent += OnAdExpanded;
30-
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnAdLoadFailed;
31-
MaxSdkCallbacks.Banner.OnAdCollapsedEvent += OnAdCollapsed;
32-
MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnAdRevenuePaid;
33-
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnAdClicked;
34-
if (size != BannerSize.Adaptive)
35-
MaxSdk.SetBannerExtraParameter(Id, "adaptive_banner", "false");
36-
_registerCallback = true;
37-
}
38-
3940
if (_isBannerDestroyed)
4041
{
4142
MaxSdk.CreateBanner(Id, ConvertPosition());

‎Runtime/Max/MaxInterstitialAdUnit.cs

+13-14
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,29 @@ namespace VirtueSky.Ads
77
public class MaxInterstitialAdUnit : AdUnit
88
{
99
[NonSerialized] internal Action completedCallback;
10-
private bool _registerCallback = false;
1110

1211

1312
public override void Init()
1413
{
15-
_registerCallback = false;
14+
#if VIRTUESKY_ADS && VIRTUESKY_MAX
15+
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
16+
#if VIRTUESKY_TRACKING
17+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
18+
#endif
19+
MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnAdLoaded;
20+
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
21+
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
22+
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnAdDisplayed;
23+
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnAdHidden;
24+
MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
25+
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnAdClicked;
26+
#endif
1627
}
1728

1829
public override void Load()
1930
{
2031
#if VIRTUESKY_ADS && VIRTUESKY_MAX
2132
if (AdStatic.IsRemoveAd || string.IsNullOrEmpty(Id)) return;
22-
if (!_registerCallback)
23-
{
24-
MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnAdLoaded;
25-
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
26-
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
27-
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnAdDisplayed;
28-
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnAdHidden;
29-
MaxSdkCallbacks.Interstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
30-
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnAdClicked;
31-
_registerCallback = true;
32-
}
33-
3433
MaxSdk.LoadInterstitial(Id);
3534
#endif
3635
}

‎Runtime/Max/MaxRewardAdUnit.cs

+14-15
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,31 @@ public class MaxRewardAdUnit : AdUnit
88
{
99
[NonSerialized] internal Action completedCallback;
1010
[NonSerialized] internal Action skippedCallback;
11-
private bool _registerCallback = false;
1211
public bool IsEarnRewarded { get; private set; }
1312

1413

1514
public override void Init()
1615
{
17-
_registerCallback = false;
16+
#if VIRTUESKY_ADS && VIRTUESKY_MAX
17+
if (string.IsNullOrEmpty(Id)) return;
18+
#if VIRTUESKY_TRACKING
19+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
20+
#endif
21+
MaxSdkCallbacks.Rewarded.OnAdDisplayedEvent += OnAdDisplayed;
22+
MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnAdHidden;
23+
MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnAdLoaded;
24+
MaxSdkCallbacks.Rewarded.OnAdDisplayFailedEvent += OnAdDisplayFailed;
25+
MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnAdLoadFailed;
26+
MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnAdRevenuePaid;
27+
MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnAdReceivedReward;
28+
MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnAdClicked;
29+
#endif
1830
}
1931

2032
public override void Load()
2133
{
2234
#if VIRTUESKY_ADS && VIRTUESKY_MAX
2335
if (string.IsNullOrEmpty(Id)) return;
24-
if (!_registerCallback)
25-
{
26-
MaxSdkCallbacks.Rewarded.OnAdDisplayedEvent += OnAdDisplayed;
27-
MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnAdHidden;
28-
MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnAdLoaded;
29-
MaxSdkCallbacks.Rewarded.OnAdDisplayFailedEvent += OnAdDisplayFailed;
30-
MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnAdLoadFailed;
31-
MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnAdRevenuePaid;
32-
MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnAdReceivedReward;
33-
MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnAdClicked;
34-
_registerCallback = true;
35-
}
36-
3736
MaxSdk.LoadRewardedAd(Id);
3837
#endif
3938
}

‎Runtime/Max/MaxRewardedInterstitialAdUnit.cs

+14-15
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,31 @@ public class MaxRewardedInterstitialAdUnit : AdUnit
88
{
99
[NonSerialized] internal Action completedCallback;
1010
[NonSerialized] internal Action skippedCallback;
11-
private bool _registerCallback = false;
1211
public bool IsEarnRewarded { get; private set; }
1312

1413

1514
public override void Init()
1615
{
17-
_registerCallback = false;
16+
#if VIRTUESKY_ADS && VIRTUESKY_MAX
17+
if (string.IsNullOrEmpty(Id)) return;
18+
#if VIRTUESKY_TRACKING
19+
paidedCallback = VirtueSky.Tracking.AppTracking.TrackRevenue;
20+
#endif
21+
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayedEvent += OnAdDisplayed;
22+
MaxSdkCallbacks.RewardedInterstitial.OnAdHiddenEvent += OnAdHidden;
23+
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
24+
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadedEvent += OnAdLoaded;
25+
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
26+
MaxSdkCallbacks.RewardedInterstitial.OnAdReceivedRewardEvent += OnAdReceivedReward;
27+
MaxSdkCallbacks.RewardedInterstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
28+
MaxSdkCallbacks.RewardedInterstitial.OnAdClickedEvent += OnAdClicked;
29+
#endif
1830
}
1931

2032
public override void Load()
2133
{
2234
#if VIRTUESKY_ADS && VIRTUESKY_MAX
2335
if (string.IsNullOrEmpty(Id)) return;
24-
if (!_registerCallback)
25-
{
26-
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayedEvent += OnAdDisplayed;
27-
MaxSdkCallbacks.RewardedInterstitial.OnAdHiddenEvent += OnAdHidden;
28-
MaxSdkCallbacks.RewardedInterstitial.OnAdDisplayFailedEvent += OnAdDisplayFailed;
29-
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadedEvent += OnAdLoaded;
30-
MaxSdkCallbacks.RewardedInterstitial.OnAdLoadFailedEvent += OnAdLoadFailed;
31-
MaxSdkCallbacks.RewardedInterstitial.OnAdReceivedRewardEvent += OnAdReceivedReward;
32-
MaxSdkCallbacks.RewardedInterstitial.OnAdRevenuePaidEvent += OnAdRevenuePaid;
33-
MaxSdkCallbacks.RewardedInterstitial.OnAdClickedEvent += OnAdClicked;
34-
_registerCallback = true;
35-
}
36-
3736
MaxSdk.LoadRewardedInterstitialAd(Id);
3837
#endif
3938
}

0 commit comments

Comments
 (0)