merge: dev/3.2.0

AgoraIO-Extensions · Dec 18, 2020 · 8c147a8 · 8c147a8
2 parents 432b088 + de52ca6
commit 8c147a8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/android/src/main/java/io/agora/rtc/base/.gitignore b/android/src/main/java/io/agora/rtc/base/.gitignore
@@ -0,0 +1 @@
+.idea/
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/android/src/main/java/io/agora/rtc/base/RtcSurfaceView.kt b/android/src/main/java/io/agora/rtc/base/RtcSurfaceView.kt
@@ -13,6 +13,8 @@ class RtcSurfaceView(
 ) : FrameLayout(context) {
   private var surface: SurfaceView
   private var canvas: VideoCanvas
+  private var isMediaOverlay = false
+  private var onTop = false
   private var channel: WeakReference<RtcChannel>? = null
 
   init {
@@ -26,6 +28,7 @@ class RtcSurfaceView(
   }
 
   fun setZOrderMediaOverlay(isMediaOverlay: Boolean) {
+    this.isMediaOverlay = isMediaOverlay
     try {
       removeView(surface)
       surface.setZOrderMediaOverlay(isMediaOverlay)
@@ -36,6 +39,7 @@ class RtcSurfaceView(
   }
 
   fun setZOrderOnTop(onTop: Boolean) {
+    this.onTop = onTop
     try {
       removeView(surface)
       surface.setZOrderOnTop(onTop)
@@ -62,6 +66,13 @@ class RtcSurfaceView(
   }
 
   private fun setupVideoCanvas(engine: RtcEngine) {
+    removeAllViews()
+    surface = RtcEngine.CreateRendererView(context.applicationContext)
+    surface.setZOrderMediaOverlay(isMediaOverlay)
+    surface.setZOrderOnTop(onTop)
+    addView(surface)
+    surface.layout(0, 0, width, height)
+    canvas.view = surface
     if (canvas.uid == 0) {
       engine.setupLocalVideo(canvas)
     } else {

diff --git a/android/src/main/java/io/agora/rtc/base/RtcTextureView.kt b/android/src/main/java/io/agora/rtc/base/RtcTextureView.kt
@@ -42,6 +42,11 @@ class RtcTextureView(
   }
 
   private fun setupVideoCanvas(engine: RtcEngine) {
+    removeAllViews()
+    texture = RtcEngine.CreateTextureView(context.applicationContext)
+    addView(texture)
+    texture.layout(0, 0, width, height)
+    canvas.view = texture
     if (canvas.uid == 0) {
       engine.setupLocalVideo(canvas)
     } else {