react-native-daro 2.0.7 → 2.0.9-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/android/build.gradle +3 -1
- package/android/src/main/java/com/daro/reactnative/DaroRNAdBannerViewManager.kt +8 -3
- package/android/src/main/java/com/daro/reactnative/DaroRNAdNativeViewManager.kt +8 -3
- package/android/src/main/java/com/daro/reactnative/DaroRNModule.kt +76 -34
- package/android/src/main/java/com/daro/reactnative/event/DaroRNEvent.kt +8 -0
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNInterstitialModuleImpl.kt +13 -13
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNLightPopupModuleImpl.kt +12 -12
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNPreloadModuleImpl.kt +77 -0
- package/android/src/main/java/com/daro/reactnative/impl/DaroRNRewardedAdModuleImpl.kt +14 -14
- package/android/src/main/java/com/daro/reactnative/preload/DaroRNPreloadRegistry.kt +57 -0
- package/android/src/main/java/com/daro/reactnative/util/AdInfoUtil.kt +27 -16
- package/android/src/main/java/com/daro/reactnative/view/DaroMediaView.kt +3 -0
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdBannerViewContainer.kt +36 -15
- package/android/src/main/java/com/daro/reactnative/view/DaroRNAdNativeViewContainer.kt +36 -15
- package/android/src/oldarch/java/com/daro/reactnative/DaroRNModuleSpec.kt +28 -14
- package/android/src/test/java/com/daro/reactnative/preload/DaroRNPreloadRegistryTest.kt +65 -0
- package/android/src/test/java/com/daro/reactnative/view/DaroMediaViewTest.kt +45 -0
- package/android/src/test/java/com/daro/reactnative/view/DaroRNPreloadFirstLoadTest.kt +160 -0
- package/ios/DaroRNModule+AppOpen.swift +9 -9
- package/ios/DaroRNModule+Interstitial.swift +9 -9
- package/ios/DaroRNModule+LightPopup.swift +13 -13
- package/ios/DaroRNModule+Preload.swift +122 -0
- package/ios/DaroRNModule+Rewarded.swift +14 -14
- package/ios/DaroRNModule.mm +20 -14
- package/ios/DaroRNModule.swift +6 -1
- package/ios/Fabric/DaroRNAdBannerComponentView.mm +12 -7
- package/ios/Fabric/DaroRNNativeAdComponentView.mm +12 -7
- package/ios/Paper/DaroRNAdBannerViewManager.m +2 -1
- package/ios/Paper/DaroRNNativeAdViewManager.m +2 -1
- package/ios/Shared/DaroRNBannerAdView.swift +23 -9
- package/ios/Shared/DaroRNNativeAdView.swift +77 -46
- package/ios/Shared/DaroRNPreloadRegistry.swift +54 -0
- package/lib/commonjs/AdBannerView.js +4 -2
- package/lib/commonjs/AdBannerView.js.map +1 -1
- package/lib/commonjs/AdPreload.js +105 -0
- package/lib/commonjs/AdPreload.js.map +1 -0
- package/lib/commonjs/AppOpenAd.js +22 -22
- package/lib/commonjs/AppOpenAd.js.map +1 -1
- package/lib/commonjs/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/lib/commonjs/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/lib/commonjs/InterstitialAd.js +24 -24
- package/lib/commonjs/InterstitialAd.js.map +1 -1
- package/lib/commonjs/LightPopupAd.js +27 -27
- package/lib/commonjs/LightPopupAd.js.map +1 -1
- package/lib/commonjs/NativeDaroModule.js.map +1 -1
- package/lib/commonjs/RewardedAd.js +22 -22
- package/lib/commonjs/RewardedAd.js.map +1 -1
- package/lib/commonjs/hooks/useAdPreload.js +61 -0
- package/lib/commonjs/hooks/useAdPreload.js.map +1 -0
- package/lib/commonjs/hooks/useInterstitialAd.js +6 -6
- package/lib/commonjs/hooks/useInterstitialAd.js.map +1 -1
- package/lib/commonjs/hooks/useLightPopupAd.js +5 -5
- package/lib/commonjs/hooks/useLightPopupAd.js.map +1 -1
- package/lib/commonjs/hooks/useRewardedAd.js +6 -6
- package/lib/commonjs/hooks/useRewardedAd.js.map +1 -1
- package/lib/commonjs/index.js +37 -0
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/nativeAd/NativeAdView.js +4 -2
- package/lib/commonjs/nativeAd/NativeAdView.js.map +1 -1
- package/lib/commonjs/types/NativeAdViewProps.js.map +1 -1
- package/lib/module/AdBannerView.js +4 -2
- package/lib/module/AdBannerView.js.map +1 -1
- package/lib/module/AdPreload.js +98 -0
- package/lib/module/AdPreload.js.map +1 -0
- package/lib/module/AppOpenAd.js +22 -22
- package/lib/module/AppOpenAd.js.map +1 -1
- package/lib/module/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/lib/module/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/lib/module/InterstitialAd.js +24 -24
- package/lib/module/InterstitialAd.js.map +1 -1
- package/lib/module/LightPopupAd.js +27 -27
- package/lib/module/LightPopupAd.js.map +1 -1
- package/lib/module/NativeDaroModule.js.map +1 -1
- package/lib/module/RewardedAd.js +22 -22
- package/lib/module/RewardedAd.js.map +1 -1
- package/lib/module/hooks/useAdPreload.js +56 -0
- package/lib/module/hooks/useAdPreload.js.map +1 -0
- package/lib/module/hooks/useInterstitialAd.js +6 -6
- package/lib/module/hooks/useInterstitialAd.js.map +1 -1
- package/lib/module/hooks/useLightPopupAd.js +5 -5
- package/lib/module/hooks/useLightPopupAd.js.map +1 -1
- package/lib/module/hooks/useRewardedAd.js +6 -6
- package/lib/module/hooks/useRewardedAd.js.map +1 -1
- package/lib/module/index.js +2 -0
- package/lib/module/index.js.map +1 -1
- package/lib/module/nativeAd/NativeAdView.js +4 -2
- package/lib/module/nativeAd/NativeAdView.js.map +1 -1
- package/lib/module/types/NativeAdViewProps.js.map +1 -1
- package/lib/typescript/commonjs/src/AdBannerView.d.ts +1 -0
- package/lib/typescript/commonjs/src/AdBannerView.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/AdPreload.d.ts +62 -0
- package/lib/typescript/commonjs/src/AdPreload.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/AppOpenAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/AppOpenAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/DaroRNAdBannerViewNativeComponent.d.ts +4 -3
- package/lib/typescript/commonjs/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts +4 -3
- package/lib/typescript/commonjs/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/InterstitialAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/InterstitialAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/LightPopupAd.d.ts +9 -9
- package/lib/typescript/commonjs/src/LightPopupAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/NativeDaroModule.d.ts +19 -14
- package/lib/typescript/commonjs/src/NativeDaroModule.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/RewardedAd.d.ts +8 -8
- package/lib/typescript/commonjs/src/RewardedAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useAdPreload.d.ts +19 -0
- package/lib/typescript/commonjs/src/hooks/useAdPreload.d.ts.map +1 -0
- package/lib/typescript/commonjs/src/hooks/useInterstitialAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useInterstitialAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useLightPopupAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useLightPopupAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/hooks/useRewardedAd.d.ts +1 -1
- package/lib/typescript/commonjs/src/hooks/useRewardedAd.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/index.d.ts +4 -0
- package/lib/typescript/commonjs/src/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/nativeAd/NativeAdView.d.ts +1 -0
- package/lib/typescript/commonjs/src/nativeAd/NativeAdView.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdBannerViewProps.d.ts +6 -0
- package/lib/typescript/commonjs/src/types/AdBannerViewProps.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdInfo.d.ts +2 -2
- package/lib/typescript/commonjs/src/types/AdInfo.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/AdProps.d.ts +1 -1
- package/lib/typescript/commonjs/src/types/AdProps.d.ts.map +1 -1
- package/lib/typescript/commonjs/src/types/NativeAdViewProps.d.ts +6 -0
- package/lib/typescript/commonjs/src/types/NativeAdViewProps.d.ts.map +1 -1
- package/lib/typescript/module/src/AdBannerView.d.ts +1 -0
- package/lib/typescript/module/src/AdBannerView.d.ts.map +1 -1
- package/lib/typescript/module/src/AdPreload.d.ts +62 -0
- package/lib/typescript/module/src/AdPreload.d.ts.map +1 -0
- package/lib/typescript/module/src/AppOpenAd.d.ts +8 -8
- package/lib/typescript/module/src/AppOpenAd.d.ts.map +1 -1
- package/lib/typescript/module/src/DaroRNAdBannerViewNativeComponent.d.ts +4 -3
- package/lib/typescript/module/src/DaroRNAdBannerViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts +4 -3
- package/lib/typescript/module/src/DaroRNNativeAdViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/module/src/InterstitialAd.d.ts +8 -8
- package/lib/typescript/module/src/InterstitialAd.d.ts.map +1 -1
- package/lib/typescript/module/src/LightPopupAd.d.ts +9 -9
- package/lib/typescript/module/src/LightPopupAd.d.ts.map +1 -1
- package/lib/typescript/module/src/NativeDaroModule.d.ts +19 -14
- package/lib/typescript/module/src/NativeDaroModule.d.ts.map +1 -1
- package/lib/typescript/module/src/RewardedAd.d.ts +8 -8
- package/lib/typescript/module/src/RewardedAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useAdPreload.d.ts +19 -0
- package/lib/typescript/module/src/hooks/useAdPreload.d.ts.map +1 -0
- package/lib/typescript/module/src/hooks/useInterstitialAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useInterstitialAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useLightPopupAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useLightPopupAd.d.ts.map +1 -1
- package/lib/typescript/module/src/hooks/useRewardedAd.d.ts +1 -1
- package/lib/typescript/module/src/hooks/useRewardedAd.d.ts.map +1 -1
- package/lib/typescript/module/src/index.d.ts +4 -0
- package/lib/typescript/module/src/index.d.ts.map +1 -1
- package/lib/typescript/module/src/nativeAd/NativeAdView.d.ts +1 -0
- package/lib/typescript/module/src/nativeAd/NativeAdView.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdBannerViewProps.d.ts +6 -0
- package/lib/typescript/module/src/types/AdBannerViewProps.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdInfo.d.ts +2 -2
- package/lib/typescript/module/src/types/AdInfo.d.ts.map +1 -1
- package/lib/typescript/module/src/types/AdProps.d.ts +1 -1
- package/lib/typescript/module/src/types/AdProps.d.ts.map +1 -1
- package/lib/typescript/module/src/types/NativeAdViewProps.d.ts +6 -0
- package/lib/typescript/module/src/types/NativeAdViewProps.d.ts.map +1 -1
- package/package.json +1 -1
- package/plugin/build/withAndroid.js +2 -2
- package/react-native-daro.podspec +1 -1
- package/src/AdBannerView.tsx +4 -2
- package/src/AdPreload.ts +141 -0
- package/src/AppOpenAd.ts +21 -21
- package/src/DaroRNAdBannerViewNativeComponent.ts +5 -3
- package/src/DaroRNNativeAdViewNativeComponent.ts +5 -3
- package/src/InterstitialAd.ts +23 -23
- package/src/LightPopupAd.ts +26 -26
- package/src/NativeDaroModule.ts +31 -14
- package/src/RewardedAd.ts +21 -21
- package/src/hooks/useAdPreload.ts +82 -0
- package/src/hooks/useInterstitialAd.ts +6 -6
- package/src/hooks/useLightPopupAd.ts +5 -5
- package/src/hooks/useRewardedAd.ts +6 -6
- package/src/index.tsx +16 -0
- package/src/nativeAd/NativeAdView.tsx +4 -2
- package/src/types/AdBannerViewProps.ts +6 -0
- package/src/types/AdInfo.ts +2 -2
- package/src/types/AdProps.ts +1 -1
- package/src/types/NativeAdViewProps.ts +6 -0
package/ios/DaroRNModule.mm
CHANGED
|
@@ -35,29 +35,35 @@ RCT_EXTERN_METHOD(getIntegrationKeyInfo:(RCTPromiseResolveBlock)resolve reject:(
|
|
|
35
35
|
|
|
36
36
|
#pragma mark - Interstitial
|
|
37
37
|
|
|
38
|
-
RCT_EXTERN_METHOD(isInterstitialReady:(double)requestId
|
|
39
|
-
RCT_EXTERN_METHOD(loadInterstitial:(double)requestId
|
|
40
|
-
RCT_EXTERN_METHOD(showInterstitial:(double)requestId
|
|
38
|
+
RCT_EXTERN_METHOD(isInterstitialReady:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
39
|
+
RCT_EXTERN_METHOD(loadInterstitial:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
40
|
+
RCT_EXTERN_METHOD(showInterstitial:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
41
41
|
|
|
42
42
|
#pragma mark - Rewarded
|
|
43
43
|
|
|
44
|
-
RCT_EXTERN_METHOD(isRewardedAdReady:(double)requestId
|
|
45
|
-
RCT_EXTERN_METHOD(loadRewardedAd:(double)requestId
|
|
46
|
-
RCT_EXTERN_METHOD(showRewardedAd:(double)requestId
|
|
44
|
+
RCT_EXTERN_METHOD(isRewardedAdReady:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
45
|
+
RCT_EXTERN_METHOD(loadRewardedAd:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
46
|
+
RCT_EXTERN_METHOD(showRewardedAd:(double)requestId adUnitKey:(NSString *)adUnitKey customData:(nullable NSString *)customData resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
47
47
|
|
|
48
48
|
#pragma mark - AppOpen Ad
|
|
49
49
|
|
|
50
|
-
RCT_EXTERN_METHOD(isAppOpenAdReady:(double)requestId
|
|
51
|
-
RCT_EXTERN_METHOD(loadAppOpenAd:(double)requestId
|
|
52
|
-
RCT_EXTERN_METHOD(showAppOpenAd:(double)requestId
|
|
50
|
+
RCT_EXTERN_METHOD(isAppOpenAdReady:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
51
|
+
RCT_EXTERN_METHOD(loadAppOpenAd:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
52
|
+
RCT_EXTERN_METHOD(showAppOpenAd:(double)requestId adUnitKey:(NSString *)adUnitKey customData:(nullable NSString *)customData resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
53
53
|
|
|
54
54
|
#pragma mark - Light Popup
|
|
55
55
|
|
|
56
|
-
RCT_EXTERN_METHOD(destroyLightPopup:(double)requestId
|
|
57
|
-
RCT_EXTERN_METHOD(isLightPopupReady:(double)requestId
|
|
58
|
-
RCT_EXTERN_METHOD(loadLightPopup:(double)requestId
|
|
59
|
-
RCT_EXTERN_METHOD(showLightPopup:(double)requestId
|
|
60
|
-
RCT_EXTERN_METHOD(setLightPopupAdConfiguration:(double)requestId
|
|
56
|
+
RCT_EXTERN_METHOD(destroyLightPopup:(double)requestId adUnitKey:(NSString *)adUnitKey)
|
|
57
|
+
RCT_EXTERN_METHOD(isLightPopupReady:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
58
|
+
RCT_EXTERN_METHOD(loadLightPopup:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
59
|
+
RCT_EXTERN_METHOD(showLightPopup:(double)requestId adUnitKey:(NSString *)adUnitKey resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
60
|
+
RCT_EXTERN_METHOD(setLightPopupAdConfiguration:(double)requestId adUnitKey:(NSString *)adUnitKey configuration:(NSDictionary *)configuration resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
61
|
+
|
|
62
|
+
#pragma mark - View Ad Preload
|
|
63
|
+
|
|
64
|
+
RCT_EXTERN_METHOD(preloadBannerAd:(NSString *)preloadId adUnitKey:(NSString *)adUnitKey adFormat:(NSString *)adFormat resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
65
|
+
RCT_EXTERN_METHOD(preloadNativeAd:(NSString *)preloadId adUnitKey:(NSString *)adUnitKey adChoicesPosition:(NSString *)adChoicesPosition resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
|
|
66
|
+
RCT_EXTERN_METHOD(destroyAdPreload:(NSString *)preloadId)
|
|
61
67
|
|
|
62
68
|
+ (BOOL)requiresMainQueueSetup {
|
|
63
69
|
return YES;
|
package/ios/DaroRNModule.swift
CHANGED
|
@@ -49,6 +49,10 @@ class DaroRNModule: RCTEventEmitter {
|
|
|
49
49
|
case onLightPopupHiddenEvent = "ON_LIGHTPOPUP_HIDDEN_EVENT"
|
|
50
50
|
case onLightPopupAdImpressionRecordedEvent = "ON_LIGHTPOPUP_AD_IMPRESSION_RECORDED"
|
|
51
51
|
|
|
52
|
+
// MARK: - View Ad Preload
|
|
53
|
+
case onAdPreloadSuccessEvent = "ON_AD_PRELOAD_SUCCESS_EVENT"
|
|
54
|
+
case onAdPreloadFailedEvent = "ON_AD_PRELOAD_FAILED_EVENT"
|
|
55
|
+
|
|
52
56
|
static var supportedEvents: [String] {
|
|
53
57
|
allCases.map(\.rawValue)
|
|
54
58
|
}
|
|
@@ -175,6 +179,7 @@ class DaroRNModule: RCTEventEmitter {
|
|
|
175
179
|
let requests = Array(lightPopups.keys)
|
|
176
180
|
requests.forEach { releaseLightPopup(requestId: $0) }
|
|
177
181
|
}
|
|
182
|
+
invalidatePreloads()
|
|
178
183
|
super.invalidate()
|
|
179
184
|
}
|
|
180
185
|
|
|
@@ -217,7 +222,7 @@ extension DaroAdInfo {
|
|
|
217
222
|
// 모듈 경로와 뷰 경로(DaroRNBannerAdView·DaroRNNativeAdView)가 **둘 다 여기를 지난다.**
|
|
218
223
|
var toBody: [String: Any] {
|
|
219
224
|
var body: [String: Any] = [
|
|
220
|
-
"
|
|
225
|
+
"adUnitKey": self.adUnitKey,
|
|
221
226
|
"latencyMillis": self.latency as Any,
|
|
222
227
|
]
|
|
223
228
|
// 없을 때는 키를 넣지 않는다 — [String: Any] 에 nil 을 담으면 JS 에서 null 로
|
|
@@ -71,7 +71,7 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
71
71
|
|
|
72
72
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
73
73
|
eventEmitter->onAdLoadedEvent({
|
|
74
|
-
.
|
|
74
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
75
75
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
76
76
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
77
77
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -93,7 +93,7 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
93
93
|
|
|
94
94
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
95
95
|
eventEmitter->onAdLoadFailedEvent({
|
|
96
|
-
.
|
|
96
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
97
97
|
.code = DaroRNFabricEventInt(eventBody, @"code"),
|
|
98
98
|
.message = DaroRNFabricEventString(eventBody, @"message"),
|
|
99
99
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
@@ -113,7 +113,7 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
113
113
|
|
|
114
114
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
115
115
|
eventEmitter->onAdClickedEvent({
|
|
116
|
-
.
|
|
116
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
117
117
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
118
118
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
119
119
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -135,7 +135,7 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
135
135
|
|
|
136
136
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
137
137
|
eventEmitter->onAdImpressionRecordedEvent({
|
|
138
|
-
.
|
|
138
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
139
139
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
140
140
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
141
141
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -161,9 +161,9 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
161
161
|
const auto &newComponentProps = *std::static_pointer_cast<const DaroRNAdBannerViewProps>(props);
|
|
162
162
|
NSMutableArray<NSString *> *changedProps = [NSMutableArray new];
|
|
163
163
|
|
|
164
|
-
if (oldComponentProps.
|
|
165
|
-
DaroRNFabricSetValue(_bannerView, @"
|
|
166
|
-
[changedProps addObject:@"
|
|
164
|
+
if (oldComponentProps.adUnitKey != newComponentProps.adUnitKey) {
|
|
165
|
+
DaroRNFabricSetValue(_bannerView, @"adUnitKey", DaroRNFabricNSStringFromStdString(newComponentProps.adUnitKey));
|
|
166
|
+
[changedProps addObject:@"adUnitKey"];
|
|
167
167
|
}
|
|
168
168
|
|
|
169
169
|
if (oldComponentProps.adFormat != newComponentProps.adFormat) {
|
|
@@ -176,6 +176,11 @@ extern int DaroRNFabricEventInt(NSDictionary *body, NSString *key);
|
|
|
176
176
|
[changedProps addObject:@"loadOnMount"];
|
|
177
177
|
}
|
|
178
178
|
|
|
179
|
+
if (oldComponentProps.preloadId != newComponentProps.preloadId) {
|
|
180
|
+
DaroRNFabricSetValue(_bannerView, @"preloadId", DaroRNFabricNSStringFromStdString(newComponentProps.preloadId));
|
|
181
|
+
[changedProps addObject:@"preloadId"];
|
|
182
|
+
}
|
|
183
|
+
|
|
179
184
|
if (oldComponentProps.isVisible != newComponentProps.isVisible) {
|
|
180
185
|
DaroRNFabricSetValue(_bannerView, @"isVisible", @(newComponentProps.isVisible));
|
|
181
186
|
[changedProps addObject:@"isVisible"];
|
|
@@ -103,7 +103,7 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
103
103
|
|
|
104
104
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
105
105
|
eventEmitter->onAdLoadedEvent({
|
|
106
|
-
.
|
|
106
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
107
107
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
108
108
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
109
109
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -125,7 +125,7 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
125
125
|
|
|
126
126
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
127
127
|
eventEmitter->onAdLoadFailedEvent({
|
|
128
|
-
.
|
|
128
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
129
129
|
.code = DaroRNFabricEventInt(eventBody, @"code"),
|
|
130
130
|
.message = DaroRNFabricEventString(eventBody, @"message"),
|
|
131
131
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
@@ -145,7 +145,7 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
145
145
|
|
|
146
146
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
147
147
|
eventEmitter->onAdClickedEvent({
|
|
148
|
-
.
|
|
148
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
149
149
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
150
150
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
151
151
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -167,7 +167,7 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
167
167
|
|
|
168
168
|
NSDictionary *eventBody = DaroRNFabricEventBody(body);
|
|
169
169
|
eventEmitter->onAdImpressionRecordedEvent({
|
|
170
|
-
.
|
|
170
|
+
.adUnitKey = DaroRNFabricEventString(eventBody, @"adUnitKey"),
|
|
171
171
|
.latencyMillis = DaroRNFabricEventDouble(eventBody, @"latencyMillis"),
|
|
172
172
|
// Fabric 이벤트는 타입 있는 구조체다 — **여기 안 적으면 네이티브가 보내도 JS 에 안 온다.**
|
|
173
173
|
// Android 는 맵을 통째로 넘겨서 안 걸린다. codegen 타입만 넓히면 부족하다.
|
|
@@ -194,9 +194,9 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
194
194
|
const auto &newComponentProps = *std::static_pointer_cast<const DaroRNNativeAdViewProps>(props);
|
|
195
195
|
NSMutableArray<NSString *> *changedProps = [NSMutableArray new];
|
|
196
196
|
|
|
197
|
-
if (oldComponentProps.
|
|
198
|
-
DaroRNFabricSetValue(_nativeAdView, @"
|
|
199
|
-
[changedProps addObject:@"
|
|
197
|
+
if (oldComponentProps.adUnitKey != newComponentProps.adUnitKey) {
|
|
198
|
+
DaroRNFabricSetValue(_nativeAdView, @"adUnitKey", DaroRNFabricNSStringFromStdString(newComponentProps.adUnitKey));
|
|
199
|
+
[changedProps addObject:@"adUnitKey"];
|
|
200
200
|
}
|
|
201
201
|
|
|
202
202
|
if (oldComponentProps.loadOnMount != newComponentProps.loadOnMount) {
|
|
@@ -204,6 +204,11 @@ static NSString *DaroRNFabricAdChoicesPositionString(DaroRNNativeAdViewAdChoices
|
|
|
204
204
|
[changedProps addObject:@"loadOnMount"];
|
|
205
205
|
}
|
|
206
206
|
|
|
207
|
+
if (oldComponentProps.preloadId != newComponentProps.preloadId) {
|
|
208
|
+
DaroRNFabricSetValue(_nativeAdView, @"preloadId", DaroRNFabricNSStringFromStdString(newComponentProps.preloadId));
|
|
209
|
+
[changedProps addObject:@"preloadId"];
|
|
210
|
+
}
|
|
211
|
+
|
|
207
212
|
if (oldComponentProps.adChoicesPosition != newComponentProps.adChoicesPosition) {
|
|
208
213
|
DaroRNFabricSetValue(
|
|
209
214
|
_nativeAdView, @"adChoicesPosition", DaroRNFabricAdChoicesPositionString(newComponentProps.adChoicesPosition));
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
@interface RCT_EXTERN_MODULE(DaroRNAdBannerViewManager, RCTViewManager)
|
|
4
4
|
|
|
5
|
-
RCT_EXPORT_VIEW_PROPERTY(
|
|
5
|
+
RCT_EXPORT_VIEW_PROPERTY(adUnitKey, NSString)
|
|
6
6
|
RCT_EXPORT_VIEW_PROPERTY(adFormat, NSString)
|
|
7
7
|
RCT_EXPORT_VIEW_PROPERTY(loadOnMount, BOOL)
|
|
8
|
+
RCT_EXPORT_VIEW_PROPERTY(preloadId, NSString)
|
|
8
9
|
RCT_EXPORT_VIEW_PROPERTY(isVisible, BOOL)
|
|
9
10
|
|
|
10
11
|
RCT_EXPORT_VIEW_PROPERTY(onAdLoadedEvent, RCTDirectEventBlock)
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
@interface RCT_EXTERN_MODULE (DaroRNNativeAdViewManager, RCTViewManager)
|
|
4
4
|
|
|
5
|
-
RCT_EXPORT_VIEW_PROPERTY(
|
|
5
|
+
RCT_EXPORT_VIEW_PROPERTY(adUnitKey, NSString)
|
|
6
6
|
RCT_EXPORT_VIEW_PROPERTY(loadOnMount, BOOL)
|
|
7
|
+
RCT_EXPORT_VIEW_PROPERTY(preloadId, NSString)
|
|
7
8
|
RCT_EXPORT_VIEW_PROPERTY(adChoicesPosition, NSString)
|
|
8
9
|
|
|
9
10
|
RCT_EXPORT_VIEW_PROPERTY(titleView, NSNumber)
|
|
@@ -14,9 +14,11 @@ final class DaroRNAdBannerView: UIView {
|
|
|
14
14
|
private var hasRequestedInitialLoad = false
|
|
15
15
|
private var pendingLoadRequest: DaroRNBannerLoadRequest?
|
|
16
16
|
|
|
17
|
-
@objc var
|
|
17
|
+
@objc var adUnitKey: String?
|
|
18
18
|
@objc var adFormat: String = DaroRNModule.Constants.bannerAdFormatLabel.value
|
|
19
19
|
@objc var loadOnMount: Bool = true
|
|
20
|
+
/// preload 로 받아 둔 광고의 id. 뷰를 처음 만들 때 한 번만 본다.
|
|
21
|
+
@objc var preloadId: String?
|
|
20
22
|
@objc var isVisible: Bool = true {
|
|
21
23
|
didSet {
|
|
22
24
|
setAdVisibility(isVisible)
|
|
@@ -55,9 +57,9 @@ final class DaroRNAdBannerView: UIView {
|
|
|
55
57
|
@objc(applyReactProps:)
|
|
56
58
|
func applyReactProps(_ changedProps: [String]!) {
|
|
57
59
|
guard let changedProps, changedProps.isEmpty == false else { return }
|
|
58
|
-
guard let
|
|
59
|
-
if changedProps.contains("
|
|
60
|
-
DaroRNModule.logger.warning("
|
|
60
|
+
guard let adUnitKey, adUnitKey.isEmpty == false else {
|
|
61
|
+
if changedProps.contains("adUnitKey") {
|
|
62
|
+
DaroRNModule.logger.warning("AdUnitKey is required")
|
|
61
63
|
}
|
|
62
64
|
return
|
|
63
65
|
}
|
|
@@ -74,9 +76,10 @@ final class DaroRNAdBannerView: UIView {
|
|
|
74
76
|
@objc(prepareForReuse)
|
|
75
77
|
func prepareForReuse() {
|
|
76
78
|
resetAdState()
|
|
77
|
-
|
|
79
|
+
adUnitKey = nil
|
|
78
80
|
adFormat = DaroRNModule.Constants.bannerAdFormatLabel.value
|
|
79
81
|
loadOnMount = true
|
|
82
|
+
preloadId = nil
|
|
80
83
|
isVisible = true
|
|
81
84
|
isHidden = false
|
|
82
85
|
}
|
|
@@ -100,14 +103,23 @@ final class DaroRNAdBannerView: UIView {
|
|
|
100
103
|
guard adBannerView == nil else {
|
|
101
104
|
return
|
|
102
105
|
}
|
|
103
|
-
guard let
|
|
104
|
-
DaroRNModule.logger.warning("
|
|
106
|
+
guard let adUnitKey, adUnitKey.isEmpty == false else {
|
|
107
|
+
DaroRNModule.logger.warning("AdUnitKey is required")
|
|
105
108
|
return
|
|
106
109
|
}
|
|
107
110
|
|
|
108
111
|
let bannerSize = adFormat == DaroRNModule.Constants.bannerAdFormatLabel.value ? DaroAdBannerSize.banner : DaroAdBannerSize.MREC
|
|
109
|
-
let
|
|
110
|
-
let
|
|
112
|
+
let adBannerView: DaroAdBannerView
|
|
113
|
+
if let preloaded = DaroRNPreloadRegistry.shared.take(
|
|
114
|
+
preloadId, adUnitKey: adUnitKey, variant: adFormat, as: DaroAdBannerView.self
|
|
115
|
+
) {
|
|
116
|
+
// 받아 둔 광고는 SDK 가 window 부착 때 소비한다 ( 실패 / 만료면 SDK 가 일반 로드로 폴백 ).
|
|
117
|
+
// 여기서 `loadAd()` 를 부르면 부착 뒤에는 새 일반 로드가 되어 요청이 겹친다.
|
|
118
|
+
adBannerView = preloaded
|
|
119
|
+
hasRequestedInitialLoad = true
|
|
120
|
+
} else {
|
|
121
|
+
adBannerView = DaroAdBannerView(unit: DaroAdUnit(adUnitKey: adUnitKey), bannerSize: bannerSize)
|
|
122
|
+
}
|
|
111
123
|
setupBannerListener(for: adBannerView)
|
|
112
124
|
|
|
113
125
|
adBannerView.isHidden = !isVisible
|
|
@@ -178,6 +190,8 @@ final class DaroRNAdBannerView: UIView {
|
|
|
178
190
|
private func resetAdState() {
|
|
179
191
|
pendingLoadRequest = nil
|
|
180
192
|
hasRequestedInitialLoad = false
|
|
193
|
+
adBannerView?.listener.onPreloadSuccess = nil
|
|
194
|
+
adBannerView?.listener.onPreloadFail = nil
|
|
181
195
|
adBannerView?.listener.onAdLoadSuccess = nil
|
|
182
196
|
adBannerView?.listener.onAdLoadFail = nil
|
|
183
197
|
adBannerView?.listener.onAdImpression = nil
|
|
@@ -8,6 +8,9 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
8
8
|
private static let maxAssetLoadRetryCount = 40
|
|
9
9
|
|
|
10
10
|
var _internalAdView: DaroRNBridgeNativeAdView?
|
|
11
|
+
/// preload 로 받아 둔 SDK 뷰. 에셋 뷰 등록이 끝날 때까지 계층 밖에 둔다 —
|
|
12
|
+
/// SDK 는 window 에 붙는 순간 그때 등록된 에셋 뷰로 광고를 렌더한다.
|
|
13
|
+
private var pendingPreloadedAdView: DaroRNBridgeNativeAdView?
|
|
11
14
|
private var pinnedConstraints: [ObjectIdentifier: [NSLayoutConstraint]] = [:]
|
|
12
15
|
private var pendingLoadWorkItem: DispatchWorkItem?
|
|
13
16
|
private let loadCoordinator = DaroRNNativeAdLoadCoordinator()
|
|
@@ -16,8 +19,10 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
16
19
|
private let eventSink = DaroRNAdEventSink()
|
|
17
20
|
var adUnit: DaroAdUnit
|
|
18
21
|
|
|
19
|
-
@objc var
|
|
22
|
+
@objc var adUnitKey: String?
|
|
20
23
|
@objc var loadOnMount: Bool = true
|
|
24
|
+
/// preload 로 받아 둔 광고의 id. 뷰를 처음 만들 때 한 번만 본다.
|
|
25
|
+
@objc var preloadId: String?
|
|
21
26
|
@objc var titleViewStyleProps: NSDictionary? {
|
|
22
27
|
didSet {
|
|
23
28
|
_internalTitleLabel.applyStyle(titleViewStyleProps)
|
|
@@ -133,7 +138,7 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
133
138
|
set { eventSink.onAdImpressionRecordedEvent = newValue }
|
|
134
139
|
}
|
|
135
140
|
|
|
136
|
-
@Atomic private var
|
|
141
|
+
@Atomic private var isAdUnitKeySet: Bool = false
|
|
137
142
|
@Atomic private var isBindBridge: Bool = false
|
|
138
143
|
@Atomic private var isDisposed: Bool = false
|
|
139
144
|
|
|
@@ -149,7 +154,7 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
149
154
|
}
|
|
150
155
|
|
|
151
156
|
required init() {
|
|
152
|
-
self.adUnit = DaroAdUnit(
|
|
157
|
+
self.adUnit = DaroAdUnit(adUnitKey: "")
|
|
153
158
|
super.init(frame: .zero)
|
|
154
159
|
}
|
|
155
160
|
|
|
@@ -169,17 +174,17 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
169
174
|
func applyReactProps(_ changedProps: [String]) {
|
|
170
175
|
guard !isDisposed else { return }
|
|
171
176
|
guard changedProps.isEmpty == false else { return }
|
|
172
|
-
guard let
|
|
173
|
-
if changedProps.contains("
|
|
174
|
-
DaroRNModule.logger.warning("[native-ad]
|
|
177
|
+
guard let adUnitKey, adUnitKey.isEmpty == false else {
|
|
178
|
+
if changedProps.contains("adUnitKey") {
|
|
179
|
+
DaroRNModule.logger.warning("[native-ad] AdUnitKey is required")
|
|
175
180
|
}
|
|
176
181
|
return
|
|
177
182
|
}
|
|
178
183
|
loadCoordinator.cancelAutomaticLoadIfNeeded(loadOnMount: loadOnMount)
|
|
179
184
|
DaroRNModule.logger.info("[native-ad] \(#function): \(changedProps)")
|
|
180
|
-
if !
|
|
181
|
-
|
|
182
|
-
makeAdViews(
|
|
185
|
+
if !isAdUnitKeySet {
|
|
186
|
+
isAdUnitKeySet = true
|
|
187
|
+
makeAdViews(adUnitKey: adUnitKey)
|
|
183
188
|
requestInitialLoadIfNeeded()
|
|
184
189
|
}
|
|
185
190
|
|
|
@@ -221,7 +226,7 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
221
226
|
}
|
|
222
227
|
|
|
223
228
|
private func requestInitialLoadIfNeeded() {
|
|
224
|
-
guard loadOnMount, !isDisposed,
|
|
229
|
+
guard loadOnMount, !isDisposed, hasAdView, hasRegisteredAssetView else { return }
|
|
225
230
|
loadCoordinator.requestAutomaticLoad(loadOnMount: loadOnMount)
|
|
226
231
|
processPendingLoad(retryCount: 0)
|
|
227
232
|
}
|
|
@@ -234,16 +239,37 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
234
239
|
return
|
|
235
240
|
}
|
|
236
241
|
|
|
237
|
-
guard
|
|
238
|
-
loadCoordinator.consumePendingLoad(loadOnMount: loadOnMount) != nil else {
|
|
242
|
+
guard hasAdView, loadCoordinator.consumePendingLoad(loadOnMount: loadOnMount) != nil else {
|
|
239
243
|
return
|
|
240
244
|
}
|
|
241
245
|
|
|
242
246
|
pendingLoadWorkItem?.cancel()
|
|
243
247
|
pendingLoadWorkItem = nil
|
|
248
|
+
if let preloaded = pendingPreloadedAdView {
|
|
249
|
+
pendingPreloadedAdView = nil
|
|
250
|
+
attachPreloadedAdView(preloaded)
|
|
251
|
+
return
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
isBindBridge = false
|
|
255
|
+
bindAssetViews()
|
|
256
|
+
_internalAdView?.loadAd()
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
/// 받아 둔 광고를 일반 로드 대신 쓴다. 에셋 뷰를 먼저 묶고 자식을 옮긴 뒤에 계층에 넣는다 —
|
|
260
|
+
/// 넣는 순간 SDK 가 광고를 소비해 렌더하기 때문이다. 실패 / 만료면 SDK 가 일반 로드로 폴백한다.
|
|
261
|
+
private func attachPreloadedAdView(_ native: DaroRNBridgeNativeAdView) {
|
|
262
|
+
let reactSubviews = subviews
|
|
263
|
+
_internalAdView = native
|
|
244
264
|
isBindBridge = false
|
|
245
265
|
bindAssetViews()
|
|
246
|
-
|
|
266
|
+
reactSubviews.forEach { native.addSubview($0) }
|
|
267
|
+
super.addSubview(native)
|
|
268
|
+
pin(native, to: self)
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
private var hasAdView: Bool {
|
|
272
|
+
_internalAdView != nil || pendingPreloadedAdView != nil
|
|
247
273
|
}
|
|
248
274
|
|
|
249
275
|
private func retryPendingLoad(retryCount: Int) {
|
|
@@ -263,7 +289,7 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
263
289
|
}
|
|
264
290
|
|
|
265
291
|
private var isReadyToLoadAd: Bool {
|
|
266
|
-
|
|
292
|
+
hasAdView && hasRegisteredAssetView && registeredAssetViewsReady
|
|
267
293
|
}
|
|
268
294
|
|
|
269
295
|
private var hasRegisteredAssetView: Bool {
|
|
@@ -286,11 +312,20 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
286
312
|
].compactMap { $0 }
|
|
287
313
|
}
|
|
288
314
|
|
|
289
|
-
private func makeAdViews(
|
|
290
|
-
self.adUnit = DaroAdUnit(
|
|
315
|
+
private func makeAdViews(adUnitKey: String) {
|
|
316
|
+
self.adUnit = DaroAdUnit(adUnitKey: adUnitKey)
|
|
317
|
+
if let preloaded = DaroRNPreloadRegistry.shared.take(
|
|
318
|
+
preloadId, adUnitKey: adUnitKey, variant: "", as: DaroRNBridgeNativeAdView.self
|
|
319
|
+
) {
|
|
320
|
+
preloaded.delegate = self
|
|
321
|
+
installListeners(on: preloaded)
|
|
322
|
+
pendingPreloadedAdView = preloaded
|
|
323
|
+
return
|
|
324
|
+
}
|
|
325
|
+
|
|
291
326
|
let native = DaroRNBridgeNativeAdView(
|
|
292
327
|
unit: adUnit,
|
|
293
|
-
preferredAdChoicesPosition:
|
|
328
|
+
preferredAdChoicesPosition: DaroAdChoicesPosition(reactValue: adChoicesPosition)
|
|
294
329
|
)
|
|
295
330
|
native.delegate = self
|
|
296
331
|
self._internalAdView = native
|
|
@@ -302,20 +337,23 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
302
337
|
insertAdSubview(subview, at: index)
|
|
303
338
|
}
|
|
304
339
|
pin(native, to: self)
|
|
340
|
+
installListeners(on: native)
|
|
341
|
+
}
|
|
305
342
|
|
|
306
|
-
|
|
343
|
+
private func installListeners(on native: DaroRNBridgeNativeAdView) {
|
|
344
|
+
native.listener.onNativeAdAssetLoaded = { [weak self] assetTypes in
|
|
307
345
|
self?.eventSink.onNativeAdAssetLoadedEvent?(["assetTypes": assetTypes.map(\.rawValue)])
|
|
308
346
|
}
|
|
309
|
-
|
|
347
|
+
native.listener.onAdLoadSuccess = { [weak self] _, adInfo in
|
|
310
348
|
self?.eventSink.emitAdLoaded(adInfo?.toBody)
|
|
311
349
|
}
|
|
312
|
-
|
|
350
|
+
native.listener.onAdLoadFail = { [weak self] error in
|
|
313
351
|
self?.eventSink.emitAdLoadFailed(error.toBody)
|
|
314
352
|
}
|
|
315
|
-
|
|
353
|
+
native.listener.onAdImpression = { [weak self] adInfo in
|
|
316
354
|
self?.eventSink.emitAdImpressionRecorded(adInfo?.toBody)
|
|
317
355
|
}
|
|
318
|
-
|
|
356
|
+
native.listener.onAdClicked = { [weak self] adInfo in
|
|
319
357
|
self?.eventSink.emitAdClicked(adInfo?.toBody)
|
|
320
358
|
}
|
|
321
359
|
}
|
|
@@ -438,19 +476,6 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
438
476
|
return changedProps.contains { bridgeProps.contains($0) }
|
|
439
477
|
}
|
|
440
478
|
|
|
441
|
-
private var preferredAdChoicesPosition: DaroAdChoicesPosition {
|
|
442
|
-
switch adChoicesPosition {
|
|
443
|
-
case "topLeft":
|
|
444
|
-
return .topLeft
|
|
445
|
-
case "topRight":
|
|
446
|
-
return .topRight
|
|
447
|
-
case "bottomLeft":
|
|
448
|
-
return .bottomLeft
|
|
449
|
-
default:
|
|
450
|
-
return .bottomRight
|
|
451
|
-
}
|
|
452
|
-
}
|
|
453
|
-
|
|
454
479
|
private func pin(_ view: UIView, to targetView: UIView) {
|
|
455
480
|
let identifier = ObjectIdentifier(view)
|
|
456
481
|
if let constraints = pinnedConstraints[identifier] {
|
|
@@ -481,8 +506,9 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
481
506
|
}
|
|
482
507
|
|
|
483
508
|
private func resetReactProps() {
|
|
484
|
-
|
|
509
|
+
adUnitKey = nil
|
|
485
510
|
loadOnMount = true
|
|
511
|
+
preloadId = nil
|
|
486
512
|
titleViewStyleProps = nil
|
|
487
513
|
titleView = nil
|
|
488
514
|
bodyViewStyleProps = nil
|
|
@@ -494,12 +520,12 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
494
520
|
mediaViewStyleProps = nil
|
|
495
521
|
mediaView = nil
|
|
496
522
|
adChoicesPosition = nil
|
|
497
|
-
adUnit = DaroAdUnit(
|
|
523
|
+
adUnit = DaroAdUnit(adUnitKey: "")
|
|
498
524
|
}
|
|
499
525
|
|
|
500
526
|
private func resetNativeAdState(clearAssetResolver: Bool, recreateAssetViews: Bool) {
|
|
501
527
|
isBindBridge = false
|
|
502
|
-
|
|
528
|
+
isAdUnitKeySet = false
|
|
503
529
|
loadCoordinator.reset()
|
|
504
530
|
pendingLoadWorkItem?.cancel()
|
|
505
531
|
pendingLoadWorkItem = nil
|
|
@@ -511,15 +537,20 @@ final class RNDaroRNNativeAdView: UIView, DaroRNNativeAdRenderDelegate {
|
|
|
511
537
|
pinnedConstraints.values.forEach { NSLayoutConstraint.deactivate($0) }
|
|
512
538
|
pinnedConstraints.removeAll()
|
|
513
539
|
|
|
514
|
-
_internalAdView
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
540
|
+
[_internalAdView, pendingPreloadedAdView].forEach { native in
|
|
541
|
+
native?.listener.onPreloadSuccess = nil
|
|
542
|
+
native?.listener.onPreloadFail = nil
|
|
543
|
+
native?.listener.onNativeAdAssetLoaded = nil
|
|
544
|
+
native?.listener.onAdLoadSuccess = nil
|
|
545
|
+
native?.listener.onAdLoadFail = nil
|
|
546
|
+
native?.listener.onAdImpression = nil
|
|
547
|
+
native?.listener.onAdClicked = nil
|
|
548
|
+
native?.delegate = nil
|
|
549
|
+
native?.clearNativeAd()
|
|
550
|
+
native?.removeFromSuperview()
|
|
551
|
+
}
|
|
522
552
|
_internalAdView = nil
|
|
553
|
+
pendingPreloadedAdView = nil
|
|
523
554
|
|
|
524
555
|
_internalTitleLabel.removeFromSuperview()
|
|
525
556
|
_internalBodyLabel.removeFromSuperview()
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import Foundation
|
|
2
|
+
|
|
3
|
+
/// `preloadId` 로 preload 뷰를 들고 있다가 RN 뷰가 마운트될 때 한 번 넘긴다.
|
|
4
|
+
///
|
|
5
|
+
/// - 넘긴 항목은 레지스트리에서 빠진다. 그 뒤의 정리는 가져간 RN 뷰의 몫이다.
|
|
6
|
+
/// - 광고 유닛이나 포맷이 RN 뷰와 다르면 넘기지 않고 정리한다 — RN 뷰는 일반 로드를 한다.
|
|
7
|
+
/// - 안 쓴 항목은 JS 의 `destroy()` 와 모듈 invalidate 가 정리한다.
|
|
8
|
+
///
|
|
9
|
+
/// 메인 스레드에서만 부른다.
|
|
10
|
+
final class DaroRNPreloadRegistry {
|
|
11
|
+
struct Entry {
|
|
12
|
+
let adUnitKey: String
|
|
13
|
+
/// 같은 유닛 안에서 갈리는 요청 조건 ( 배너 포맷 ). 없으면 빈 문자열.
|
|
14
|
+
let variant: String
|
|
15
|
+
let view: AnyObject
|
|
16
|
+
/// 들고 있는 뷰에 다시 요청한다. 중복과 TTL 판정은 SDK 가 한다.
|
|
17
|
+
let preload: () -> Void
|
|
18
|
+
let destroy: () -> Void
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
static let shared = DaroRNPreloadRegistry()
|
|
22
|
+
|
|
23
|
+
private var entries: [String: Entry] = [:]
|
|
24
|
+
|
|
25
|
+
/// 처음이면 `create` 로 만든다 ( SDK 뷰는 만들어질 때 요청을 시작한다 ). 이미 있으면 다시 요청한다.
|
|
26
|
+
func preload(_ preloadId: String, create: () -> Entry) {
|
|
27
|
+
if let entry = entries[preloadId] {
|
|
28
|
+
entry.preload()
|
|
29
|
+
} else {
|
|
30
|
+
entries[preloadId] = create()
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
func take<View>(_ preloadId: String?, adUnitKey: String, variant: String, as type: View.Type) -> View? {
|
|
35
|
+
guard let preloadId, !preloadId.isEmpty, let entry = entries.removeValue(forKey: preloadId) else {
|
|
36
|
+
return nil
|
|
37
|
+
}
|
|
38
|
+
guard entry.adUnitKey == adUnitKey, entry.variant == variant, let view = entry.view as? View else {
|
|
39
|
+
entry.destroy()
|
|
40
|
+
return nil
|
|
41
|
+
}
|
|
42
|
+
return view
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
func destroy(_ preloadId: String) {
|
|
46
|
+
entries.removeValue(forKey: preloadId)?.destroy()
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
func destroyAll() {
|
|
50
|
+
let remaining = Array(entries.values)
|
|
51
|
+
entries.removeAll()
|
|
52
|
+
remaining.forEach { $0.destroy() }
|
|
53
|
+
}
|
|
54
|
+
}
|
|
@@ -31,10 +31,11 @@ const toNativeAdFormat = adFormat => {
|
|
|
31
31
|
}
|
|
32
32
|
};
|
|
33
33
|
const AdBannerView = exports.AdBannerView = /*#__PURE__*/(0, _react.forwardRef)(function AdBannerView({
|
|
34
|
-
|
|
34
|
+
adUnitKey,
|
|
35
35
|
adFormat,
|
|
36
36
|
loadOnMount = true,
|
|
37
37
|
isVisible = true,
|
|
38
|
+
preload,
|
|
38
39
|
onAdLoaded,
|
|
39
40
|
onAdLoadFailed,
|
|
40
41
|
onAdClicked,
|
|
@@ -88,8 +89,9 @@ const AdBannerView = exports.AdBannerView = /*#__PURE__*/(0, _react.forwardRef)(
|
|
|
88
89
|
style: style,
|
|
89
90
|
adFormat: toNativeAdFormat(adFormat),
|
|
90
91
|
ref: saveElement,
|
|
91
|
-
|
|
92
|
+
adUnitKey: adUnitKey,
|
|
92
93
|
loadOnMount: loadOnMount,
|
|
94
|
+
preloadId: preload?.preloadId,
|
|
93
95
|
isVisible: isVisible,
|
|
94
96
|
onAdLoadedEvent: onAdLoadedEvent,
|
|
95
97
|
onAdLoadFailedEvent: onAdLoadFailedEvent,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_DaroRNAdBannerViewNativeComponent","_interopRequireWildcard","_NativeDaroModule","_interopRequireDefault","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BANNER_AD_FORMAT_LABEL","MREC_AD_FORMAT_LABEL","NativeDaroModule","getConstants","AdFormat","exports","toNativeAdFormat","adFormat","BANNER","MREC","AdBannerView","forwardRef","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_DaroRNAdBannerViewNativeComponent","_interopRequireWildcard","_NativeDaroModule","_interopRequireDefault","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","BANNER_AD_FORMAT_LABEL","MREC_AD_FORMAT_LABEL","NativeDaroModule","getConstants","AdFormat","exports","toNativeAdFormat","adFormat","BANNER","MREC","AdBannerView","forwardRef","adUnitKey","loadOnMount","isVisible","preload","onAdLoaded","onAdLoadFailed","onAdClicked","onAdImpressionRecorded","style","otherProps","ref","adViewRef","useRef","isInitialized","setIsInitialized","useState","loadAd","useCallback","current","Commands","useImperativeHandle","saveElement","element","useEffect","initialized","console","warn","onAdLoadedEvent","event","nativeEvent","onAdLoadFailedEvent","onAdClickedEvent","onAdImpressionRecordedEvent","log","jsx","View","preloadId"],"sourceRoot":"../../src","sources":["AdBannerView.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AASA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,kCAAA,GAAAC,uBAAA,CAAAH,OAAA;AAGA,IAAAI,iBAAA,GAAAC,sBAAA,CAAAL,OAAA;AAAkD,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAK,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAG,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAR,uBAAA,YAAAA,CAAAI,CAAA,EAAAG,CAAA,SAAAA,CAAA,IAAAH,CAAA,IAAAA,CAAA,CAAAC,UAAA,SAAAD,CAAA,MAAAO,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAR,OAAA,EAAAF,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAS,CAAA,MAAAF,CAAA,GAAAJ,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAE,CAAA,CAAAI,GAAA,CAAAX,CAAA,UAAAO,CAAA,CAAAK,GAAA,CAAAZ,CAAA,GAAAO,CAAA,CAAAM,GAAA,CAAAb,CAAA,EAAAS,CAAA,gBAAAN,CAAA,IAAAH,CAAA,gBAAAG,CAAA,OAAAW,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAG,CAAA,OAAAK,CAAA,IAAAD,CAAA,GAAAS,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAG,CAAA,OAAAK,CAAA,CAAAI,GAAA,IAAAJ,CAAA,CAAAK,GAAA,IAAAN,CAAA,CAAAE,CAAA,EAAAN,CAAA,EAAAK,CAAA,IAAAC,CAAA,CAAAN,CAAA,IAAAH,CAAA,CAAAG,CAAA,WAAAM,CAAA,KAAAT,CAAA,EAAAG,CAAA;AAQlD,MAAM;EAAEgB,sBAAsB;EAAEC;AAAqB,CAAC,GACpDC,yBAAgB,CAACC,YAAY,CAAC,CAAC;AAAC,IAEtBC,QAAQ,GAAAC,OAAA,CAAAD,QAAA,0BAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA;AAKpB,MAAME,gBAAgB,GAAIC,QAA2B,IAAa;EAChE,QAAQA,QAAQ;IACd,KAAKH,QAAQ,CAACI,MAAM;MAClB,OAAOR,sBAAsB;IAC/B,KAAKI,QAAQ,CAACK,IAAI;MAChB,OAAOR,oBAAoB;IAC7B;MACE,OAAOM,QAAQ;EACnB;AACF,CAAC;AAIM,MAAMG,YAAY,GAAAL,OAAA,CAAAK,YAAA,gBAAG,IAAAC,iBAAU,EAGpC,SAASD,YAAYA,CACrB;EACEE,SAAS;EACTL,QAAQ;EACRM,WAAW,GAAG,IAAI;EAClBC,SAAS,GAAG,IAAI;EAChBC,OAAO;EACPC,UAAU;EACVC,cAAc;EACdC,WAAW;EACXC,sBAAsB;EACtBC,KAAK;EACL,GAAGC;AACL,CAAC,EACDC,GAAG,EACH;EACA,MAAMC,SAAS,GAAG,IAAAC,aAAM,EAAoB,IAAI,CAAC;EACjD,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAAC,eAAQ,EAAU,KAAK,CAAC;EAElE,MAAMC,MAAM,GAAG,IAAAC,kBAAW,EAAC,MAAM;IAC/B,IAAIN,SAAS,CAACO,OAAO,EAAE;MACrBC,2CAAQ,CAACH,MAAM,CAACL,SAAS,CAACO,OAAO,CAAC;IACpC;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAE,0BAAmB,EAACV,GAAG,EAAE,OAAO;IAAEM;EAAO,CAAC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEtD,MAAMK,WAAW,GAAG,IAAAJ,kBAAW,EAAEK,OAA0B,IAAK;IAC9DX,SAAS,CAACO,OAAO,GAAGI,OAAO;EAC7B,CAAC,EAAE,EAAE,CAAC;EAEN,IAAAC,gBAAS,EAAC,MAAM;IACd,CAAC,YAAY;MACX,MAAMC,WAAW,GAAG,MAAMlC,yBAAgB,CAACuB,aAAa,CAAC,CAAC;MAC1DC,gBAAgB,CAACU,WAAW,CAAC;MAE7B,IAAI,CAACA,WAAW,EAAE;QAChBC,OAAO,CAACC,IAAI,CACV,oFACF,CAAC;MACH;IACF,CAAC,EAAE,CAAC;EACN,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,eAAe,GAAG,IAAAV,kBAAW,EAChCW,KAA4B,IAAK;IAChCxB,UAAU,GAAGwB,KAAK,CAACC,WAAW,CAAC;EACjC,CAAC,EACD,CAACzB,UAAU,CACb,CAAC;EAED,MAAM0B,mBAAmB,GAAG,IAAAb,kBAAW,EACpCW,KAAsC,IAAK;IAC1CvB,cAAc,GAAGuB,KAAK,CAACC,WAAW,CAAC;EACrC,CAAC,EACD,CAACxB,cAAc,CACjB,CAAC;EAED,MAAM0B,gBAAgB,GAAG,IAAAd,kBAAW,EACjCW,KAA4B,IAAK;IAChCtB,WAAW,GAAGsB,KAAK,CAACC,WAAW,CAAC;EAClC,CAAC,EACD,CAACvB,WAAW,CACd,CAAC;EAED,MAAM0B,2BAA2B,GAAG,IAAAf,kBAAW,EAC5CW,KAA4B,IAAK;IAChCrB,sBAAsB,GAAGqB,KAAK,CAACC,WAAW,CAAC;EAC7C,CAAC,EACD,CAACtB,sBAAsB,CACzB,CAAC;EAED,IAAI,CAACM,aAAa,EAAE;IAClB;IACAY,OAAO,CAACQ,GAAG,CAAC,iCAAiC,CAAC;IAC9C,oBAAO,IAAAjE,WAAA,CAAAkE,GAAA,EAACvE,YAAA,CAAAwE,IAAI;MAAC3B,KAAK,EAAEA,KAAM;MAAA,GAAKC;IAAU,CAAG,CAAC;EAC/C;EAEA,oBACE,IAAAzC,WAAA,CAAAkE,GAAA,EAACtE,kCAAA,CAAAO,OAA2B;IAC1BqC,KAAK,EAAEA,KAAM;IACbb,QAAQ,EAAED,gBAAgB,CAACC,QAAQ,CAAE;IACrCe,GAAG,EAAEW,WAAY;IACjBrB,SAAS,EAAEA,SAAU;IACrBC,WAAW,EAAEA,WAAY;IACzBmC,SAAS,EAAEjC,OAAO,EAAEiC,SAAU;IAC9BlC,SAAS,EAAEA,SAAU;IACrByB,eAAe,EAAEA,eAAgB;IACjCG,mBAAmB,EAAEA,mBAAoB;IACzCC,gBAAgB,EAAEA,gBAAiB;IACnCC,2BAA2B,EAAEA,2BAA4B;IAAA,GACrDvB;EAAU,CACf,CAAC;AAEN,CAAC,CAAC","ignoreList":[]}
|