- add constructor for typescript

- fix Android `mapToChannelMediaInfo` crash - fix iOS `switchChannel` `sendMetadata` crash
AgoraIO-Extensions · Jul 9, 2020 · 93621d3 · 93621d3
1 parent d1d40f5
commit 93621d3
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 10 deletions.
diff --git a/BeanCovertor.kt b/BeanCovertor.kt
@@ -97,8 +97,8 @@ fun mapToLiveTranscoding(map: Map<*, *>): LiveTranscoding {
 
 fun mapToChannelMediaInfo(map: Map<*, *>): ChannelMediaInfo {
     return ChannelMediaInfo(
-            map["channelName"] as String,
-            map["token"] as String,
+            map["channelName"] as? String,
+            map["token"] as? String,
             (map["uid"] as Number).toInt()
     )
 }

diff --git a/Callback.kt b/Callback.kt
@@ -4,17 +4,38 @@ import io.agora.rtc.Constants
 import io.agora.rtc.RtcEngine
 import kotlin.math.abs
 
-abstract class Callback<T> {
-    fun code(code: Int?) {
-        val newCode = code ?: Constants.ERR_NOT_INITIALIZED
-        if (newCode == 0) {
+abstract class Callback {
+    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))
+            return
+        }
+
+        val res = if (runnable != null) runnable(code) else Unit
+        if (res is Unit) {
+            success(null)
+        } else {
+            success(res)
+        }
+    }
+
+    fun <T> resolve(source: T?, runnable: (T) -> Any?) {
+        if (source == null) {
+            val code = Constants.ERR_NOT_INITIALIZED
+            failure(code.toString(), RtcEngine.getErrorDescription(code))
+            return
+        }
+
+        val res = runnable(source)
+        if (res is Unit) {
             success(null)
-        } else if (newCode < 0) {
-            failure(newCode.toString(), RtcEngine.getErrorDescription(abs(newCode)))
+        } else {
+            success(res)
         }
     }
 
-    abstract fun success(data: T?)
+    abstract fun success(data: Any?)
 
     abstract fun failure(code: String, message: String)
 }
diff --git a/RtcChannel.kt b/RtcChannel.kt
@@ -110,6 +110,20 @@ class RtcChannelManager {
         return Constants.ERR_NOT_INITIALIZED
     }
 
+    fun createDataStream(channelId: String, reliable: Boolean, ordered: Boolean): Int {
+        this[channelId]?.let {
+            return@createDataStream it.createDataStream(reliable, ordered)
+        }
+        return Constants.ERR_NOT_INITIALIZED
+    }
+
+    fun sendStreamMessage(channelId: String, streamId: Int, message: String): Int {
+        this[channelId]?.let {
+            return@sendStreamMessage it.sendStreamMessage(streamId, message.toByteArray())
+        }
+        return Constants.ERR_NOT_INITIALIZED
+    }
+
     interface RtcAudioInterface<Callback> {
         fun adjustUserPlaybackSignalVolume(channelId: String, uid: Int, @IntRange(from = 0, to = 100) volume: Int, callback: Callback?)
 

diff --git a/RtcSurfaceView.kt b/RtcSurfaceView.kt
@@ -11,11 +11,17 @@ import java.lang.ref.WeakReference
 class RtcSurfaceView(
         context: Context
 ) : FrameLayout(context) {
-    private var surface: SurfaceView = RtcEngine.CreateRendererView(context)
+    private var surface: SurfaceView
     private var canvas: VideoCanvas
     private var channel: WeakReference<RtcChannel>? = null
 
     init {
+        try {
+            surface = RtcEngine.CreateRendererView(context)
+        } catch (e: UnsatisfiedLinkError) {
+            surface = SurfaceView(context)
+            e.printStackTrace()
+        }
         canvas = VideoCanvas(surface)
         addView(surface)
     }