adwhale-sdk-react-native 2.7.204 → 2.7.300

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);
+  }
+}

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

@@ -1,5 +1,6 @@
 package com.adwhalesdkreactnative;
 
+import android.app.Activity;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
@@ -10,6 +11,8 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
@@ -30,6 +33,13 @@ import java.util.Map;
 public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule implements AdWhaleMediationRewardedAdLoadCallback, AdWhaleMediationFullScreenContentCallback, AdWhaleMediationUserEarnedRewardListener {
 
     public static final String REACT_CLASS_NAME = RNAdWhaleMediationRewardAd.class.getSimpleName();
+
+    // Flutter와 싱크: adId 기반 멀티 인스턴스 지원
+    private final Map<Integer, AdWhaleMediationRewardAd> adsById = new HashMap<>();
+    /** 멀티 로드 시 콜백마다 올바른 adId로 onAdEvent 를 보내기 위한 리스너 (공유 this + lastActiveAdId 는 경합) */
+    private final Map<Integer, PerAdRewardListener> rewardListenersById = new HashMap<>();
+    private int lastActiveAdId = 0;
+
     private AdWhaleMediationRewardAd adWhaleMediationRewardAd;
     private String placementUid;
     private String placementName;
@@ -78,6 +88,7 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     @ReactMethod
     public void loadAd(String placementUid) {
         Log.e(REACT_CLASS_NAME, "loadAd()");
+        lastActiveAdId = 0;
         this.placementUid = placementUid;
         adWhaleMediationRewardAd = new AdWhaleMediationRewardAd(placementUid);
         adWhaleMediationRewardAd.setAdWhaleMediationFullScreenContentCallback(this);
@@ -90,6 +101,70 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
         });
     }
 
+    /**
+     * Flutter MethodChannel과 동일 네이밍:
+     * loadRewardAd({adId, placementUid, region, gcoder:[lt,lng], placementName})
+     */
+    @ReactMethod
+    public void loadRewardAd(ReadableMap args) {
+      if (args == null) {
+        Log.e(REACT_CLASS_NAME, "loadRewardAd args is null");
+        return;
+      }
+      if (!args.hasKey("adId") || args.getType("adId") != ReadableType.Number) {
+        Log.e(REACT_CLASS_NAME, "loadRewardAd missing adId (number)");
+        return;
+      }
+      if (!args.hasKey("placementUid") || args.getType("placementUid") != ReadableType.String) {
+        Log.e(REACT_CLASS_NAME, "loadRewardAd missing placementUid (string)");
+        return;
+      }
+      final int adId = args.getInt("adId");
+      final String placementUid = args.getString("placementUid");
+
+      final AdWhaleMediationRewardAd rewardAd = new AdWhaleMediationRewardAd(placementUid);
+      final PerAdRewardListener perAdListener = new PerAdRewardListener(adId);
+      rewardListenersById.put(adId, perAdListener);
+      rewardAd.setAdWhaleMediationFullScreenContentCallback(perAdListener);
+
+      try {
+        if (args.hasKey("region") && args.getType("region") == ReadableType.String) {
+          String r = args.getString("region");
+          if (r != null && !r.isEmpty()) rewardAd.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()) rewardAd.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);
+            rewardAd.setGcoder(lat, lng);
+          }
+        }
+      } catch (Throwable t) {
+        Log.w(REACT_CLASS_NAME, "setGcoder failed: " + t.getMessage());
+      }
+
+      adsById.put(adId, rewardAd);
+
+      UiThreadUtil.runOnUiThread(() -> rewardAd.loadAd(perAdListener));
+    }
+
     @ReactMethod
     public void showAd() {
         Log.e(REACT_CLASS_NAME, "showAd()");
@@ -98,9 +173,63 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
             return;
         }
 
