react-native-firework-sdk 1.2.0-beta.1 → 1.2.0-beta.7

package/android/build.gradle

@@ -168,7 +168,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
 
   // optional 1: firework sdk release verison
-  def firework_sdk_version = 'v5.11.4'
+  def firework_sdk_version = 'v5.12.0'
   implementation "com.github.loopsocial:firework_sdk:$firework_sdk_version"
 
   // optional 2: firework sdk local version,

package/android/src/main/AndroidManifest.xml

@@ -15,6 +15,10 @@
       android:name="com.fireworksdk.bridge.reactnative.pages.FWContainerActivity"
       android:theme="@style/Theme.AppCompat.Light.NoActionBar"
       />
+    <activity
+      android:name="com.fireworksdk.bridge.reactnative.pages.FWCustomCTALinkContentContainerActivity"
+      android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+      />
     <provider
       android:authorities="com.fireworksdk.bridge.reactnative"
       android:name=".reactnative.FWInitializationProvider"

package/android/src/main/java/com/fireworksdk/bridge/components/videofeed/FWVideoFeed.kt

@@ -40,6 +40,7 @@ class FWVideoFeed(
       videoFeedPropsModel.mode = props.mode
       videoFeedPropsModel.videoFeedConfiguration = props.videoFeedConfiguration
       videoFeedPropsModel.videoPlayerConfiguration = props.videoPlayerConfiguration
+      videoFeedPropsModel.dynamicContentParameters = props.dynamicContentParameters
     }
     setData()
   }
@@ -69,6 +70,11 @@ class FWVideoFeed(
     setData()
   }
 
