react-native-firework-sdk 1.2.4 → 1.3.0-beta.2

package/android/build.gradle

@@ -180,7 +180,6 @@ dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6"
   implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
   // required to avoid crash on Android 12 API 31
   implementation 'androidx.work:work-runtime-ktx:2.7.0'
@@ -189,6 +188,8 @@ dependencies {
   implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
   // react-native 0.61.3
   implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+  implementation "com.google.code.gson:gson:2.9.0"
 }
 
 configurations.all {

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoPlaybackDetails.kt

@@ -1,7 +1,7 @@
 package com.fireworksdk.bridge.models
 
 import android.os.Parcelable
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.google.gson.annotations.SerializedName
 import kotlinx.android.parcel.Parcelize
 
 @Parcelize
@@ -10,10 +10,10 @@ data class FWVideoPlaybackDetails(
   val badge: String?,
   val caption: String?,
   val duration: Long?,
-  @field:JsonProperty("has_cta")
+  @SerializedName("has_cta")
   val hasCta: Boolean?,
   val height: Int?,
   val width: Int?,
-  @field:JsonProperty("video_id")
+  @SerializedName("video_id")
   val videoId: String?
 ) : Parcelable

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWVideoFeedManager.kt

@@ -10,12 +10,12 @@ import com.facebook.react.uimanager.annotations.ReactProp
 import com.fireworksdk.bridge.constants.FWCommandConstant
 import com.fireworksdk.bridge.models.FWVideoFeedConfigModel
 import com.fireworksdk.bridge.models.FWVideoPlayerConfigModel
-import com.fireworksdk.bridge.utils.FWJsonUtils
 import com.facebook.react.common.MapBuilder
 import com.fireworksdk.bridge.components.videofeed.FWVideoFeed
 import com.fireworksdk.bridge.models.FWFeedViewEventName
 import com.fireworksdk.bridge.models.FWVideoFeedItemDetailsModel
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWGsonUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.models.OnPlaylistGroupItemClickedListener
 import com.loopnow.fireworklibrary.models.VideoContentStatus
@@ -158,14 +158,14 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
   @ReactProp(name = "videoFeedConfiguration")
   fun setVideoFeedConfig(view: FWVideoFeed, config: ReadableMap?) {
     val configMap = config?.toHashMap()
-    val videoFeedConfigModel = FWJsonUtils.fromMap(configMap, FWVideoFeedConfigModel::class.java)
+    val videoFeedConfigModel = FWGsonUtil.fromObject(configMap, FWVideoFeedConfigModel::class.java)
     view.setVideoFeedConfigProps(videoFeedConfigModel)
   }
 
   @ReactProp(name = "videoPlayerConfiguration")
   fun setVideoPlayerConfig(view: FWVideoFeed, config: ReadableMap?) {
     val configMap = config?.toHashMap()
-    val videoPlayerConfigModel = FWJsonUtils.fromMap(configMap, FWVideoPlayerConfigModel::class.java)
+    val videoPlayerConfigModel = FWGsonUtil.fromObject(configMap, FWVideoPlayerConfigModel::class.java)
     view.setVideoPlayerConfigProps(videoPlayerConfigModel)
   }
 

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWVideoShoppingModule.kt

@@ -2,17 +2,16 @@ package com.fireworksdk.bridge.reactnative.module
 
 import android.app.Activity
 import com.facebook.react.bridge.*
-import com.fasterxml.jackson.core.type.TypeReference
-import com.loopnow.fireworklibrary.baya.Baya
-import com.loopnow.fireworklibrary.baya.UpdateCartStatus
-import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.models.FWVideoShoppingProduct
+import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
-import com.fireworksdk.bridge.utils.FWJsonUtils
+import com.fireworksdk.bridge.utils.FWGsonUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.google.gson.reflect.TypeToken
+import com.loopnow.fireworklibrary.baya.Baya
+import com.loopnow.fireworklibrary.baya.UpdateCartStatus
 import com.loopnow.fireworklibrary.data.Product
 import com.loopnow.fireworklibrary.utils.Util
-import kotlin.collections.HashMap
 
 
 class FWVideoShoppingModule(
@@ -37,7 +36,10 @@ class FWVideoShoppingModule(
     }
 
     val configArrayList = productArray?.toArrayList()
-    val videoShoppingProducts = FWJsonUtils.fromJson(FWJsonUtils.toJson(configArrayList), object : TypeReference<List<FWVideoShoppingProduct>?>() {})
+    val configArrayListJsonString = FWGsonUtil.toJson(configArrayList)
+
+    val listOfMyClassObject = object : TypeToken<List<FWVideoShoppingProduct>?>() {}.type
+    val videoShoppingProducts: List<FWVideoShoppingProduct>? = FWGsonUtil.fromJson(configArrayListJsonString, listOfMyClassObject)
     if (videoShoppingProducts.isNullOrEmpty()) {
       return
     }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FireworkSDKModule.kt

@@ -66,7 +66,7 @@ class FireworkSDKModule(
 
     // set configuration
     val configMap = config?.toHashMap()
-    val videoPlayerContentConfigModel = FWJsonUtils.fromMap(configMap, FWVideoPlayerConfigModel::class.java)
+    val videoPlayerContentConfigModel = FWGsonUtil.fromObject(configMap, FWVideoPlayerConfigModel::class.java)
     FWVideoPlayerUtils.setVideoPlayerConfig(videoPlayerContentConfigModel)
 
     // open player
@@ -94,7 +94,7 @@ class FireworkSDKModule(
   @ReactMethod
   override fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise) {
     val configMap = config?.toHashMap()
-    val adBadgeConfigModel = FWJsonUtils.fromMap(configMap, FWAdBadgeConfigModel::class.java)
+    val adBadgeConfigModel = FWGsonUtil.fromObject(configMap, FWAdBadgeConfigModel::class.java)
     FWVideoPlayerUtils.setAdBadgeConfig(adBadgeConfigModel)
     promise.resolve(Arguments.createMap())
   }
@@ -198,7 +198,7 @@ class FireworkSDKModule(
     }
     FwSDK.addVideoEventListener(object: FwSDK.VideoEventListener {
       override fun event(event: String, jsonObject: JSONObject) {
-        val videoPlaybackDetails = FWJsonUtils.fromJson(jsonObject.toString(), FWVideoPlaybackDetails::class.java)
+        val videoPlaybackDetails = FWGsonUtil.fromJson(jsonObject.toString(), FWVideoPlaybackDetails::class.java)
 
         when (event) {
           VideoEvent.videoImpression -> {

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWDataUtils.kt

@@ -1,16 +1,19 @@
 package com.fireworksdk.bridge.reactnative.utils
 
 import com.facebook.react.bridge.*
-import com.fireworksdk.bridge.utils.FWJsonUtils
+import com.fireworksdk.bridge.utils.FWGsonUtil
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 
 
-inline fun <reified T : Any> T.asMap(): WritableMap {
-  val jsonString = FWJsonUtils.toJson(this)
+inline fun <reified T : Any?> T.asMap(): WritableMap? {
+  val jsonString = FWGsonUtil.toJson(this)
+  if (jsonString.isNullOrBlank()) {
+    return null
+  }
   val jsonObject = JSONObject(jsonString)
-  return FWDataUtils.convertJsonObjectToWritableMap(jsonObject)?: Arguments.createMap()
+  return FWDataUtils.convertJsonObjectToWritableMap(jsonObject)
 }
 
 object FWDataUtils {

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -9,7 +9,6 @@ import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
 import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
 import com.fireworksdk.bridge.utils.FWDateUtils
-import com.fireworksdk.bridge.utils.FWJsonUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
 import java.util.*
@@ -73,8 +72,8 @@ object FWEventUtils {
     contentMap.putString("playlist", info.playlist)
     contentMap.putString("channel", info.channel)
 
-    val dynamicContentParametersMap = Arguments.createMap()
     if (!info.dynamicContentParameters.isNullOrEmpty()) {
+      val dynamicContentParametersMap = Arguments.createMap()
       for (key in info.dynamicContentParameters.keys) {
         val value = info.dynamicContentParameters[key]
         val array = Arguments.createArray()
@@ -85,15 +84,10 @@ object FWEventUtils {
         }
         dynamicContentParametersMap.putArray(key, array)
       }
+      contentMap.putMap("dynamicContentParameters", dynamicContentParametersMap)
     }
-    contentMap.putMap("dynamicContentParameters", dynamicContentParametersMap)
 
     eventMap.putMap("info", contentMap)
-//    sendLogMessageEvent(reactContext, "[Android] Receive sendVideoFeedClickEvent event before: $info")
-//    val jsonString = FWJsonUtils.toJson(info)
-//    sendLogMessageEvent(reactContext, "[Android] Receive sendVideoFeedClickEvent event before2: $jsonString")
-//    eventMap.putMap("info", info.asMap())
-//    sendLogMessageEvent(reactContext, "[Android] Receive sendVideoFeedClickEvent event after: $eventMap")
 
     sendEvent(reactContext, FWEventName.VideoFeedClick.rawValue, eventMap)
   }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWGsonUtil.kt

@@ -0,0 +1,38 @@
+package com.fireworksdk.bridge.utils
+
+import com.google.gson.Gson
+import java.lang.reflect.Type
+
+object FWGsonUtil {
+
+  private val gson by lazy {
+    Gson()
+  }
+
+  fun toJson(ts: Any?): String? {
+    return gson.toJson(ts)
+  }
+
+  fun <T> fromJson(json: String?, type: Class<T>): T? {
+    if (json.isNullOrBlank()) {
+      return null
+    }
+    return gson.fromJson(json, type)
+  }
+
+  fun <T> fromJson(json: String?, type: Type): T? {
+    if (json.isNullOrBlank()) {
+      return null
+    }
+    return gson.fromJson(json, type)
+  }
+
+  fun <T> fromObject(o: Any?, type: Class<T>): T? {
+    if (o == null) {
+      return null
+    }
+    val jsonString = toJson(o)
+    return gson.fromJson(jsonString, type)
+  }
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "1.2.4",
+  "version": "1.3.0-beta.2",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/android/src/main/java/com/fireworksdk/bridge/utils/FWJsonUtils.kt

@@ -1,85 +0,0 @@
-package com.fireworksdk.bridge.utils
-
-import android.os.Looper
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.DeserializationFeature
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.util.*
-
-object FWJsonUtils {
-  val mapper: ObjectMapper by lazy {
-    jacksonObjectMapper()
-//      .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
-      .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true)
-      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
-      .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-      .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-      .configure(SerializationFeature.WRITE_DATES_WITH_ZONE_ID, true)
-      .setTimeZone(TimeZone.getDefault())
-  }
-
-  private fun logJsonError(e: Exception) {
-    val loggedError = RuntimeException("Json Read Error!", e)
-    if (Looper.myLooper() != Looper.getMainLooper()) {
-      throw loggedError
-    }
-  }
-
-  @JvmStatic
-  fun <T> fromMap(map: Map<*, *>?, cls: Class<T>): T? {
-    if (map.isNullOrEmpty()) {
-      return null
-    }
-    try {
-      return mapper.convertValue(map, cls)
-    } catch (e: Exception) {
-      e.printStackTrace()
-      logJsonError(e)
-    }
-    return null
-  }
-
-  @JvmStatic
-  fun <T> fromJson(json: String?, cls: Class<T>): T? {
-    if (json.isNullOrBlank()) {
-      return null
-    }
-    try {
-      return mapper.readValue(json, cls)
-    } catch (e: Exception) {
-      e.printStackTrace()
-      logJsonError(e)
-    }
-    return null
-  }
-
-  @JvmStatic
-  fun <T> fromJson(json: String?, type: TypeReference<T>): T? {
-    if (json.isNullOrBlank()) {
-      return null
-    }
-    try {
-      return mapper.readValue(json, type)
-    } catch (e: Exception) {
-      e.printStackTrace()
-      logJsonError(e)
-    }
-    return null
-  }
-
-  @JvmStatic
-  fun toJson(obj: Any?): String? {
-    if (obj == null) {
-      return null
-    }
-    try {
-      return mapper.writeValueAsString(obj)
-    } catch (e: Exception) {
-      e.printStackTrace()
-    }
-    return null
-  }
-}