tagworks-sdk-v1-react 1.1.18 → 1.1.19

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.25"
+  implementation "com.obzen.tagworks:tagworks-v1-kotlin:1.1.26"
 }
 

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

@@ -5,13 +5,13 @@ 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.obzen.tagworks.TagWorks
 import com.obzen.tagworks.data.DataBundle
 import com.obzen.tagworks.data.DimensionType
 import com.obzen.tagworks.util.Logger
 import org.json.JSONArray
 import org.json.JSONObject
 
-
 class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaModule(context) {
 
   private var eventData= DataBundle()
@@ -28,6 +28,7 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
     super.initialize()
     eventData.dataBundle.clear()
     eventData.dimensions.clear()
+    eventData.dynamicDimensions.clear()
   }
 
   @ReactMethod
@@ -59,7 +60,11 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
             while (keys.hasNext()) {
               val key = keys.next()
               val value = general.getString(key)
-              eventData.setDimension(key.toInt(),value)
+              if(TagWorks.getInstance().isUseDynamicParameter) {
+                eventData.setDynamicDimension(key,value)
+              } else {
+                eventData.setDimension(key.toInt(),value)
+              }
             }
           }
 
@@ -69,7 +74,11 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
             while (keys.hasNext()) {
               val key = keys.next()
               val value = fact.getString(key)
-              eventData.setDimension(key.toInt(), value.toDouble())
+              if(TagWorks.getInstance().isUseDynamicParameter) {
+                eventData.setDynamicDimension(key,value.toDouble())
+              } else {
+                eventData.setDimension(key.toInt(),value.toDouble())
+              }
             }
           }
 
@@ -197,6 +206,52 @@ class DataBundleModule(context: ReactApplicationContext):ReactContextBaseJavaMod
     }
   }
 
+  @ReactMethod
+  fun getDynamicDimensions(callback: Callback){
+    try {
+
+      val generalDimensions = JSONObject()
+      val factDimensions = JSONObject()
+
+      eventData.dimensions.forEach { dimension ->
+        when (dimension.type) {
+          DimensionType.GENERAL_TYPE -> generalDimensions.put(dimension.index.toString(),dimension.value)
+          DimensionType.FACT_TYPE -> factDimensions.put(dimension.index.toString(),dimension.numValue)
+        }
+      }
+
+      eventData.dynamicDimensions.forEach { dimension ->
+        when(dimension.type) {
+          DimensionType.GENERAL_TYPE ->generalDimensions.put(dimension.key,dimension.value)
+          DimensionType.FACT_TYPE -> factDimensions.put(dimension.key,dimension.numValue)
+        }
+      }
+
+      val generalWrapper = 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) {
+      e.printStackTrace()
+      callback.invoke(null)
+    }
+  }
+
   @ReactMethod
   fun getDimensionsOfArrayIndex(callback: Callback) {
     try {

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

@@ -16,7 +16,6 @@ import com.obzen.tagworks.util.Logger.Companion.d
 import com.obzen.tagworks.util.WebAppInterface.Companion.MessageHandlerName
 import org.json.JSONArray
 import org.json.JSONObject
-import javax.security.auth.callback.Callback
 
 class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJavaModule(reactContext) {
 
@@ -200,6 +199,55 @@ class TagWorksModule(reactContext: ReactApplicationContext):ReactContextBaseJava
 
   }
 
+  @ReactMethod
+  fun getDynamicCommonDimensions(callback: Callback) {
+    try {
+      val cDimensions = TagWorks.getInstance().getCommonDimensions()
+      val cDynamicDimensions = TagWorks.getInstance().getDynamicCommonDimensions()
+
+      val generalDimensions = JSONObject()
+      val factDimensions = JSONObject()
+
+      cDimensions.forEach { dimension ->
+        when (dimension.type) {
+          DimensionType.GENERAL_TYPE -> generalDimensions.put(dimension.index.toString(),dimension.value)
+          DimensionType.FACT_TYPE -> factDimensions.put(dimension.index.toString(),dimension.numValue)
+        }
+      }
+
+      cDynamicDimensions.forEach { dimension ->
+        when (dimension.type) {
+          DimensionType.GENERAL_TYPE -> generalDimensions.put(dimension.key,dimension.value)
+          DimensionType.FACT_TYPE -> factDimensions.put(dimension.key,dimension.numValue)
+        }
+      }
+
+      val generalWrapper = 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) {
+      // 오류 처리
+      e.printStackTrace()
+      callback.invoke(null)
+    }
+  }
 
   @ReactMethod
   fun getCommonDimensionsOfArrayIndex(callback: Callback) {

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

@@ -4,8 +4,6 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import com.tagworks_sdk_react.DataBundleModule
-import com.tagworks_sdk_react.TagWorksModule
 
 
 class TagworksSdkV1Package : ReactPackage {

package/ios/DataBundleModule.swift

@@ -75,14 +75,24 @@ class DataBundleModule: NSObject, RCTBridgeModule {
                                 genericDimensions = dimension["General"] as! [String: String]
                                 
                                 for (key, value) in genericDimensions {
-                                    self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, stringValue: value))
+                                    // if TagWorks_SDK_iOS.TagWorks.sharedInstance.isUseDynamicParameter == false {
+                                    if Int(key) != nil {
+                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, stringValue: value))
+                                    } else {
+                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, value: value))
+                                    }
                                 }
                             }
                             if dimension["Fact"] != nil {
                                 factDimensions = dimension["Fact"] as! [String: Any]
                                 
                                 for (key, value) in factDimensions {
-                                    self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, numValue: Double(value as! String) ?? 0.0))
+                                    // 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))
+                                    } else {
+                                        self.eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: Double(value as! String) ?? 0.0))
+                                    }
                                 }
                             }
                         }
