adwhale-sdk-react-native 2.7.204 → 2.7.400

package/android/src/main/java/com/adwhalesdkreactnative/RNAdWhaleMediationInterstitialAd.java

@@ -11,6 +11,8 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
@@ -27,6 +29,13 @@ import java.util.Map;
 public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule implements AdWhaleMediationInterstitialAdListener {
 
     public static final String REACT_CLASS_NAME = RNAdWhaleMediationInterstitialAd.class.getSimpleName();
+
+    // Flutter와 싱크: adId 기반 멀티 인스턴스 지원 (RN에서도 여러 placement 동시 운용 가능)
+    private final Map<Integer, AdWhaleMediationInterstitialAd> adsById = new HashMap<>();
+
+    // 마지막으로 콜백이 발생한 광고 id (SDK Listener가 adId를 직접 주지 않아서 우회)
+    private int lastActiveAdId = 0;
+
     private AdWhaleMediationInterstitialAd adWhaleMediationInterstitialAd;
     private String placementUid;
     private String placementName;
@@ -72,6 +81,8 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
     @ReactMethod
     public void loadAd(String placementUid) {
         Log.e(REACT_CLASS_NAME, ".loadAd()");
+      // 싱글턴 load 경로: onAdEvent(adId) 는 0으로 고정 (멀티 로드 후 lastActiveAdId 오염 방지)
+      lastActiveAdId = 0;
       this.placementUid = placementUid;
         adWhaleMediationInterstitialAd = new AdWhaleMediationInterstitialAd(placementUid);
         adWhaleMediationInterstitialAd.setAdWhaleMediationInterstitialAdListener(this);
@@ -84,6 +95,69 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
         });
     }
 
+    /**
+     * Flutter MethodChannel과 동일 네이밍:
+     * loadInterstitialAd({adId, placementUid, region, gcoder:[lt,lng], placementName})
+     */
+    @ReactMethod
+    public void loadInterstitialAd(ReadableMap args) {
+      if (args == null) {
+        Log.e(REACT_CLASS_NAME, "loadInterstitialAd args is null");
+        return;
+      }
+      if (!args.hasKey("adId") || args.getType("adId") != ReadableType.Number) {
+        Log.e(REACT_CLASS_NAME, "loadInterstitialAd missing adId (number)");
+        return;
+      }
+      if (!args.hasKey("placementUid") || args.getType("placementUid") != ReadableType.String) {
+        Log.e(REACT_CLASS_NAME, "loadInterstitialAd missing placementUid (string)");
+        return;
+      }
+      final int adId = args.getInt("adId");
+      final String placementUid = args.getString("placementUid");
+
+      final AdWhaleMediationInterstitialAd interstitialAd = new AdWhaleMediationInterstitialAd(placementUid);
+      // 멀티 인스턴스: 인스턴스마다 adId를 캡처한 리스너 (공유 this + lastActiveAdId 는 경합으로 마지막 id만 남음)
+      interstitialAd.setAdWhaleMediationInterstitialAdListener(new PerAdInterstitialListener(adId));
+
+      try {
+        if (args.hasKey("region") && args.getType("region") == ReadableType.String) {
+          String r = args.getString("region");
+          if (r != null && !r.isEmpty()) interstitialAd.setRegion(r);
+        }
+      } catch (Throwable t) {
+        Log.w(REACT_CLASS_NAME, "setRegion failed: " + t.getMessage());
+      }
+
+      try {
+        if (args.hasKey("placementName") && args.getType("placementName") == ReadableType.String) {
+          String pn = args.getString("placementName");
+          if (pn != null && !pn.isEmpty()) interstitialAd.setPlacementName(pn);
+        }
+      } catch (Throwable t) {
+        Log.w(REACT_CLASS_NAME, "setPlacementName failed: " + t.getMessage());
+      }
+
+      try {
+        if (args.hasKey("gcoder") && args.getType("gcoder") == ReadableType.Array) {
+          ReadableArray arr = args.getArray("gcoder");
+          if (arr != null && arr.size() >= 2
+              && arr.getType(0) == ReadableType.Number
+              && arr.getType(1) == ReadableType.Number) {
+            double lat = arr.getDouble(0);
+            double lng = arr.getDouble(1);
+            interstitialAd.setGcoder(lat, lng);
+          }
+        }
+      } catch (Throwable t) {
+        Log.w(REACT_CLASS_NAME, "setGcoder failed: " + t.getMessage());
+      }
+
+      adsById.put(adId, interstitialAd);
+
+      UiThreadUtil.runOnUiThread(interstitialAd::loadAd);
+    }
+
     @ReactMethod
     public void showAd() {
         Log.e(REACT_CLASS_NAME, "showAd()");
@@ -92,15 +166,42 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
             return;
         }
 