-        UiThreadUtil.runOnUiThread(() -> {
-            adWhaleMediationRewardAd.showAd(this);
-        });
+        lastActiveAdId = 0;
+        UiThreadUtil.runOnUiThread(() -> showRewardAdOnUi(adWhaleMediationRewardAd, this));
+    }
+
+    /** Flutter 네이밍: showAdWithoutView(adId) */
+    @ReactMethod
+    public void showAdWithoutView(int adId) {
+      AdWhaleMediationRewardAd ad = adsById.get(adId);
+      if (ad == null) {
+        Log.e(REACT_CLASS_NAME, "showAdWithoutView: ad not found. adId=" + adId);
+        return;
+      }
+      PerAdRewardListener listener = rewardListenersById.get(adId);
+      if (listener == null) {
+        Log.e(REACT_CLASS_NAME, "showAdWithoutView: listener not found. adId=" + adId);
+        return;
+      }
+      UiThreadUtil.runOnUiThread(() -> showRewardAdOnUi(ad, listener));
+    }
+
+    /**
+     * SDK는 Activity 생명주기와 연동해 onAdDismissed / 보상 콜백을 지연·발행합니다.
+     * {@code showAd(Listener)}만 쓰면 현재 Activity를 못 잡아 콜백이 누락될 수 있어
+     * {@code showAd(Activity, Listener)}를 우선 사용합니다.
+     */
+    /**
+     * @param listener 전면/로드/보상 콜백을 동일 adId로 보낼 리스턴스 (싱글턴은 {@code this})
+     */
+    private void showRewardAdOnUi(
+        @NonNull AdWhaleMediationRewardAd ad,
+        @NonNull AdWhaleMediationUserEarnedRewardListener listener) {
+      Activity activity = getCurrentActivity();
+      if (activity != null && !activity.isFinishing()) {
+        try {
+          ad.showAd(activity, listener);
+          return;
+        } catch (Throwable t) {
+          Log.w(REACT_CLASS_NAME, "showAd(activity, listener) failed, fallback: " + t.getMessage());
+        }
+      } else {
+        Log.w(REACT_CLASS_NAME, "showRewardAdOnUi: no valid Activity, using showAd(listener)");
+      }
+      ad.showAd(listener);
+    }
+
+    /** Flutter 네이밍: destroyAd(adId) */
+    @ReactMethod
+    public void destroyAd(int adId) {
+      rewardListenersById.remove(adId);
+      AdWhaleMediationRewardAd ad = adsById.remove(adId);
+      if (ad != null) {
+        try {
+          ad.destroy();
+        } catch (Throwable t) {
+          Log.w(REACT_CLASS_NAME, "destroyAd failed: " + t.getMessage());
+        }
+      }
     }
 
 
@@ -109,12 +238,17 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     public void onAdClicked() {
         Log.i(REACT_CLASS_NAME, "onAdClicked()");
         sendEvnet("onRewardAdClicked", null);
+        sendAdEvent(lastActiveAdId, "onRewardAdClicked", null);
     }
 
     @Override
     public void onAdDismissed() {
         Log.i(REACT_CLASS_NAME, "onAdDismissed()");
         sendEvnet("onRewardAdDismissed", null);
+        sendAdEvent(lastActiveAdId, "onRewardAdDismissed", null);
+        if (adsById.containsKey(lastActiveAdId)) {
+          destroyAd(lastActiveAdId);
+        }
     }
 
     @Override
@@ -123,6 +257,8 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
         WritableMap params = Arguments.createMap();
         params.putInt("statusCode", statusCode);
         params.putString("message", message);
+        // NOTE: emit() 이후에는 Map 이 consume 될 수 있으므로, payload 복사(sendAdEvent)를 먼저 수행
+        sendAdEvent(lastActiveAdId, "onRewardAdFailedToShow", params);
         sendEvnet("onRewardAdFailedToShow", params);
     }
 
@@ -130,6 +266,7 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     public void onAdShowed() {
         Log.i(REACT_CLASS_NAME, "onAdShowed()");
         sendEvnet("onRewardAdShowed", null);
+        sendAdEvent(lastActiveAdId, "onRewardAdShowed", null);
     }
 
     /// AdWhaleMediationRewardedAdLoadCallback
@@ -137,6 +274,7 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     public void onAdLoaded(AdWhaleMediationRewardAd adWhaleMediationRewardAd, String message) {
         Log.i(REACT_CLASS_NAME, "onAdLoaded(+ " + message + ")");
         sendEvnet("onRewardAdLoaded", null);
+        sendAdEvent(lastActiveAdId, "onRewardAdLoaded", null);
     }
 
     @Override
@@ -145,6 +283,8 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
         WritableMap params = Arguments.createMap();
         params.putInt("statusCode", statusCode);
         params.putString("message", message);
+        // NOTE: emit() 이후에는 Map 이 consume 될 수 있으므로, payload 복사(sendAdEvent)를 먼저 수행
+        sendAdEvent(lastActiveAdId, "onRewardAdFailedToLoad", params);
         sendEvnet("onRewardAdFailedToLoad", params);
     }
 
@@ -154,8 +294,14 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     public void onUserRewarded(AdWhaleMediationRewardItem adWhaleMediationRewardItem) {
         Log.i(REACT_CLASS_NAME, "onUserRewarded(" + adWhaleMediationRewardItem.toString() + ")");
         WritableMap params = Arguments.createMap();
+        // Flutter와 동일 키: RewardType / RewardAmount (대소문자 포함)
+        params.putString("RewardType", adWhaleMediationRewardItem.getRewardType());
+        params.putInt("RewardAmount", adWhaleMediationRewardItem.getRewardAmount());
+        // 레거시 호환 키도 유지
         params.putString("type", adWhaleMediationRewardItem.getRewardType());
         params.putInt("amount", adWhaleMediationRewardItem.getRewardAmount());
+        // NOTE: emit() 이후에는 Map 이 consume 될 수 있으므로, payload 복사(sendAdEvent)를 먼저 수행
+        sendAdEvent(lastActiveAdId, "onUserRewarded", params);
         sendEvnet("onUserRewarded", params);
     }
 
