@100mslive/react-native-hms 1.9.0 → 1.9.1-beta.0

package/android/src/main/java/com/reactnativehmssdk/HMSView.kt

@@ -43,16 +43,36 @@ class HMSView(context: ReactContext) : FrameLayout(context) {
           newHeight: Int,
         ) {
           super.onResolutionChange(newWidth, newHeight)
-          if (!jsCanApplyStyles) {
-            val event: WritableMap = Arguments.createMap()
-            context.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
-            jsCanApplyStyles = true
+
+          videoTrack?.let { nonnullVideoTrack ->
+            // emit when source is screen or `jsCanApplyStyles` is `false`
+            if (nonnullVideoTrack.source == "screen" || !jsCanApplyStyles) {
+              jsCanApplyStyles = true
+
+              val data = Arguments.createMap()
+              data.putInt("width", newWidth)
+              data.putInt("height", newHeight)
+
+              sendEventToJS("ON_RESOLUTION_CHANGE_EVENT", data)
+            }
           }
         }
       },
     )
   }
 
+  private fun sendEventToJS(
+    eventName: String,
+    data: WritableMap,
+  ) {
+    val event: WritableMap = Arguments.createMap()
+    event.putString("event", eventName)
+    event.putMap("data", data)
+
+    val reactContext = context as ReactContext
+    reactContext.getJSModule(RCTEventEmitter::class.java).receiveEvent(id, "topChange", event)
+  }
+
   @RequiresApi(Build.VERSION_CODES.N)
   fun captureHmsView(args: ReadableArray?) {
     hmsVideoView?.let {

package/android/src/main/java/com/reactnativehmssdk/HmsScreenshareActivity.kt

@@ -27,7 +27,7 @@ class HmsScreenshareActivity : ComponentActivity() {
 
             override fun onSuccess() {
               HMSManager.hmsCollection[id]?.screenshareCallback?.resolve(
-                HMSManager.hmsCollection[id]?.emitHMSSuccess(),
+                HMSManager.hmsCollection[id]?.getPromiseResolveData(),
               )
               finish()
             }

package/ios/HMSHLSPlayerManager.swift

@@ -308,18 +308,31 @@ class HMSHLSPlayer: UIView {
         sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_FAILURE_EVENT, data)
     }
 
-    fileprivate func onPlaybackStateChanged(state: HMSHLSPlaybackState? = nil, videoSizeChanged: Bool = false, aspectRatio: Double? = nil) {
+    fileprivate func onPlaybackStateChanged(state: HMSHLSPlaybackState) {
         guard onHmsHlsPlaybackEvent != nil else { return }
 
         var data = [String: Any]()
 
-        data["state"] = videoSizeChanged ? "onVideoSizeChanged" : state?.description
+        data["state"] = state.description
 
-        if let aspectRatio = aspectRatio {
-            data["aspectRatio"] = aspectRatio
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+    }
+
+    fileprivate func onResolutionChanged(videoSize: CGSize) {
+        if videoSize.width >= videoSize.height {
+            hmsHLSPlayerViewController?.videoGravity = .resizeAspect
+        } else {
+            hmsHLSPlayerViewController?.videoGravity = .resizeAspectFill
         }
 
-        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_STATE_CHANGE_EVENT, data)
+        guard onHmsHlsPlaybackEvent != nil else { return }
+
+        var data = [String: Any]()
+
+        data["width"] = videoSize.width
+        data["height"] = videoSize.height
+
+        sendHLSPlaybackEventToJS(HMSHLSPlayerConstants.ON_PLAYBACK_RESOLUTION_CHANGE_EVENT, data)
     }
 }
 
@@ -343,12 +356,7 @@ class HLSPlaybackEventController: HMSHLSPlayerDelegate {
     }
 
     func onResolutionChanged(videoSize: CGSize) {
-        if videoSize.width >= videoSize.height {
-            hmsHlsPlayerDelegate?.hmsHLSPlayerViewController?.videoGravity = .resizeAspect
-        } else {
-            hmsHlsPlayerDelegate?.hmsHLSPlayerViewController?.videoGravity = .resizeAspectFill
-        }
-        hmsHlsPlayerDelegate?.onPlaybackStateChanged(videoSizeChanged: true, aspectRatio: videoSize.width/videoSize.height)
+        hmsHlsPlayerDelegate?.onResolutionChanged(videoSize: videoSize)
     }
 }
 
@@ -357,6 +365,7 @@ enum HMSHLSPlayerConstants {
     static let ON_PLAYBACK_CUE_EVENT = "ON_PLAYBACK_CUE_EVENT"
     static let ON_PLAYBACK_FAILURE_EVENT = "ON_PLAYBACK_FAILURE_EVENT"
     static let ON_PLAYBACK_STATE_CHANGE_EVENT = "ON_PLAYBACK_STATE_CHANGE_EVENT"
+    static let ON_PLAYBACK_RESOLUTION_CHANGE_EVENT = "ON_PLAYBACK_RESOLUTION_CHANGE_EVENT"
 
     // HLS Playback Stats Events
     static let ON_STATS_EVENT_UPDATE = "ON_STATS_EVENT_UPDATE"

package/ios/HMSManager.m

@@ -12,8 +12,14 @@ RCT_EXTERN_METHOD(previewForRole
 RCT_EXTERN_METHOD(cancelPreview : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(setLocalMute : (NSDictionary)isMute)
-RCT_EXTERN_METHOD(setLocalVideoMute : (NSDictionary)isMute)
+RCT_EXTERN_METHOD(setLocalMute
+                  : (NSDictionary)isMute
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(setLocalVideoMute
+                  : (NSDictionary)isMute
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(sendBroadcastMessage
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -26,7 +32,10 @@ RCT_EXTERN_METHOD(sendDirectMessage
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(setPlaybackAllowed : (NSDictionary)data)
+RCT_EXTERN_METHOD(setPlaybackAllowed
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(removePeer
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -54,7 +63,10 @@ RCT_EXTERN_METHOD(getRoom
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(switchCamera : (NSDictionary)data)
-RCT_EXTERN_METHOD(setVolume : (NSDictionary)data)
+RCT_EXTERN_METHOD(setVolume
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(build
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -63,7 +75,10 @@ RCT_EXTERN_METHOD(leave
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(setPlaybackForAllAudio : (NSDictionary)mute)
+RCT_EXTERN_METHOD(setPlaybackForAllAudio
+                  : (NSDictionary)mute
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(remoteMuteAllAudio
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -132,10 +147,22 @@ RCT_EXTERN_METHOD(playAudioShare
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(setAudioShareVolume : (NSDictionary)data)
-RCT_EXTERN_METHOD(stopAudioShare : (NSDictionary)data)
-RCT_EXTERN_METHOD(resumeAudioShare : (NSDictionary)data)
-RCT_EXTERN_METHOD(pauseAudioShare : (NSDictionary)data)
+RCT_EXTERN_METHOD(setAudioShareVolume
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(stopAudioShare
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(resumeAudioShare
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(pauseAudioShare
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(audioShareIsPlaying
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
@@ -182,7 +209,10 @@ RCT_EXTERN_METHOD(disableEvent
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(restrictData : (NSDictionary)data)
+RCT_EXTERN_METHOD(restrictData
+                  : (NSDictionary)data
+                  : (RCTPromiseResolveBlock)resolve
+                  : (RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(getAuthTokenByRoomCode
                   : (NSDictionary)data
                   : (RCTPromiseResolveBlock)resolve

package/ios/HMSManager.swift

@@ -125,17 +125,17 @@ class HMSManager: RCTEventEmitter {
     // MARK: - Audio & Video Actions
 
     @objc
-    func setLocalMute(_ data: NSDictionary) {
+    func setLocalMute(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setLocalMute(data)
+        hms?.setLocalMute(data, resolve, reject)
     }
 
     @objc
-    func setLocalVideoMute(_ data: NSDictionary) {
+    func setLocalVideoMute(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setLocalVideoMute(data)
+        hms?.setLocalVideoMute(data, resolve, reject)
     }
 
     @objc
@@ -157,10 +157,10 @@ class HMSManager: RCTEventEmitter {
     }
 
     @objc
-    func setPlaybackAllowed(_ data: NSDictionary) {
+    func setPlaybackAllowed(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setPlaybackAllowed(data)
+        hms?.setPlaybackAllowed(data, resolve, reject)
     }
 
     @objc
@@ -171,10 +171,10 @@ class HMSManager: RCTEventEmitter {
     }
 
     @objc
-    func setPlaybackForAllAudio(_ data: NSDictionary) {
+    func setPlaybackForAllAudio(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setPlaybackForAllAudio(data)
+        hms?.setPlaybackForAllAudio(data, resolve, reject)
     }
 
     @objc
@@ -185,10 +185,10 @@ class HMSManager: RCTEventEmitter {
     }
 
     @objc
-    func setVolume(_ data: NSDictionary) {
+    func setVolume(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setVolume(data)
+        hms?.setVolume(data, resolve, reject)
     }
 
     @objc
@@ -398,31 +398,31 @@ class HMSManager: RCTEventEmitter {
     }
 
     @objc
-    func setAudioShareVolume(_ data: NSDictionary) {
+    func setAudioShareVolume(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.setAudioShareVolume(data)
+        hms?.setAudioShareVolume(data, resolve, reject)
     }
 
     @objc
-    func stopAudioShare(_ data: NSDictionary) {
+    func stopAudioShare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.stopAudioShare(data)
+        hms?.stopAudioShare(data, resolve, reject)
     }
 
     @objc
-    func resumeAudioShare(_ data: NSDictionary) {
+    func resumeAudioShare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.resumeAudioShare(data)
+        hms?.resumeAudioShare(data, resolve, reject)
     }
 
     @objc
-    func pauseAudioShare(_ data: NSDictionary) {
+    func pauseAudioShare(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.pauseAudioShare(data)
+        hms?.pauseAudioShare(data, resolve, reject)
     }
 
     @objc
@@ -497,10 +497,10 @@ class HMSManager: RCTEventEmitter {
     // MARK: - Restrict sending whole HMSRole object
 
     @objc
-    func restrictData(_ data: NSDictionary) {
+    func restrictData(_ data: NSDictionary, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         let hms = HMSHelper.getHms(data, hmsCollection)
 
-        hms?.restrictData(data)
+        hms?.restrictData(data, resolve, reject)
     }
 
     // MARK: - Room Code Auth Token API