+        lastActiveAdId = 0;
         UiThreadUtil.runOnUiThread(() -> {
             adWhaleMediationInterstitialAd.showAd();
         });
     }
 
+    /** Flutter 네이밍: showAdWithoutView(adId) */
+    @ReactMethod
+    public void showAdWithoutView(int adId) {
+      AdWhaleMediationInterstitialAd ad = adsById.get(adId);
+      if (ad == null) {
+        Log.e(REACT_CLASS_NAME, "showAdWithoutView: ad not found. adId=" + adId);
+        return;
+      }
+      lastActiveAdId = adId;
+      UiThreadUtil.runOnUiThread(ad::showAd);
+    }
+
+    /** Flutter 네이밍: destroyAd(adId) */
+    @ReactMethod
+    public void destroyAd(int adId) {
+      AdWhaleMediationInterstitialAd ad = adsById.remove(adId);
+      if (ad != null) {
+        try {
+          ad.destroy();
+        } catch (Throwable t) {
+          Log.w(REACT_CLASS_NAME, "destroyAd failed: " + t.getMessage());
+        }
+      }
+    }
+
     @Override
     public void onAdLoaded() {
         Log.i(REACT_CLASS_NAME, "onAdLoaded()");
         sendEvent("onInterstitialAdLoaded", null);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdLoaded", null);
 
     }
 
@@ -111,12 +212,18 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
         params.putInt("statusCode", statusCode);
         params.putString("message", message);
         sendEvent("onInterstitialAdLoadFailed", params);
+        // NOTE: emit() 이후에는 Map 이 consume 되므로 재사용 금지. 새 맵으로 따로 보낸다.
+        WritableMap forAdEvent = Arguments.createMap();
+        forAdEvent.putInt("statusCode", statusCode);
+        forAdEvent.putString("message", message);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdLoadFailed", forAdEvent);
     }
 
     @Override
     public void onAdShowed() {
         Log.i(REACT_CLASS_NAME, "onAdShowed()");
         sendEvent("onInterstitialAdShowed", null);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdShowed", null);
     }
 
     @Override
@@ -126,18 +233,30 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
         params.putInt("statusCode", statusCode);
         params.putString("message", message);
         sendEvent("onInterstitialAdShowFailed", params);
+        // NOTE: emit() 이후에는 Map 이 consume 되므로 재사용 금지. 새 맵으로 따로 보낸다.
+        WritableMap forAdEvent = Arguments.createMap();
+        forAdEvent.putInt("statusCode", statusCode);
+        forAdEvent.putString("message", message);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdShowFailed", forAdEvent);
     }
 
     @Override
     public void onAdClosed() {
         Log.i(REACT_CLASS_NAME, "onAdClosed()");
         sendEvent("onInterstitialAdClosed", null);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdClosed", null);
+
+        // Flutter 구현과 유사하게 닫힘 후 destroy 권장: 자동 정리(선택)
+        if (adsById.containsKey(lastActiveAdId)) {
+          destroyAd(lastActiveAdId);
+        }
     }
 
     @Override
     public void onAdClicked() {
         Log.i(REACT_CLASS_NAME, "onAdClicked()");
         sendEvent("onInterstitialAdClicked", null);
+        sendAdEvent(lastActiveAdId, "onInterstitialAdClicked", null);
     }
 
     @Nullable
@@ -153,6 +272,21 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
                 .emit(eventName, params);
     }
 
