Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support events in rendering API #452

Merged
merged 4 commits into from
May 18, 2022
Merged

Support events in rendering API #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed3faaa
feat: support win event in rendering API #443
ValentinPostindustria May 16, 2022
e6012e8
feat: add native event notifications #443
ValentinPostindustria May 16, 2022
9832889
fix: fix null pointer #443
ValentinPostindustria May 16, 2022
65f2aed
feat: request impression urls when Open measurement impression notifi…
ValentinPostindustria May 17, 2022
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
9 changes: 9 additions & 0 deletions Example/PrebidInternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/AdFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.prebid.mobile.renderingtestapp
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
Expand All @@ -38,7 +39,11 @@ import org.prebid.mobile.renderingtestapp.utils.OpenRtbConfigs
abstract class AdFragment : BaseFragment() {

companion object {
private val TAG = AdFragment::class.simpleName

const val CONFIGURATOR_REQUEST_CODE = 0

const val ARGUMENT_ACCOUNT_ID = "ARGUMENT_ACCOUNT_ID"
}

var idlingResource = CountingIdlingResource(AdFragment::class.java.simpleName)
Expand All @@ -64,6 +69,10 @@ abstract class AdFragment : BaseFragment() {
val title = it.getString(getString(R.string.key_title), getString(R.string.segment_title_in_app))
setTitle(title)
shouldSetNoBids()
it.getString(ARGUMENT_ACCOUNT_ID)?.let { accountId ->
Log.d(TAG, "Using custom account id: $accountId")
PrebidMobile.setPrebidServerAccountId(accountId)
}
}
if (ConfigurationViewSettings.isEnabled && configuratorMode() != null) {
startAdConfigurator()
Expand Down
182 changes: 172 additions & 10 deletions ...nternalTestApp/src/main/java/org/prebid/mobile/renderingtestapp/utils/DemoItemProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package org.prebid.mobile.renderingtestapp.utils

import android.content.Context
import android.os.Bundle
import org.prebid.mobile.renderingtestapp.AdFragment
import org.prebid.mobile.renderingtestapp.R
import org.prebid.mobile.renderingtestapp.data.DemoItem
import org.prebid.mobile.renderingtestapp.data.Tag
Expand Down Expand Up @@ -95,7 +96,6 @@ class DemoItemProvider private constructor() {
val ppmInterstitialTagList = listOf(Tag.ALL, Tag.IN_APP, Tag.INTERSTITIAL, Tag.REMOTE)
val ppmMraidTagList = listOf(Tag.ALL, Tag.IN_APP, Tag.MRAID, Tag.REMOTE)
val ppmVideoTagList = listOf(Tag.ALL, Tag.IN_APP, Tag.VIDEO, Tag.REMOTE)

val ppmNativeTagList = listOf(Tag.ALL, Tag.IN_APP, Tag.NATIVE, Tag.REMOTE)

// In-App Banner
Expand All @@ -112,21 +112,54 @@ class DemoItemProvider private constructor() {
getString(R.string.demo_bidding_in_app_banner_320_50_imp_prebid_random_bid),
ppmBannerAction,
ppmBannerTagList,
createBannerBundle(R.string.imp_prebid_id_banner_320x50, null, 320, 50, R.string.response_prebid_banner_320_50)
createBannerBundle(
R.string.imp_prebid_id_banner_320x50,
null,
320,
50,
R.string.response_prebid_banner_320_50
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_in_app_banner_320_50_no_bids), ppmBannerAction,
ppmBannerTagList, createBannerBundle(R.string.imp_prebid_id_no_bids, null, 320, 50, R.string.response_prebid_no_bids)
getString(R.string.demo_bidding_in_app_banner_320_50_no_bids),
ppmBannerAction,
ppmBannerTagList,
createBannerBundle(R.string.imp_prebid_id_no_bids, null, 320, 50, R.string.response_prebid_no_bids)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_in_app_banner_320_50_events),
ppmBannerAction,
ppmBannerTagList,
createBannerBundle(
R.string.imp_prebid_id_banner_320x50,
null,
320,
50,
R.string.response_prebid_banner_320_50
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_in_app_banner_300_250),
ppmBannerAction,
ppmBannerTagList,
createBannerBundle(R.string.imp_prebid_id_banner_300x250, null, 300, 250,R.string.response_prebid_banner_300_250)
createBannerBundle(
R.string.imp_prebid_id_banner_300x250,
null,
300,
250,
R.string.response_prebid_banner_300_250
)
)
)
demoList.add(
Expand Down Expand Up @@ -631,7 +664,10 @@ class DemoItemProvider private constructor() {
getString(R.string.demo_bidding_in_app_native),
R.id.action_header_bidding_to_in_app_native,
ppmNativeTagList,
createBannerBundle(R.string.imp_prebid_id_native_styles,storedResponse = R.string.response_prebid_native_styles)
createBannerBundle(
R.string.imp_prebid_id_native_styles,
storedResponse = R.string.response_prebid_native_styles
)
)
)
demoList.add(
Expand All @@ -647,7 +683,26 @@ class DemoItemProvider private constructor() {
getString(R.string.demo_bidding_in_app_native_links),
R.id.action_header_bidding_to_in_app_native_links,
ppmNativeTagList,
createBannerBundle(R.string.imp_prebid_id_native_links,storedResponse = R.string.response_prebid_native_links)
createBannerBundle(
R.string.imp_prebid_id_native_links,
storedResponse = R.string.response_prebid_native_links
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_in_app_native_events),
R.id.action_header_bidding_to_in_app_native,
ppmNativeTagList,
createBannerBundle(
R.string.imp_prebid_id_native_styles,
storedResponse = R.string.response_prebid_native_styles
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
}
Expand Down Expand Up @@ -701,10 +756,28 @@ class DemoItemProvider private constructor() {
R.string.imp_prebid_id_banner_320x50,
R.string.adunit_gam_banner_320_50_random,
320,
50,R.string.response_prebid_banner_320_50
50, R.string.response_prebid_banner_320_50
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_gam_banner_320_50_app_event_with_events_url),
gamBannerAction,
gamBannerTagList,
createBannerBundle(
R.string.imp_prebid_id_banner_320x50,
R.string.adunit_gam_banner_320_50_app_event,
320,
50, R.string.response_prebid_banner_320_50
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_gam_banner_300_250),
Expand All @@ -714,7 +787,7 @@ class DemoItemProvider private constructor() {
R.string.imp_prebid_id_banner_300x250,
R.string.adunit_gam_banner_300_250,
300,
250,R.string.response_prebid_banner_300_250
250, R.string.response_prebid_banner_300_250
)
)
)
Expand Down Expand Up @@ -1027,9 +1100,28 @@ class DemoItemProvider private constructor() {
)
)

