Skip to content
This repository was archived by the owner on Nov 28, 2023. It is now read-only.

release:v3.0.0 #8

Merged
merged 1 commit into from
Feb 23, 2023
Merged

release:v3.0.0 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Assets/CrossDK/CrossDKConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class CrossDKConverter
private static AndroidJavaObject crossDKWrapper;
private const string CONFIG = "config";
private const string DISMISS = "dismissOverlay";
private const string LOAD = "loadOverlay";
private const string DISPLAY = "displayOverlay";
#endif

Expand Down Expand Up @@ -73,6 +74,24 @@ public static void DismissOverlay()
#endif
}

public static void LoadOverlayWithFormat(OverlayFormat format, OverlayPosition position, bool withCloseButton, bool isRewarded)
{
#if UNITY_EDITOR
Debug.Log("DisplayOverlayWithFormat called in editor");
#elif UNITY_IOS
displayOverlayWithFormat((int)format, (int)position, withCloseButton, isRewarded);
#endif
#if UNITY_ANDROID
object[] parameters = new object[4];
parameters[0] = (int)format;
parameters[1] = (int)position;
parameters[2] = withCloseButton;
parameters[3] = isRewarded;

crossDKWrapper.Call(LOAD, parameters);
#endif
}

public static void DisplayOverlayWithFormat(OverlayFormat format, OverlayPosition position, bool withCloseButton, bool isRewarded)
{
#if UNITY_EDITOR
Expand Down
23 changes: 23 additions & 0 deletions Assets/CrossDK/CrossDKSingleton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ public class CrossDKSingleton : MonoBehaviour
private static CrossDKSingleton _instance;

public delegate void CrossDKDelegate(string message);
public static CrossDKDelegate overlayWillStartPreloadDelegate;
public static CrossDKDelegate overlayDidFinishPreloadDelegate;
public static CrossDKDelegate overlayPreloadExpiredDelegate;
public static CrossDKDelegate overlayWillStartPresentationDelegate;
public static CrossDKDelegate overlayDidFinishPresentationDelegate;
public static CrossDKDelegate overlayWillStartDismissalDelegate;
Expand Down Expand Up @@ -60,6 +63,11 @@ public static void DismissOverlay()
CrossDKConverter.DismissOverlay();
}

public static void LoadOverlay(OverlayFormat format = OverlayFormat.Interstitial, OverlayPosition position = OverlayPosition.Bottom, bool withCloseButton = true, bool isRewarded = true)
{
CrossDKConverter.LoadOverlayWithFormat(format, position, withCloseButton, isRewarded);
}

