react-native-firework-sdk 1.6.0 → 1.6.2

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

@@ -53,10 +53,14 @@ class FWStoryBlockManager(
     val filter = IntentFilter()
     filter.addAction(FW_STORY_BLOCK_INIT_ACTION)
     LocalBroadcastManager.getInstance(reactContext).registerReceiver(broadcastReceiver, filter)
-
     return FrameLayout(reactContext)
   }
 
+  override fun onAfterUpdateTransaction(view: FrameLayout) {
+    super.onAfterUpdateTransaction(view)
+    FWLogUtils.d { "FWStoryBlockManager onAfterUpdateTransaction" }
+  }
+
   @Nullable
   override fun getCommandsMap(): Map<String, Int>? {
     return MapBuilder.of("create", COMMAND_CREATE)
@@ -107,9 +111,11 @@ class FWStoryBlockManager(
   private fun setupLayout(view: View) {
     Choreographer.getInstance().postFrameCallback(object : Choreographer.FrameCallback {
       override fun doFrame(frameTimeNanos: Long) {
-        manuallyLayoutChildren(view)
-        view.viewTreeObserver.dispatchOnGlobalLayout()
-        Choreographer.getInstance().postFrameCallback(this)
+        if (view.isAttachedToWindow) {
+          manuallyLayoutChildren(view)
+          view.viewTreeObserver.dispatchOnGlobalLayout()
+          Choreographer.getInstance().postFrameCallback(this)
+        }
       }
     })
   }
@@ -118,10 +124,6 @@ class FWStoryBlockManager(
    * Layout all children properly
    */
   private fun manuallyLayoutChildren(view: View) {
-    // propWidth and propHeight coming from react-native props
-//    val width = requireNotNull(propWidth)
-//    val height = requireNotNull(propHeight)
-
     view.measure(
       View.MeasureSpec.makeMeasureSpec(view.measuredWidth, View.MeasureSpec.EXACTLY),
       View.MeasureSpec.makeMeasureSpec(view.measuredHeight, View.MeasureSpec.EXACTLY)
@@ -132,6 +134,7 @@ class FWStoryBlockManager(
 
 
   private fun createFragment(root: FrameLayout, reactNativeViewId: Int?) {
+    FWLogUtils.d { "FWStoryBlockManager createFragment, reactNativeViewId = $reactNativeViewId" }
     reactNativeViewId ?: return
     val activity = (reactContext.currentActivity as AppCompatActivity?) ?: return
 
@@ -146,43 +149,37 @@ class FWStoryBlockManager(
     val fireworkPlayerFragment = FireworkPlayerFragment()
     this.fireworkPlayerFragment = fireworkPlayerFragment
 
-    FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach before" }
-    parentView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-      override fun onViewAttachedToWindow(v: View?) {
-        FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach" }
-//      Log.e("isAttachedToWindow", parentView.isAttachedToWindow.toString())
-        activity.supportFragmentManager
-          .beginTransaction()
-          .replace(reactNativeViewId, fireworkPlayerFragment, reactNativeViewId.toString())
-          .commitNow()
-        parentView.requestLayout()
-//      Log.e("isAttachedToWindow", fireworkPlayerFragment.isAdded.toString())
-        setStoryBlockParameters()
-      }
-
-      override fun onViewDetachedFromWindow(v: View?) {
+    FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach before, fireworkPlayerFragment.isAdded = ${fireworkPlayerFragment.isAdded},  parentView.isAttachedToWindow = ${parentView.isAttachedToWindow}" }
+    if (parentView.isAttachedToWindow) {
+      if (fireworkPlayerFragment.isAdded) {
+        return
       }
+      activity.supportFragmentManager
+        .beginTransaction()
+        .replace(reactNativeViewId, fireworkPlayerFragment, reactNativeViewId.toString())
+        .commitNow()
+      parentView.requestLayout()
+      setStoryBlockParameters()
+    } else {
+      parentView.addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
+        override fun onViewAttachedToWindow(v: View?) {
+          FWLogUtils.d { "FWStoryBlockManager createFragment doOnAttach" }
+          if (fireworkPlayerFragment.isAdded) {
+            return
+          }
+          activity.supportFragmentManager
+            .beginTransaction()
+            .replace(reactNativeViewId, fireworkPlayerFragment, reactNativeViewId.toString())
+            .commitNow()
+          parentView.requestLayout()
+          setStoryBlockParameters()
+        }
 
-    })
-
-//    activity.lifecycleScope.launch {
-////      withContext(Dispatchers.Default) {
-////        while (!FwSDK.initialized) {
-////          delay(2000)
-////        }
-////      }
-//
-//      withContext(Dispatchers.Main) {
-//        if(FwSDK.initialized) {
-//          delay(2000)
-//          Log.e("isAttachedToWindow", parentView.isAttachedToWindow.toString())
-////          FeedFactory.getVideoFeed(13, FeedType.DISCOVER, null, null)
-//          fireworkPlayerFragment.setStoryBlockParameters(FeedType.DISCOVER)
-////          fireworkPlayerFragment.setParameters(13, null)
-//        }
-//      }
-//    }
+        override fun onViewDetachedFromWindow(v: View?) {
+        }
 
+      })
+    }
   }
 
   private fun addStoryBlockListener(reactContext: ReactApplicationContext) {

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

@@ -1,11 +1,15 @@
 package com.fireworksdk.bridge.reactnative.module
 
 import android.app.Activity
+import androidx.appcompat.app.AppCompatActivity
 import com.facebook.react.bridge.*
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.reactnative.models.FWNavigatorInterface
 import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
 import com.fireworksdk.bridge.utils.FWLogUtils
+import com.loopnow.fireworklibrary.baya.ProductListFragment
+import com.loopnow.fireworklibrary.views.BaseVideoViewFragment
+import com.loopnow.fireworklibrary.views.FireworkPlayerFragment
 
 
 class FWNavigatorModule(
@@ -28,6 +32,7 @@ class FWNavigatorModule(
     }
 
     if (isTaskRoot(activity)) {
+      closeDialog(activity)
       promise.resolve(false)
       return
     }
@@ -69,6 +74,36 @@ class FWNavigatorModule(
     return false
   }
 
+  private fun closeDialog(activity: Activity) {
+    // close ProductListFragment
+    if (activity is AppCompatActivity) {
+      val fragmentList = activity.supportFragmentManager.fragments
+      if (fragmentList.isEmpty()) {
+        return
+      }
+      for (fragment in fragmentList) {
+        if (fragment !is FireworkPlayerFragment) {
+          continue
+        }
+        val childFragmentList = fragment.childFragmentManager.fragments
+        for (childFragment in childFragmentList) {
+          if (childFragment !is BaseVideoViewFragment<*>) {
+            continue
+          }
+          val list = childFragment.childFragmentManager.fragments
+          for (f in list) {
+            if (f !is ProductListFragment) {
+              continue
+            }
+            if (f.isAdded) {
+              f.dismiss()
+            }
+          }
+        }
+      }
+    }
+  }
+
   override fun getName(): String {
     return "FWNavigatorModule"
   }

package/ios/Modules/FWNavigatorModule/FWNavigatorModule.swift

@@ -104,6 +104,24 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
         }
     }
 
+    func getCloseButton(view: UIView) -> UIButton? {
+        if let button = view as? UIButton, let targetImage = button.image(for: .normal) {
+            let iOSSDKBundle = Bundle(for: FireworkVideoSDK.self)
+            if targetImage.isEqual(UIImage(named: "closeX", in: iOSSDKBundle, compatibleWith: nil))
+                || targetImage.isEqual(UIImage(named: "down-arrow-light", in: iOSSDKBundle, compatibleWith: nil)) {
+                return button
+            }
+        }
+
+        for subview in view.subviews {
+            if let result = getCloseButton(view: subview) {
+                return result
+            }
+        }
+
+        return nil
+    }
+
     // swiftlint:enable function_body_length
 
     @objc(popNativeContainer:rejecter:)
@@ -124,22 +142,36 @@ class FWNavigatorModule: RCTEventEmitter, FWNavigator {
             } else if let presentedVC = RCTPresentedViewController(),
                 let presentingVC = presentedVC.presentingViewController,
                 presentingVC.presentingViewController == RCTKeyWindow()?.rootViewController {
-                NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
-                FWNavigatorUtils.shared.shouldDisablePlay = true
+                let closeButton = self.getCloseButton(view: presentingVC.view)
+                if closeButton == nil {
+                    FWNavigatorUtils.shared.shouldDisablePlay = true
+                }
                 presentedVC.dismiss(animated: false) {
                     DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.1) {
-                        presentingVC.dismiss(animated: true) {
-                            NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
+                        FWNavigatorUtils.shared.shouldDisablePlay = false
+                        if closeButton != nil {
+                            closeButton!.sendActions(for: .touchUpInside)
                             resolver(true)
-                            FWNavigatorUtils.shared.shouldDisablePlay = false
+                        } else {
+                            NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
+                            presentingVC.dismiss(animated: true) {
+                                NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
+                                resolver(true)
+                            }
                         }
                     }
                 }
-            } else if let rootVC = RCTKeyWindow()?.rootViewController, rootVC.presentedViewController != nil {
-                NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
-                rootVC.dismiss(animated: true) {
-                    NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
+            } else if let rootVC = RCTKeyWindow()?.rootViewController,
+                        let presentedVC = rootVC.presentedViewController {
+                if let closeButton = self.getCloseButton(view: presentedVC.view) {
+                    closeButton.sendActions(for: .touchUpInside)
                     resolver(true)
+                } else {
+                    NotificationCenter.default.post(name: gOnVideoTemporarilyReleasePipController, object: nil)
+                    presentedVC.dismiss(animated: true) {
+                        NotificationCenter.default.post(name: gOnVideoRestorePipController, object: nil)
+                        resolver(true)
+                    }
                 }
             } else {
                 resolver(false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firework-sdk",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Firework React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",