demoList.add(
DemoItem(
getString(R.string.demo_bidding_gam_native_custom_templates_events),
R.id.action_header_bidding_to_gam_native,
gamNativeTagList,
createBannerBundle(
R.string.imp_prebid_id_native_styles,
R.string.adunit_gam_native_custom_template,
storedResponse = R.string.response_prebid_native_styles
).apply {
putString(GamNativeFragment.ARG_CUSTOM_FORMAT_ID, "11934135")
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)

gamNativeBundle = createBannerBundle(
R.string.imp_prebid_id_no_bids,
R.string.adunit_gam_native_custom_template,storedResponse = R.string.response_prebid_no_bids
R.string.adunit_gam_native_custom_template, storedResponse = R.string.response_prebid_no_bids
)
gamNativeBundle.putString(GamNativeFragment.ARG_CUSTOM_FORMAT_ID, "11982639")
demoList.add(
Expand Down Expand Up @@ -1147,6 +1239,24 @@ class DemoItemProvider private constructor() {
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_admob_banner_320_50_adapter_with_events),
adMobBannerAction,
adMobBannerTagList,
createBannerBundle(
R.string.imp_prebid_id_banner_320x50_high_price,
R.string.admob_banner_bidding_ad_unit_id_adapter,
320, 50,
R.string.response_prebid_banner_320_50
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_admob_banner_300_250_adapter),
Expand Down Expand Up @@ -1350,6 +1460,23 @@ class DemoItemProvider private constructor() {
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_admob_native_adapter_events),
adMobNativeAction,
adMobNativeTagList,
createBannerBundle(
R.string.imp_prebid_id_native_styles,
R.string.admob_native_bidding_ad_unit_id_adapter,
storedResponse = R.string.response_prebid_native_styles
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
}

private fun addApplovinMaxPbsExamples() {
Expand Down Expand Up @@ -1397,6 +1524,24 @@ class DemoItemProvider private constructor() {
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_max_banner_320_50_adapter_with_events),
maxBannerAction,
maxBannerTagList,
createBannerBundle(
R.string.imp_prebid_id_banner_320x50,
R.string.max_banner_ad_unit_id,
320, 50,
R.string.response_prebid_banner_320_50
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_max_banner_300_250_adapter),
Expand Down Expand Up @@ -1621,6 +1766,23 @@ class DemoItemProvider private constructor() {
)
)
)
demoList.add(
DemoItem(
getString(R.string.demo_bidding_max_native_adapter_events),
maxNativeAction,
maxNativeTagList,
createBannerBundle(
R.string.imp_prebid_id_native_styles,
R.string.max_native_ad_unit_id,
storedResponse = R.string.response_prebid_native_styles
).apply {
putString(
AdFragment.ARGUMENT_ACCOUNT_ID,
getString(R.string.prebid_account_id_prod_enabled_events)
)
}
)
)
}

private fun createBannerBundle(
Expand Down
9 changes: 9 additions & 0 deletions Example/PrebidInternalTestApp/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@

<!--In-App Titles-->
<string name="demo_bidding_in_app_banner_320_50">Banner 320x50 (In-App)</string>
<string name="demo_bidding_in_app_banner_320_50_events">Banner 320x50 Events (In-App)</string>
<string name="demo_bidding_in_app_banner_320_50_no_bids">Banner 320x50 [noBids] (In-App)</string>
<string name="demo_bidding_in_app_banner_320_50_imp_prebid_random_bid"> Banner 320x50 [Bid - RANDOM noBids, Ad - RESPECTIVE]</string>
<string name="demo_bidding_in_app_banner_300_250">Banner 300x250 (In-App)</string>
Expand Down Expand Up @@ -129,12 +130,14 @@
<string name="demo_bidding_in_app_native_styles_no_assets">Banner Native Styles No Assets (In-App)</string>
<string name="demo_bidding_in_app_native_styles_no_creative">Banner Native Styles No Creative (In-App)</string>
<string name="demo_bidding_in_app_native">Native Ad (In-App)</string>
<string name="demo_bidding_in_app_native_events">Native Ad Events (In-App)</string>
<string name="demo_bidding_in_app_native_feed">Native Ad Feed (In-App)</string>
<string name="demo_bidding_in_app_native_links">Native Ad Links (In-App)</string>
<string name="demo_bidding_in_app_native_video">Native Ad Video (In-App)</string>

<!--GAM Titles-->
<string name="demo_bidding_gam_banner_320_50_app_event">Banner 320x50 (GAM) [OK, AppEvent]</string>
<string name="demo_bidding_gam_banner_320_50_app_event_with_events_url">Banner 320x50 Events (GAM) [OK, AppEvent]</string>
<string name="demo_bidding_gam_banner_320_50_gam_ad">Banner 320x50 (GAM) [OK, GAM Ad]</string>
<string name="demo_bidding_gam_banner_320_50_no_bids">Banner 320x50 (GAM) [noBids, GAM Ad]</string>
<string name="demo_bidding_gam_banner_320_50_random">Banner 320x50 (GAM) [OK, Random]</string>
Expand Down Expand Up @@ -167,6 +170,7 @@
<string name="demo_bidding_gam_native_styles_fluid">Banner Native Styles (GAM) [Fluid]</string>
<string name="demo_bidding_gam_native_styles_no_assets">Banner Native Styles No Assets (GAM) [MRect]</string>
<string name="demo_bidding_gam_native_custom_templates">Native Ad Custom Templates (GAM) [OK, NativeAd]</string>
<string name="demo_bidding_gam_native_custom_templates_events">Native Ad Custom Templates Events (GAM) [OK, NativeAd]</string>
<string name="demo_bidding_gam_native_custom_templates_no_bids">Native Ad (GAM) [noBids, GADNativeCustomTemplateAd]</string>
<string name="demo_bidding_gam_native_unified_ads">Native Ad Unified Ad (GAM) [OK, NativeAd]</string>
<string name="demo_bidding_gam_native_unified_ads_no_bids">Native Ad (GAM) [noBids, GADUnifiedNativeAd]</string>
Expand All @@ -179,6 +183,7 @@

<!--AdMob Titles-->
<string name="demo_bidding_admob_banner_320_50_adapter">Banner 320x50 (AdMob) [OK, OXB Adapter]</string>
<string name="demo_bidding_admob_banner_320_50_adapter_with_events">Banner 320x50 Events (AdMob) [OK, OXB Adapter]</string>
<string name="demo_bidding_admob_banner_320_50_ok_random">Banner 320x50 (AdMob) [OK, Random]</string>
<string name="demo_bidding_admob_banner_320_50_no_bids">Banner 320x50 (AdMob) [noBids, AdMob ad]</string>
<string name="demo_bidding_admob_banner_320_50_random_respectively">Banner 320x50 (AdMob) [Random, Respectively]</string>
Expand All @@ -200,10 +205,12 @@
<string name="demo_bidding_admob_rewarded_random">Video Rewarded 320x480 (AdMob) [OK, Random]</string>

<string name="demo_bidding_admob_native_adapter">Native Ad (AdMob) [OK, OXB Adapter]</string>
<string name="demo_bidding_admob_native_adapter_events">Native Ad Events (AdMob) [OK, OXB Adapter]</string>
<string name="demo_bidding_admob_native_no_bids">Native Ad (AdMob) [noBids, AdMob ad]</string>

<!--MAX Titles-->
<string name="demo_bidding_max_banner_320_50_adapter">Banner 320x50 (MAX) [OK, Adapter]</string>
<string name="demo_bidding_max_banner_320_50_adapter_with_events">Banner 320x50 Events (MAX) [OK, Adapter]</string>
<string name="demo_bidding_max_banner_320_50_no_bids">Banner 320x50 (MAX) [noBids, MAX ad]</string>
<string name="demo_bidding_max_banner_320_50_random">Banner 320x50 (MAX) [Random, Respectively]</string>
<string name="demo_bidding_max_banner_300_250_adapter">Banner 300x250 (MAX) [OK, Adapter]</string>
Expand All @@ -224,6 +231,7 @@
<string name="demo_bidding_max_rewarded_adapter_no_end_card">Video Rewarded 320x480 no EndCard (MAX) [OK, Adapter]</string>

<string name="demo_bidding_max_native_adapter">Native Ad (MAX) [OK, Adapter]</string>
<string name="demo_bidding_max_native_adapter_events">Native Ad Events (MAX) [OK, Adapter]</string>
<string name="demo_bidding_max_native_no_bids">Native Ad (MAX) [noBids, MAX ad]</string>

<!--GAM AdUnits-->
Expand Down Expand Up @@ -271,6 +279,7 @@
<!-- Bidding configs-->
<string name="prebid_account_id_prod">0689a263-318d-448b-a3d4-b02e8a709d9d</string>
<string name="prebid_account_id_prod_no_bids">1768035c-74d3-4786-b056-13bd41f34bde</string>
<string name="prebid_account_id_prod_enabled_events">prebid-stored-request-enabled-events</string>

<string name="prebid_config_id_banner_320x50">50699c03-0910-477c-b4a4-911dbe2b9d42</string>
<string name="prebid_config_id_mraid_resize">758bef6c-a811-497e-8234-9a583daf92e0</string>
Expand Down
2 changes: 2 additions & 0 deletions ...PrebidMobile-admobAdapters/src/main/java/org/prebid/mobile/admob/PrebidNativeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.prebid.mobile.NativeAdUnit;
import org.prebid.mobile.ParametersMatcher;
import org.prebid.mobile.PrebidNativeAd;
import org.prebid.mobile.rendering.bidding.events.EventsNotifier;

import java.io.InputStream;
import java.net.HttpURLConnection;
Expand Down Expand Up @@ -72,6 +73,7 @@ public void requestNativeAd(
adMobListener.onAdFailedToLoad(new AdError(1004, error, "prebid"));
return;
}
EventsNotifier.notify(nativeAd.getWinEvent());

PrebidNativeAdMapper mapper = new PrebidNativeAdMapper(nativeAd, adMobListener);
configureMapper(mapper, nativeAd, context);
Expand Down
Loading