Fix the bug that encrypted videos do not interoperate between iOS and Android.

Author: qinhui

iOS/APIExample/APIExample/Common/AgoraExtension.swift

@@ -107,15 +107,15 @@ extension AgoraAudioScenario {
 extension AgoraEncryptionMode {
     func description() -> String {
         switch self {
-        case .AES128GCM2: return "AES128GCM"
-        case .AES256GCM2: return "AES256GCM"
+        case .AES128GCM: return "AES128GCM"
+        case .AES256GCM: return "AES256GCM"
         default:
             return "\(self.rawValue)"
         }
     }
 
     static func allValues() -> [AgoraEncryptionMode] {
-        return [.AES128GCM2, .AES256GCM2]
+        return [.AES128GCM, .AES256GCM]
     }
 }
 

iOS/APIExample/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift

@@ -14,7 +14,7 @@ class StreamEncryptionEntry: UIViewController {
     @IBOutlet weak var channelTextField: UITextField!
     @IBOutlet weak var encryptSecretField: UITextField!
     @IBOutlet weak var encryptModeBtn: UIButton!
-    var mode: AgoraEncryptionMode = .AES128GCM2
+    var mode: AgoraEncryptionMode = .AES128GCM
     var useCustom: Bool = false
     let identifier = "StreamEncryption"
 

macOS/APIExample/Common/AgoraExtension.swift

@@ -151,15 +151,15 @@ extension AgoraAudioScenario {
 extension AgoraEncryptionMode {
     func description() -> String {
         switch self {
-        case .AES128GCM2: return "AES128GCM"
-        case .AES256GCM2: return "AES256GCM"
+        case .AES128GCM: return "AES128GCM"
+        case .AES256GCM: return "AES256GCM"
         default:
             return "\(self.rawValue)"
         }
     }
 
     static func allValues() -> [AgoraEncryptionMode] {
-        return [.AES128GCM2, .AES256GCM2]
+        return [.AES128GCM, .AES256GCM]
     }
 }
 

macOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift

@@ -240,6 +240,7 @@ class StreamEncryption: BaseViewController {
                 config.encryptionMode = selectedEncrption!
                 config.encryptionKey = encryptionSecretField.stringValue
                 config.encryptionKdfSalt = getEncryptionSaltFromServer()
+
                 let ret = agoraKit.enableEncryption(true, encryptionConfig: config)
                 if ret != 0 {
                     // for errors please take a look at: