tagworks-sdk-v1-react 1.1.21 → 1.1.23

package/android/build.gradle

@@ -100,6 +100,6 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
 //  implementation "com.facebook.react:react-android:0.71.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.obzen.tagworks:tagworks-v1-kotlin:1.1.31"
+  api "com.obzen.tagworks:tagworks-v1-kotlin:1.1.35"
 }
 

package/android/src/main/java/com/tagworkssdkv1/DataBundleModule.kt

@@ -8,7 +8,6 @@ import com.facebook.react.bridge.ReactMethod
 import com.obzen.tagworks.TagWorks
 import com.obzen.tagworks.event.data.DataBundle
 import com.obzen.tagworks.event.data.DimensionType
-import com.obzen.tagworks.util.Logger
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -180,23 +179,11 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
                 }
             }
 
-            val generalWrapper = JSONObject().apply {
+            val result = JSONObject().apply {
                 put("General", generalDimensions)
-            }
-
-            val factWrapper = JSONObject().apply {
                 put("Fact", factDimensions)
             }
 
-            val dimensionsArray = JSONArray().apply {
-                put(generalWrapper)
-                put(factWrapper)
-            }
-
-            val result = JSONObject().apply {
-                put("Dimensions", dimensionsArray)
-            }
-
             val jsonString = result.toString(4)
             callback.invoke(jsonString)
         } catch (e: Exception) {
@@ -226,23 +213,11 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
                 }
             }
 
-            val generalWrapper = JSONObject().apply {
+            val result = JSONObject().apply {
                 put("General", generalDimensions)
-            }
-
-            val factWrapper = JSONObject().apply {
                 put("Fact", factDimensions)
             }
 
-            val dimensionsArray = JSONArray().apply {
-                put(generalWrapper)
-                put(factWrapper)
-            }
-
-            val result = JSONObject().apply {
-                put("Dimensions", dimensionsArray)
-            }
-
             val jsonString = result.toString(4)
             callback.invoke(jsonString)
         } catch (e: Exception) {

package/android/src/main/java/com/tagworkssdkv1/OnCmsBannerView.kt

@@ -0,0 +1,68 @@
+package com.tagworkssdkv1
+
+import android.content.Context
+import android.widget.FrameLayout
+import com.obzen.tagworks.TagWorksPopup
+
+
+class OnCmsBannerView(
+    context: Context
+) : FrameLayout(context){
+
+    private var onCmsUrl: String? = null
+    private var custId: String?= null
+    private var rcmdAreaCd: String? =  null
+    private var defaultImageRes: Int? = null
+
+    private var isAttached = false
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+       removeAllViews()
+       isAttached = false
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+    }
+
+    fun setOnCmsUrl(url: String) {
+        onCmsUrl = url
+        tryAttach()
+    }
+
+    fun setCustId(id: String?) {
+        custId = id
+        tryAttach()
+    }
+
+    fun setRcmdAreaCd(code: String) {
+        rcmdAreaCd = code
+        tryAttach()
+    }
+
+    fun setDefaultImage(resId: Int) {
+        defaultImageRes = resId
+        tryAttach()
+    }
+
+    private fun tryAttach() {
+        if(
+            isAttached ||
+            onCmsUrl.isNullOrEmpty() ||
+            rcmdAreaCd.isNullOrEmpty() ||
+            defaultImageRes == null
+        ) return
+
+        isAttached = true
+
+        TagWorksPopup.onCMSPopupBanner(
+            onCmsUrl =  onCmsUrl!!,
+            cust_id = custId,
+            rcmd_area_cd = rcmdAreaCd!!,
+            bannerView = this,
+            context = context,
+            defaultImage = defaultImageRes!!
+        )
+    }
+}

package/android/src/main/java/com/tagworkssdkv1/OnCmsBannerViewManager.kt

@@ -1,83 +1,54 @@
 package com.tagworkssdkv1
 
-import android.util.Log
-import android.widget.FrameLayout
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.obzen.tagworks.TagWorksPopup
+
 
 /**
  * React Native에서 사용할 수 있는 커스텀 네이티브 View를 정의하는 ViewManager 클래스
  * FrameLayout을 기반으로 하며, 외부에서 전달된 props를 통해 배너를 갱신.
  * Created by obzen on 2025-04-23
  */
