feat(ad): add adData to onReceiveAdEvent

avencat · Nov 23, 2023 · e8fe11c · e8fe11c
1 parent b3744f9
commit e8fe11c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java b/android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java
@@ -413,13 +413,23 @@ public void audioBecomingNoisy() {
         receiveEvent(EVENT_AUDIO_BECOMING_NOISY, null);
     }
 
-    public void receiveAdEvent(String event) {
+    public void receiveAdEvent(String event, Map<String, String> adData) {
         WritableMap map = Arguments.createMap();
         map.putString("event", event);
 
+        WritableMap adDataMap = Arguments.createMap();
+        for (Map.Entry<String, String> entry : adData.entrySet()) {
+            adDataMap.putString(entry.getKey(), entry.getValue());
+        }
+        map.putMap("adData", adDataMap);
+
         receiveEvent(EVENT_ON_RECEIVE_AD_EVENT, map);
     }
 
+    public void receiveAdEvent(String event) {
+        this.receiveAdEvent(event, Map.of());
+    }
+
     private void receiveEvent(@VideoEvents String type, WritableMap event) {
         eventEmitter.receiveEvent(viewId, type, event);
     }

diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -2088,6 +2088,10 @@ public void setShutterColor(Integer color) {
 
     @Override
     public void onAdEvent(AdEvent adEvent) {
-        eventEmitter.receiveAdEvent(adEvent.getType().name());
+        if (adEvent.getAdData() != null) {
+            eventEmitter.receiveAdEvent(adEvent.getType().name(), adEvent.getAdData());
+        } else {
+            eventEmitter.receiveAdEvent(adEvent.getType().name());
+        }
     }
 }
diff --git a/ios/Video/Features/RCTIMAAdsManager.swift b/ios/Video/Features/RCTIMAAdsManager.swift
@@ -100,6 +100,7 @@ class RCTIMAAdsManager: NSObject, IMAAdsLoaderDelegate, IMAAdsManagerDelegate, I
 
             _video.onReceiveAdEvent?([
                 "event": type,
+                "adData": event.adData ?? [String](),
                 "target": _video.reactTag!
             ]);
         }

diff --git a/src/VideoNativeComponent.ts b/src/VideoNativeComponent.ts
@@ -237,6 +237,7 @@ export type OnPictureInPictureStatusChangedData = Readonly<{
 }>;
 
 export type OnReceiveAdEventData = Readonly<{
+  adData: Record<string, string>;
   event: AdEvent;
 }>;
 

diff --git a/src/types/events.ts b/src/types/events.ts
@@ -115,6 +115,7 @@ export type OnPictureInPictureStatusChangedData = Readonly<{
 }>;
 
 export type OnReceiveAdEventData = Readonly<{
+  adData: Record<string, string>;
   event: AdEvent;
 }>;
 

diff --git a/src/types/video.ts b/src/types/video.ts
@@ -173,7 +173,7 @@ export interface ReactVideoProps extends ReactVideoEvents {
   source?: ReactVideoSource;
   drm?: Drm;
   style?: StyleProp<ViewStyle>;
-  adTagUrl?: string; // iOS
+  adTagUrl?: string;
   audioOnly?: boolean;
   automaticallyWaitsToMinimizeStalling?: boolean; // iOS
   backBufferDurationMs?: number; // Android