Squashed 'ios/Classes/Base/' changes from ed3b61b..b664522

b664522 fix: merge error

git-subtree-dir: ios/Classes/Base
git-subtree-split: b6645228de8298934114967cbf4bf53dc762de65

RtcChannel.swift

@@ -316,17 +316,7 @@ class RtcChannelManager: NSObject, RtcChannelInterface {
     }
 
     @objc func setEncryptionMode(_ params: NSDictionary, _ callback: Callback) {
-        var encryptionMode = ""
-        switch (params["encryptionMode"] as! NSNumber).intValue {
-        case AgoraEncryptionMode.AES128XTS.rawValue:
-            encryptionMode = "aes-128-xts"
-        case AgoraEncryptionMode.AES128ECB.rawValue:
-            encryptionMode = "aes-128-ecb"
-        case AgoraEncryptionMode.AES256XTS.rawValue:
-            encryptionMode = "aes-256-xts"
-        default: encryptionMode = ""
-        }
-        callback.code(self[params["channelId"] as! String]?.setEncryptionMode(encryptionMode))
+        callback.code(self[params["channelId"] as! String]?.setEncryptionMode(params["encryptionMode"] as? String))
     }
 
     @objc func addInjectStreamUrl(_ params: NSDictionary, _ callback: Callback) {

RtcChannelEvent.swift

@@ -104,11 +104,11 @@ extension RtcChannelEventHandler: AgoraRtcChannelDelegate {
     }
 
     public func rtcChannelDidJoin(_ rtcChannel: AgoraRtcChannel, withUid uid: UInt, elapsed: Int) {
-        callback(RtcChannelEvents.JoinChannelSuccess, rtcChannel, uid, elapsed)
+        callback(RtcChannelEvents.JoinChannelSuccess, rtcChannel, rtcChannel.getId(), uid, elapsed)
     }
 
     public func rtcChannelDidRejoin(_ rtcChannel: AgoraRtcChannel, withUid uid: UInt, elapsed: Int) {
-        callback(RtcChannelEvents.RejoinChannelSuccess, rtcChannel, uid, elapsed)
+        callback(RtcChannelEvents.RejoinChannelSuccess, rtcChannel, rtcChannel.getId(), uid, elapsed)
     }
 
     public func rtcChannelDidLeave(_ rtcChannel: AgoraRtcChannel, with stats: AgoraChannelStats) {