+    /**
+     * Flutter의 `onAdEvent`와 동일한 단일 이벤트 채널 형태.
+     * payload: { adId, eventName, ...statusCode/message... }
+     */
+    private void sendAdEvent(int adId, @NonNull String eventName, @Nullable WritableMap original) {
+      WritableMap payload = Arguments.createMap();
+      payload.putInt("adId", adId);
+      payload.putString("eventName", eventName);
+      if (original != null) {
+        if (original.hasKey("statusCode")) payload.putInt("statusCode", original.getInt("statusCode"));
+        if (original.hasKey("message")) payload.putString("message", original.getString("message"));
+      }
+      sendEvent("onAdEvent", payload);
+    }
+
     @ReactMethod
     public void addListener(String eventName) {
         //TODO NOTHING
@@ -162,4 +296,75 @@ public class RNAdWhaleMediationInterstitialAd extends ReactContextBaseJavaModule
      public void removeListeners(Integer count) {
         //TODO NOTHING
      }
+
+    /**
+     * adId별 전면 인스턴스 전용 리스너. 여러 개를 동시에 로드할 때 공유 리스너 + lastActiveAdId 만으로는
+     * 콜백이 모두 마지막 id로만 전달되는 문제가 있다.
+     */
+    private final class PerAdInterstitialListener implements AdWhaleMediationInterstitialAdListener {
+      private final int boundAdId;
+
+      PerAdInterstitialListener(int boundAdId) {
+        this.boundAdId = boundAdId;
+      }
+
+      @Override
+      public void onAdLoaded() {
+        Log.i(REACT_CLASS_NAME, "onAdLoaded() adId=" + boundAdId);
+        sendEvent("onInterstitialAdLoaded", null);
+        sendAdEvent(boundAdId, "onInterstitialAdLoaded", null);
+      }
+
+      @Override
+      public void onAdLoadFailed(int statusCode, String message) {
+        Log.i(REACT_CLASS_NAME, "onAdLoadFailed(" + statusCode + ", " + message + ") adId=" + boundAdId);
+        WritableMap params = Arguments.createMap();
+        params.putInt("statusCode", statusCode);
+        params.putString("message", message);
+        sendEvent("onInterstitialAdLoadFailed", params);
+        // NOTE: emit() 이후에는 Map 이 consume 되므로 재사용 금지. 새 맵으로 따로 보낸다.
+        WritableMap forAdEvent = Arguments.createMap();
+        forAdEvent.putInt("statusCode", statusCode);
+        forAdEvent.putString("message", message);
+        sendAdEvent(boundAdId, "onInterstitialAdLoadFailed", forAdEvent);
+      }
+
+      @Override
+      public void onAdShowed() {
+        Log.i(REACT_CLASS_NAME, "onAdShowed() adId=" + boundAdId);
+        sendEvent("onInterstitialAdShowed", null);
+        sendAdEvent(boundAdId, "onInterstitialAdShowed", null);
+      }
+
+      @Override
+      public void onAdShowFailed(int statusCode, String message) {
+        Log.i(REACT_CLASS_NAME, "onAdShowFailed(" + statusCode + ", " + message + ") adId=" + boundAdId);
+        WritableMap params = Arguments.createMap();
+        params.putInt("statusCode", statusCode);
+        params.putString("message", message);
+        sendEvent("onInterstitialAdShowFailed", params);
+        // NOTE: emit() 이후에는 Map 이 consume 되므로 재사용 금지. 새 맵으로 따로 보낸다.
+        WritableMap forAdEvent = Arguments.createMap();
+        forAdEvent.putInt("statusCode", statusCode);
+        forAdEvent.putString("message", message);
+        sendAdEvent(boundAdId, "onInterstitialAdShowFailed", forAdEvent);
+      }
+
+      @Override
+      public void onAdClosed() {
+        Log.i(REACT_CLASS_NAME, "onAdClosed() adId=" + boundAdId);
+        sendEvent("onInterstitialAdClosed", null);
+        sendAdEvent(boundAdId, "onInterstitialAdClosed", null);
+        if (adsById.containsKey(boundAdId)) {
+          destroyAd(boundAdId);
+        }
+      }
+
+      @Override
+      public void onAdClicked() {
+        Log.i(REACT_CLASS_NAME, "onAdClicked() adId=" + boundAdId);
+        sendEvent("onInterstitialAdClicked", null);
+        sendAdEvent(boundAdId, "onInterstitialAdClicked", null);
+      }
+    }
 }

package/android/src/main/java/com/adwhalesdkreactnative/RNAdWhaleMediationLoggerModule.java