+  fun setDynamicContentParametersProps(dynamicContentParameters: HashMap<String, List<String>>?) {
+    videoFeedPropsModel.dynamicContentParameters = dynamicContentParameters
+    setData()
+  }
+
   fun setVideoFeedConfigProps(config: FWVideoFeedConfigModel?) {
     videoFeedPropsModel.videoFeedConfiguration = config
     setData()
@@ -87,6 +93,7 @@ class FWVideoFeed(
   private fun setData() {
     val source = videoFeedPropsModel.source
     val mode = videoFeedPropsModel.mode
+    val dynamicContentParameters = videoFeedPropsModel.dynamicContentParameters
     val channel = videoFeedPropsModel.channel
     val playlist = videoFeedPropsModel.playlist
     val playlistGroup = videoFeedPropsModel.playlistGroup
@@ -100,14 +107,17 @@ class FWVideoFeed(
       FWVideoFeedSource.PlaylistGroup.rawValue -> {
         setPlaylistGroupFeed(mode, playlistGroup, videoFeedConfiguration, videoPlayerConfiguration)
       }
+      FWVideoFeedSource.DynamicContent.rawValue -> {
+        setFeed(mode, channel, playlist, FeedType.DYNAMIC_CONTENT, dynamicContentParameters, videoFeedConfiguration, videoPlayerConfiguration)
+      }
       FWVideoFeedSource.Playlist.rawValue -> {
-        setFeed(mode, channel, playlist, FeedType.PLAYLIST, videoFeedConfiguration, videoPlayerConfiguration)
+        setFeed(mode, channel, playlist, FeedType.PLAYLIST, null, videoFeedConfiguration, videoPlayerConfiguration)
       }
       FWVideoFeedSource.Channel.rawValue -> {
-        setFeed(mode, channel, null, FeedType.CHANNEL, videoFeedConfiguration, videoPlayerConfiguration)
+        setFeed(mode, channel, null, FeedType.CHANNEL, null, videoFeedConfiguration, videoPlayerConfiguration)
       }
       else -> {
-        setFeed(mode, null, null, FeedType.DISCOVER, videoFeedConfiguration, videoPlayerConfiguration)
+        setFeed(mode, null, null, FeedType.DISCOVER, null, videoFeedConfiguration, videoPlayerConfiguration)
       }
     }
   }
@@ -115,6 +125,7 @@ class FWVideoFeed(
   private fun setFeed(
     mode: String?,
     channelId: String?, playlistId: String?, feedType: FeedType?,
+    dynamicContentParameters: HashMap<String, List<String>>?,
     videoFeedConfiguration: FWVideoFeedConfigModel?,
     videoPlayerConfiguration: FWVideoPlayerConfigModel?,
   ) {
@@ -133,7 +144,9 @@ class FWVideoFeed(
     }
 
     // set channel playlistId feedType
-    if (feedType == FeedType.CHANNEL && !channelId.isNullOrBlank()) {
+    if (feedType == FeedType.DYNAMIC_CONTENT && !channelId.isNullOrBlank()) {
+      videoFeedView?.setDynamicContent(channelId, dynamicContentParameters?:hashMapOf())
+    } else if (feedType == FeedType.CHANNEL && !channelId.isNullOrBlank()) {
       videoFeedView?.setFeed(channelId, null, FeedType.CHANNEL)
     } else if (feedType == FeedType.PLAYLIST && !channelId.isNullOrBlank() && !playlistId.isNullOrBlank()) {
       videoFeedView?.setFeed(channelId, playlistId, FeedType.PLAYLIST)

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

@@ -7,6 +7,7 @@ enum class FWEventName(val rawValue: String) {
   VideoFeedClick("fw:video-feed-click"),
   LiveStream("fw:livestream"),
   LiveStreamChat("fw:livestream-chat"),
+  LogMessage("fw:log-message")
 }
 
 enum class FWSDKInitSubEventName(val rawValue: String) {

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

@@ -15,4 +15,5 @@ data class FWVideoFeedPropsModel(
     var mode: String? = null,
     var videoFeedConfiguration: FWVideoFeedConfigModel? = null,
     var videoPlayerConfiguration: FWVideoPlayerConfigModel? = null,
+    var dynamicContentParameters: HashMap<String, List<String>>? = null,
 ) : Parcelable

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

@@ -4,5 +4,6 @@ enum class FWVideoFeedSource(val rawValue: String) {
   Discover("discover"),
   Channel("channel"),
   Playlist("playlist"),
+  DynamicContent("dynamicContent"),
   PlaylistGroup("playlistGroup"),
 }

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

@@ -133,6 +133,12 @@ class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
     view.setModeProps(mode)
   }
 
+  @ReactProp(name = "dynamicContentParameters")
+  fun setDynamicContentParameters(view: FWVideoFeed, parameters: ReadableMap?) {
+    val parametersMap = parameters?.toHashMap() as? HashMap<String, List<String>>
+    view.setDynamicContentParametersProps(parametersMap)
+  }
+
   @ReactProp(name = "videoFeedConfiguration")
   fun setVideoFeedConfig(view: FWVideoFeed, config: ReadableMap?) {
     val configMap = config?.toHashMap()

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

@@ -5,10 +5,11 @@ import com.facebook.react.bridge.ReadableMap
 
 interface FireworkSDKInterface {
 
-  fun init(userId: String?, adConfig: ReadableMap?)
+  fun init(userId: String?)
   fun openVideoPlayer(url: String, config: ReadableMap?)
   fun setShareBaseURL(url: String?, promise: Promise)
   fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise)
   fun setCustomCTAClickEnabled(value: Boolean?)
+  fun setCustomCTALinkContentRenderEnabled(value: Boolean?)
   fun setVideoPlaybackEventEnabled(value: Boolean?)
 }

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

@@ -4,7 +4,10 @@ import com.facebook.react.bridge.*
 import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
 import com.fireworksdk.bridge.reactnative.pages.FWContainerActivity
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWDateUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
+import java.util.*
 
 
 class FWNavigatorModule(
@@ -21,8 +24,15 @@ class FWNavigatorModule(
       return
     }
 
+    FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Enter pushNativeContainer ${FWDateUtils.getDateString(Date())}")
+
     UiThreadUtil.runOnUiThread {
+
+      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Before Starting container activity ${FWDateUtils.getDateString(Date())}")
+
       activity.startActivity(FWContainerActivity.createIntent(activity, callbackId))
+
+      FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] After Starting container activity ${FWDateUtils.getDateString(Date())}")
     }
     promise.resolve(true)
   }

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

@@ -11,9 +11,12 @@ import com.fireworksdk.bridge.utils.*
 import org.json.JSONObject
 import com.facebook.react.bridge.ReactMethod
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
+import com.fireworksdk.bridge.reactnative.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
+import com.fireworksdk.bridge.reactnative.pages.FWCustomCTALinkContentContainerActivity
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.loopnow.fireworklibrary.*
+import java.util.*
 
 
 class FireworkSDKModule(
@@ -35,8 +38,10 @@ class FireworkSDKModule(
    *                           If id passed is not unique, it will affect the quality of content recommended to the user.
    */
   @ReactMethod
-  override fun init(userId: String?, adConfig: ReadableMap?) {
-    init(userId)
+  override fun init(userId: String?) {
+    initSdk(userId)
+
+    handleCustomCTAClick()
   }
 
   /**
@@ -97,7 +102,11 @@ class FireworkSDKModule(
   @ReactMethod
   override fun setCustomCTAClickEnabled(value: Boolean?) {
     FWVideoPlayerUtils.customCTAClickEnabled = value?:false
-    handleCustomCTAClick()
+  }
+
+  @ReactMethod
+  override fun setCustomCTALinkContentRenderEnabled(value: Boolean?) {
+    FWVideoPlayerUtils.customCTALinkContentRenderEnabled = value?:false
   }
 
   @ReactMethod
@@ -106,7 +115,7 @@ class FireworkSDKModule(
     handleVideoPlaybackEvent()
   }
 
-  private fun init(userId: String?) {
+  private fun initSdk(userId: String?) {
     val clientId = getAppid()
     if (clientId.isNullOrBlank()) {
       val errorMsg = "The appid is invalid"
@@ -166,8 +175,17 @@ class FireworkSDKModule(
     FwSDK.ctaClickHandler = object: FwSDK.CtaClickHandler {
       override fun ctaClicked(label: String, actionUrl: String?): Boolean {
         FWLogUtils.d { "ctaClicked" }
+
+        FWEventUtils.sendLogMessageEvent(reactApplicationContext, "[Android] Receive CustomCTAClick event ${FWDateUtils.getDateString(Date())}")
+
         FWEventUtils.sendCustomCTAClickEvent(reactApplicationContext, actionUrl)
-        return FWVideoPlayerUtils.customCTAClickEnabled
+
+        if (FWVideoPlayerUtils.customCTALinkContentRenderEnabled) {
+          val activity = FWInitializationProvider.INSTANCE.resumedActivity
+          activity?.startActivity(FWCustomCTALinkContentContainerActivity.createIntent(activity, actionUrl))
+        }
+
+        return FWVideoPlayerUtils.customCTAClickEnabled || FWVideoPlayerUtils.customCTALinkContentRenderEnabled
       }
     }
   }

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

@@ -0,0 +1,55 @@
+package com.fireworksdk.bridge.reactnative.pages
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.facebook.react.ReactFragment
+import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler
+import com.fireworksdk.bridge.R
+
+class FWCustomCTALinkContentContainerActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.fw_bridge_fragment_container)
+
+    val url = intent.getStringExtra(KEY_URL)
+
+    val reactNativeFragment: Fragment = ReactFragment.Builder()
+      .setComponentName(COMPONENT_NAME)
+      .setLaunchOptions(getLaunchOptions(url))
+      .build()
+
+    supportFragmentManager
+      .beginTransaction()
+      .add(R.id.fw_bridge_container, reactNativeFragment)
+      .commit()
+  }
+
+  private fun getLaunchOptions(url: String?) = Bundle().apply {
+    if (!url.isNullOrEmpty()) {
+      putString(KEY_URL, url)
+    }
+  }
+
+  companion object {
+
+    private const val KEY_URL = "url"
+    private const val COMPONENT_NAME = "FWCustomCTALinkContentContainer"
+
+    fun createIntent(activity: Activity, url: String?): Intent {
+      val intent = Intent(activity, FWCustomCTALinkContentContainerActivity::class.java)
+      intent.putExtra(KEY_URL, url)
+      intent.flags = Intent.FLAG_ACTIVITY_NO_ANIMATION
+      activity.overridePendingTransition(0, 0)
+      return intent
+    }
+  }
+
+  override fun invokeDefaultOnBackPressed() {
+    super.onBackPressed();
+  }
+
+}

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

@@ -6,6 +6,7 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.facebook.react.uimanager.events.RCTEventEmitter
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.utils.FWLogUtils
 import com.loopnow.fireworklibrary.data.Product
 
 object FWEventUtils {
@@ -109,6 +110,14 @@ object FWEventUtils {
       .emit(eventName, params)
   }
 
+  fun sendLogMessageEvent(reactContext: ReactContext, message: String?) {
+    FWLogUtils.d { message }
+
+    val eventMap = Arguments.createMap()
+    eventMap.putString("message", message)
+    sendEvent(reactContext, FWEventName.LogMessage.rawValue, eventMap)
+  }
+
   fun receiveVideoFeedLoadFinishedSuccessEvent(reactContext: ReactContext, targetTag: Int) {
     receiveEvent(reactContext, targetTag, FWFeedViewEventName.VideoFeedLoadFinished.rawValue, null)
   }

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

@@ -0,0 +1,15 @@
+package com.fireworksdk.bridge.utils
+
+import org.jetbrains.annotations.NotNull
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
+
+object FWDateUtils {
+
+  fun getDateString(@NotNull date: Date): String {
+    val dateFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())
+    dateFormat.timeZone = TimeZone.getDefault()
+    return dateFormat.format(date)
+  }
+}

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

@@ -16,6 +16,7 @@ import com.loopnow.fireworklibrary.views.VideoFeedView
 object FWVideoPlayerUtils {
 
   var customCTAClickEnabled: Boolean = false
+  var customCTALinkContentRenderEnabled: Boolean = false
   var videoPlaybackEventEnabled: Boolean = false
 
   private var hasAssignedLaunchAppWithMute = false

package/ios/Components/VideoFeed.swift

@@ -31,7 +31,7 @@ public enum VideoFeedMode: Int {
 
 @objc
 public enum VideFeedSourceType: Int {
-    case discover, channel, playlist, playlistGroup
+    case discover, channel, playlist, playlistGroup, dynamicContent
 }
 
 public protocol VideoFeedViewDelegate: AnyObject {
@@ -48,6 +48,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
     @objc public var channel: String = ""
     @objc public var playlist: String = ""
     @objc public var playlistGroup: String = ""
+    @objc public var dynamicContentParameters: NSDictionary = NSDictionary()
     @objc public var mode: VideoFeedMode = .row
     @objc public var feedViewConfig: VideoFeedConfiguration? {
         didSet {
@@ -81,6 +82,9 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
             return .channelPlaylist(channelID: channel, playlistID: playlist)
         case .playlistGroup:
             return .playlistGroup(groupID: playlistGroup)
+        case .dynamicContent:
+            let parameters = dynamicContentParameters as? [String: [String]]
+            return .dynamicContent(channelID: channel, parameters: parameters ?? [:])
         }
     }
     
@@ -153,28 +157,6 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate {
 }
 
 extension VideoFeed {
-    private func convertToFWAdBadgeConfiguration(_ adBadgeConfiguration: AdBadgeConfiguration?) -> FireworkVideo.AdBadgeConfiguration? {
-        guard let adBadgeConfiguration = adBadgeConfiguration else {
-            return nil
-        }
-        
-        var fwAdBadgeConfiguration = FireworkVideo.AdBadgeConfiguration()
-        if let textColor = adBadgeConfiguration.textColor {
-            fwAdBadgeConfiguration.textColor = textColor.uicolor()
-        }
-        if let backgroundColor = adBadgeConfiguration.backgroundColor {
-            fwAdBadgeConfiguration.backgroundColor = backgroundColor.uicolor()
-        }
-        switch adBadgeConfiguration.badgeTextType {
-            case .sponsored:
-                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.sponsored
-            default:
-                fwAdBadgeConfiguration.badgeText = FireworkVideo.AdBadgeConfiguration.BadgeText.ad
-        }
-        
-        return fwAdBadgeConfiguration
-    }
-    
     private func convertToVideoFeedConentConfiguration() -> VideoFeedContentConfiguration {
         var videoConfig = VideoFeedContentConfiguration()
         //set default value so that behavior will the same with Android
@@ -196,8 +178,7 @@ extension VideoFeed {
         if let shareBaseUrl = gShareBaseURL {
             videoConfig.playerView.shareButton.behavior.baseURL = URL(string:shareBaseUrl)
         }
-        let adBadge = self.convertToFWAdBadgeConfiguration(gAdBadgeConfiguration)
-        if let adBadge = adBadge  {
+        if let adBadge = FireworkSDKModule.convertToFWAdBadgeConfiguration(gAdBadgeConfiguration)  {
             videoConfig.adBadge = adBadge
         }
         

package/ios/Components/VideoFeedManager.m

@@ -22,6 +22,7 @@ RCT_CUSTOM_VIEW_PROPERTY(source, VideFeedSourceType, VideoFeed) {
 RCT_EXPORT_VIEW_PROPERTY(channel, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlist, NSString)
 RCT_EXPORT_VIEW_PROPERTY(playlistGroup, NSString)
+RCT_EXPORT_VIEW_PROPERTY(dynamicContentParameters, NSDictionary)
 
 RCT_CUSTOM_VIEW_PROPERTY(mode, VideoFeedMode, VideoFeed) {
     if (json) {

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -30,7 +30,6 @@
 		897523962817DEF80070EBB6 /* ProductInfoViewConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975237A2817DEF80070EBB6 /* ProductInfoViewConfiguration.swift */; };
 		897523972817DEF80070EBB6 /* Product.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975237B2817DEF80070EBB6 /* Product.swift */; };
 		897523982817DEF80070EBB6 /* ShoppingModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975237C2817DEF80070EBB6 /* ShoppingModule.swift */; };
-		897523992817DEF80070EBB6 /* MobileADConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975237E2817DEF80070EBB6 /* MobileADConfiguration.swift */; };
 		8975239A2817DEF80070EBB6 /* FireworkSDKModule+EventTracking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8975237F2817DEF80070EBB6 /* FireworkSDKModule+EventTracking.swift */; };
 		8975239B2817DEF80070EBB6 /* FireworkSDKModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523802817DEF80070EBB6 /* FireworkSDKModule.swift */; };
 		8975239C2817DEF80070EBB6 /* AdBadgeConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523812817DEF80070EBB6 /* AdBadgeConfiguration.swift */; };
@@ -38,6 +37,7 @@
 		8975239E2817DEF80070EBB6 /* FireworkSDKModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523832817DEF80070EBB6 /* FireworkSDKModule.m */; };
 		8975239F2817DEF80070EBB6 /* LiveStreamModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897523852817DEF80070EBB6 /* LiveStreamModule.swift */; };
 		897523A02817DEF80070EBB6 /* LiveStreamModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 897523862817DEF80070EBB6 /* LiveStreamModule.m */; };
