Skip to content

Commit 4b3eace

Browse files
committed
#4 Fixed issue when state was not reported to GDScript correctly also placement id was added to adsFinish signal
1 parent ede176a commit 4b3eace

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

godot-lib.release/build.gradle

Lines changed: 0 additions & 2 deletions
This file was deleted.

unity-ads/build.gradle

Lines changed: 0 additions & 2 deletions
This file was deleted.

unityadsgodot/src/main/java/com/jandans/unityaddsgodot/UnityAdsInterface.java

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class UnityAdsInterface extends GodotPlugin implements IUnityAdsListener,
2727
private final String TAG = "UnityAdsInterface";
2828
private SignalInfo UnityAdsReady = new SignalInfo("UnityAdsReady");
2929
private SignalInfo UnityAdsStart = new SignalInfo("UnityAdsStart");
30-
private SignalInfo UnityAdsFinish = new SignalInfo("UnityAdsFinish", String.class);
30+
private SignalInfo UnityAdsFinish = new SignalInfo("UnityAdsFinish", String.class, String.class);
3131
private SignalInfo UnityAdsError = new SignalInfo("UnityAdsError", String.class);
3232
private SignalInfo UnityBannerLoaded = new SignalInfo("UnityBannerLoaded");
3333
private SignalInfo UnityBannerUnloaded = new SignalInfo("UnityBannerUnloaded");
@@ -49,30 +49,34 @@ public String getPluginName() {
4949
@NonNull
5050
@Override
5151
public List<String> getPluginMethods() {
52-
List<String> retVal = new ArrayList<String>();
53-
retVal.add("initialise");
54-
retVal.add("showBanner");
55-
retVal.add("loadAd");
56-
retVal.add("show");
57-
retVal.add("hideBanner");
58-
retVal.add("isReady");
59-
return retVal;
52+
return new ArrayList<String>() {
53+
{
54+
add("initialise");
55+
add("showBanner");
56+
add("loadAd");
57+
add("show");
58+
add("hideBanner");
59+
add("isReady");
60+
}
61+
};
6062
}
6163

6264
@NonNull
6365
@Override
6466
public Set<SignalInfo> getPluginSignals() {
65-
Set<SignalInfo> retVal = new HashSet<SignalInfo>();
66-
retVal.add(UnityAdsReady);
67-
retVal.add(UnityAdsStart);
68-
retVal.add(UnityAdsFinish);
69-
retVal.add(UnityAdsError);
70-
retVal.add(UnityBannerLoaded);
71-
retVal.add(UnityBannerUnloaded);
72-
retVal.add(UnityBannerShow);
73-
retVal.add(UnityBannerHide);
74-
retVal.add(UnityBannerError);
75-
return retVal;
67+
return new HashSet<SignalInfo>() {
68+
{
69+
add(UnityAdsReady);
70+
add(UnityAdsStart);
71+
add(UnityAdsFinish);
72+
add(UnityAdsError);
73+
add(UnityBannerLoaded);
74+
add(UnityBannerUnloaded);
75+
add(UnityBannerShow);
76+
add(UnityBannerHide);
77+
add(UnityBannerError);
78+
}
79+
};
7680
}
7781

7882
public void initialise(String appId, boolean testMode)
@@ -160,7 +164,7 @@ public void onUnityAdsStart(String s) {
160164
}
161165

162166
@Override
163-
public void onUnityAdsFinish(String s, UnityAds.FinishState finishState) {
167+
public void onUnityAdsFinish(String placement, UnityAds.FinishState finishState) {
164168
int state = -1;
165169

166170
// Implement conditional logic for each ad completion status:
@@ -172,11 +176,11 @@ public void onUnityAdsFinish(String s, UnityAds.FinishState finishState) {
172176
state = 1;
173177
} else if (finishState == UnityAds.FinishState.ERROR) {
174178
// Log an error.
175-
Log.e(TAG, s);
179+
Log.e(TAG, placement);
176180
state = 0;
177181
}
178182

179-
emitSignal(UnityAdsFinish.getName(), s.toString());
183+
emitSignal(UnityAdsFinish.getName(), placement, String.format("%d", state));
180184
}
181185

182186
@Override
@@ -214,5 +218,6 @@ public void onUnityBannerHide(String s) {
214218
public void onUnityBannerError(String s) {
215219
emitSignal(UnityBannerError.getName(), s);
216220
Log.e(TAG, s);
221+
hideBanner();
217222
}
218223
}

0 commit comments

Comments
 (0)