@@ -4,6 +4,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import com.adwhalesdkreactnative.common.RNMethodResultConst;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -43,7 +44,7 @@ public class RNAdWhaleMediationLoggerModule extends ReactContextBaseJavaModule {
             promise.resolve(logLevelString);
         } catch (Exception e) {
             Log.e(REACT_CLASS_NAME, "로그 레벨 조회 실패", e);
-            promise.reject("GET_LOG_LEVEL_ERROR", "Failed to get log level", e);
+            promise.reject(RNMethodResultConst.GET_LOG_LEVEL_ERROR, "Failed to get log level", e);
         }
     }
 }

package/android/src/main/java/com/adwhalesdkreactnative/RNAdWhaleMediationNativeAdViewListenerBridge.java

@@ -0,0 +1,83 @@
+package com.adwhalesdkreactnative;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.adwhalesdkreactnative.common.RNMethodArgConst;
+import com.adwhalesdkreactnative.common.RNMethodCallConst;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+
+import net.adwhale.sdk.mediation.ads.AdWhaleMediationNativeAdViewListener;
+
+/**
+ * {@link AdWhaleMediationNativeAdViewListener} 단일 구현체.
+ * Flutter {@code FlutterNativeTemplateAd} / {@code FlutterNativeBinderAd}와 동일하게
+ * 모든 콜백을 동일한 이벤트 이름({@link RNMethodCallConst#ON_NATIVE_AD_*})으로 정규화합니다.
+ */
+public final class RNAdWhaleMediationNativeAdViewListenerBridge implements AdWhaleMediationNativeAdViewListener {
+
+  /** Flutter {@link net.adwhale.sdk.adwhale_sdk_flutter.nativeads.FlutterNativeBinderAd} 와 동일. */
+  public static final int NATIVE_BINDER_CONFIGURATION_ERROR_CODE = 300;
+
+  /**
+   * 네이티브 → JS 로 이벤트를 보낼 때 사용. Flutter AdWhaleAdInstanceManager 의 emit 과 대응.
+   */
+  public interface Emitter {
+    void emit(@NonNull String eventName, @Nullable WritableMap payload);
+  }
+
+  @NonNull private final String logTag;
+  @NonNull private final Emitter emitter;
+
+  public RNAdWhaleMediationNativeAdViewListenerBridge(
+      @NonNull String logTag,
+      @NonNull Emitter emitter) {
+    this.logTag = logTag;
+    this.emitter = emitter;
+  }
+
+  @NonNull
+  public static WritableMap createErrorPayload(int statusCode, @Nullable String message) {
+    WritableMap m = Arguments.createMap();
+    m.putInt(RNMethodArgConst.SEND_STATUS_CODE, statusCode);
+    m.putString(RNMethodArgConst.SEND_MESSAGE, message != null ? message : "");
+    return m;
+  }
+
+  @Override
+  public void onNativeAdLoaded() {
+    Log.d(logTag, "onNativeAdLoaded");
+    emitter.emit(RNMethodCallConst.ON_NATIVE_AD_LOADED, null);
+  }
+
+  @Override
+  public void onNativeAdFailedToLoad(int errorCode, String errorMessage) {
+    Log.d(logTag, "onNativeAdFailedToLoad: " + errorCode + ", " + errorMessage);
+    emitter.emit(
+        RNMethodCallConst.ON_NATIVE_AD_FAILED_TO_LOAD,
+        createErrorPayload(errorCode, errorMessage));
+  }
+
+  @Override
+  public void onNativeAdShowFailed(int errorCode, String errorMessage) {
+    Log.d(logTag, "onNativeAdShowFailed: " + errorCode + ", " + errorMessage);
+    emitter.emit(
+        RNMethodCallConst.ON_NATIVE_AD_SHOW_FAILED,
+        createErrorPayload(errorCode, errorMessage));
+  }
+
+  @Override
+  public void onNativeAdClicked() {
+    Log.d(logTag, "onNativeAdClicked");
+    emitter.emit(RNMethodCallConst.ON_NATIVE_AD_CLICKED, null);
+  }
+
+  @Override
+  public void onNativeAdClosed() {
+    Log.d(logTag, "onNativeAdClosed");
+    emitter.emit(RNMethodCallConst.ON_NATIVE_AD_CLOSED, null);
+  }
+}