+		89BA1734283619FE00C2287A /* FWCustomCTALinkContentContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BA1733283619FE00C2287A /* FWCustomCTALinkContentContainerViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -79,7 +79,6 @@
 		8975237A2817DEF80070EBB6 /* ProductInfoViewConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductInfoViewConfiguration.swift; sourceTree = "<group>"; };
 		8975237B2817DEF80070EBB6 /* Product.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Product.swift; sourceTree = "<group>"; };
 		8975237C2817DEF80070EBB6 /* ShoppingModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShoppingModule.swift; sourceTree = "<group>"; };
-		8975237E2817DEF80070EBB6 /* MobileADConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MobileADConfiguration.swift; sourceTree = "<group>"; };
 		8975237F2817DEF80070EBB6 /* FireworkSDKModule+EventTracking.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FireworkSDKModule+EventTracking.swift"; sourceTree = "<group>"; };
 		897523802817DEF80070EBB6 /* FireworkSDKModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FireworkSDKModule.swift; sourceTree = "<group>"; };
 		897523812817DEF80070EBB6 /* AdBadgeConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdBadgeConfiguration.swift; sourceTree = "<group>"; };
@@ -87,6 +86,7 @@
 		897523832817DEF80070EBB6 /* FireworkSDKModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FireworkSDKModule.m; sourceTree = "<group>"; };
 		897523852817DEF80070EBB6 /* LiveStreamModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveStreamModule.swift; sourceTree = "<group>"; };
 		897523862817DEF80070EBB6 /* LiveStreamModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveStreamModule.m; sourceTree = "<group>"; };
+		89BA1733283619FE00C2287A /* FWCustomCTALinkContentContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWCustomCTALinkContentContainerViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -209,12 +209,12 @@
 		8975237D2817DEF80070EBB6 /* FireworkSDKModule */ = {
 			isa = PBXGroup;
 			children = (
-				8975237E2817DEF80070EBB6 /* MobileADConfiguration.swift */,
 				8975237F2817DEF80070EBB6 /* FireworkSDKModule+EventTracking.swift */,
 				897523802817DEF80070EBB6 /* FireworkSDKModule.swift */,
 				897523812817DEF80070EBB6 /* AdBadgeConfiguration.swift */,
 				897523822817DEF80070EBB6 /* FireworkSDKModule+CTA.swift */,
 				897523832817DEF80070EBB6 /* FireworkSDKModule.m */,
+				89BA1733283619FE00C2287A /* FWCustomCTALinkContentContainerViewController.swift */,
 			);
 			path = FireworkSDKModule;
 			sourceTree = "<group>";
@@ -290,7 +290,6 @@
 				897523952817DEF80070EBB6 /* ShoppingModule.m in Sources */,
 				897523A02817DEF80070EBB6 /* LiveStreamModule.m in Sources */,
 				8975238E2817DEF80070EBB6 /* FireworkSDK+Json.swift in Sources */,
-				897523992817DEF80070EBB6 /* MobileADConfiguration.swift in Sources */,
 				8975235F2817DEEE0070EBB6 /* VideoFeedConfiguration.swift in Sources */,
 				897523612817DEEE0070EBB6 /* VideoPlayerConfiguration.swift in Sources */,
 				897523972817DEF80070EBB6 /* Product.swift in Sources */,
@@ -305,6 +304,7 @@
 				8975239A2817DEF80070EBB6 /* FireworkSDKModule+EventTracking.swift in Sources */,
 				8975239E2817DEF80070EBB6 /* FireworkSDKModule.m in Sources */,
 				897523962817DEF80070EBB6 /* ProductInfoViewConfiguration.swift in Sources */,
+				89BA1734283619FE00C2287A /* FWCustomCTALinkContentContainerViewController.swift in Sources */,
 				8975238D2817DEF80070EBB6 /* RCTConvert+VideoFeed.swift in Sources */,
 				8975238C2817DEF80070EBB6 /* RCTConvert+Shopping.swift in Sources */,
 				897523602817DEEE0070EBB6 /* VideoFeed.swift in Sources */,

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -15,6 +15,7 @@ enum FWEventName: String, CaseIterable {
   case VideoFeedClick = "fw:video-feed-click"
   case ShareBaseURLUpdated = "fw:share-base-url-updated" //emitted in JS side
   case AdBadgeConfigurationUpdated = "fw:ad-badge-configuration-updated" //emitted in JS side
+  case LogMessage = "fw:log-message"
 }
 
 enum VideoPlaybackSubEventName: String {

package/ios/Models/RNToNative/RCTConvert+FireworkSDKModule.swift

@@ -69,26 +69,6 @@ extension RCTConvert {
         return btnContentConfig
     }
     
-    static func mobileADConfiguration(_ config: [String: AnyObject]?) -> MobileADConfiguration? {
-        guard let rConfig = config else {
-            return nil
-        }
-        
-        let jsonData = try? JSONSerialization.data(withJSONObject: rConfig, options: .prettyPrinted)
-        guard let rJsonData = jsonData else {
-            return nil
-        }
-        
-        var result: MobileADConfiguration?
-        do {
-            result = try JSONDecoder().decode(MobileADConfiguration.self, from: rJsonData)
-        } catch let error {
-            print(error.localizedDescription)
-        }
-        
-        return result
-    }
-    
     static func adBadgeConfiguration(_ config: [String: AnyObject]?) -> AdBadgeConfiguration? {
         guard let rConfig = config else {
             return nil

package/ios/Models/RNToNative/RCTConvert+VideoFeed.swift

@@ -12,7 +12,8 @@ extension VideFeedSourceType {
         ["discover": .discover,
          "channel": .channel,
          "playlist": .playlist,
-         "playlistGroup": .playlistGroup]
+         "playlistGroup": .playlistGroup,
+         "dynamicContent": .dynamicContent]
     }
 }
 

package/ios/Modules/FWNavigatorModule/FWNavigatorContainerViewController.swift

@@ -2,7 +2,7 @@
 //  FWNavigatorContainerViewController.swift
 //  react-native-firework-sdk
 //
-//  Created by 熊韦华 on 2022/4/22.
+//  Created by Big Bear Xiong on 2022/4/22.
 //
 
 import UIKit

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -10,7 +10,7 @@ import FireworkVideo
 @objc(FWNavigatorModule)
 class FWNavigatorModule: RCTEventEmitter, FWNavigator {
     override func supportedEvents() -> [String]! {
-        return []
+        return [FWEventName.LogMessage.rawValue]
     }
     
     override class func requiresMainQueueSetup() -> Bool {
@@ -19,6 +19,10 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
 
     @objc(pushNativeContainer:resolver:rejecter:)
     func pushNativeContainer(_ callbackId: String?, resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock) {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Enter pushNativeContainer \(formatter.string(from: Date()))"])
+
         DispatchQueue.main.async {
             guard let callbackId = callbackId else {
                 resolver(false)
@@ -29,10 +33,18 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
                 resolver(false)
                 return
             }
+            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Before creating containerViewController \(formatter.string(from: Date()))"])
+
             let containerViewController = FWNavigatorContainerViewController(callbackId: callbackId)
+
+            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] After creating containerViewController \(formatter.string(from: Date()))"])
+
             containerViewController.modalPresentationStyle = .fullScreen
 
+            self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Present containerViewController \(formatter.string(from: Date()))"])
+
             presentedVC.present(containerViewController, animated: true) {
+                self.sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Finish presenting containerViewController \(formatter.string(from: Date()))"])
                 resolver(true)
             }
         }
@@ -46,12 +58,8 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
                 return
             }
 
-            if presentedVC is FWNavigatorContainerViewController {
-                presentedVC.dismiss(animated: true) {
-                    resolver(true)
-                }
-            } else {
-                resolver(false)
+            presentedVC.dismiss(animated: true) {
+                resolver(true)
             }
         }
     }

package/ios/Modules/FireworkSDKModule/FWCustomCTALinkContentContainerViewController.swift

@@ -0,0 +1,31 @@
+//
+//  FWCustomCTALinkContentContainerViewController.swift
+//  FireworkSdk
+//
+//  Created by linjie jiang on 2022/5/19.
+//  Copyright © 2022 Facebook. All rights reserved.
+//
+
+import UIKit
+
+class FWCustomCTALinkContentContainerViewController: UIViewController {
+    var url: String?
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        loadContent()
+    }
+
+    private func loadContent() {
+        let rctRootView = RCTRootView.init(bridge: RCTBridge.current(), moduleName: "FWCustomCTALinkContentContainer", initialProperties: ["url": url ?? ""])
+        view.addSubview(rctRootView)
+        rctRootView.translatesAutoresizingMaskIntoConstraints = false
+
+        NSLayoutConstraint.activate([
+            rctRootView.leftAnchor.constraint(equalTo: view.leftAnchor),
+            rctRootView.topAnchor.constraint(equalTo: view.topAnchor),
+            rctRootView.rightAnchor.constraint(equalTo: view.rightAnchor),
+            rctRootView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+        ])
+    }
+}

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+CTA.swift

@@ -10,8 +10,21 @@ import FireworkVideo
 
 extension FireworkSDKModule: FireworkVideoCTADelegate {
     func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL) -> Bool {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+        sendEvent(withName: FWEventName.LogMessage.rawValue, body: ["message": "[iOS] Receive CustomCTAClick event \(formatter.string(from: Date()))"])
+
         sendEvent(withName: FWEventName.CustomCTAClick.rawValue, body: ["url": url.absoluteString])
+
+        if customCTALinkContentRenderEnabled, let presentedVC = RCTPresentedViewController() {
+            let customCTALinkContentContainerVC = FWCustomCTALinkContentContainerViewController()
+            customCTALinkContentContainerVC.modalPresentationStyle = .fullScreen
+            customCTALinkContentContainerVC.url = url.absoluteString
+            presentedVC.present(customCTALinkContentContainerVC, animated: true) {
+
+            }
+        }
         
-        return customCTAClickEnabled
+        return customCTAClickEnabled || customCTALinkContentRenderEnabled
     }
 }