react-native-firework-sdk 2.13.0 → 2.14.0

package/android/.idea/codeStyles/Project.xml

@@ -0,0 +1,124 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/android/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/android/gradle.properties

@@ -6,4 +6,4 @@ FireworkSDK_minSdkVersion=21
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_targetSdkVersion=33
 FireworkSDK_fwPlayerLaunchMode=singleTask
-FireworkSDK_fwNativeVersion=6.10.2
+FireworkSDK_fwNativeVersion=6.11.0

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

@@ -2,4 +2,5 @@ package com.fireworksdk.bridge.models
 
 data class FWLiveStreamEventDetailsModel(
   val id: String? = null,
+  val feedId: String? = null,
 )

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

@@ -18,6 +18,7 @@ data class FWVideoFeedConfigModel(
     val hidden: Boolean? = null,
     val textColor: String? = null,
     val fontSize: Int? = null,
+    val numberOfLines: Int? = null,
     val fontInfo: FWFontInfoModel? = null,
     val backgroundColor: String? = null,
     val gradientDrawable: FWGradientDrawableModel? = null,

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

@@ -18,6 +18,7 @@ object FWVideoFeedConfigModelDeserializer {
   private const val HIDDEN_KEY = "hidden"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val FONT_SIZE_KEY = "fontSize"
+  private const val NUMBER_OF_LINES = "numberOfLines"
   private const val FONT_INFO_KEY = "androidFontInfo"
   private const val GRADIENT_DRAWABLE_KEY = "gradientDrawable"
 
@@ -55,6 +56,7 @@ object FWVideoFeedConfigModelDeserializer {
     val hidden = if (titleJson.has(HIDDEN_KEY)) titleJson.optBoolean(HIDDEN_KEY) else null
     val textColor = if (titleJson.has(TEXT_COLOR_KEY)) titleJson.optString(TEXT_COLOR_KEY) else null
     val fontSize = if (titleJson.has(FONT_SIZE_KEY)) titleJson.optInt(FONT_SIZE_KEY) else null
+    val numberOfLines = if (titleJson.has(NUMBER_OF_LINES)) titleJson.optInt(NUMBER_OF_LINES) else null
     val fontInfo = FWFontInfoModelDeserializer.deserialize(titleJson.optJSONObject(FONT_INFO_KEY))
     val backgroundColor = if (titleJson.has(BACKGROUND_COLOR_KEY)) titleJson.optString(BACKGROUND_COLOR_KEY) else null
     val gradientDrawable = FWGradientDrawableModelDeserializer.deserialize(titleJson.optJSONObject(GRADIENT_DRAWABLE_KEY))
@@ -63,6 +65,7 @@ object FWVideoFeedConfigModelDeserializer {
       hidden = hidden,
       textColor = textColor,
       fontSize = fontSize,
+      numberOfLines = numberOfLines,
       fontInfo = fontInfo,
       backgroundColor = backgroundColor,
       gradientDrawable = gradientDrawable,

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

@@ -18,6 +18,7 @@ object FWVideoFeedConfigModelSerializer {
   private const val HIDDEN_KEY = "hidden"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val FONT_SIZE_KEY = "fontSize"
+  private const val NUMBER_OF_LINES = "numberOfLines"
   private const val FONT_INFO_KEY = "androidFontInfo"
   private const val GRADIENT_DRAWABLE_KEY = "gradientDrawable"
 
@@ -44,6 +45,7 @@ object FWVideoFeedConfigModelSerializer {
     jsonObject.put(HIDDEN_KEY, model.hidden)
     jsonObject.put(TEXT_COLOR_KEY, model.textColor)
     jsonObject.put(FONT_SIZE_KEY, model.fontSize)
+    jsonObject.put(NUMBER_OF_LINES, model.numberOfLines)
     jsonObject.put(FONT_INFO_KEY, FWFontInfoModelSerializer.serialize(model.fontInfo))
     jsonObject.put(GRADIENT_DRAWABLE_KEY, FWGradientDrawableModelSerializer.serialize(model.gradientDrawable))
     return jsonObject

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

@@ -0,0 +1,7 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWDataTrackingLevel(val rawValue: String) {
+  ALL("all"),
+  ESSENTIAL_ONLY("essentialOnly"),
+  NONE("none")
+}

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

@@ -1,7 +1,7 @@
 package com.fireworksdk.bridge.models.enums
 
 enum class FWEventName(val rawValue: String) {
-  SDKIni("fw:sdk-init"),
+  SDKInit("fw:sdk-init"),
   CustomCTAClick("fw:custom-cta-click"),
   VideoPlayback("fw:video-playback"),
   VideoFeedClick("fw:video-feed-click"),
@@ -42,6 +42,7 @@ enum class FWVideoShoppingEventName(val rawValue: String) {
   WillDisplayProduct("fw:shopping:will-display-product"),
   CustomLinkButtonClick("fw:shopping:custom-link-button-click"),
   CustomProductCardTap("fw:shopping:custom-product-card-tap"),
+  ProductClick("fw:shopping:product-click"),
 }
 
 enum class FWLiveStreamEventName(val rawValue: String) {

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

@@ -0,0 +1,6 @@
+package com.fireworksdk.bridge.models.enums
+
+enum class FWSwitchLanguageBehavior {
+  RestartingActivity,
+  NotRestartingActivity
+}

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

@@ -1,11 +1,8 @@
 package com.fireworksdk.bridge.reactnative
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
-import android.provider.Settings
-import android.util.Base64
 import com.firework.imageloading.ImageLoader
 import com.firework.livestream.LivestreamPlayerInitializer
 import com.firework.sdk.FireworkSdk
@@ -13,13 +10,12 @@ import com.firework.sdk.FireworkSdkConfig
 import com.fireworksdk.bridge.models.FWSDKInitOptionsModel
 import com.fireworksdk.bridge.models.FWSdkInitResultModel
 import com.fireworksdk.bridge.models.enums.FWPlayerLaunchBehavior
+import com.fireworksdk.bridge.models.enums.FWSwitchLanguageBehavior
 import com.fireworksdk.bridge.utils.FWGlobalDataUtil
 import com.fireworksdk.bridge.utils.FWImageLoaderUtil
 import com.fireworksdk.bridge.utils.FWLanguageUtil
 import com.fireworksdk.bridge.utils.FWLiveStreamUtil
 import com.fireworksdk.bridge.utils.FWLogUtils
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
 
 object FWReactNativeSDK {
 
@@ -36,11 +32,13 @@ object FWReactNativeSDK {
         success = false,
         reason = it
       )
+      FWGlobalDataUtil.initCompletedListener?.invoke()
     }, onSuccess = {
       FWGlobalDataUtil.sdkInitResultModel = FWSdkInitResultModel(
         success = true,
         reason = null
       )
+      FWGlobalDataUtil.initCompletedListener?.invoke()
     })
   }
 
@@ -56,8 +54,21 @@ object FWReactNativeSDK {
     return FWLanguageUtil.getInstance(context).updateBaseContextLocale(context)
   }
 
-  fun changeLanguage(localeString: String, activity: Activity) {
-    FWLanguageUtil.getInstance(activity).changeLanguage(localeString, activity)
+  fun changeLanguage(localeString: String?, context: Context): Boolean {
+    val isSameLanguageWithCache = FWLanguageUtil.getInstance(context).isSameLanguageWithCache(localeString)
+    return if (!isSameLanguageWithCache) {
+      // execute change language behavior
+      val changeLanguageResult = FWLanguageUtil.getInstance(context).changeLanguage(localeString)
+      // change language success, execute rest of logic
+      if (changeLanguageResult && context is Activity && FWGlobalDataUtil.switchLanguageBehavior == FWSwitchLanguageBehavior.RestartingActivity) {
+        // restart activity
+        FWLanguageUtil.getInstance(context).restartActivity(context)
+      }
+      changeLanguageResult
+    } else {
+      // no need to change language, return true means change successfully
+      true
+    }
   }
 
   fun initSdkInternal(
@@ -95,6 +106,7 @@ object FWReactNativeSDK {
       FWPlayerLaunchBehavior.MuteOnFirstLaunch -> {
         configBuilder.muteOnLaunch(true)
       }
+
       else -> {}
     }
 

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

@@ -15,4 +15,5 @@ interface FireworkSDKInterface {
   fun changeAppLanguage(language: String?, promise: Promise)
   fun restart(promise: Promise)
   fun trackPurchase(config: ReadableMap?, promise: Promise)
+  fun setDataTrackingLevel(level: String?, promise: Promise)
 }

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

@@ -13,6 +13,7 @@ import com.fireworksdk.bridge.models.enums.FWLiveStreamEventName
 import com.fireworksdk.bridge.reactnative.models.FWLiveStreamInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.fireworksdk.bridge.utils.FWModelUtils
 
 
 class FWLiveStreamModule(
@@ -27,6 +28,7 @@ class FWLiveStreamModule(
   @Keep
   @FwAnalyticCallable
   fun onLivestreamEvent(event: LivestreamAnalyticEvent) {
+    val liveStreamEventDetailsModel = FWModelUtils.convertVideoInfo2LivestreamDetails(event.videoInfo)
     when (event) {
       is LivestreamAnalyticEvent.UserSentChatMessage -> {
         FWLogUtils.d { "userSentChat: $event" }
@@ -34,7 +36,7 @@ class FWLiveStreamModule(
           reactApplicationContext,
           FWLiveStreamEventName.UserSendChat.rawValue,
           FWLiveStreamMessageDetailsModel(event.messageId, event.username, event.messageText),
-          FWLiveStreamEventDetailsModel(event.livestreamId)
+          liveStreamEventDetailsModel
         )
       }
       is LivestreamAnalyticEvent.UserJoined -> {
@@ -42,7 +44,7 @@ class FWLiveStreamModule(
         FWEventUtils.sendLiveStreamEvent(
           reactApplicationContext,
           FWLiveStreamEventName.UserJoin.rawValue,
-          FWLiveStreamEventDetailsModel(event.livestreamId)
+          liveStreamEventDetailsModel
         )
       }
       is LivestreamAnalyticEvent.UserLeft -> {
@@ -50,7 +52,7 @@ class FWLiveStreamModule(
         FWEventUtils.sendLiveStreamEvent(
           reactApplicationContext,
           FWLiveStreamEventName.UserLeave.rawValue,
-          FWLiveStreamEventDetailsModel(event.livestreamId)
+          liveStreamEventDetailsModel
         )
       }
       is LivestreamAnalyticEvent.UserSentLike -> {
@@ -58,7 +60,7 @@ class FWLiveStreamModule(
         FWEventUtils.sendLiveStreamEvent(
           reactApplicationContext,
           FWLiveStreamEventName.UserSendLike.rawValue,
-          FWLiveStreamEventDetailsModel(event.livestreamId)
+          liveStreamEventDetailsModel
         )
       }
     }

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

@@ -34,11 +34,13 @@ class FWVideoShoppingModule(
   private var ctaHandler: Triple<Int, String, String>? = null
   private val updateProductHandler: HashMap<String, List<Product>> = HashMap()
   private val updateProductHydratorHandler: HashMap<String, ProductHydrator> = HashMap()
+  private var isCustomProductCardEnabled = false
 
   @ReactMethod
   override fun init() {
     cartListener()
     productListener()
+    productCardListener()
   }
 
   @ReactMethod
@@ -344,13 +346,27 @@ class FWVideoShoppingModule(
 
   @ReactMethod
   override fun setCustomTapProductCardEnabled(value: Boolean?, promise: Promise) {
+    isCustomProductCardEnabled = value ?: false
+    promise.resolve(true)
+  }
 
-    if (value == true) {
-      FireworkSdk.shopping.setOnProductCardClickListener { productId, unitId, productWebUrl, videoInfo ->
-        FWLogUtils.d { "FWVideoShoppingModule productCardClick $productId $unitId $productWebUrl" }
+  @ReactMethod
+  fun addListener(eventName: String?) {
+    // Set up any upstream listeners or background tasks as necessary
+    FWLogUtils.d { "addListener: $eventName" }
+  }
 
-        val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
+  @ReactMethod
+  fun removeListeners(count: Int?) {
+    // Remove upstream listeners, stop unnecessary background tasks
+    FWLogUtils.d { "removeListeners: $count" }
+  }
 
+  private fun productCardListener() {
+    FireworkSdk.shopping.setOnProductCardClickListener { productId, unitId, productWebUrl, videoInfo ->
+      FWLogUtils.d { "FWVideoShoppingModule productCardClick $productId $unitId $productWebUrl" }
+      val videoPlaybackDetails = FWModelUtils.convertVideoInfo2PlaybackDetails(videoInfo)
+      if (isCustomProductCardEnabled) {
         FWEventUtils.sendProductCardClickEvent(
           reactApplicationContext,
           productWebUrl,
@@ -360,25 +376,19 @@ class FWVideoShoppingModule(
           callbackId
         )
       }
-    } else {
-      FireworkSdk.shopping.setOnProductCardClickListener(null)
+      // send onClickProduct
+      FWEventUtils.sendProductClickEvent(
+        reactApplicationContext,
+        productWebUrl,
+        productId,
+        unitId,
+        videoPlaybackDetails
+      )
+      isCustomProductCardEnabled
     }
-
-
-    promise.resolve(true)
   }
 
-  @ReactMethod
-  fun addListener(eventName: String?) {
-    // Set up any upstream listeners or background tasks as necessary
-    FWLogUtils.d { "addListener: $eventName" }
-  }
 
-  @ReactMethod
-  fun removeListeners(count: Int?) {
-    // Remove upstream listeners, stop unnecessary background tasks
-    FWLogUtils.d { "removeListeners: $count" }
-  }
 
   override fun getName(): String {
     return "ShoppingModule"

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

@@ -13,8 +13,10 @@ import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
 import com.firework.bus.FwAnalyticCallable
 import com.firework.sdk.FireworkSdk
+import com.firework.sdk.FwTrackingLevel
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWDataTrackingLevel
 import com.fireworksdk.bridge.models.enums.FWVideoPlaybackSubEventName
 import com.fireworksdk.bridge.reactnative.FWReactNativeSDK
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
@@ -29,6 +31,30 @@ class FireworkSDKModule(
   reactContext: ReactApplicationContext
 ) : ReactContextBaseJavaModule(reactContext), FireworkSDKInterface {
 
+  init {
+    FWGlobalDataUtil.initCompletedListener =  {
+      initCallback()
+    }
+  }
+
+  private fun initCallback(): Boolean {
+    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
+    return if (sdkInitResultModel != null) { // init in application
+      if (sdkInitResultModel.success == true) {
+        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
+      } else if (sdkInitResultModel.success == false) {
+        FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
+      }
+
+      FireworkSdk.analytics.register(this)
+      true
+    } else {
+      false
+    }
+  }
+
+
+
   /**
    * Initializes FW SDK
    *
@@ -63,22 +89,7 @@ class FireworkSDKModule(
   override fun markInitCalled(promise: Promise) {
     FWColorUtil.useRgba = true
     FWGlobalDataUtil.pauseWhenNotVisible = true
-
-    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
-    if (sdkInitResultModel != null) { // init in application
-      if (sdkInitResultModel.success == true) {
-        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
-      } else if (sdkInitResultModel.success == false) {
-        FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
-      }
-
-      FireworkSdk.analytics.register(this)
-      promise.resolve(true)
-
-      return
-    }
-
-    promise.resolve(false)
+    promise.resolve(initCallback())
   }
 
   /**
@@ -236,7 +247,7 @@ class FireworkSDKModule(
       return
     }
     UiThreadUtil.runOnUiThread {
-      val result = FWLanguageUtil.getInstance(activity).changeLanguage(language, activity)
+      val result = FWReactNativeSDK.changeLanguage(language, activity)
       promise.resolve(result)
     }
   }
@@ -299,6 +310,19 @@ class FireworkSDKModule(
     }
   }
 
+  @ReactMethod
+  override fun setDataTrackingLevel(level: String?, promise: Promise) {
+    val trackingLevel =
+      when (level) {
+        FWDataTrackingLevel.ALL.rawValue -> FwTrackingLevel.ALL
+        FWDataTrackingLevel.NONE.rawValue -> FwTrackingLevel.NONE
+        FWDataTrackingLevel.ESSENTIAL_ONLY.rawValue -> FwTrackingLevel.ESSENTIAL_ONLY
+        else -> FwTrackingLevel.ALL
+      }
+    FireworkSdk.setTrackingLevel(trackingLevel)
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary

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

@@ -18,7 +18,7 @@ import java.util.*
 object FWEventUtils {
 
   fun sendInitSuccessEvent(reactContext: ReactContext) {
-    sendEvent(reactContext, FWEventName.SDKIni.rawValue, Arguments.createMap())
+    sendEvent(reactContext, FWEventName.SDKInit.rawValue, Arguments.createMap())
   }
 
   fun sendInitFailedEvent(reactContext: ReactContext, reason: String?) {
@@ -26,7 +26,7 @@ object FWEventUtils {
     val contentMap = Arguments.createMap()
     contentMap.putString(FWSDKInitSubEventName.InitFailed.rawValue, reason?:"unknown")
     eventMap.putMap("error", contentMap)
-    sendEvent(reactContext, FWEventName.SDKIni.rawValue, eventMap)
+    sendEvent(reactContext, FWEventName.SDKInit.rawValue, eventMap)
   }
 
   fun sendVideoFeedClickEvent(reactContext: ReactContext, info: FWVideoFeedItemDetailsModel) {
@@ -79,6 +79,17 @@ object FWEventUtils {
     sendEvent(reactContext, FWEventName.VideoPlayback.rawValue, eventMap)
   }
 
+  private fun convertLiveStreamDetails2Map(info: FWLiveStreamEventDetailsModel?): WritableMap {
+    val contentMap = Arguments.createMap()
+    if (!info?.id.isNullOrBlank()) {
+      contentMap.putString("id", info?.id)
+    }
+    if (!info?.feedId.isNullOrBlank()) {
+      contentMap.putString("feedId", info?.feedId)
+    }
+    return contentMap
+  }
+
   private fun convertVideoPlaybackDetails2Map(info: FWVideoPlaybackDetails?): WritableMap {
     val contentMap = Arguments.createMap()
     if (!info?.id.isNullOrBlank()) {
@@ -244,11 +255,7 @@ object FWEventUtils {
     val eventMap = Arguments.createMap()
     eventMap.putString("eventName", eventName)
 
-    val contentMap = Arguments.createMap()
-    if (!info?.id.isNullOrBlank()) {
-      contentMap.putString("id", info?.id)
-    }
-    eventMap.putMap("info", contentMap)
+    eventMap.putMap("info", convertLiveStreamDetails2Map(info))
     sendEvent(reactContext, FWEventName.LiveStream.rawValue, eventMap)
   }
 
@@ -267,14 +274,10 @@ object FWEventUtils {
     if (!message?.text.isNullOrBlank()) {
       chatMap.putString("text", message?.text)
     }
-    eventMap.putMap("chat", chatMap)
+    eventMap.putMap("message", chatMap)
 
     // live stream map
-    val liveStreamMap = Arguments.createMap()
-    if (!liveStream?.id.isNullOrBlank()) {
-      liveStreamMap.putString("id", liveStream?.id)
-    }
-    eventMap.putMap("liveStream", liveStreamMap)
+    eventMap.putMap("liveStream", convertLiveStreamDetails2Map(liveStream))
 
     sendEvent(reactContext, FWEventName.LiveStreamChat.rawValue, eventMap)
   }
@@ -289,6 +292,15 @@ object FWEventUtils {
     sendEvent(reactContext, FWVideoShoppingEventName.CustomProductCardTap.rawValue, eventMap)
   }
 
+  fun sendProductClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("url", url?:"")
+    eventMap.putString("productId", productId)
+    eventMap.putString("unitId", unitId)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
+    sendEvent(reactContext, FWVideoShoppingEventName.ProductClick.rawValue, eventMap)
+  }
+
   fun sendCustomLinkButtonClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("url", url ?: "")

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

@@ -137,6 +137,7 @@ object FWConfigUtil {
       val titleHidden = title.hidden
       val titleTextColor = title.textColor
       val titleFontSize = title.fontSize
+      val titleNumberOfLines = title.numberOfLines
       val titleBackgroundColor = title.backgroundColor
       val titleGradientDrawable = title.gradientDrawable
       val typeface = getTypeface(context, title.fontInfo)
@@ -149,6 +150,9 @@ object FWConfigUtil {
       if (titleFontSize != null && titleFontSize > 0) {
         titleOptionBuilder.feedTitleTextSize(FWCommonUtil.spToPx(titleFontSize.toFloat(), context))
       }
+      if (titleNumberOfLines != null && titleNumberOfLines > 0 && titleNumberOfLines < 6) {
+        titleOptionBuilder.feedTitleTextNumberOfLines(titleNumberOfLines.toInt())
+      }
       typeface?.let {
         titleOptionBuilder.feedTitleTextTypeface(it)
       }

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

@@ -2,6 +2,7 @@ package com.fireworksdk.bridge.utils
 
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
 import com.fireworksdk.bridge.models.FWSdkInitResultModel
+import com.fireworksdk.bridge.models.enums.FWSwitchLanguageBehavior
 
 object FWGlobalDataUtil {
 
@@ -18,4 +19,8 @@ object FWGlobalDataUtil {
   var shareBaseUrl: String? = null
 
   var pauseWhenNotVisible: Boolean = false
+
+  var switchLanguageBehavior = FWSwitchLanguageBehavior.RestartingActivity
+
+  var initCompletedListener: (() -> Unit)? = null
 }