fix: Android setData error

AgoraIO-Extensions · Oct 22, 2020 · 69a7a96 · 69a7a96
1 parent c08be4d
commit 69a7a96
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcSurfaceViewManager.kt b/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcSurfaceViewManager.kt
@@ -41,8 +41,10 @@ class RCTAgoraRtcSurfaceViewManager : SimpleViewManager<RtcSurfaceView>() {
 
     @ReactProp(name = "data")
     fun setData(view: RtcSurfaceView, data: ReadableMap) {
-        val channel = data.getString("channelId")?.let { getChannel(it) }
-        getEngine()?.let { view.setData(it, channel, data.getInt("uid")) }
+        data.toHashMap().let { map ->
+            val channel = (map["channelId"] as? String)?.let { getChannel(it) }
+            getEngine()?.let { view.setData(it, channel, (map["uid"] as Number).toInt()) }
+        }
     }
 
     @ReactProp(name = "renderMode")

diff --git a/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcTextureViewManager.kt b/android/src/main/java/io/agora/rtc/react/RCTAgoraRtcTextureViewManager.kt
@@ -31,8 +31,10 @@ class RCTAgoraRtcTextureViewManager : SimpleViewManager<RtcTextureView>() {
 
     @ReactProp(name = "data")
     fun setData(view: RtcTextureView, data: ReadableMap) {
-        val channel = data.getString("channelId")?.let { getChannel(it) }
-        getEngine()?.let { view.setData(it, channel, data.getInt("uid")) }
+        data.toHashMap().let { map ->
+            val channel = (map["channelId"] as? String)?.let { getChannel(it) }
+            getEngine()?.let { view.setData(it, channel, (map["uid"] as Number).toInt()) }
+        }
     }
 
     @ReactProp(name = "renderMode")

diff --git a/src/common/RtcRenderView.native.tsx b/src/common/RtcRenderView.native.tsx
@@ -91,7 +91,7 @@ export class RtcSurfaceView extends Component<
   {}
 > {
   render() {
-    const { channelId = undefined, uid, ...others } = this.props;
+    const { channelId, uid, ...others } = this.props;
     return (
       <RCTRtcSurfaceView
         key={`surface-${channelId}-${uid}`}
@@ -117,7 +117,7 @@ export class RtcTextureView extends Component<
   {}
 > {
   render() {
-    const { channelId = undefined, uid, ...others } = this.props;
+    const { channelId, uid, ...others } = this.props;
     return (
       <RCTRtcTextureView
         key={`texture-${channelId}-${uid}`}