-class OnCmsBannerViewManager: SimpleViewManager<FrameLayout>() {
+class OnCmsBannerViewManager: SimpleViewManager<OnCmsBannerView>() {
 
-  private var onCmsUrl: String = ""
-  private var custId: String? = ""
-  private var rcmdAreaCd: String = ""
-  private var defaultImage: String = ""
+  override fun getName(): String {
+      return "OnCmsBannerView"
+  } 
 
   /**
    * 실제 Native View를 생성하는 함수.
    * React Native에서 <OnCmsBannerView />를 선언하면 호출.
    */
-  override fun createViewInstance(reactContext: ThemedReactContext): FrameLayout {
-    val frameLayout= FrameLayout(reactContext)
-
-    return frameLayout
+  override fun createViewInstance(reactContext: ThemedReactContext): OnCmsBannerView {
+      return OnCmsBannerView(reactContext)
   }
 
   @ReactProp(name = "onCmsUrl")
-  fun setOnCmsUrl(view: FrameLayout, url: String) {
-      onCmsUrl = url
-      attachBanner(view)
-  }
-
-  @ReactProp(name = "rcmd_area_cd")
-  fun setRcmdAreaCd(view: FrameLayout, areaCd: String) {
-      rcmdAreaCd = areaCd
-      attachBanner(view)
+  fun setOnCmsUrl(view: OnCmsBannerView,url: String) {
+      view.setOnCmsUrl(url)
   }
 
   @ReactProp(name = "cust_id")
-  fun setCustId(view: FrameLayout, id: String?) {
-      custId = id
-      attachBanner(view)
+  fun setCustId(view: OnCmsBannerView, id: String?) {
+      view.setCustId(id)
   }
 
-  @ReactProp(name = "defaultImage")
-  fun setDefaultImage(view: FrameLayout, image: String) {
-      defaultImage = image
-      attachBanner(view)
+  @ReactProp(name = "rcmd_area_cd")
+  fun setRcmdAreaCd(view: OnCmsBannerView, code:String) {
+      view.setRcmdAreaCd(code)
   }
 
-  /**
-   * 설정된 배너 데이터를 바탕으로 실제 배너를 View에 붙이는 함수.
-   * 모든 필수 데이터가 들어왔을 때만 실행되며, 내부적으로 TagWorksPopup 모듈을 호출.
-   */
-  private fun attachBanner(container: FrameLayout) {
-
-    val context = container.context
-    val activity = (context as? ReactContext)?.currentActivity
-
-    val resId = activity?.resources?.getIdentifier(defaultImage, "drawable", activity.packageName)
-
-    if (resId != null) {
-      TagWorksPopup.onCMSPopupBanner(
-        onCmsUrl = onCmsUrl,
-        cust_id = custId,
-        rcmd_area_cd = rcmdAreaCd,
-        context = context,
-        bannerView = container,
-        defaultImage = resId
+  @ReactProp(name = "defaultImage")
+  fun setDefaultImage(view: OnCmsBannerView, imageName: String) {
+      val resId = view.context.resources.getIdentifier(
+          imageName,
+          "drawable",
+          view.context.packageName
       )
-    }
-  }
 
-  override fun getName(): String {
-    return "OnCmsBannerView"
+      if (resId != 0) {
+          view.setDefaultImage(resId)
+      }
   }
 }

package/android/src/main/java/com/tagworkssdkv1/TagWorksDeeplinkModule.kt

@@ -13,7 +13,7 @@ import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter
 import com.obzen.tagworks.TagWorks
 import com.obzen.tagworks.TagWorksDeeplink
-import com.obzen.tagworks.util.Logger.Companion.e
+import com.obzen.tagworks.common.Logger
 
 class TagWorksDeeplinkModule(private val reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext),ActivityEventListener {
@@ -54,7 +54,7 @@ class TagWorksDeeplinkModule(private val reactContext: ReactApplicationContext)
                 UiThreadUtil.runOnUiThread { emitDeeplink(null, false) }
             }
         } catch (t: Throwable) {
-            e(TagWorks.getInstance().tag, "reportDeeplinkUrl error for: $url")
+            Logger.e(TagWorks.getInstance().tag, "reportDeeplinkUrl error for: $url")
             UiThreadUtil.runOnUiThread { emitDeeplink(null, false) }
         }
     }

package/android/src/main/java/com/tagworkssdkv1/TagWorksModule.kt

@@ -5,18 +5,18 @@ import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.UiThreadUtil
 import com.obzen.tagworks.TagWorks
 import com.obzen.tagworks.TagWorksConfig
+import com.obzen.tagworks.common.Logger
 import com.obzen.tagworks.event.data.DataBundle
 import com.obzen.tagworks.event.data.Dimension
 import com.obzen.tagworks.event.data.DimensionType
-import com.obzen.tagworks.util.Logger
-import com.obzen.tagworks.util.Logger.Companion.d
-import com.obzen.tagworks.util.WebAppInterface
-import com.obzen.tagworks.util.WebAppInterface.Companion.MessageHandlerName
-import com.obzen.tagworks.util.WebAppOnCmsInterface
+import com.obzen.tagworks.web.WebAppInterface
+import com.obzen.tagworks.web.WebAppInterface.Companion.MessageHandlerName
+import com.obzen.tagworks.web.WebAppOnCmsInterface
 import org.json.JSONArray
 import org.json.JSONObject
 
@@ -132,12 +132,40 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
     @ReactMethod
     fun getDeeplinkServerUrl(callback: Callback) {
         try {
-            callback.invoke(TagWorks.getInstance().isUseIntervals)
+            callback.invoke(TagWorks.getInstance().deeplinkServerUrl)
         } catch (e:Exception) {
             callback.invoke("error :",e.message)
         }
     }
 
+    @ReactMethod
+    fun enableTestTool(isTestMode: Boolean) {
+        val currentActivity = reactApplicationContext.currentActivity  ?: return
+        if (isTestMode) TagWorks.getInstance().enableTestTool(currentActivity)
+    }
+
+    @ReactMethod
+    fun excludeAutoTrackingPages(pageNames: ReadableArray?) {
+        if (pageNames == null) return
+
+        val classList = mutableListOf<Class<*>>()
+
+        for (i in 0 until pageNames.size()) {
+            val name = pageNames.getString(i)
+
+            try {
+                val clazz = Class.forName(name)
+                classList.add(clazz)
+            } catch (e: ClassNotFoundException) {
+                e.printStackTrace()
+            }
+        }
+
+        if (classList.isNotEmpty()) {
+            TagWorks.getInstance().excludeAutoTrackingPages(classList)
+        }
+    }
+
 
     /**
      * 공용 dimension 설정
@@ -189,23 +217,11 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
                 }
             }
 
-            val generalWrapper = JSONObject().apply {
+            val result = JSONObject().apply {
                 put("General", generalDimensions)
-            }
-
-            val factWrapper = JSONObject().apply {
                 put("Fact", factDimensions)
             }
 
-            val dimensionsArray = JSONArray().apply {
-                put(generalWrapper)
-                put(factWrapper)
-            }
-
-            val result = JSONObject().apply {
-                put("Dimensions", dimensionsArray)
-            }
-
             val jsonString = result.toString(4)
 
             callback.invoke(jsonString)
@@ -241,25 +257,12 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
                 }
             }
 
-            val generalWrapper = JSONObject().apply {
+            val result = JSONObject().apply {
                 put("General", generalDimensions)
-            }
-
-            val factWrapper = JSONObject().apply {
                 put("Fact", factDimensions)
             }
 
-            val dimensionsArray = JSONArray().apply {
-                put(generalWrapper)
-                put(factWrapper)
-            }
-
-            val result = JSONObject().apply {
-                put("Dimensions", dimensionsArray)
-            }
-
             val jsonString = result.toString(4)
-
             callback.invoke(jsonString)
         } catch (e: Exception) {
             // 오류 처리
@@ -423,6 +426,15 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
 
     }
 
+    @ReactMethod
+    fun isInitialize(callback: Callback) {
+        try {
+            callback.invoke(TagWorks.getInstance().isInitialize.toString())
+        } catch (e:Exception) {
+            callback.invoke("error :",e.message)
+        }
+    }
+
     @ReactMethod
     fun saveErrorReport(errorType: String, errorMessage: String) {
         TagWorks.getInstance().saveErrorReport(errorType, errorMessage)
@@ -430,7 +442,7 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
 
     @ReactMethod
     fun webInterfaceDidReceive(jsonEventString: String) {
-        d(TagWorks.getInstance().tag,jsonEventString)
+        Logger.d(TagWorks.getInstance().tag,jsonEventString)
         try {
 
             val jsonObj = JSONObject(jsonEventString)
@@ -445,7 +457,7 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
                 val currentActivity = reactApplicationContext.currentActivity  ?: return
 
                 if (currentActivity == null) {
-                    d(TagWorks.getInstance().tag, "currentActivity is null; cannot show popup yet")
+                    Logger.d(TagWorks.getInstance().tag, "currentActivity is null; cannot show popup yet")
                     return
                 }
                 val hasCommand = jsonObj.has("command")

package/android/src/main/java/com/tagworkssdkv1/TagworksSdkV1Package.kt

@@ -9,7 +9,7 @@ import com.facebook.react.uimanager.ViewManager
 class TagworksSdkV1Package : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
   //  return listOf(TagworksSdkV1Module(reactContext))
-  return listOf(TagworksSdkV1Module(reactContext),
+  return listOf(
     TagWorksPopupModule(reactContext),
     DataBundleModule(reactContext),
     TagWorksModule(reactContext),

package/ios/DataBundleModule.swift

@@ -7,13 +7,13 @@
 
 import Foundation
 import React
-import TagWorks_SDK_iOS
+import TagWorks_SDK_iOS_v1
 
 @objc(DataBundleModule)
 class DataBundleModule: NSObject, RCTBridgeModule {
     
     var dataDictionary: [String: String] = [:]
-    var eventDimensions: [TagWorks_SDK_iOS.Dimension] = []
+    var eventDimensions: [TagWorks_SDK_iOS_v1.Dimension] = []
     
     static func moduleName() -> String {
         return "DataBundleModule"
@@ -77,9 +77,9 @@ class DataBundleModule: NSObject, RCTBridgeModule {
                                 for (key, value) in genericDimensions {
                                     // if TagWorks_SDK_iOS.TagWorks.sharedInstance.isUseDynamicParameter == false {
                                     if Int(key) != nil {
-                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, stringValue: value))
+                                        self.eventDimensions.append(TagWorks_SDK_iOS_v1.Dimension(index: Int(key)!, stringValue: value))
                                     } else {
-                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, value: value))
+                                        self.eventDimensions.append(TagWorks_SDK_iOS_v1.Dimension(key: key, value: value))
                                     }
                                 }
                             }
@@ -89,9 +89,9 @@ class DataBundleModule: NSObject, RCTBridgeModule {
                                 for (key, value) in factDimensions {
                                     // if TagWorks_SDK_iOS.TagWorks.sharedInstance.isUseDynamicParameter == false {
                                     if Int(key) != nil {
-                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, numValue: Double(value as! String) ?? 0.0))
+                                        self.eventDimensions.append(TagWorks_SDK_iOS_v1.Dimension(index: Int(key)!, numValue: Double(value as! String) ?? 0.0))
                                     } else {
-                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: Double(value as! String) ?? 0.0))
+                                        self.eventDimensions.append(TagWorks_SDK_iOS_v1.Dimension(key: key, numValue: Double(value as! String) ?? 0.0))
                                     }
                                 }
                             }
@@ -256,7 +256,7 @@ class DataBundleModule: NSObject, RCTBridgeModule {
     }
     
     @objc func getDimensionWithString(_ index: Int, callback: @escaping RCTResponseSenderBlock) {
-        let dimension: TagWorks_SDK_iOS.Dimension? = self.eventDimensions.filter {$0.index == index && $0.type == Dimension.generalType}.first
+        let dimension: TagWorks_SDK_iOS_v1.Dimension? = self.eventDimensions.filter {$0.index == index && $0.type == Dimension.generalType}.first
         if let dimension {
             callback([dimension.value])
         } else {
@@ -265,7 +265,7 @@ class DataBundleModule: NSObject, RCTBridgeModule {
     }
     
     @objc func getDimensionWithDouble(_ index: Int, callback: @escaping RCTResponseSenderBlock) {
-        let dimension: TagWorks_SDK_iOS.Dimension? = self.eventDimensions.filter {$0.index == index && $0.type == Dimension.factType}.first
+        let dimension: TagWorks_SDK_iOS_v1.Dimension? = self.eventDimensions.filter {$0.index == index && $0.type == Dimension.factType}.first
         if let dimension {
             callback([String(dimension.numValue)])
         } else {

package/ios/OnCMSBannerViewManagerBridge.m

@@ -15,6 +15,7 @@ RCT_EXPORT_VIEW_PROPERTY(rcmd_area_cd, NSString)
 RCT_EXPORT_VIEW_PROPERTY(cust_id, NSString)
 RCT_EXPORT_VIEW_PROPERTY(defaultImage, NSString)
 
-//RCT_EXTERN_METHOD(setOnCmsBannerParam:(NSNumber *) reactTag url:(NSString *)url custId:(NSString *)custId areaCd:(NSString *)areaCd defaultImage:(NSString *)defaultImage)
-
+// JS에서 호출할 명령 정의
+// RCT_EXTERN_METHOD(setOnCmsBannerParam:(nonnull NSNumber *)reactTag params:(NSDictionary *)params)
+// RCT_EXTERN_METHOD(setOnCmsBannerParam:(NSNumber *) reactTag url:(NSString *)url custId:(NSString *)custId areaCd:(NSString *)areaCd defaultImage:(NSString *)defaultImage)
 @end