finish

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## THE CHANGELOG
 
+#### 3.1.2
+  - support 3.1.2 native sdk
+  - fix `RejoinChannelSuccess` bug
+
 #### 3.0.1
   - release version
 

android/src/main/java/io/agora/rtc/base/Annotations.java

@@ -789,4 +789,11 @@ public class Annotations {
     @Retention(RetentionPolicy.SOURCE)
     public @interface AgoraStreamPublishState {
     }
+
+    @IntDef({
+            Constants.RTMP_STREAMING_EVENT_FAILED_LOAD_IMAGE,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface AgoraRtmpStreamingEvent {
+    }
 }

android/src/main/java/io/agora/rtc/base/Extensions.kt

@@ -15,7 +15,8 @@ fun LocalAudioStats.toMap(): Map<String, Any?> {
     return hashMapOf(
             "numChannels" to numChannels,
             "sentSampleRate" to sentSampleRate,
-            "sentBitrate" to sentBitrate
+            "sentBitrate" to sentBitrate,
+            "txPacketLossRate" to txPacketLossRate
     )
 }
 
@@ -68,7 +69,8 @@ fun RemoteAudioStats.toMap(): Map<String, Any?> {
             "receivedBitrate" to receivedBitrate,
             "totalFrozenTime" to totalFrozenTime,
             "frozenRate" to frozenRate,
-            "totalActiveTime" to totalActiveTime
+            "totalActiveTime" to totalActiveTime,
+            "publishDuration" to publishDuration
     )
 }
 
@@ -85,7 +87,9 @@ fun LocalVideoStats.toMap(): Map<String, Any?> {
             "encodedFrameWidth" to encodedFrameWidth,
             "encodedFrameHeight" to encodedFrameHeight,
             "encodedFrameCount" to encodedFrameCount,
-            "codecType" to codecType
+            "codecType" to codecType,
+            "txPacketLossRate" to txPacketLossRate,
+            "captureFrameRate" to captureFrameRate
     )
 }
 
@@ -102,7 +106,8 @@ fun RemoteVideoStats.toMap(): Map<String, Any?> {
             "rxStreamType" to rxStreamType,
             "totalFrozenTime" to totalFrozenTime,
             "frozenRate" to frozenRate,
-            "totalActiveTime" to totalActiveTime
+            "totalActiveTime" to totalActiveTime,
+            "publishDuration" to publishDuration
     )
 }
 

android/src/main/java/io/agora/rtc/base/RtcChannel.kt

@@ -7,7 +7,7 @@ import io.agora.rtc.RtcEngine
 import io.agora.rtc.internal.EncryptionConfig
 import java.util.*
 
