fix(uid compatible): int to uint

android/build.gradle

@@ -127,7 +127,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
-  api 'com.github.agorabuilder:native-full-sdk:3.4.1'
+  api 'com.github.agorabuilder:native-full-sdk:3.4.1.1'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

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

@@ -55,7 +55,7 @@ fun mapToAgoraImage(map: Map<*, *>): AgoraImage {
 
 fun mapToTranscodingUser(map: Map<*, *>): TranscodingUser {
   return TranscodingUser().apply {
-    (map["uid"] as? Number)?.let { uid = it.toInt() }
+    map["uid"]?.toSDKUInt()?.let { uid = it }
     (map["x"] as? Number)?.let { x = it.toInt() }
     (map["y"] as? Number)?.let { y = it.toInt() }
     (map["width"] as? Number)?.let { width = it.toInt() }
@@ -105,7 +105,7 @@ fun mapToChannelMediaInfo(map: Map<*, *>): ChannelMediaInfo {
   return ChannelMediaInfo(
     map["channelName"] as? String,
     map["token"] as? String,
-    (map["uid"] as Number).toInt()
+    map["uid"]?.toSDKUInt()!!
   )
 }
 

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

@@ -6,7 +6,7 @@ import io.agora.rtc.models.UserInfo
 
 fun UserInfo.toMap(): Map<String, Any?> {
   return hashMapOf(
-    "uid" to uid,
+    "uid" to uid.toJSUInt(),
     "userAccount" to userAccount
   )
 }
@@ -59,7 +59,7 @@ fun Rect.toMap(): Map<String, Any?> {
 
 fun RemoteAudioStats.toMap(): Map<String, Any?> {
   return hashMapOf(
-    "uid" to uid,
+    "uid" to uid.toJSUInt(),
     "quality" to quality,
     "networkTransportDelay" to networkTransportDelay,
     "jitterBufferDelay" to jitterBufferDelay,
@@ -99,7 +99,7 @@ fun LocalVideoStats.toMap(): Map<String, Any?> {
 
 fun RemoteVideoStats.toMap(): Map<String, Any?> {
   return hashMapOf(
-    "uid" to uid,
+    "uid" to uid.toJSUInt(),
     "delay" to delay,
     "width" to width,
     "height" to height,
@@ -117,7 +117,7 @@ fun RemoteVideoStats.toMap(): Map<String, Any?> {
 
 fun AudioVolumeInfo.toMap(): Map<String, Any?> {
   return hashMapOf(
-    "uid" to uid,
+    "uid" to uid.toJSUInt(),
     "volume" to volume,
     "vad" to vad,
     "channelId" to channelId
@@ -158,3 +158,12 @@ fun AgoraFacePositionInfo.toMap(): Map<String, Any?> {
 fun Array<out AgoraFacePositionInfo>.toMapList(): List<Map<String, Any?>> {
   return List(size) { this[it].toMap() }
 }
+
+@ExperimentalUnsignedTypes
+fun Any.toSDKUInt(): Int? {
+  return (this as? Number)?.toLong()?.toUInt()?.toInt()
+}
+
+fun Int.toJSUInt(): Long {
+  return this.toUInt().toLong();
+}

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

@@ -32,7 +32,7 @@ class MediaObserver(
 
   override fun onMetadataReceived(buffer: ByteArray, uid: Int, timeStampMs: Long) {
     emit(hashMapOf(
-      "data" to arrayListOf(String(buffer), uid, timeStampMs)
+      "data" to arrayListOf(String(buffer), uid.toJSUInt(), timeStampMs)
     ))
   }
 }

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

@@ -159,7 +159,7 @@ class RtcChannelManager(
   }
 
   override fun joinChannel(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.joinChannel(params["token"] as? String, params["optionalInfo"] as? String, (params["optionalUid"] as Number).toInt(), mapToChannelMediaOptions(params["options"] as Map<*, *>)))
+    callback.code(this[params["channelId"] as String]?.joinChannel(params["token"] as? String, params["optionalInfo"] as? String, params["optionalUid"]?.toSDKUInt()!!, mapToChannelMediaOptions(params["options"] as Map<*, *>)))
   }
 
   override fun joinChannelWithUserAccount(params: Map<String, *>, callback: Callback) {
@@ -191,11 +191,11 @@ class RtcChannelManager(
   }
 
   override fun adjustUserPlaybackSignalVolume(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.adjustUserPlaybackSignalVolume((params["uid"] as Number).toInt(), (params["volume"] as Number).toInt()))
+    callback.code(this[params["channelId"] as String]?.adjustUserPlaybackSignalVolume(params["uid"]?.toSDKUInt()!!, (params["volume"] as Number).toInt()))
   }
 
   override fun muteRemoteAudioStream(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.muteRemoteAudioStream((params["uid"] as Number).toInt(), params["muted"] as Boolean))
+    callback.code(this[params["channelId"] as String]?.muteRemoteAudioStream(params["uid"]?.toSDKUInt()!!, params["muted"] as Boolean))
   }
 
   override fun muteAllRemoteAudioStreams(params: Map<String, *>, callback: Callback) {
@@ -207,7 +207,7 @@ class RtcChannelManager(
   }
 
   override fun muteRemoteVideoStream(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.muteRemoteVideoStream((params["uid"] as Number).toInt(), params["muted"] as Boolean))
+    callback.code(this[params["channelId"] as String]?.muteRemoteVideoStream(params["uid"]?.toSDKUInt()!!, params["muted"] as Boolean))
   }
 
   override fun muteAllRemoteVideoStreams(params: Map<String, *>, callback: Callback) {
@@ -219,11 +219,11 @@ class RtcChannelManager(
   }
 
   override fun enableRemoteSuperResolution(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.enableRemoteSuperResolution((params["uid"] as Number).toInt(), params["enable"] as Boolean))
+    callback.code(this[params["channelId"] as String]?.enableRemoteSuperResolution(params["uid"]?.toSDKUInt()!!, params["enable"] as Boolean))
   }
 
   override fun setRemoteVoicePosition(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.setRemoteVoicePosition((params["uid"] as Number).toInt(), (params["pan"] as Number).toDouble(), (params["gain"] as Number).toDouble()))
+    callback.code(this[params["channelId"] as String]?.setRemoteVoicePosition(params["uid"]?.toSDKUInt()!!, (params["pan"] as Number).toDouble(), (params["gain"] as Number).toDouble()))
   }
 
   override fun setLiveTranscoding(params: Map<String, *>, callback: Callback) {
@@ -251,15 +251,15 @@ class RtcChannelManager(
   }
 
   override fun setRemoteVideoStreamType(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.setRemoteVideoStreamType((params["uid"] as Number).toInt(), (params["streamType"] as Number).toInt()))
+    callback.code(this[params["channelId"] as String]?.setRemoteVideoStreamType(params["uid"]?.toSDKUInt()!!, (params["streamType"] as Number).toInt()))
   }
 
   override fun setRemoteDefaultVideoStreamType(params: Map<String, *>, callback: Callback) {
     callback.code(this[params["channelId"] as String]?.setRemoteDefaultVideoStreamType((params["streamType"] as Number).toInt()))
   }
 
   override fun setRemoteUserPriority(params: Map<String, *>, callback: Callback) {
-    callback.code(this[params["channelId"] as String]?.setRemoteUserPriority((params["uid"] as Number).toInt(), (params["userPriority"] as Number).toInt()))
+    callback.code(this[params["channelId"] as String]?.setRemoteUserPriority(params["uid"]?.toSDKUInt()!!, (params["userPriority"] as Number).toInt()))
   }
 
   override fun registerMediaMetadataObserver(params: Map<String, *>, callback: Callback) {

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

@@ -112,11 +112,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.toJSUInt(), 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.toJSUInt(), elapsed)
   }
 
   override fun onLeaveChannel(rtcChannel: RtcChannel?, stats: IRtcEngineEventHandler.RtcStats?) {
@@ -128,11 +128,11 @@ class RtcChannelEventHandler(
   }
 
   override fun onUserJoined(rtcChannel: RtcChannel?, uid: Int, elapsed: Int) {
-    callback(RtcChannelEvents.UserJoined, rtcChannel, uid, elapsed)
+    callback(RtcChannelEvents.UserJoined, rtcChannel, uid.toJSUInt(), elapsed)
   }
 
   override fun onUserOffline(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraUserOfflineReason reason: Int) {
-    callback(RtcChannelEvents.UserOffline, rtcChannel, uid, reason)
+    callback(RtcChannelEvents.UserOffline, rtcChannel, uid.toJSUInt(), reason)
   }
 
   override fun onConnectionStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraConnectionStateType state: Int, @Annotations.AgoraConnectionChangedReason reason: Int) {
@@ -152,35 +152,35 @@ class RtcChannelEventHandler(
   }
 
   override fun onActiveSpeaker(rtcChannel: RtcChannel?, uid: Int) {
-    callback(RtcChannelEvents.ActiveSpeaker, rtcChannel, uid)
+    callback(RtcChannelEvents.ActiveSpeaker, rtcChannel, uid.toJSUInt())
   }
 
   override fun onVideoSizeChanged(rtcChannel: RtcChannel?, uid: Int, width: Int, height: Int, @IntRange(from = 0, to = 360) rotation: Int) {
-    callback(RtcChannelEvents.VideoSizeChanged, rtcChannel, uid, width, height, rotation)
+    callback(RtcChannelEvents.VideoSizeChanged, rtcChannel, uid.toJSUInt(), width, height, rotation)
   }
 
   override fun onRemoteVideoStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraVideoRemoteState state: Int, @Annotations.AgoraVideoRemoteStateReason reason: Int, elapsed: Int) {
-    callback(RtcChannelEvents.RemoteVideoStateChanged, rtcChannel, uid, state, reason, elapsed)
+    callback(RtcChannelEvents.RemoteVideoStateChanged, rtcChannel, uid.toJSUInt(), state, reason, elapsed)
   }
 
   override fun onRemoteAudioStateChanged(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraAudioRemoteState state: Int, @Annotations.AgoraAudioRemoteStateReason reason: Int, elapsed: Int) {
-    callback(RtcChannelEvents.RemoteAudioStateChanged, rtcChannel, uid, state, reason, elapsed)
+    callback(RtcChannelEvents.RemoteAudioStateChanged, rtcChannel, uid.toJSUInt(), state, reason, elapsed)
   }
 
   override fun onLocalPublishFallbackToAudioOnly(rtcChannel: RtcChannel?, isFallbackOrRecover: Boolean) {
     callback(RtcChannelEvents.LocalPublishFallbackToAudioOnly, rtcChannel, isFallbackOrRecover)
   }
 
   override fun onRemoteSubscribeFallbackToAudioOnly(rtcChannel: RtcChannel?, uid: Int, isFallbackOrRecover: Boolean) {
-    callback(RtcChannelEvents.RemoteSubscribeFallbackToAudioOnly, rtcChannel, uid, isFallbackOrRecover)
+    callback(RtcChannelEvents.RemoteSubscribeFallbackToAudioOnly, rtcChannel, uid.toJSUInt(), isFallbackOrRecover)
   }
 
   override fun onRtcStats(rtcChannel: RtcChannel?, stats: IRtcEngineEventHandler.RtcStats?) {
     callback(RtcChannelEvents.RtcStats, rtcChannel, stats?.toMap())
   }
 
   override fun onNetworkQuality(rtcChannel: RtcChannel?, uid: Int, @Annotations.AgoraNetworkQuality txQuality: Int, @Annotations.AgoraNetworkQuality rxQuality: Int) {
-    callback(RtcChannelEvents.NetworkQuality, rtcChannel, uid, txQuality, rxQuality)
+    callback(RtcChannelEvents.NetworkQuality, rtcChannel, uid.toJSUInt(), txQuality, rxQuality)
   }
 
   override fun onRemoteVideoStats(rtcChannel: RtcChannel?, stats: IRtcEngineEventHandler.RemoteVideoStats?) {
@@ -200,15 +200,15 @@ class RtcChannelEventHandler(
   }
 
   override fun onStreamInjectedStatus(rtcChannel: RtcChannel?, url: String?, uid: Int, @Annotations.AgoraInjectStreamStatus status: Int) {
-    callback(RtcChannelEvents.StreamInjectedStatus, rtcChannel, url, uid, status)
+    callback(RtcChannelEvents.StreamInjectedStatus, rtcChannel, url, uid.toJSUInt(), status)
   }
 
   override fun onStreamMessage(rtcChannel: RtcChannel?, uid: Int, streamId: Int, data: ByteArray?) {
-    callback(RtcChannelEvents.StreamMessage, rtcChannel, uid, streamId, data?.let { String(it, Charsets.UTF_8) })
+    callback(RtcChannelEvents.StreamMessage, rtcChannel, uid.toJSUInt(), streamId, data?.let { String(it, Charsets.UTF_8) })
   }
 
   override fun onStreamMessageError(rtcChannel: RtcChannel?, uid: Int, streamId: Int, @Annotations.AgoraErrorCode error: Int, missed: Int, cached: Int) {
-    callback(RtcChannelEvents.StreamMessageError, rtcChannel, uid, streamId, error, missed, cached)
+    callback(RtcChannelEvents.StreamMessageError, rtcChannel, uid.toJSUInt(), streamId, error, missed, cached)
   }
 
   override fun onChannelMediaRelayStateChanged(rtcChannel: RtcChannel?, @Annotations.AgoraChannelMediaRelayState state: Int, @Annotations.AgoraChannelMediaRelayError code: Int) {
@@ -228,18 +228,18 @@ class RtcChannelEventHandler(
   }
 
   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.toJSUInt(), 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.toJSUInt(), oldState, newState, elapseSinceLastState)
   }
 
   override fun onRtmpStreamingEvent(rtcChannel: RtcChannel?, url: String?, @Annotations.AgoraRtmpStreamingEvent errCode: Int) {
     callback(RtcChannelEvents.RtmpStreamingEvent, rtcChannel, url, errCode)
   }
 
   override fun onUserSuperResolutionEnabled(rtcChannel: RtcChannel?, uid: Int, enabled: Boolean, @Annotations.AgoraSuperResolutionStateReason reason: Int) {
-    callback(RtcChannelEvents.UserSuperResolutionEnabled, rtcChannel, uid, enabled, reason)
+    callback(RtcChannelEvents.UserSuperResolutionEnabled, rtcChannel, uid.toJSUInt(), enabled, reason)
   }
 }

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

@@ -407,7 +407,7 @@ class RtcEngineManager(
     val token = params["token"] as? String
     val channelName = params["channelName"] as String
     val optionalInfo = params["optionalInfo"] as? String
-    val optionalUid = (params["optionalUid"] as Number).toInt()
+    val optionalUid = params["optionalUid"]?.toSDKUInt()!!
     (params["options"] as? Map<*, *>)?.let {
       callback.code(engine?.joinChannel(token, channelName, optionalInfo, optionalUid, mapToChannelMediaOptions(it)))
       return@joinChannel
@@ -523,7 +523,7 @@ class RtcEngineManager(
   override fun getUserInfoByUid(params: Map<String, *>, callback: Callback) {
     callback.resolve(engine) {
       val userInfo = UserInfo()
-      it.getUserInfoByUid((params["uid"] as Number).toInt(), userInfo)
+      it.getUserInfoByUid(params["uid"]?.toSDKUInt()!!, userInfo)
       userInfo.toMap()
     }
   }
@@ -545,7 +545,7 @@ class RtcEngineManager(
   }
 
   override fun adjustUserPlaybackSignalVolume(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.adjustUserPlaybackSignalVolume((params["uid"] as Number).toInt(), (params["volume"] as Number).toInt()))
+    callback.code(engine?.adjustUserPlaybackSignalVolume(params["uid"]?.toSDKUInt()!!, (params["volume"] as Number).toInt()))
   }
 
   override fun adjustPlaybackSignalVolume(params: Map<String, *>, callback: Callback) {
@@ -561,7 +561,7 @@ class RtcEngineManager(
   }
 
   override fun muteRemoteAudioStream(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.muteRemoteAudioStream((params["uid"] as Number).toInt(), params["muted"] as Boolean))
+    callback.code(engine?.muteRemoteAudioStream(params["uid"]?.toSDKUInt()!!, params["muted"] as Boolean))
   }
 
   override fun muteAllRemoteAudioStreams(params: Map<String, *>, callback: Callback) {
@@ -617,7 +617,7 @@ class RtcEngineManager(
   }
 
   override fun muteRemoteVideoStream(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.muteRemoteVideoStream((params["uid"] as Number).toInt(), params["muted"] as Boolean))
+    callback.code(engine?.muteRemoteVideoStream(params["uid"]?.toSDKUInt()!!, params["muted"] as Boolean))
   }
 
   override fun muteAllRemoteVideoStreams(params: Map<String, *>, callback: Callback) {
@@ -633,7 +633,7 @@ class RtcEngineManager(
   }
 
   override fun enableRemoteSuperResolution(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.enableRemoteSuperResolution((params["uid"] as Number).toInt(), params["enable"] as Boolean))
+    callback.code(engine?.enableRemoteSuperResolution(params["uid"]?.toSDKUInt()!!, params["enable"] as Boolean))
   }
 
   override fun startAudioMixing(params: Map<String, *>, callback: Callback) {
@@ -811,7 +811,7 @@ class RtcEngineManager(
   }
 
   override fun setRemoteVoicePosition(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.setRemoteVoicePosition((params["uid"] as Number).toInt(), (params["pan"] as Number).toDouble(), (params["gain"] as Number).toDouble()))
+    callback.code(engine?.setRemoteVoicePosition(params["uid"]?.toSDKUInt()!!, (params["pan"] as Number).toDouble(), (params["gain"] as Number).toDouble()))
   }
 
   override fun setLiveTranscoding(params: Map<String, *>, callback: Callback) {
@@ -863,7 +863,7 @@ class RtcEngineManager(
   }
 
   override fun setRemoteVideoStreamType(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.setRemoteVideoStreamType((params["uid"] as Number).toInt(), (params["streamType"] as Number).toInt()))
+    callback.code(engine?.setRemoteVideoStreamType(params["uid"]?.toSDKUInt()!!, (params["streamType"] as Number).toInt()))
   }
 
   override fun setRemoteDefaultVideoStreamType(params: Map<String, *>, callback: Callback) {
@@ -879,7 +879,7 @@ class RtcEngineManager(
   }
 
   override fun setRemoteUserPriority(params: Map<String, *>, callback: Callback) {
-    callback.code(engine?.setRemoteUserPriority((params["uid"] as Number).toInt(), (params["userPriority"] as Number).toInt()))
+    callback.code(engine?.setRemoteUserPriority(params["uid"]?.toSDKUInt()!!, (params["userPriority"] as Number).toInt()))
   }
 
   override fun startEchoTest(params: Map<String, *>, callback: Callback) {