fix: MetadataReceived event parameters bug

AgoraIO-Extensions · Dec 18, 2020 · bda6ec0 · bda6ec0
1 parent dbeb8ef
commit bda6ec0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/android/src/main/java/io/agora/rtc/base/Callback.kt b/android/src/main/java/io/agora/rtc/base/Callback.kt
@@ -5,7 +5,7 @@ import io.agora.rtc.RtcEngine
 import kotlin.math.abs
 
 abstract class Callback {
-  fun code(code: Int?, runnable: ((Int) -> Any?)? = null) {
+  fun code(code: Int?, runnable: ((Int?) -> Any?)? = null) {
     if (code == null || code < 0) {
       val newCode = abs(code ?: Constants.ERR_NOT_INITIALIZED)
       failure(newCode.toString(), RtcEngine.getErrorDescription(newCode))

diff --git a/android/src/main/java/io/agora/rtc/base/MediaObserver.kt b/android/src/main/java/io/agora/rtc/base/MediaObserver.kt
@@ -32,9 +32,7 @@ class MediaObserver(
 
   override fun onMetadataReceived(buffer: ByteArray, uid: Int, timeStampMs: Long) {
     emit(hashMapOf(
-      "buffer" to String(buffer),
-      "uid" to uid,
-      "timeStampMs" to timeStampMs
+      "data" to arrayListOf(String(buffer), uid, timeStampMs)
     ))
   }
 }
diff --git a/ios/RCTAgora/Base/Callback.swift b/ios/RCTAgora/Base/Callback.swift
@@ -17,14 +17,14 @@ protocol Callback: class {
 }
 
 extension Callback {
-    func code(_ code: Int32?, _ runnable: ((Int32) -> Any?)? = nil) {
+    func code(_ code: Int32?, _ runnable: ((Int32?) -> Any?)? = nil) {
         if code == nil || code! < 0 {
             let newCode = abs(Int(code ?? Int32(AgoraErrorCode.notInitialized.rawValue)))
             failure(String(newCode), AgoraRtcEngineKit.getErrorDescription(newCode) ?? "")
             return
         }
 
-        let res = runnable?(code!)
+        let res = runnable?(code)
         if res is Void {
             success(nil)
         } else {

diff --git a/ios/RCTAgora/Base/MediaObserver.swift b/ios/RCTAgora/Base/MediaObserver.swift
@@ -43,9 +43,7 @@ extension MediaObserver: AgoraMediaMetadataDataSource {
 extension MediaObserver: AgoraMediaMetadataDelegate {
     func receiveMetadata(_ data: Data, fromUser uid: Int, atTimestamp timestamp: TimeInterval) {
         emitter([
-            "buffer": String(data: data, encoding: .utf8),
-            "uid": uid,
-            "timeStampMs": timestamp
+            "data": [String(data: data, encoding: .utf8) ?? "", uid, timestamp]
         ])
     }
 }