@@ -167,9 +313,36 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     }
 
     private void sendEvnet(String eventName, @Nullable WritableMap params) {
-        getReactApplicationContext()
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        final ReactApplicationContext ctx = getReactApplicationContext();
+        if (ctx == null) {
+          return;
+        }
+        // SDK 콜백이 메인이 아닌 스레드에서 올 수 있어 RN 브리지는 UI 큐에서 emit
+        ctx.runOnUiQueueThread(() -> {
+          try {
+            ctx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(eventName, params);
+          } catch (Throwable t) {
+            Log.w(REACT_CLASS_NAME, "emit failed: " + eventName + " — " + t.getMessage());
+          }
+        });
+    }
+
+    /**
+     * Flutter `onAdEvent` 스타일: payload에 eventName + adId 포함.
+     * payload: { adId, eventName, statusCode?, message?, RewardType?, RewardAmount? }
+     */
+    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"));
+        if (original.hasKey("RewardType")) payload.putString("RewardType", original.getString("RewardType"));
+        if (original.hasKey("RewardAmount")) payload.putInt("RewardAmount", original.getInt("RewardAmount"));
+      }
+      sendEvnet("onAdEvent", payload);
     }
 
     @ReactMethod
@@ -178,7 +351,83 @@ public class RNAdWhaleMediationRewardAd extends ReactContextBaseJavaModule imple
     }
 
     @ReactMethod
-    public void removeListeners(Integer count) {
+     public void removeListeners(Integer count) {
         //TODO NOTHING
     }
+
+    /**
+     * 멀티 보상형 인스턴스당 1개: 로드/전면/보상 콜백 모두 boundAdId 로 onAdEvent 전달.
+     */
+    private final class PerAdRewardListener implements AdWhaleMediationRewardedAdLoadCallback,
+        AdWhaleMediationFullScreenContentCallback,
+        AdWhaleMediationUserEarnedRewardListener {
+      private final int boundAdId;
+
+      PerAdRewardListener(int boundAdId) {
+        this.boundAdId = boundAdId;
+      }
+
+      @Override
+      public void onAdClicked() {
+        Log.i(REACT_CLASS_NAME, "onAdClicked() adId=" + boundAdId);
+        sendEvnet("onRewardAdClicked", null);
+        sendAdEvent(boundAdId, "onRewardAdClicked", null);
+      }
+
+      @Override
+      public void onAdDismissed() {
+        Log.i(REACT_CLASS_NAME, "onAdDismissed() adId=" + boundAdId);
+        sendEvnet("onRewardAdDismissed", null);
+        sendAdEvent(boundAdId, "onRewardAdDismissed", null);
+        if (adsById.containsKey(boundAdId)) {
+          destroyAd(boundAdId);
+        }
+      }
+
+      @Override
+      public void onFailedToShow(int statusCode, String message) {
+        Log.i(REACT_CLASS_NAME, "onFailedToShow(" + statusCode + ", " + message + ") adId=" + boundAdId);
+        WritableMap params = Arguments.createMap();
+        params.putInt("statusCode", statusCode);
+        params.putString("message", message);
+        sendAdEvent(boundAdId, "onRewardAdFailedToShow", params);
+        sendEvnet("onRewardAdFailedToShow", params);
+      }
+
+      @Override
+      public void onAdShowed() {
+        Log.i(REACT_CLASS_NAME, "onAdShowed() adId=" + boundAdId);
+        sendEvnet("onRewardAdShowed", null);
+        sendAdEvent(boundAdId, "onRewardAdShowed", null);
+      }
+
+      @Override
+      public void onAdLoaded(AdWhaleMediationRewardAd adWhaleMediationRewardAd, String message) {
+        Log.i(REACT_CLASS_NAME, "onAdLoaded(+ " + message + ") adId=" + boundAdId);
+        sendEvnet("onRewardAdLoaded", null);
+        sendAdEvent(boundAdId, "onRewardAdLoaded", null);
+      }
+
+      @Override
+      public void onAdFailedToLoad(int statusCode, String message) {
+        Log.i(REACT_CLASS_NAME, "onAdFailedToLoad(" + statusCode + ", " + message + ") adId=" + boundAdId);
+        WritableMap params = Arguments.createMap();
+        params.putInt("statusCode", statusCode);
+        params.putString("message", message);
+        sendAdEvent(boundAdId, "onRewardAdFailedToLoad", params);
+        sendEvnet("onRewardAdFailedToLoad", params);
+      }
+
+      @Override
+      public void onUserRewarded(AdWhaleMediationRewardItem adWhaleMediationRewardItem) {
+        Log.i(REACT_CLASS_NAME, "onUserRewarded(" + adWhaleMediationRewardItem + ") adId=" + boundAdId);
+        WritableMap params = Arguments.createMap();
+        params.putString("RewardType", adWhaleMediationRewardItem.getRewardType());
+        params.putInt("RewardAmount", adWhaleMediationRewardItem.getRewardAmount());
+        params.putString("type", adWhaleMediationRewardItem.getRewardType());
+        params.putInt("amount", adWhaleMediationRewardItem.getRewardAmount());
+        sendAdEvent(boundAdId, "onUserRewarded", params);
+        sendEvnet("onUserRewarded", params);
+      }
+    }
 }