public static void DisplayOverlay(OverlayFormat format = OverlayFormat.Interstitial, OverlayPosition position = OverlayPosition.Bottom, bool withCloseButton = true, bool isRewarded = true)
{
CrossDKConverter.DisplayOverlayWithFormat(format, position, withCloseButton, isRewarded);
Expand All @@ -74,6 +82,21 @@ public static void DisplayOverlay(OverlayFormat format = OverlayFormat.Interstit
// Logger.Log(message);
//}

internal void OverlayWillStartPreload(string message)
{
overlayWillStartPreloadDelegate?.Invoke(message);
}

internal void OverlayDidFinishPreload(string message)
{
overlayDidFinishPreloadDelegate?.Invoke(message);
}

internal void OverlayPreloadExpired(string message)
{
overlayPreloadExpiredDelegate?.Invoke(message);
}

internal void OverlayWillStartPresentation(string message)
{
overlayWillStartPresentationDelegate?.Invoke(message);
Expand Down
226 changes: 147 additions & 79 deletions Assets/Plugins/Android/CrossDKBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import com.unity3d.player.UnityPlayer
public class CrossDKBridge {
private var mUnityPlayerActivity: Activity = UnityPlayer.currentActivity
private var mOpenedOverlayFormat: OverlayFormat = OverlayFormat.NONE
private lateinit var mCrossDKView: CrossDKView
private lateinit var mCrossDKMidSizeView: CrossDKMidSizeView
private lateinit var mCrossDKInterstitialView: CrossDKInterstitialView
private var mCrossDKView: CrossDKView? = null
private var mCrossDKMidSizeView: CrossDKMidSizeView? = null
private var mCrossDKInterstitialView: CrossDKInterstitialView? = null

///////////////////////////////////////////////////////////////////////////
// CONFIG
///////////////////////////////////////////////////////////////////////////

public fun config(appId: String, apiKey: String, userId: String?, deviceId:String?) {
public fun config(appId: String, apiKey: String, userId: String?, deviceId: String?) {
CrossDKConfig.Builder()
.apiKey(apiKey)
.appId(appId)
Expand All @@ -50,83 +50,52 @@ public class CrossDKBridge {
// DISPLAY
///////////////////////////////////////////////////////////////////////////

public fun displayOverlay(
public fun loadOverlay(
format: Int,
position: Int,
isCloseButtonVisible: Boolean,
isRewarded: Boolean
) {
val crossDKContentCallback = object : CrossDKContentCallback {
override fun onConfigurationError() {
unitySendOverlayError("Overlay error: configuration error")
}

override fun onNoRecommendation() {
unitySendOverlayError("Overlay error: unavailable recommendation")
}

override fun onShowContentError() {
unitySendOverlayError("Overlay error: show content error")
}

override fun onRecommendationDisplayed() {
overlayDidFinishPresentation()
}

override fun onRecommendationClicked() {
overlayShowsRecommendedAppInAppStore()
}

override fun onRecommendationClosed() {
overlayDidFinishDismissal()
destroyViews()
}

override fun onUnsupportedApiVersion() {
unitySendOverlayError("Overlay error: unsupported Api version")
mUnityPlayerActivity.runOnUiThread {
overlayWillStartPreload()
mOpenedOverlayFormat = OverlayFormat.fromInt(format)
createFormat(position, isCloseButtonVisible, isRewarded)
when (mOpenedOverlayFormat) {
OverlayFormat.BANNER -> {
mCrossDKView?.load(getCrossDKLoadCallback())
}
OverlayFormat.MID_SIZE -> {
mCrossDKMidSizeView?.load(getCrossDKLoadCallback())
}
OverlayFormat.INTERSTITIAL -> {
mCrossDKInterstitialView?.load(getCrossDKLoadCallback())
}
else -> {
unitySendOverlayError("Overlay error: unsupported format requested")
}
}
}
}

public fun displayOverlay(
format: Int,
position: Int,
isCloseButtonVisible: Boolean,
isRewarded: Boolean
) {
overlayWillStartPresentation()
mUnityPlayerActivity.runOnUiThread {
if (mOpenedOverlayFormat != OverlayFormat.NONE) dismissOverlay()
val overlayFormat = OverlayFormat.fromInt(format)
mOpenedOverlayFormat = overlayFormat
overlayWillStartPresentation()
when (overlayFormat) {
mOpenedOverlayFormat = OverlayFormat.fromInt(format)
createFormat(position, isCloseButtonVisible, isRewarded)
when (mOpenedOverlayFormat) {
OverlayFormat.BANNER -> {
mCrossDKView = CrossDKView(mUnityPlayerActivity)
mCrossDKView.setCrossDKContentCallback(crossDKContentCallback)
mCrossDKView.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mUnityPlayerActivity.addContentView(mCrossDKView, getLayoutParams())
mCrossDKView.setPosition(if (position == 0) CrossDKPosition.BOTTOM else CrossDKPosition.BOTTOM_RAISED)
mCrossDKView?.show()
}
OverlayFormat.MID_SIZE -> {
mCrossDKMidSizeView = CrossDKMidSizeView(mUnityPlayerActivity)
mCrossDKMidSizeView.setCrossDKContentCallback(crossDKContentCallback)
mCrossDKMidSizeView.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mUnityPlayerActivity.addContentView(mCrossDKMidSizeView, getLayoutParams())
mCrossDKMidSizeView.setPosition(if (position == 0) CrossDKPosition.BOTTOM else CrossDKPosition.BOTTOM_RAISED)
mCrossDKMidSizeView?.show()
}
OverlayFormat.INTERSTITIAL -> {
mCrossDKInterstitialView = CrossDKInterstitialView(mUnityPlayerActivity)
mCrossDKInterstitialView.setCrossDKContentCallback(crossDKContentCallback)
mCrossDKInterstitialView.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mCrossDKInterstitialView.setRewarded(isRewarded,
object : CrossDKRewardedCallback {
override fun onUserRewarded() {
overlayDidFinishPlayingVideo()
overlayDidRewardUserWithReward()
}
})
mUnityPlayerActivity.addContentView(mCrossDKInterstitialView, getLayoutParams())
mCrossDKInterstitialView.load(object : CrossDKLoadCallback {
override fun onRecommendationLoaded() {
mCrossDKInterstitialView.show()
}

override fun onRecommendationLoadFailure() {
overlayDidFailToLoadWithError(java.lang.Exception("Recommendation load failure"))
}
})
mCrossDKInterstitialView?.show()
}
else -> {
unitySendOverlayError("Overlay error: unsupported format requested")
Expand All @@ -140,18 +109,18 @@ public class CrossDKBridge {
mUnityPlayerActivity.runOnUiThread {
when (mOpenedOverlayFormat) {
OverlayFormat.BANNER -> {
mCrossDKView.dismissView(true)
mCrossDKView?.dismissView(true)
destroyViews()
}
OverlayFormat.MID_SIZE -> {
mCrossDKMidSizeView.dismissView(true)
mCrossDKMidSizeView?.dismissView(true)
destroyViews()
}
OverlayFormat.INTERSTITIAL -> {
mCrossDKInterstitialView.dismissView(true)
mCrossDKInterstitialView?.dismissView(true)
destroyViews()
}
else -> {}
OverlayFormat.NONE -> overlayDidFinishDismissal()
}
}
}
Expand All @@ -160,27 +129,30 @@ public class CrossDKBridge {
mUnityPlayerActivity.runOnUiThread {
when (mOpenedOverlayFormat) {
OverlayFormat.BANNER -> {
mCrossDKView.destroy()
val parentView = mCrossDKView.parent
mCrossDKView?.destroy()
val parentView = mCrossDKView?.parent
if (parentView is ViewGroup) {
parentView.removeView(mCrossDKView)
}
mCrossDKView = null
}
OverlayFormat.MID_SIZE -> {
mCrossDKMidSizeView.destroy()
val parentView = mCrossDKMidSizeView.parent
mCrossDKMidSizeView?.destroy()
val parentView = mCrossDKMidSizeView?.parent
if (parentView is ViewGroup) {
parentView.removeView(mCrossDKMidSizeView)
}
mCrossDKMidSizeView = null
}
OverlayFormat.INTERSTITIAL -> {
mCrossDKInterstitialView.destroy()
val parentView = mCrossDKInterstitialView.parent
mCrossDKInterstitialView?.destroy()
val parentView = mCrossDKInterstitialView?.parent
if (parentView is ViewGroup) {
parentView.removeView(mCrossDKInterstitialView)
}
mCrossDKInterstitialView = null
}
else -> {}
else -> mOpenedOverlayFormat = OverlayFormat.NONE
}
mOpenedOverlayFormat = OverlayFormat.NONE
}
Expand All @@ -190,6 +162,18 @@ public class CrossDKBridge {
// LISTENERS
///////////////////////////////////////////////////////////////////////////

private fun overlayWillStartPreload() {
unitySendMessage("OverlayWillStartPreload", "Overlay will start preload");
}

private fun overlayDidFinishedPreload() {
unitySendMessage("OverlayDidFinishPreload", "Overlay did finish preload");
}

private fun overlayPreloadExpired() {
unitySendMessage("OverlayPreloadExpired", "Overlay preload expired");
}

private fun overlayWillStartPresentation() {
unitySendMessage("OverlayWillStartPresentation", "Overlay will start presentation");
}
Expand Down Expand Up @@ -240,6 +224,42 @@ public class CrossDKBridge {
// HELPERS
///////////////////////////////////////////////////////////////////////////

private fun createFormat(
position: Int,
isCloseButtonVisible: Boolean,
isRewarded: Boolean
) {
when {
mOpenedOverlayFormat == OverlayFormat.BANNER && mCrossDKView == null -> {
mCrossDKView = CrossDKView(mUnityPlayerActivity)
mCrossDKView?.setCrossDKContentCallback(getCrossDKContentCallback())
mCrossDKView?.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mUnityPlayerActivity.addContentView(mCrossDKView, getLayoutParams())
mCrossDKView?.setPosition(if (position == 0) CrossDKPosition.BOTTOM else CrossDKPosition.BOTTOM_RAISED)
}
mOpenedOverlayFormat == OverlayFormat.MID_SIZE && mCrossDKMidSizeView == null -> {
mCrossDKMidSizeView = CrossDKMidSizeView(mUnityPlayerActivity)
mCrossDKMidSizeView?.setCrossDKContentCallback(getCrossDKContentCallback())
mCrossDKMidSizeView?.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mUnityPlayerActivity.addContentView(mCrossDKMidSizeView, getLayoutParams())
mCrossDKMidSizeView?.setPosition(if (position == 0) CrossDKPosition.BOTTOM else CrossDKPosition.BOTTOM_RAISED)
}
mOpenedOverlayFormat == OverlayFormat.INTERSTITIAL && mCrossDKInterstitialView == null -> {
mCrossDKInterstitialView = CrossDKInterstitialView(mUnityPlayerActivity)
mCrossDKInterstitialView?.setCrossDKContentCallback(getCrossDKContentCallback())
mCrossDKInterstitialView?.setCloseButtonVisibility(if (isCloseButtonVisible) View.VISIBLE else View.INVISIBLE)
mCrossDKInterstitialView?.setRewarded(isRewarded,
object : CrossDKRewardedCallback {
override fun onUserRewarded() {
overlayDidFinishPlayingVideo()
overlayDidRewardUserWithReward()
}
})
mUnityPlayerActivity.addContentView(mCrossDKInterstitialView, getLayoutParams())
}
}
}

private fun getLayoutParams(): FrameLayout.LayoutParams {
val adParams = FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT
Expand All @@ -266,4 +286,52 @@ public class CrossDKBridge {
fun fromInt(value: Int) = values().first { it.value == value }
}
}

private fun getCrossDKLoadCallback() = object : CrossDKLoadCallback {
override fun onRecommendationLoaded() {
overlayDidFinishedPreload()
}

override fun onRecommendationLoadFailure() {
overlayDidFailToLoadWithError(java.lang.Exception("Recommendation load failure"))
destroyViews()
}

override fun onRecommendationExpired() {
overlayPreloadExpired()
destroyViews()
}
}

private fun getCrossDKContentCallback() = object : CrossDKContentCallback {
override fun onConfigurationError() {
unitySendOverlayError("Overlay error: configuration error")
}

override fun onNoRecommendation() {
unitySendOverlayError("Overlay error: unavailable recommendation")
destroyViews()
}

override fun onShowContentError() {
unitySendOverlayError("Overlay error: show content error")
}

override fun onRecommendationDisplayed() {
overlayDidFinishPresentation()
}

override fun onRecommendationClicked() {
overlayShowsRecommendedAppInAppStore()
}

override fun onRecommendationClosed() {
overlayDidFinishDismissal()
destroyViews()
}

override fun onUnsupportedApiVersion() {
unitySendOverlayError("Overlay error: unsupported Api version")
}
}
}
Loading