react-native-firework-sdk 2.12.1 → 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/build.gradle

@@ -5,7 +5,6 @@ buildscript {
   repositories {
     google()
     mavenCentral()
-    mavenLocal()
   }
 
   dependencies {
@@ -35,6 +34,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault('minSdkVersion')
     targetSdkVersion getExtOrIntegerDefault('targetSdkVersion')
+    manifestPlaceholders["fw_player_launch_mode"] = getExtOrDefault('fwPlayerLaunchMode')
   }
 
   // LOG_LEVEL: VERBOSE(2), DEBUG(3), INFO(4), WARN(5), ERROR(6), ASSERT(7)
@@ -61,9 +61,9 @@ android {
 }
 
 repositories {
+  mavenLocal()
   mavenCentral()
   google()
-  mavenLocal()
 
   maven {
     setUrl("https://s01.oss.sonatype.org/content/repositories/snapshots/")
@@ -144,5 +144,6 @@ dependencies {
   def fireworkSdkVersion = getExtOrDefault('fwNativeVersion')
   implementation "com.firework:sdk:$fireworkSdkVersion"
   implementation "com.firework.feature:uiKit:$fireworkSdkVersion"
+  implementation "com.firework.feature.player:pager:$fireworkSdkVersion"
 }
 

package/android/gradle.properties

@@ -1,8 +1,9 @@
-android.useAndroidX=true
 android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
-FireworkSDK_kotlinVersion=1.6.10
+FireworkSDK_kotlinVersion=1.8.22
 FireworkSDK_minSdkVersion=21
 FireworkSDK_compileSdkVersion=33
 FireworkSDK_targetSdkVersion=33
-FireworkSDK_fwNativeVersion=6.9.3
+FireworkSDK_fwPlayerLaunchMode=singleTask
+FireworkSDK_fwNativeVersion=6.11.0

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   package="com.fireworksdk.bridge">
 
   <uses-permission android:name="android.permission.INTERNET" />
@@ -23,6 +24,19 @@
       android:name="Firework:RecyclerViewRequestLayoutEnable"
       android:value="true" />
 
+    <activity
+      android:name="com.firework.player.pager.PlayerActivity"
+      android:autoRemoveFromRecents="true"
+      android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+      android:exported="true"
+      android:launchMode="${fw_player_launch_mode}"
+      android:screenOrientation="portrait"
+      android:supportsPictureInPicture="true"
+      android:theme="@style/FwPlayerPagerPlayerActivity"
+      android:windowSoftInputMode="adjustPan"
+      tools:replace="android:launchMode"
+      tools:targetApi="n" />
+
   </application>
 
 </manifest>

package/android/src/main/java/com/fireworksdk/bridge/FWInitializationProvider.kt

@@ -14,6 +14,7 @@ class FWInitializationProvider: ContentProvider() {
 
   var application: Application? = null
   var resumedActivity by weakProperty<Activity?>()
+  var mainActivity by weakProperty<Activity?>()
 
   override fun onCreate(): Boolean {
     sInstance = this
@@ -36,6 +37,9 @@ class FWInitializationProvider: ContentProvider() {
 
           override fun onActivityResumed(activity: Activity) {
             resumedActivity = activity
+            if (mainActivity == null) { // only set once
+              mainActivity = activity
+            }
           }
 
           override fun onActivityPaused(activity: Activity) {

package/android/src/main/java/com/fireworksdk/bridge/components/storyblock/StoryBlockFragment.kt

@@ -119,8 +119,7 @@ class StoryBlockFragment : FWBaseFragment() {
       childFragmentManager,
       viewLifecycleOwner,
       viewOptionsBuilder.build(),
-      FWGlobalDataUtil.pauseWhenNotVisible,
-      videoFeedPropsModel?.videoPlayerConfiguration?.countdownTimerConfiguration?.isHidden == false
+      FWGlobalDataUtil.pauseWhenNotVisible
     )
     isStoryBlockInitializer = true
 

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/FWVideoPlayerLogoConfigurationModel.kt

@@ -5,4 +5,5 @@ import com.fireworksdk.bridge.models.enums.FWVideoPlayerLogoOption
 data class FWVideoPlayerLogoConfigurationModel(
   val option: FWVideoPlayerLogoOption?,
   val encodedId: String?,
+  val isClickable: Boolean?
 )

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

@@ -7,16 +7,19 @@ object FWVideoPlayerLogoConfigurationModelDeserializer {
 
   private const val OPTION_KEY = "option"
   private const val ENCODED_ID_KEY = "encodedId"
+  private const val IS_CLICKABLE = "isClickable"
 
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerLogoConfigurationModel? {
     responseJson ?: return null
 
     val option = if (responseJson.has(OPTION_KEY)) responseJson.optString(OPTION_KEY) else null
     val encodedId = if (responseJson.has(ENCODED_ID_KEY)) responseJson.optString(ENCODED_ID_KEY) else null
+    val isClickable = if (responseJson.has(IS_CLICKABLE)) responseJson.optBoolean(IS_CLICKABLE) else null
 
     return FWVideoPlayerLogoConfigurationModel(
       option = if (!option.isNullOrBlank()) FWVideoPlayerLogoOption.deserialize(option) else null,
       encodedId = encodedId,
+      isClickable = isClickable
     )
   }
 

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

@@ -7,12 +7,14 @@ object FWVideoPlayerLogoConfigurationModelSerializer {
 
   private const val OPTION_KEY = "option"
   private const val ENCODED_ID_KEY = "encodedId"
+  private const val IS_CLICKABLE = "isClickable"
 
   fun serialize(model: FWVideoPlayerLogoConfigurationModel?): JSONObject? {
     model ?: return null
     val jsonObject = JSONObject()
     jsonObject.put(OPTION_KEY, FWVideoPlayerLogoOption.serialize(model.option))
     jsonObject.put(ENCODED_ID_KEY, model.encodedId)
+    jsonObject.put(IS_CLICKABLE, model.isClickable)
     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/FWNavigatorInterface.kt

@@ -11,4 +11,6 @@ interface FWNavigatorInterface {
   fun canPopNativeContainer(promise: Promise)
   fun startFloatingPlayer(promise: Promise)
   fun stopFloatingPlayer(promise: Promise)
+  fun bringRNContainerToTop(promise: Promise)
+  fun bringRNContainerToBottom(promise: Promise)
 }

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/FWNavigatorModule.kt

@@ -1,7 +1,9 @@
 package com.fireworksdk.bridge.reactnative.module
 
 import android.app.Activity
+import android.content.Intent
 import com.facebook.react.bridge.*
+import com.firework.player.pager.PlayerActivity
 import com.firework.sdk.FireworkSdk
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
@@ -85,6 +87,30 @@ class FWNavigatorModule(
     promise.resolve(true)
   }
 
+  @ReactMethod
+  override fun bringRNContainerToTop(promise: Promise) {
+    // reorder MainActivity to front
+    val mainActivity = FWInitializationProvider.INSTANCE.mainActivity
+    mainActivity?.let { mActivity ->
+      val resumedActivity = FWInitializationProvider.INSTANCE.resumedActivity
+      resumedActivity?.let { rActivity ->
+        rActivity.startActivity(
+          Intent(rActivity, mActivity::class.java)
+          .addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
+        )
+      }
+    }
+  }
+
+  @ReactMethod
+  override fun bringRNContainerToBottom(promise: Promise) {
+    // reorder PlayerActivity to front
+    val mainActivity = FWInitializationProvider.INSTANCE.mainActivity
+    mainActivity?.let {
+      it.startActivity(PlayerActivity.getIntentForReorderToFront(it))
+    }
+  }
+
   @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/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"