@@ -101,13 +111,7 @@ class DataBundleModule: NSObject, RCTBridgeModule {
         
         var generalDimensions: [String: String] = [:]
         var factDimensions: [String: Any] = [:]
-//        for dimension in self.eventDimensions {
-//            if dimension.type == Dimension.generalType {
-//                generalDimensions[String(dimension.index)] = dimension.value
-//            } else if dimension.type == Dimension.factType {
-//                factDimensions[String(dimension.index)] = String(dimension.numValue)
-//            }
-//        }
+
         for dimension in self.eventDimensions {
             if dimension.type == Dimension.generalType {
                 if dimension.index == -1 {
@@ -117,9 +121,9 @@ class DataBundleModule: NSObject, RCTBridgeModule {
                 }
             } else if dimension.type == Dimension.factType {
                 if dimension.index == -1 {
-                    factDimensions[dimension.key] = String(dimension.numValue)
+                    factDimensions[dimension.key] = dimension.numValue
                 } else {
-                    factDimensions[String(dimension.index)] = String(dimension.numValue)
+                    factDimensions[String(dimension.index)] = dimension.numValue
                 }
             }
         }
@@ -180,21 +184,21 @@ class DataBundleModule: NSObject, RCTBridgeModule {
         var generalDimensions: [String: String] = [:]
         var factDimensions: [String: Any] = [:]
         
-      for dimension in self.eventDimensions {
-          if dimension.type == Dimension.generalType {
-              if dimension.index == -1 {
-                  generalDimensions[dimension.key] = dimension.value
-              } else {
-                  generalDimensions[String(dimension.index)] = dimension.value
-              }
-          } else if dimension.type == Dimension.factType {
-              if dimension.index == -1 {
-                  factDimensions[dimension.key] = String(dimension.numValue)
-              } else {
-                  factDimensions[String(dimension.index)] = String(dimension.numValue)
-              }
-          }
-      }
+        for dimension in self.eventDimensions {
+            if dimension.type == Dimension.generalType {
+                if dimension.index == -1 {
+                    generalDimensions[dimension.key] = dimension.value
+                } else {
+                    generalDimensions[String(dimension.index)] = dimension.value
+                }
+            } else if dimension.type == Dimension.factType {
+                if dimension.index == -1 {
+                    factDimensions[dimension.key] = String(dimension.numValue)
+                } else {
+                    factDimensions[String(dimension.index)] = String(dimension.numValue)
+                }
+            }
+        }
         let gDimension = ["General": generalDimensions]
         let fDimension = ["Fact": factDimensions]
         dictDimensions["Dimensions"] = [gDimension, fDimension]
@@ -358,24 +362,6 @@ class DataBundleModule: NSObject, RCTBridgeModule {
             callback([])
         }
     }
-  
-//    @objc func getDynamicDimensionWithString(_ key: String, callback: @escaping RCTResponseSenderBlock) {
-//        let dimension: TagWorks_SDK_iOS.Dimension? = self.eventDimensions.filter {$0.key == key && $0.type == Dimension.generalType}.first
-//        if let dimension {
-//            callback([dimension.value])
-//        } else {
-//            callback([])
-//        }
-//    }
-//    
-//    @objc func getDynamicDimensionWithDouble(_ key: String, callback: @escaping RCTResponseSenderBlock) {
-//        let dimension: TagWorks_SDK_iOS.Dimension? = self.eventDimensions.filter {$0.key == key && $0.type == Dimension.factType}.first
-//        if let dimension {
-//            callback([dimension.numValue])
-//        } else {
-//            callback([])
-//        }
-//    }
     
     // Dimension 삭제
     @objc func removeDimensionInGeneralType(_ index: Int) {
@@ -409,28 +395,28 @@ class DataBundleModule: NSObject, RCTBridgeModule {
     
     
     /// 이벤트에 필요한 파라미터 항목들이 비어 있는지 체크
-    @objc public func isParameterEmpty() -> Bool {
+    @objc public func isParameterEmpty(_ callback: @escaping RCTResponseSenderBlock) {
         if dataDictionary.isEmpty {
-            return true
+            callback([true])
         }
-        return false
+        callback([false])
     }
     
     /// 이벤트에 필요한 Dimension 항목들이 비어 있는지 체크
-    @objc public func isDimensionEmpty() -> Bool {
+    @objc public func isDimensionEmpty(_ callback: @escaping RCTResponseSenderBlock) {
         if eventDimensions.isEmpty {
-            return true
+            callback([true])
         }
-        return false
+        callback([false])
     }
     
     /// 이벤트에 필요한 파라미터 항목들의 갯수를 리턴
-    @objc public func parameterCount() -> Int {
-        return dataDictionary.count
+    @objc public func parameterCount(_ callback: @escaping RCTResponseSenderBlock) {
+        callback([dataDictionary.count])
     }
     
     /// 이벤트에 필요한 Dimension 항목들의 갯수를 리턴
-    @objc public func dimensionCount() -> Int {
-        return eventDimensions.count
+    @objc public func dimensionCount(_ callback: @escaping RCTResponseSenderBlock) {
+        callback([eventDimensions.count])
     }
 }

package/ios/DataBundleModuleBridge.m

@@ -41,4 +41,9 @@ RCT_EXTERN_METHOD(removeDynamicDimension:(NSString *)key)
 RCT_EXTERN_METHOD(removeDynamicDimensionWithArrayIndex:(int)index)
 RCT_EXTERN_METHOD(removeAllDynamicDimension)
 
+RCT_EXTERN_METHOD(isParameterEmpty:(RCTResponseSenderBlock) callback)
+RCT_EXTERN_METHOD(isDimensionEmpty:(RCTResponseSenderBlock) callback)
+RCT_EXTERN_METHOD(parameterCount:(RCTResponseSenderBlock) callback)
+RCT_EXTERN_METHOD(dimensionCount:(RCTResponseSenderBlock) callback)
+
 @end

package/ios/TagWorksModule.swift

@@ -30,15 +30,14 @@ class TagWorksModule: NSObject, RCTBridgeModule {
             "EVENT_TYPE_USER_EVENT": "EVENT_TYPE_USER_EVENT",
         ]
     }
-    
+    //   userAgent: String? = nil,
     // MARK: SDK 초기화
     @objc func initializeTagWorks(_ siteId: String,
                                   baseUrl: String,
                                   isUseIntervals: Bool,
-                                  dispatchInterval: TimeInterval,
+                                  dispatchInterval: TimeInterval = 5.0,
                                   sessionTimeOut: TimeInterval = 5.0,
                                   isManualDispatch: Bool = false,
-                                //   userAgent: String? = nil,
                                   appVersion: String? = nil,
                                   appName: String? = nil,
                                   isUseDynamicParameter: Bool = false) {
@@ -294,24 +293,6 @@ class TagWorksModule: NSObject, RCTBridgeModule {
             callback([])
         }
     }
-  
-//    @objc func getDynamicCommonDimensionWithString(_ key: String, callback: @escaping RCTResponseSenderBlock) {
-//        let dimension = TagWorks.sharedInstance.getDynamicCommonDimension(key: key)
-//        if let dimension {
-//            callback([dimension.value])
-//        } else {
-//            callback([])
-//        }
-//    }
-//    
-//    @objc func getDynamicCommonDimensionWithDouble(_ key: String, callback: @escaping RCTResponseSenderBlock) {
-//        let dimension = TagWorks.sharedInstance.getDynamicCommonDimension(key: key)
-//        if let dimension {
-//            callback([dimension.numValue])
-//        } else {
-//            callback([])
-//        }
-//    }
     
     // Dimension 삭제
     @objc func removeCommonDimensionInGeneralType(_ index: Int) {
@@ -392,12 +373,12 @@ class TagWorksModule: NSObject, RCTBridgeModule {
                                 
                                 for (key, value) in factDimensions {
                                     if TagWorks.sharedInstance.isUseDynamicParameter {
-                                        eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: Double(value as! String) ?? 0.0))
+                                        eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: value as! Double))
                                     } else {
                                         if Int(key) != nil {
-                                            eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, numValue: Double(value as! String) ?? 0.0))
+                                            eventDimensions.append(TagWorks_SDK_iOS.Dimension(index: Int(key)!, numValue: value as! Double))
                                         } else {
-                                            eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: Double(value as! String) ?? 0.0))
+                                            eventDimensions.append(TagWorks_SDK_iOS.Dimension(key: key, numValue: value as! Double))
                                         }
                                     }
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tagworks-sdk-v1-react",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "TagWorks SDK React Native Library",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",