react-native-firework-sdk 2.13.0 → 2.14.0

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

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import androidx.fragment.app.FragmentActivity
 import com.fireworksdk.bridge.components.base.FWBaseFragment
+
 import java.util.Locale
 
 class FWLanguageUtil private constructor(context: Context) {
@@ -14,12 +15,38 @@ class FWLanguageUtil private constructor(context: Context) {
 
   private val initAppLocale: Locale = Locale.getDefault()
 
+  /**
+   * local string, e.g. ar, ar-AE, pt-BR
+   */
   private var localeString: String? = null
 
   init {
     localeString = sharedPreferences.getString(LOCALE_KEY, null)
   }
 
+  fun getCurrentSettingLocale(): Locale {
+    val localeLanguage = localeString
+    if (localeLanguage.isNullOrBlank()) {
+      return Locale(initAppLocale.language, initAppLocale.country)
+    } else {
+      if (localeLanguage.contains("-")) {
+        val locales = localeLanguage.split("-")
+        if (locales.size > 1) {
+          return Locale(locales[0], locales[1])
+        }
+      }
+      return Locale(localeLanguage)
+    }
+  }
+
+  fun shouldOverrideLanguage(language: String): Boolean {
+    if (localeString.isNullOrBlank()) {
+      // not update language in local string
+      return false
+    }
+    return !localeString.equals(language, true)
+  }
+
   fun updateBaseContextLocale(baseContext: Context): Context {
     val currentLocaleString = localeString
 
@@ -28,29 +55,45 @@ class FWLanguageUtil private constructor(context: Context) {
       return updateResourcesLocale(baseContext, initAppLocale)
     }
 
-    val localeStrings = currentLocaleString.split("-")
-    val locale = if (localeStrings.size > 1) {
-      Locale(localeStrings[0], localeStrings[1])
-    } else {
-      Locale(currentLocaleString)
-    }
+    val locale = getLocaleByLanguage(currentLocaleString)
+
     Locale.setDefault(locale)
     return updateResourcesLocale(baseContext, locale)
   }
 
+  private fun getLocaleByLanguage(language: String): Locale {
+    if (language.contains("-")) {
+      val locales = language.split("-")
+      if (locales.size > 1) {
+        return Locale(locales[0], locales[1])
+      }
+    }
+    return Locale(language)
+  }
+
   private fun updateResourcesLocale(context: Context, locale: Locale): Context {
     val resources = context.resources
     val configuration = resources.configuration
     configuration.setLocale(locale)
     configuration.setLayoutDirection(locale)
-    return context.createConfigurationContext(configuration)
+    val newContext = context.createConfigurationContext(configuration)
+    context.resources.updateConfiguration(configuration, context.resources.displayMetrics)
+    return newContext
   }
 
-  fun changeLanguage(inputLocaleString: String?, activity: Activity?): Boolean {
-    // no change
-    if ((inputLocaleString.isNullOrBlank() && localeString.isNullOrBlank())
+  /**
+   * return
+   * true: need to execute change language.
+   * false: don't need to execute change language.
+   */
+  fun isSameLanguageWithCache(inputLocaleString: String?): Boolean {
+    return (inputLocaleString.isNullOrBlank() && localeString.isNullOrBlank())
       || localeString == inputLocaleString
-    ) {
+  }
+
+  fun changeLanguage(inputLocaleString: String?): Boolean {
+    // no change
+    if (isSameLanguageWithCache(inputLocaleString)) {
       return true
     }
 
@@ -58,7 +101,6 @@ class FWLanguageUtil private constructor(context: Context) {
     if (inputLocaleString.isNullOrBlank()) {
       localeString = null
       updateSpLanguage(inputLocaleString)
-      restartActivity(activity)
       return true
     }
 
@@ -70,7 +112,6 @@ class FWLanguageUtil private constructor(context: Context) {
     // update locale
     localeString = inputLocaleString
     updateSpLanguage(inputLocaleString)
-    restartActivity(activity)
     return true
   }
 
@@ -86,7 +127,7 @@ class FWLanguageUtil private constructor(context: Context) {
     }
   }
 
-  private fun restartActivity(activity: Activity?) {
+  fun restartActivity(activity: Activity?) {
     if (activity is FragmentActivity) {
       val fragments = activity.supportFragmentManager.fragments
       for (f in fragments) {
@@ -98,7 +139,7 @@ class FWLanguageUtil private constructor(context: Context) {
     activity?.recreate()
   }
 
-  private fun isValidLocale(locale: String?) : Boolean {
+  private fun isValidLocale(locale: String?): Boolean {
     locale ?: return false
     val list = Locale.getAvailableLocales()
     if (locale.contains("-")) {
@@ -114,4 +155,5 @@ class FWLanguageUtil private constructor(context: Context) {
     private const val LOCALE_SP = "fw_locale_sp"
     private const val LOCALE_KEY = "fw_locale_key"
   }
+
 }

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

@@ -4,6 +4,7 @@ import com.firework.analyticsevents.VideoInfo
 import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
 import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
+import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
 import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
 
 object FWModelUtils {
@@ -20,6 +21,13 @@ object FWModelUtils {
     )
   }
 
+  fun convertVideoInfo2LivestreamDetails(videoInfo: VideoInfo): FWLiveStreamEventDetailsModel {
+    return FWLiveStreamEventDetailsModel(
+      id = videoInfo.id,
+      feedId = videoInfo.feedId,
+    )
+  }
+
   fun convertCtaEvent2PlaybackDetails(event: CtaButtonClickAnalyticsEvent): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
       badge = event.videoInfo.badge,
@@ -61,4 +69,4 @@ object FWModelUtils {
     )
   }
 
-}
+}

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */; };
 		891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */; };
 		891F4AF82A68DEDF00A9E8DA /* PushRNContainerParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */; };
 		891F4AFA2A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */; };
@@ -98,6 +99,7 @@
 
 /* Begin PBXFileReference section */
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; sourceTree = "<group>"; };
+		890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+AppLanguage.swift"; sourceTree = "<group>"; };
 		891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWRNContainerViewController.swift; sourceTree = "<group>"; };
 		891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRNContainerParams.swift; sourceTree = "<group>"; };
 		891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RCTConvert+FWNavigatorModule.swift"; sourceTree = "<group>"; };
@@ -183,6 +185,7 @@
 		898873122A0A8E7E0089CD1C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */,
 				89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */,
 				898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */,
 				898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */,
@@ -424,6 +427,7 @@
 				8988735B2A0A8E7E0089CD1C /* FireworkSDKModule.m in Sources */,
 				8988736A2A0A8E7E0089CD1C /* VideoFeedConfiguration.swift in Sources */,
 				8975238D2817DEF80070EBB6 /* (null) in Sources */,
+				890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */,
 				8975238C2817DEF80070EBB6 /* (null) in Sources */,
 				8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */,
 				891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */,

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -45,6 +45,7 @@ enum ShoppingEventName: String, CaseIterable {
     case logMessage = "fw:log-message"
     case customLinkButtonClick = "fw:shopping:custom-link-button-click"
     case customProductCardTap = "fw:shopping:custom-product-card-tap"
+    case productClick = "fw:shopping:product-click"
 }
 
 /// Live stream event

package/ios/Models/NativeToRN/FireworkSDK+Json.swift

@@ -72,7 +72,8 @@ extension FeedEventDetails {
         var result: [String: Any] = [
             "index": index,
             "id": id,
-            "duration": duration
+            "duration": duration,
+            "feedId": feedId
         ]
         if let title = caption {
             result["title"] = title
@@ -112,7 +113,10 @@ extension FeedEventDetails {
 
 extension LiveStreamEventDetails {
     var jsObject: [String: Any] {
-        return ["id": id]
+        return [
+            "id": videoID,
+            "feedId": feedID
+        ]
     }
 }
 

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

@@ -113,4 +113,17 @@ extension RCTConvert {
 
         return result
     }
+
+    static func dataTrackingLevel(_ level: String) -> FireworkVideo.DataTrackingLevel? {
+        switch level {
+        case "all":
+            return FireworkVideo.DataTrackingLevel.all
+        case "essentialOnly":
+            return FireworkVideo.DataTrackingLevel.essentialOnly
+        case "none":
+            return FireworkVideo.DataTrackingLevel.none
+        default:
+            return nil
+        }
+    }
 }

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

@@ -8,27 +8,19 @@
 import FireworkVideo
 import Foundation
 
-var gVideoDetailsForTappingCTAButton: VideoDetails?
-
 extension FireworkSDKModule: FireworkVideoCTADelegate {
-    func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL) -> Bool {
+    func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL, for video: VideoDetails) -> Bool {
         let callbackId = UUID().uuidString
         playerMap.setObject(viewController, forKey: callbackId as NSString)
 
-        DispatchQueue.main.async { [weak self] in
-            var body: [String: Any?] = [
-                "url": url.absoluteString,
-                "callbackId": callbackId
-            ]
-
-            if let video = gVideoDetailsForTappingCTAButton {
-                body["video"] = video.jsObject
-                gVideoDetailsForTappingCTAButton = nil
-            }
+        let body: [String: Any?] = [
+            "url": url.absoluteString,
+            "callbackId": callbackId,
+            "video": video.jsObject
+        ]
 
-            self?.sendEvent(withName: FWEventName.customCTAClick.rawValue,
-                      body: body)
-        }
+        self.sendEvent(withName: FWEventName.customCTAClick.rawValue,
+                  body: body)
 
         return customCTAClickEnabled
     }

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

@@ -110,7 +110,6 @@ extension FireworkSDKModule: FireworkVideoPlaybackDelegate {
     }
 
     func fireworkVideoDidTapCTAButton(_ videoPlayback: VideoPlaybackDetails) {
-        gVideoDetailsForTappingCTAButton = videoPlayback
         guard enableVideoPlayBackEvent else { return }
         sendEvent(
             withName: FWEventName.videoPlayback.rawValue,
@@ -137,3 +136,12 @@ extension FireworkSDKModule: FireworkVideoFeedDelegate {
             withName: FWEventName.videoFeedClick.rawValue, body: ["info": eventDetails.jsObject])
     }
 }
+
+extension FireworkSDKModule {
+    @objc(setDataTrackingLevel:)
+    func setDataTrackingLevel(_ level: String) {
+        if let dataTrackingLevel = RCTConvert.dataTrackingLevel(level) {
+            FireworkVideoSDK.dataTrackingLevel = dataTrackingLevel
+        }
+    }
+}

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.m

@@ -22,5 +22,6 @@ RCT_EXTERN_METHOD(trackPurchase:(NSDictionary *)parameters)
 RCT_EXTERN_METHOD(changeAppLanguage:(NSString * __nullable)language resolver: (RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter)
 RCT_EXTERN_METHOD(pausePlayer:(NSString *)callbackId)
 RCT_EXTERN_METHOD(resumePlayer:(NSString *)callbackId)
+RCT_EXTERN_METHOD(setDataTrackingLevel:(NSString *)level)
 
 @end

package/ios/Modules/FireworkSDKModule/FireworkSDKModule.swift

@@ -28,9 +28,11 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
     // player view controller
     var playerMap: NSMapTable<NSString, UIViewController> = NSMapTable.strongToWeakObjects()
 
-    private var hasCalledSDKInitFromNative: Bool = false
+    private var hasCalledSDKInit: Bool = false
     private var argumentsForInitEvent: [String: Any]?
     private var hasListeners = false
+    private let monitor = NWPathMonitor()
+    private var scheduledInitializingSDKClosure: (() -> Void)?
 
     override init() {
         super.init()
@@ -45,6 +47,8 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         NotificationCenter.default.addObserver(
             self, selector: #selector(Self.onAppLanguageChanged),
             name: AppLanguageManager.NotificationName.AppLanguageChanged, object: nil)
+        startMonitoringNetworkStatus()
+        swizzleMethodsForAppLanguage()
     }
 
     override func supportedEvents() -> [String]! {
@@ -86,33 +90,44 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
     func markInitCalled(
         _ resolver: @escaping RCTPromiseResolveBlock, rejecter: @escaping RCTPromiseRejectBlock
     ) {
-        if hasCalledSDKInitFromNative,
-           let argumentsForInitEvent = argumentsForInitEvent {
+        if let argumentsForInitEvent = argumentsForInitEvent {
             // The sdk init event was received before.
             sendEvent(withName: FWEventName.sdkInit.rawValue, body: argumentsForInitEvent)
         }
 
-        resolver(hasCalledSDKInitFromNative)
+        resolver(hasCalledSDKInit)
     }
 
     func initializeSDK(_ options: SDKInitOptions?, _ fromNative: Bool) {
-        if hasCalledSDKInitFromNative && !fromNative {
+        if hasCalledSDKInit {
             if let argumentsForInitEvent = argumentsForInitEvent {
                 // The sdk init event was received before.
                 sendEvent(withName: FWEventName.sdkInit.rawValue, body: argumentsForInitEvent)
             }
         } else {
-            gVideoLaunchBehavior = options?.videoLaunchBehavior
+            let initializingSDKClosure = {
+                gVideoLaunchBehavior = options?.videoLaunchBehavior
 
-            FireworkVideoSDK.initializeSDK(delegate: self, userID: options?.userId)
-            FireworkVideoSDK.ctaDelegate = self
-            FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
-            FireworkVideoSDK.eventTracking.feedDelegate = self
-        }
+                FireworkVideoSDK.initializeSDK(delegate: self, userID: options?.userId)
+                FireworkVideoSDK.ctaDelegate = self
+                FireworkVideoSDK.eventTracking.videoPlaybackDelegate = self
+                FireworkVideoSDK.eventTracking.feedDelegate = self
+            }
 
-        if fromNative {
-            hasCalledSDKInitFromNative = true
+            if monitor.currentPath.status == .satisfied {
+                #if DEBUG
+                print("call initializingSDKClosure directly")
+                #endif
+                initializingSDKClosure()
+            } else {
+                #if DEBUG
+                print("schedule initializingSDKClosure")
+                #endif
+                self.scheduledInitializingSDKClosure = initializingSDKClosure
+            }
         }
+
+        hasCalledSDKInit = true
     }
 
     @objc(openVideoPlayer:config:)
@@ -213,7 +228,7 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
         let result = AppLanguageManager.shared.changeAppLanguage(language)
-
+        swizzleMethodsForAppLanguage()
         resolver(result)
     }
 
@@ -229,33 +244,83 @@ class FireworkSDKModule: RCTEventEmitter, FireworkVideoSDKDelegate {
 
     // MARK: - FireworkVideoSDKDelegate
     func fireworkVideoDidLoadSuccessfully() {
-        argumentsForInitEvent = [:]
-
-        if hasListeners {
-            sendEvent(withName: FWEventName.sdkInit.rawValue, body: argumentsForInitEvent)
+        DispatchQueue.main.async {
+            self.argumentsForInitEvent = [:]
+
+            if self.hasListeners {
+                self.sendEvent(
+                    withName: FWEventName.sdkInit.rawValue,
+                    body: self.argumentsForInitEvent
+                )
+            }
         }
     }
 
     func fireworkVideoDidLoadWith(error: FireworkVideoSDKError) {
-        argumentsForInitEvent = [
-            "error": [
-                "name": error.jsErrorName, "reason": error.recoverySuggestion ?? "default"
+        DispatchQueue.main.async {
+            self.argumentsForInitEvent = [
+                "error": [
+                    "name": error.jsErrorName, "reason": error.recoverySuggestion ?? "default"
+                ]
             ]
-        ]
 
-        if hasListeners {
-            sendEvent(
-                withName: FWEventName.sdkInit.rawValue,
-                body: argumentsForInitEvent)
+            if self.hasListeners {
+                self.sendEvent(
+                    withName: FWEventName.sdkInit.rawValue,
+                    body: self.argumentsForInitEvent
+                )
+            }
         }
     }
 
     @objc func onAppLanguageChanged() {
-        sendEvent(
-            withName: FWEventName.nativeAppLanguageUpdated.rawValue,
-            body: [
-                "appLanguage": AppLanguageManager.shared.appLanguage ?? ""
-            ])
+        if self.hasListeners {
+            sendEvent(
+                withName: FWEventName.nativeAppLanguageUpdated.rawValue,
+                body: [
+                    "appLanguage": AppLanguageManager.shared.appLanguage ?? ""
+                ])
+        }
+    }
+
+    func startMonitoringNetworkStatus() {
+        monitor.pathUpdateHandler = { path in
+            if path.status == .satisfied {
+                #if DEBUG
+                print("Network access is allowed.")
+                #endif
+                DispatchQueue.main.async {
+                    if let initializingSDKClosure = self.scheduledInitializingSDKClosure {
+                        #if DEBUG
+                        print("call scheduledInitializingSDKClosure")
+                        #endif
+                        initializingSDKClosure()
+                        self.scheduledInitializingSDKClosure = nil
+                    }
+                }
+            } else {
+                #if DEBUG
+                print("Network access is not allowed.")
+                #endif
+            }
+        }
+        let queue = DispatchQueue(label: "FWNetworkMonitor")
+        monitor.start(queue: queue)
+    }
+
+    func cancelMonitoringNetworkStatus() {
+        monitor.pathUpdateHandler = nil
+        monitor.cancel()
+    }
+
+    func swizzleMethodsForAppLanguage() {
+        if AppLanguageManager.shared.appLanguage == nil {
+            return
+        }
+
+        DispatchQueue.once {
+            NumberFormatter.swizzleNumberFormatterMethodsForAppLanguage()
+        }
     }
 }
 

package/ios/Modules/Shopping/ShoppingModule.swift

@@ -238,12 +238,15 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate {
     func fireworkShopping(
         _ fireworkShopping: FireworkVideoShopping,
         didTapLinkButtonAt item: SelectedProductVariant,
+        fromVideo video: VideoDetails,
         withURL itemURL: String
     ) -> Bool {
         if customClickLinkButtonEnabled {
+            var body = item.jsObject
+            body["video"] = video.jsObject
             sendEvent(
                 withName: ShoppingEventName.customLinkButtonClick.rawValue,
-                body: item.jsObject)
+                body: body)
         }
         return customClickLinkButtonEnabled
     }
@@ -263,10 +266,11 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate {
         didTapProductVariant item: SelectedProductVariant,
         forVideo video: VideoDetails
     ) -> Bool {
+        var body = item.jsObject
+        body["video"] = video.jsObject
+
         if customTapProductCardEnabled {
             let callbackId = ShoppingModule.generateCallbackId()
-            var body = item.jsObject
-            body["video"] = video.jsObject
             body["callbackId"] = callbackId as NSNumber
             if let presentedVC = RCTPresentedViewController(),
                let playerViewController = ShoppingModule.getTopPlayerViewController(presentedVC) {
@@ -277,6 +281,11 @@ class ShoppingModule: RCTEventEmitter, FireworkVideoShoppingDelegate {
                 body: body)
 
         }
+
+        sendEvent(
+            withName: ShoppingEventName.productClick.rawValue,
+            body: body)
+
         return customTapProductCardEnabled
     }
 }

package/ios/Utils/Extensions/NumberFormatter+AppLanguage.swift

@@ -0,0 +1,27 @@
+//
+//  NumberFormatter+FWAppLanguage.swift
+//  
+//  Created by linjie jiang on 2023/2/20.
+//
+
+import Foundation
+import FireworkVideoUI
+
+extension NumberFormatter {
+    static func swizzleNumberFormatterMethodsForAppLanguage() {
+        Swizzle.swizzleSelector(
+            cls: self,
+            originalSelector: #selector(NumberFormatter.string(from:)),
+            customSelector: #selector(NumberFormatter.fw_string(from:)))
+    }
+
+    @objc func fw_string(from number: NSNumber) -> String? {
+        if let language = AppLanguageManager.shared.appLanguage,
+           self.locale == Locale.current ||
+            self.locale == Locale.autoupdatingCurrent {
+            self.locale = Locale(identifier: language)
+        }
+
+        return fw_string(from: number)
+    }
+}