-class RtcChannelInterface {
+class IRtcChannel {
     interface RtcChannelInterface : RtcAudioInterface, RtcVideoInterface, RtcVoicePositionInterface,
             RtcPublishStreamInterface, RtcMediaRelayInterface, RtcDualStreamInterface,
             RtcFallbackInterface, RtcMediaMetadataInterface, RtcEncryptionInterface,
@@ -116,7 +116,7 @@ class RtcChannelInterface {
 
 class RtcChannelManager(
         private val emit: (methodName: String, data: Map<String, Any?>?) -> Unit
-) : RtcChannelInterface.RtcChannelInterface {
+) : IRtcChannel.RtcChannelInterface {
     private val rtcChannelMap = Collections.synchronizedMap(mutableMapOf<String, RtcChannel>())
     private val mediaObserverMap = Collections.synchronizedMap(mutableMapOf<String, MediaObserver>())
 
@@ -315,12 +315,16 @@ class RtcChannelManager(
     override fun createDataStream(params: Map<String, *>, callback: Callback) {
         var code = -Constants.ERR_NOT_INITIALIZED
         this[params["channelId"] as String]?.let {
-            code= it.createDataStream(reliable, ordered)
+            code = it.createDataStream(params["reliable"] as Boolean, params["ordered"] as Boolean)
         }
-        callback.code(manager.createDataStream(channelId, reliable, ordered)) { it }
+        callback.code(code) { it }
     }
 
     override fun sendStreamMessage(params: Map<String, *>, callback: Callback) {
-        callback.code(manager.sendStreamMessage(channelId, streamId, message))
+        var code = -Constants.ERR_NOT_INITIALIZED
+        this[params["channelId"] as String]?.let {
+            code = it.sendStreamMessage((params["streamId"] as Number).toInt(), (params["message"] as String).toByteArray())
+        }
+        callback.code(code)
     }
 }

android/src/main/java/io/agora/rtc/base/RtcChannelEvent.kt

@@ -110,11 +110,11 @@ class RtcChannelEventHandler(
     }
 
     override fun onJoinChannelSuccess(rtcChannel: RtcChannel?, uid: Int, elapsed: Int) {
-        callback(RtcChannelEvents.JoinChannelSuccess, rtcChannel, rtcChannel.channelId(), uid, elapsed)
+        callback(RtcChannelEvents.JoinChannelSuccess, rtcChannel, rtcChannel?.channelId(), uid, elapsed)
     }
 
     override fun onRejoinChannelSuccess(rtcChannel: RtcChannel?, uid: Int, elapsed: Int) {
-        callback(RtcChannelEvents.RejoinChannelSuccess, rtcChannel, rtcChannel.channelId(), uid, elapsed)
+        callback(RtcChannelEvents.RejoinChannelSuccess, rtcChannel, rtcChannel?.channelId(), uid, elapsed)
     }
 
     override fun onLeaveChannel(rtcChannel: RtcChannel?, stats: IRtcEngineEventHandler.RtcStats?) {
@@ -218,22 +218,22 @@ class RtcChannelEventHandler(
     }
 
     override fun onAudioPublishStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraStreamPublishState oldState: Int, @Annotations.AgoraStreamPublishState newState: Int, elapseSinceLastState: Int) {
-        callback(RtcChannelEvents.AudioPublishStateChanged, rtcChannel, rtcChannel.channelId(), oldState, newState, elapseSinceLastState)
+        callback(RtcChannelEvents.AudioPublishStateChanged, rtcChannel, rtcChannel?.channelId(), oldState, newState, elapseSinceLastState)
     }
 
     override fun onVideoPublishStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraStreamPublishState oldState: Int, @Annotations.AgoraStreamPublishState newState: Int, elapseSinceLastState: Int) {
-        callback(RtcChannelEvents.VideoPublishStateChanged, rtcChannel, rtcChannel.channelId(), oldState, newState, elapseSinceLastState)
+        callback(RtcChannelEvents.VideoPublishStateChanged, rtcChannel, rtcChannel?.channelId(), oldState, newState, elapseSinceLastState)
     }
 
     override fun onAudioSubscribeStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraStreamSubscribeState oldState: Int, @Annotations.AgoraStreamSubscribeState newState: Int, elapseSinceLastState: Int) {
-        callback(RtcChannelEvents.AudioSubscribeStateChanged, rtcChannel, rtcChannel.channelId(), uid, oldState, newState, elapseSinceLastState)
+        callback(RtcChannelEvents.AudioSubscribeStateChanged, rtcChannel, rtcChannel?.channelId(), uid, oldState, newState, elapseSinceLastState)
     }
 
     override fun onVideoSubscribeStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraStreamSubscribeState oldState: Int, @Annotations.AgoraStreamSubscribeState newState: Int, elapseSinceLastState: Int) {
-        callback(RtcChannelEvents.VideoSubscribeStateChanged, rtcChannel, rtcChannel.channelId(), uid, oldState, newState, elapseSinceLastState)
+        callback(RtcChannelEvents.VideoSubscribeStateChanged, rtcChannel, rtcChannel?.channelId(), uid, oldState, newState, elapseSinceLastState)
     }
 
-    override fun onRtmpStreamingEvent(rtcChannel: RtcChannel?, url: String?, errCode: Int) {
+    override fun onRtmpStreamingEvent(rtcChannel: RtcChannel?, url: String?, @Annotations.AgoraRtmpStreamingEvent errCode: Int) {
         callback(RtcChannelEvents.RtmpStreamingEvent, rtcChannel, url, errCode)
     }
 }

android/src/main/java/io/agora/rtc/base/RtcEngine.kt

@@ -5,7 +5,7 @@ import io.agora.rtc.*
 import io.agora.rtc.internal.EncryptionConfig
 import io.agora.rtc.models.UserInfo
 
-class RtcEngineInterface {
+class IRtcEngine {
     interface RtcEngineInterface : RtcUserInfoInterface, RtcAudioInterface, RtcVideoInterface,
             RtcAudioMixingInterface, RtcAudioEffectInterface, RtcVoiceChangerInterface,
             RtcVoicePositionInterface, RtcPublishStreamInterface, RtcMediaRelayInterface,
@@ -316,7 +316,7 @@ class RtcEngineInterface {
 
 class RtcEngineManager(
         private val emit: (methodName: String, data: Map<String, Any?>?) -> Unit
-) : RtcEngineInterface.RtcEngineInterface {
+) : IRtcEngine.RtcEngineInterface {
     var engine: RtcEngine? = null
         private set
     private var mediaObserver: MediaObserver? = null

android/src/main/java/io/agora/rtc/base/RtcEngineEvent.kt

@@ -509,7 +509,7 @@ class RtcEngineEventHandler(
         callback(RtcEngineEvents.VideoSubscribeStateChanged, channel, uid, oldState, newState, elapseSinceLastState)
     }
 
-    override fun onRtmpStreamingEvent(url: String?, error: Int) {
+    override fun onRtmpStreamingEvent(url: String?, @Annotations.AgoraRtmpStreamingEvent error: Int) {
         callback(RtcEngineEvents.RtmpStreamingEvent, url, error)
     }
 }

android/src/main/java/io/agora/rtc/react/RCTAgoraRtcChannelModule.kt

@@ -5,8 +5,11 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import io.agora.rtc.RtcChannel
 import io.agora.rtc.RtcEngine
-import io.agora.rtc.base.*
+import io.agora.rtc.base.RtcChannelEventHandler
+import io.agora.rtc.base.RtcChannelManager
 import io.agora.rtc.react.RCTAgoraRtcChannelModule.Companion.REACT_CLASS
+import kotlin.reflect.full.declaredMemberFunctions
+import kotlin.reflect.jvm.javaMethod
 
 @ReactModule(name = REACT_CLASS)
 class RCTAgoraRtcChannelModule(
@@ -16,7 +19,7 @@ class RCTAgoraRtcChannelModule(
         const val REACT_CLASS = "RCTAgoraRtcChannelModule"
     }
 
-    private val manager = RtcChannelManager()
+    private val manager = RtcChannelManager { methodName, data -> emit(methodName, data) }
 
     override fun getName(): String {
         return REACT_CLASS
@@ -46,5 +49,23 @@ class RCTAgoraRtcChannelModule(
         return manager[channelId]
     }
 
-
+    @ReactMethod
+    fun callMethod(methodName: String, params: ReadableMap?, callback: Promise?) {
+        manager::class.declaredMemberFunctions.find { it.name == methodName }?.let { function ->
+            function.javaMethod?.let { method ->
+                try {
+                    val parameters = mutableListOf<Any?>()
+                    params?.toHashMap()?.toMutableMap()?.let {
+                        if (methodName == "create") {
+                            it["engine"] = engine()
+                        }
+                        parameters.add(it)
+                    }
+                    method.invoke(manager, *parameters.toTypedArray(), PromiseCallback(callback))
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
 }

ios/RCTAgora/Base/Extensions.swift

@@ -23,7 +23,8 @@ extension AgoraRtcLocalAudioStats {
         return [
             "numChannels": numChannels,
             "sentSampleRate": sentSampleRate,
-            "sentBitrate": sentBitrate
+            "sentBitrate": sentBitrate,
+            "txPacketLossRate": txPacketLossRate
         ]
     }
 }
@@ -82,7 +83,8 @@ extension AgoraRtcRemoteAudioStats {
             "receivedBitrate": receivedBitrate,
             "totalFrozenTime": totalFrozenTime,
             "frozenRate": frozenRate,
-            "totalActiveTime": totalActiveTime
+            "totalActiveTime": totalActiveTime,
+            "publishDuration": publishDuration
         ]
     }
 }
@@ -101,7 +103,9 @@ extension AgoraRtcLocalVideoStats {
             "encodedFrameWidth": encodedFrameWidth,
             "encodedFrameHeight": encodedFrameHeight,
             "encodedFrameCount": encodedFrameCount,
-            "codecType": codecType.rawValue
+            "codecType": codecType.rawValue,
+            "txPacketLossRate": txPacketLossRate,
+            "captureFrameRate": captureFrameRate
         ]
     }
 }
@@ -120,7 +124,8 @@ extension AgoraRtcRemoteVideoStats {
             "rxStreamType": rxStreamType.rawValue,
             "totalFrozenTime": totalFrozenTime,
             "frozenRate": frozenRate,
-            "totalActiveTime": totalActiveTime
+            "totalActiveTime": totalActiveTime,
+            "publishDuration": publishDuration
         ]
     }
 }

ios/RCTAgora/React/RCTAgoraRtcChannelModule.swift

@@ -73,6 +73,9 @@ class RCTAgoraRtcChannelModule: RCTEventEmitter {
 
     @objc func callMethod(_ methodName: String, _ params: NSDictionary?, _ resolve: RCTPromiseResolveBlock?, _ reject: RCTPromiseRejectBlock?) {
         if let `params` = params {
+            if methodName == "create" {
+                params.setValue(engine(), forKey: "engine")
+            }
             manager.perform(NSSelectorFromString(methodName + "::"), with: params, with: PromiseCallback(resolve, reject))
         } else {
             manager.perform(NSSelectorFromString(methodName + ":"), with: PromiseCallback(resolve, reject))

ios/RCTAgora/React/RCTAgoraRtcChannelModuleBridge.m

@@ -11,6 +11,7 @@
 
 @interface RCT_EXTERN_MODULE(RCTAgoraRtcChannelModule, NSObject)
 
-RCT_EXTERN_METHOD(callMethod:(NSString *) methodName :(NSDictionary *) params :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(callMethod:
+    (NSString *) methodName :(NSDictionary *) params :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 
 @end

ios/RCTAgora/React/RCTAgoraRtcEngineModuleBridge.m

@@ -11,6 +11,7 @@
 
 @interface RCT_EXTERN_MODULE(RCTAgoraRtcEngineModule, NSObject)
 
-RCT_EXTERN_METHOD(callMethod:(NSString *) methodName :(NSDictionary *) params :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
+RCT_EXTERN_METHOD(callMethod:
+    (NSString *) methodName :(NSDictionary *) params :(RCTPromiseResolveBlock) resolve :(RCTPromiseRejectBlock) reject)
 
 @end

ios/RCTAgora/React/RCTAgoraRtcSurfaceViewManager.swift

@@ -42,7 +42,7 @@ class RtcView: RtcSurfaceView {
 
     deinit {
         // if let engine = getEngine?() {
-        // resetVideoCanvas(engine)
+            // resetVideoCanvas(engine)
         // }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-agora",
-  "version": "3.0.1",
+  "version": "3.1.2",
   "description": "React Native around the Agora RTC SDKs for Android and iOS agora",
   "summary": "agora native sdk for react-native",
   "main": "lib/index.js",

react-native-agora.podspec

@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
     s.source         = { :git => package["repository"]["url"] }
     s.source_files   = 'ios/RCTAgora/**/*.{h,m,swift}'
 
-    s.dependency 'React-Core'
-    s.dependency "AgoraRtcEngine_iOS_Crypto", "3.0.1.1"
+    s.dependency 'React'
+    s.dependency "AgoraRtcEngine_iOS_Crypto", "3.1.2"
 end