From b7482205a99ef78432b47e8f14ffb0250f800c47 Mon Sep 17 00:00:00 2001 From: your name Date: Tue, 4 Aug 2020 23:01:25 +0800 Subject: [PATCH 01/23] fix android enableEncryptionConfig --- .../java/io/agora/openvcall/ui/BaseActivity.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java b/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java index d502a45c..6e0f833b 100644 --- a/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java +++ b/Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java @@ -20,6 +20,7 @@ import io.agora.openvcall.model.*; import io.agora.propeller.Constant; import io.agora.rtc.RtcEngine; +import io.agora.rtc.internal.EncryptionConfig; import io.agora.rtc.video.VideoCanvas; import io.agora.rtc.video.VideoEncoderConfiguration; @@ -361,9 +362,18 @@ protected void disablePreProcessor() { } protected void configEngine(VideoEncoderConfiguration.VideoDimensions videoDimension, VideoEncoderConfiguration.FRAME_RATE fps, String encryptionKey, String encryptionMode) { + EncryptionConfig config = new EncryptionConfig(); if (!TextUtils.isEmpty(encryptionKey)) { - rtcEngine().setEncryptionMode(encryptionMode); - rtcEngine().setEncryptionSecret(encryptionKey); + config.encryptionKey = encryptionKey; + + if(TextUtils.equals(encryptionMode, "AES-128-XTS")) { + config.encryptionMode = EncryptionConfig.EncryptionMode.AES_128_XTS; + } else if(TextUtils.equals(encryptionMode, "AES-256-XTS")) { + config.encryptionMode = EncryptionConfig.EncryptionMode.AES_256_XTS; + } + rtcEngine().enableEncryption(true, config); + } else { + rtcEngine().enableEncryption(false, config); } log.debug("configEngine " + videoDimension + " " + fps + " " + encryptionMode); From 6ca129326eeb3b9e45b597d6654cf2f88a1114e0 Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Thu, 6 Aug 2020 18:29:12 +0800 Subject: [PATCH 02/23] Update README.md --- One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.md b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.md index 9a1c07b0..5acf0632 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.md @@ -43,7 +43,6 @@ To build and run the sample application, get an App ID: 1. Download the [Agora Video SDK](https://www.agora.io/en/download/). Unzip the downloaded SDK package and copy the following files from the SDK `libs` folder into the sample application `Agora iOS Tutorial Objective-C` folder. - `AograRtcEngineKit.framework` - `AgoraRtcCryptoLoader.framework` - - `libcrypto.a` 2. Connect your iPhone or iPad device and run the project. Ensure a valid provisioning profile is applied or your project will not run. From 967605c9fc25000ea93ead2bcb7ddc10b7070834 Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Thu, 6 Aug 2020 18:29:40 +0800 Subject: [PATCH 03/23] Update README.md --- One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.md b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.md index d0b05dd8..5cd42caf 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.md @@ -45,7 +45,6 @@ To build and run the sample application, get an App Id: - `AograRtcEngineKit.framework` - `AgoraRtcCryptoLoader.framework` - - `libcrypto.a` 2. Connect your iPhone or iPad device and run the project. Ensure a valid provisioning profile is applied or your project will not run. From b9b77399018ff6e34ead408005b50f60729a6e92 Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Thu, 6 Aug 2020 18:45:51 +0800 Subject: [PATCH 04/23] Update README.md --- One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.md b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.md index 8876b349..a990897d 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.md @@ -42,7 +42,6 @@ To build and run the sample application, get an App Id: 1. Download the [Agora Video SDK](https://www.agora.io/en/download/). Unzip the downloaded SDK package and copy the following files from the SDK `libs` folder into the sample application `Agora-iOS-Tutorial-SwiftUI-1to1` folder. - `AograRtcEngineKit.framework` - `AgoraRtcCryptoLoader.framework` - - `libcrypto.a` 2. Connect your iPhone or iPad device and run the project. Ensure a valid provisioning profile is applied or your project will not run. From 7f526af67720fcd222fdc3e1be9fc0ee788ec149 Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Tue, 11 Aug 2020 14:18:15 +0800 Subject: [PATCH 05/23] Update README.zh.md --- .../Agora-iOS-Tutorial-Objective-C-1to1/README.zh.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.zh.md b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.zh.md index dcc5c12a..09cabe9a 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.zh.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/README.zh.md @@ -44,7 +44,6 @@ - AgoraRtcEngineKit.framework - AgoraRtcCryptoLoader.framework - - libcrypto.a 2. 最后使用 XCode 打开 Agora iOS Tutorial Objective-C.xcodeproj，连接 iPhone／iPad 测试设备，设置有效的开发者签名后即可运行。 From 7c413aa410fc29fada4c072b0585d2ea9f2547ef Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Tue, 11 Aug 2020 14:18:47 +0800 Subject: [PATCH 06/23] Update README.zh.md --- One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.zh.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.zh.md b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.zh.md index 39175cf4..35a93e0d 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.zh.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/README.zh.md @@ -44,7 +44,6 @@ - AgoraRtcEngineKit.framework - AgoraRtcCryptoLoader.framework - - libcrypto.a 2. 最后使用 Xcode 打开 Agora iOS Tutorial.xcodeproj，连接 iPhone／iPad 测试设备，设置有效的开发者签名后即可运行。 From 7523b528fbe326bbea45c54b228d430a2607ca4d Mon Sep 17 00:00:00 2001 From: Qianze Zhang Date: Tue, 11 Aug 2020 14:20:00 +0800 Subject: [PATCH 07/23] Update README.zh.md --- One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.zh.md | 1 - 1 file changed, 1 deletion(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.zh.md b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.zh.md index cc62883b..4d1529ab 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.zh.md +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/README.zh.md @@ -44,7 +44,6 @@ - AgoraRtcEngineKit.framework - AgoraRtcCryptoLoader.framework - - libcrypto.a 2. 最后使用 XCode 打开 Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj，连接 iPhone／iPad 测试设备，设置有效的开发者签名后即可运行。 From b7dbed911c9210f7f07b99dee7d428d743fdea2a Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 16:17:08 +0800 Subject: [PATCH 08/23] update deprecate api --- .../VideoChatViewController.m | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m index af5d19ec..666a1e60 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m @@ -76,25 +76,23 @@ - (void)joinChannel { [UIApplication sharedApplication].idleTimerDisabled = YES; } - /// Callback to handle the event such when the first frame of a remote video stream is decoded on the device. -/// @param engine - RTC engine instance -/// @param uid - user id -/// @param size - the height and width of the video frame -/// @param elapsed - lapsed Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. -- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size: (CGSize)size elapsed:(NSInteger)elapsed { - if (self.remoteVideo.hidden) { - self.remoteVideo.hidden = NO; +- (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed +{ + if(state == AgoraVideoRemoteStateStarting) { + if (self.remoteVideo.hidden) { + self.remoteVideo.hidden = NO; + } + + AgoraRtcVideoCanvas *videoCanvas = [[AgoraRtcVideoCanvas alloc] init]; + videoCanvas.uid = uid; + // Since we are making a simple 1:1 video chat app, for simplicity sake, we are not storing the UIDs. You could use a mechanism such as an array to store the UIDs in a channel. + + videoCanvas.view = self.remoteVideo; + videoCanvas.renderMode = AgoraVideoRenderModeHidden; + [self.agoraKit setupRemoteVideo:videoCanvas]; + // Bind remote video stream to view } - - AgoraRtcVideoCanvas *videoCanvas = [[AgoraRtcVideoCanvas alloc] init]; - videoCanvas.uid = uid; - // Since we are making a simple 1:1 video chat app, for simplicity sake, we are not storing the UIDs. You could use a mechanism such as an array to store the UIDs in a channel. - - videoCanvas.view = self.remoteVideo; - videoCanvas.renderMode = AgoraVideoRenderModeHidden; - [self.agoraKit setupRemoteVideo:videoCanvas]; - // Bind remote video stream to view } - (IBAction)hangUpButton:(UIButton *)sender { From ac72b4043bf089a066ef4a82ba7d885022033f3c Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 18:13:02 +0800 Subject: [PATCH 09/23] fix deprecate api --- .../VideoChatViewController.m | 8 ++++- .../VideoChatViewController.swift | 29 ++++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m index 666a1e60..1205c1be 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m @@ -76,7 +76,13 @@ - (void)joinChannel { [UIApplication sharedApplication].idleTimerDisabled = YES; } -/// Callback to handle the event such when the first frame of a remote video stream is decoded on the device. +/// Callback to handle the event when the remote video state changed +/// - Parameters: +/// - engine: RTC engine instance +/// - uid: user id +/// - state: The state of the remote video +/// - reason: The reason of the remote video state change +/// - elapsed: Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. - (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed { if(state == AgoraVideoRemoteStateStarting) { diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift index ac8b21dd..c49b8576 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift @@ -150,23 +150,26 @@ class VideoChatViewController: UIViewController { extension VideoChatViewController: AgoraRtcEngineDelegate { - /// Callback to handle the event when the first frame of a remote video stream is decoded on the device. + /// Callback to handle the event when the remote video state changed /// - Parameters: /// - engine: RTC engine instance /// - uid: user id - /// - size: the height and width of the video frame + /// - state: The state of the remote video + /// - reason: The reason of the remote video state change /// - elapsed: Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. - func rtcEngine(_ engine: AgoraRtcEngineKit, firstRemoteVideoDecodedOfUid uid:UInt, size:CGSize, elapsed:Int) { - isRemoteVideoRender = true - - // Only one remote video view is available for this - // tutorial. Here we check if there exists a surface - // view tagged as this uid. - let videoCanvas = AgoraRtcVideoCanvas() - videoCanvas.uid = uid - videoCanvas.view = remoteVideo - videoCanvas.renderMode = .hidden - agoraKit.setupRemoteVideo(videoCanvas) + func rtcEngine(_ engine: AgoraRtcEngineKit, remoteVideoStateChangedOfUid uid: UInt, state: AgoraVideoRemoteState, reason: AgoraVideoRemoteStateReason, elapsed: Int) { + if(state == .starting) { + isRemoteVideoRender = true + + // Only one remote video view is available for this + // tutorial. Here we check if there exists a surface + // view tagged as this uid. + let videoCanvas = AgoraRtcVideoCanvas() + videoCanvas.uid = uid + videoCanvas.view = remoteVideo + videoCanvas.renderMode = .hidden + agoraKit.setupRemoteVideo(videoCanvas) + } } /// Occurs when a remote user (Communication)/host (Live Broadcast) leaves a channel. From 2b1637bb8b2a917eca0e7b03fc4d79d873995c62 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 18:38:14 +0800 Subject: [PATCH 10/23] fix deprecate api --- .../VideoEngine.swift | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift index cad75955..182b34fe 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift @@ -32,17 +32,24 @@ extension VideoEngine: AgoraRtcEngineDelegate { contentView?.isRemoteInSession = false } - func rtcEngine(_ engine: AgoraRtcEngineKit, firstRemoteVideoDecodedOfUid uid: UInt, size: CGSize, elapsed: Int) { - // Only one remote video view is available for this - // tutorial. Here we check if there exists a surface - // view tagged as this uid. - let videoCanvas = AgoraRtcVideoCanvas() - videoCanvas.view = contentView?.remoteCanvas.rendererView - videoCanvas.renderMode = .hidden - videoCanvas.uid = uid - agoraEngine.setupRemoteVideo(videoCanvas) + func rtcEngine(_ engine: AgoraRtcEngineKit, remoteVideoStateChangedOfUid uid: UInt, state: AgoraVideoRemoteState, reason: AgoraVideoRemoteStateReason, elapsed: Int) { + if(state == .starting){ + + // Only one remote video view is available for this + // tutorial. Here we check if there exists a surface + // view tagged as this uid. + let videoCanvas = AgoraRtcVideoCanvas() + videoCanvas.view = contentView?.remoteCanvas.rendererView + videoCanvas.renderMode = .hidden + videoCanvas.uid = uid + agoraEngine.setupRemoteVideo(videoCanvas) - contentView?.isRemoteVideoMuted = false + contentView?.isRemoteVideoMuted = false + } + } + + func rtcEngine(_ engine: AgoraRtcEngineKit, firstRemoteVideoDecodedOfUid uid: UInt, size: CGSize, elapsed: Int) { + } func rtcEngine(_ engine: AgoraRtcEngineKit, didVideoMuted muted:Bool, byUid:UInt) { From 740362379143fe89dbed3b0c67fc0fe768ee6e4c Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 23:48:22 +0800 Subject: [PATCH 11/23] Revert "fix deprecate api" This reverts commit 2b1637bb8b2a917eca0e7b03fc4d79d873995c62. --- .../VideoEngine.swift | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift index 182b34fe..cad75955 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1/VideoEngine.swift @@ -32,24 +32,17 @@ extension VideoEngine: AgoraRtcEngineDelegate { contentView?.isRemoteInSession = false } - func rtcEngine(_ engine: AgoraRtcEngineKit, remoteVideoStateChangedOfUid uid: UInt, state: AgoraVideoRemoteState, reason: AgoraVideoRemoteStateReason, elapsed: Int) { - if(state == .starting){ - - // Only one remote video view is available for this - // tutorial. Here we check if there exists a surface - // view tagged as this uid. - let videoCanvas = AgoraRtcVideoCanvas() - videoCanvas.view = contentView?.remoteCanvas.rendererView - videoCanvas.renderMode = .hidden - videoCanvas.uid = uid - agoraEngine.setupRemoteVideo(videoCanvas) - - contentView?.isRemoteVideoMuted = false - } - } - func rtcEngine(_ engine: AgoraRtcEngineKit, firstRemoteVideoDecodedOfUid uid: UInt, size: CGSize, elapsed: Int) { - + // Only one remote video view is available for this + // tutorial. Here we check if there exists a surface + // view tagged as this uid. + let videoCanvas = AgoraRtcVideoCanvas() + videoCanvas.view = contentView?.remoteCanvas.rendererView + videoCanvas.renderMode = .hidden + videoCanvas.uid = uid + agoraEngine.setupRemoteVideo(videoCanvas) + + contentView?.isRemoteVideoMuted = false } func rtcEngine(_ engine: AgoraRtcEngineKit, didVideoMuted muted:Bool, byUid:UInt) { From 6543c82664ed0626db18940793c1ba43832c0541 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 23:48:29 +0800 Subject: [PATCH 12/23] Revert "fix deprecate api" This reverts commit ac72b4043bf089a066ef4a82ba7d885022033f3c. --- .../VideoChatViewController.m | 8 +---- .../VideoChatViewController.swift | 29 +++++++++---------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m index 1205c1be..666a1e60 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m @@ -76,13 +76,7 @@ - (void)joinChannel { [UIApplication sharedApplication].idleTimerDisabled = YES; } -/// Callback to handle the event when the remote video state changed -/// - Parameters: -/// - engine: RTC engine instance -/// - uid: user id -/// - state: The state of the remote video -/// - reason: The reason of the remote video state change -/// - elapsed: Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. +/// Callback to handle the event such when the first frame of a remote video stream is decoded on the device. - (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed { if(state == AgoraVideoRemoteStateStarting) { diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift index c49b8576..ac8b21dd 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial/VideoChatViewController.swift @@ -150,26 +150,23 @@ class VideoChatViewController: UIViewController { extension VideoChatViewController: AgoraRtcEngineDelegate { - /// Callback to handle the event when the remote video state changed + /// Callback to handle the event when the first frame of a remote video stream is decoded on the device. /// - Parameters: /// - engine: RTC engine instance /// - uid: user id - /// - state: The state of the remote video - /// - reason: The reason of the remote video state change + /// - size: the height and width of the video frame /// - elapsed: Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. - func rtcEngine(_ engine: AgoraRtcEngineKit, remoteVideoStateChangedOfUid uid: UInt, state: AgoraVideoRemoteState, reason: AgoraVideoRemoteStateReason, elapsed: Int) { - if(state == .starting) { - isRemoteVideoRender = true - - // Only one remote video view is available for this - // tutorial. Here we check if there exists a surface - // view tagged as this uid. - let videoCanvas = AgoraRtcVideoCanvas() - videoCanvas.uid = uid - videoCanvas.view = remoteVideo - videoCanvas.renderMode = .hidden - agoraKit.setupRemoteVideo(videoCanvas) - } + func rtcEngine(_ engine: AgoraRtcEngineKit, firstRemoteVideoDecodedOfUid uid:UInt, size:CGSize, elapsed:Int) { + isRemoteVideoRender = true + + // Only one remote video view is available for this + // tutorial. Here we check if there exists a surface + // view tagged as this uid. + let videoCanvas = AgoraRtcVideoCanvas() + videoCanvas.uid = uid + videoCanvas.view = remoteVideo + videoCanvas.renderMode = .hidden + agoraKit.setupRemoteVideo(videoCanvas) } /// Occurs when a remote user (Communication)/host (Live Broadcast) leaves a channel. From 91625d9b8704a4bc21337f6c29c1d2bb404f7b4d Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Wed, 12 Aug 2020 23:48:34 +0800 Subject: [PATCH 13/23] Revert "update deprecate api" This reverts commit b7dbed911c9210f7f07b99dee7d428d743fdea2a. --- .../VideoChatViewController.m | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m index 666a1e60..af5d19ec 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m @@ -76,23 +76,25 @@ - (void)joinChannel { [UIApplication sharedApplication].idleTimerDisabled = YES; } + /// Callback to handle the event such when the first frame of a remote video stream is decoded on the device. -- (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed -{ - if(state == AgoraVideoRemoteStateStarting) { - if (self.remoteVideo.hidden) { - self.remoteVideo.hidden = NO; - } - - AgoraRtcVideoCanvas *videoCanvas = [[AgoraRtcVideoCanvas alloc] init]; - videoCanvas.uid = uid; - // Since we are making a simple 1:1 video chat app, for simplicity sake, we are not storing the UIDs. You could use a mechanism such as an array to store the UIDs in a channel. - - videoCanvas.view = self.remoteVideo; - videoCanvas.renderMode = AgoraVideoRenderModeHidden; - [self.agoraKit setupRemoteVideo:videoCanvas]; - // Bind remote video stream to view +/// @param engine - RTC engine instance +/// @param uid - user id +/// @param size - the height and width of the video frame +/// @param elapsed - lapsed Time elapsed (ms) from the local user calling JoinChannel method until the SDK triggers this callback. +- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size: (CGSize)size elapsed:(NSInteger)elapsed { + if (self.remoteVideo.hidden) { + self.remoteVideo.hidden = NO; } + + AgoraRtcVideoCanvas *videoCanvas = [[AgoraRtcVideoCanvas alloc] init]; + videoCanvas.uid = uid; + // Since we are making a simple 1:1 video chat app, for simplicity sake, we are not storing the UIDs. You could use a mechanism such as an array to store the UIDs in a channel. + + videoCanvas.view = self.remoteVideo; + videoCanvas.renderMode = AgoraVideoRenderModeHidden; + [self.agoraKit setupRemoteVideo:videoCanvas]; + // Bind remote video stream to view } - (IBAction)hangUpButton:(UIButton *)sender { From 3d856d1df856f88d3fce65bd4d2b14eb61f66af4 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 11:01:52 +0800 Subject: [PATCH 14/23] sdk update --- .../OpenVideoCall-Android/app/build.gradle | 2 +- .../project.pbxproj | 20 +++++++++---------- .../VideoChatViewController.m | 5 +++++ azure-pipelines.yml | 8 ++++---- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Group-Video/OpenVideoCall-Android/app/build.gradle b/Group-Video/OpenVideoCall-Android/app/build.gradle index 909fe9e2..36eb12ee 100644 --- a/Group-Video/OpenVideoCall-Android/app/build.gradle +++ b/Group-Video/OpenVideoCall-Android/app/build.gradle @@ -52,7 +52,7 @@ dependencies { exclude group: 'com.google.android', module: 'android' } - implementation 'io.agora.rtc:full-sdk:2.9.2' + implementation 'io.agora.rtc:full-sdk:3.1.0' androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' } diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj index ff50fde6..ccd11dfc 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj @@ -168,8 +168,8 @@ TargetAttributes = { 1A8E8D371D396CAA002FA67C = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = SW3CA7M752; - ProvisioningStyle = Manual; + DevelopmentTeam = GM72UGLGZW; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -354,9 +354,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = SW3CA7M752; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -371,7 +371,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-Objective-C"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Debug; }; @@ -379,9 +379,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = SW3CA7M752; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -396,7 +396,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-Objective-C"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = ""; }; name = Release; }; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m index af5d19ec..9fbd2d14 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C/VideoChatViewController.m @@ -97,6 +97,11 @@ - (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUI // Bind remote video stream to view } +- (void)rtcEngine:(AgoraRtcEngineKit *)engine remoteVideoStateChangedOfUid:(NSUInteger)uid state:(AgoraVideoRemoteState)state reason:(AgoraVideoRemoteStateReason)reason elapsed:(NSInteger)elapsed +{ + NSLog(@"remoteVideoStateChangedOfUid %@ %@ %@", @(uid), @(state), @(reason)); +} + - (IBAction)hangUpButton:(UIButton *)sender { [self leaveChannel]; } diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8595a2af..fcb04de0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,8 @@ variables: - iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_1_FULL.zip?_ga=2.217080854.1429354637.1591107319-5559409.1503304822' - MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_1_FULL.zip?_ga=2.45223076.1429354637.1591107319-5559409.1503304822' - WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_0_1_FULL.zip' - AndroidRTCSDKVer: '3.0.1' + iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_1_0_FULL.zip?_ga=2.221003672.1493357375.1597372715-269570672.1596526126' + MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_1_0_FULL.zip?_ga=2.221003672.1493357375.1597372715-269570672.1596526126' + WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v3_1_0_FULL.zip?_ga=2.221003672.1493357375.1597372715-269570672.1596526126' + AndroidRTCSDKVer: '3.1.0' jobs: From 941ca593f6380d26c69ac71af6623c6123187f85 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 11:03:41 +0800 Subject: [PATCH 15/23] fix provision & sdk update --- .../OpenVideoCall.xcodeproj/project.pbxproj | 14 +++++++------- .../OpenVideoCall/Encryption.h | 3 ++- .../project.pbxproj | 14 +++++++------- .../project.pbxproj | 18 +++++++++--------- .../project.pbxproj | 12 ++++++------ 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall.xcodeproj/project.pbxproj b/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall.xcodeproj/project.pbxproj index dde75c4b..fba33740 100644 --- a/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall.xcodeproj/project.pbxproj +++ b/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall.xcodeproj/project.pbxproj @@ -292,7 +292,7 @@ TargetAttributes = { 076C59711DDDBC3500F813E2 = { CreatedOnToolsVersion = 8.1; - DevelopmentTeam = SW3CA7M752; + DevelopmentTeam = GM72UGLGZW; ProvisioningStyle = Manual; }; }; @@ -495,9 +495,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -513,7 +513,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "dc253ab3-71e4-40a3-a57c-a3a763407202"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -522,9 +522,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -540,7 +540,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "dc253ab3-71e4-40a3-a57c-a3a763407202"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall/Encryption.h b/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall/Encryption.h index f0b98a4a..05db14e9 100644 --- a/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall/Encryption.h +++ b/Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall/Encryption.h @@ -7,6 +7,7 @@ // #import +#import typedef NS_ENUM(int, EncryptionType) { EncryptionTypeXTS128, @@ -16,7 +17,7 @@ typedef NS_ENUM(int, EncryptionType) { @interface Encryption : NSObject @property (nonatomic, copy, readonly) NSString *modeString; -@property (nonatomic, copy, readonly) AgoraEncryptionMode modeValue; +@property (nonatomic, readonly) AgoraEncryptionMode modeValue; @property (nonatomic, copy, readonly) NSString *description; @property (nonatomic, assign) EncryptionType type; @property (nonatomic, copy) NSString *secret; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj index ccd11dfc..19c07955 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj @@ -169,7 +169,7 @@ 1A8E8D371D396CAA002FA67C = { CreatedOnToolsVersion = 7.3.1; DevelopmentTeam = GM72UGLGZW; - ProvisioningStyle = Automatic; + ProvisioningStyle = Manual; SystemCapabilities = { com.apple.BackgroundModes = { enabled = 1; @@ -354,8 +354,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -371,7 +371,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-Objective-C"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = App; }; name = Debug; }; @@ -379,8 +379,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -396,7 +396,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-Objective-C"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = App; }; name = Release; }; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj index 7a971591..6ddcf872 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj @@ -195,7 +195,7 @@ TargetAttributes = { 1ABDEE3D1D383BE4007DE451 = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = SW3CA7M752; + DevelopmentTeam = GM72UGLGZW; LastSwiftMigration = 1130; ProvisioningStyle = Manual; SystemCapabilities = { @@ -416,9 +416,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - DEVELOPMENT_TEAM = ""; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -435,7 +435,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; @@ -446,9 +446,9 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - DEVELOPMENT_TEAM = ""; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -465,7 +465,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 5.0; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj index 92630969..1c52b470 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj @@ -362,10 +362,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -379,7 +379,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-SwiftUI-1to1"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -389,10 +389,10 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -406,7 +406,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "io.agora.Agora-iOS-Tutorial-SwiftUI-1to1"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; From 3d0b16900b4ab898c70a84a1baef0fd01c83f991 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 13:28:01 +0800 Subject: [PATCH 16/23] update project --- .../project.pbxproj | 4 ++-- .../Agora-iOS-Tutorial.xcodeproj/project.pbxproj | 8 ++++---- .../project.pbxproj | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj index 19c07955..31eab2dd 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; @@ -379,7 +379,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj index 6ddcf872..164b4699 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj @@ -416,8 +416,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -446,8 +446,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj index 1c52b470..be8d4317 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; DEVELOPMENT_TEAM = GM72UGLGZW; @@ -389,7 +389,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; DEVELOPMENT_TEAM = GM72UGLGZW; From fde2c0da16d2c1ed7f884e8601eda6fec44cf4f8 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 13:32:59 +0800 Subject: [PATCH 17/23] update provision --- .../project.pbxproj | 4 ++-- .../Agora-iOS-Tutorial.xcodeproj/project.pbxproj | 8 ++++---- .../project.pbxproj | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj index 31eab2dd..7d4f99c4 100755 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/Agora-iOS-Tutorial-Objective-C.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; @@ -379,7 +379,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj index 164b4699..6ddcf872 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/Agora-iOS-Tutorial.xcodeproj/project.pbxproj @@ -416,8 +416,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -446,8 +446,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj index be8d4317..1c52b470 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/Agora-iOS-Tutorial-SwiftUI-1to1.xcodeproj/project.pbxproj @@ -362,7 +362,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; DEVELOPMENT_TEAM = GM72UGLGZW; @@ -389,7 +389,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Developer ID Application: Qianze Zhang (GM72UGLGZW)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"Agora-iOS-Tutorial-SwiftUI-1to1/Preview Content\""; DEVELOPMENT_TEAM = GM72UGLGZW; From 61a61ad9e65e04e2b58387132cc73d6e099f65bb Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 14:13:16 +0800 Subject: [PATCH 18/23] fix exports.plist --- .../Agora-iOS-Tutorial-Objective-C-1to1/exportPlist.plist | 2 +- .../Agora-iOS-Tutorial-Swift-1to1/exportPlist.plist | 2 +- .../Agora-iOS-Tutorial-SwiftUI-1to1/exportPlist.plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/exportPlist.plist b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/exportPlist.plist index 68797c7b..2d4ed12d 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/exportPlist.plist +++ b/One-to-One-Video/Agora-iOS-Tutorial-Objective-C-1to1/exportPlist.plist @@ -9,7 +9,7 @@ provisioningProfiles io.agora.Agora-iOS-Tutorial-Objective-C - AgoraAppsDevProfile + App diff --git a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/exportPlist.plist b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/exportPlist.plist index 770fae52..d2f1d1cb 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/exportPlist.plist +++ b/One-to-One-Video/Agora-iOS-Tutorial-Swift-1to1/exportPlist.plist @@ -9,7 +9,7 @@ provisioningProfiles io.agora.Agora-iOS-Tutorial - AgoraAppsDevProfile + App diff --git a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/exportPlist.plist b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/exportPlist.plist index e09d1821..75d7e222 100644 --- a/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/exportPlist.plist +++ b/One-to-One-Video/Agora-iOS-Tutorial-SwiftUI-1to1/exportPlist.plist @@ -9,7 +9,7 @@ provisioningProfiles io.agora.Agora-iOS-Tutorial-SwiftUI-1to1 - AgoraAppsDevProfile + App From ddbd4bad2fbd927622bd28f265d6ba2f3d4f0d06 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 14:23:14 +0800 Subject: [PATCH 19/23] fix build --- .../OpenVideoCall-iOS-Objective-C/exportPlist.plist | 2 +- .../OpenVideoCall.xcodeproj/project.pbxproj | 8 ++++---- Group-Video/OpenVideoCall-iOS/exportPlist.plist | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Group-Video/OpenVideoCall-iOS-Objective-C/exportPlist.plist b/Group-Video/OpenVideoCall-iOS-Objective-C/exportPlist.plist index 0b85fe99..f5b3f00e 100644 --- a/Group-Video/OpenVideoCall-iOS-Objective-C/exportPlist.plist +++ b/Group-Video/OpenVideoCall-iOS-Objective-C/exportPlist.plist @@ -9,7 +9,7 @@ provisioningProfiles io.agora.OpenVideoCall - AgoraAppsDevProfile + App diff --git a/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj b/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj index 84c32693..216ef09a 100644 --- a/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj +++ b/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj @@ -490,8 +490,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; DEVELOPMENT_TEAM = SW3CA7M752; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -522,8 +522,8 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)"; + CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; DEVELOPMENT_TEAM = SW3CA7M752; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Group-Video/OpenVideoCall-iOS/exportPlist.plist b/Group-Video/OpenVideoCall-iOS/exportPlist.plist index 0b85fe99..f5b3f00e 100644 --- a/Group-Video/OpenVideoCall-iOS/exportPlist.plist +++ b/Group-Video/OpenVideoCall-iOS/exportPlist.plist @@ -9,7 +9,7 @@ provisioningProfiles io.agora.OpenVideoCall - AgoraAppsDevProfile + App From 3094a8bb067328ec1848f54235f67f7f3a693802 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 14:58:15 +0800 Subject: [PATCH 20/23] fix swift ovc --- .../OpenVideoCall.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj b/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj index 216ef09a..fa9c1a09 100644 --- a/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj +++ b/Group-Video/OpenVideoCall-iOS/OpenVideoCall.xcodeproj/project.pbxproj @@ -276,7 +276,7 @@ TargetAttributes = { 07F52EB01D62F39D006DDCD4 = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = SW3CA7M752; + DevelopmentTeam = GM72UGLGZW; LastSwiftMigration = 1000; ProvisioningStyle = Manual; SystemCapabilities = { @@ -492,7 +492,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -508,7 +508,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -524,7 +524,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Qianze Zhang (3C9KJFP729)"; - DEVELOPMENT_TEAM = SW3CA7M752; + DEVELOPMENT_TEAM = GM72UGLGZW; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -540,7 +540,7 @@ PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; - PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile; + PROVISIONING_PROFILE_SPECIFIER = App; SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_SWIFT3_OBJC_INFERENCE = Default; SWIFT_VERSION = 4.2; From e25783103fe55fa7cf42d917581da347bb546d68 Mon Sep 17 00:00:00 2001 From: QianzeZhang Date: Fri, 14 Aug 2020 15:15:48 +0800 Subject: [PATCH 21/23] fix build --- .../OpenVideoCall-iOS/OpenVideoCall/RoomViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Group-Video/OpenVideoCall-iOS/OpenVideoCall/RoomViewController.swift b/Group-Video/OpenVideoCall-iOS/OpenVideoCall/RoomViewController.swift index 4bba5fa0..ae9c9041 100644 --- a/Group-Video/OpenVideoCall-iOS/OpenVideoCall/RoomViewController.swift +++ b/Group-Video/OpenVideoCall-iOS/OpenVideoCall/RoomViewController.swift @@ -223,7 +223,7 @@ private extension RoomViewController { // Step 4, enable encryption mode if let type = settings.encryptionType, let text = type.text, !text.isEmpty { let config = AgoraEncryptionConfig() - config.encryptionKey = NSString(utf8String: text) + config.encryptionKey = text config.encryptionMode = type.modeValue() agoraKit.enableEncryption(true, encryptionConfig: config) } From 4a6833662bf8ae4f34d00ec01c02dc3cb047bef9 Mon Sep 17 00:00:00 2001 From: sbd021 Date: Fri, 14 Aug 2020 16:17:07 +0800 Subject: [PATCH 22/23] encrypt error --- .../OpenVideoCall/EnterChannelDlg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp index 1fd9678a..a51822a6 100644 --- a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp +++ b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp @@ -202,9 +202,11 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel() // configuration of encrypt EncryptionConfig config; // set encrypt mode - config.encryptionMode = m_cmbEncType.GetCurSel(); + config.encryptionMode = ENCRYPTION_MODE(m_cmbEncType.GetCurSel() + 1); // set encrypt key - config.encryptionKey = strKey; + char szKey[520] = { 0 }; + WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL); + config.encryptionKey = szKey; // EnableEncryption of engine. CAgoraObject::GetAgoraObject()->EnableEncryption(true, config); } From bdbdf8cf8913f997eeb887148f558d012227b5dc Mon Sep 17 00:00:00 2001 From: sbd021 Date: Fri, 14 Aug 2020 16:32:46 +0800 Subject: [PATCH 23/23] crash --- .../Language/ChineseSimplified/ChineseSimplified.h | 2 ++ .../Language/ChineseSimplified/Source.def | 2 ++ .../OpenVideoCall-Windows-MFC/Language/English/English.h | 2 ++ .../OpenVideoCall-Windows-MFC/Language/English/Source.def | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h index 811549e9..b4e681dc 100644 --- a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h +++ b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h @@ -48,6 +48,8 @@ extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS; extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256GCM; extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM; extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR; +extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB; +extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB; extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_RESOLUTION; extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MFR; diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def index ebb6cb8a..b80ed295 100644 --- a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def +++ b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def @@ -37,6 +37,8 @@ IDS_CHN_AES256XTS DATA; IDS_CHN_AES256GCM DATA; IDS_CHN_AES256CCM DATA; IDS_CHN_AES256CTR DATA; +IDS_CHN_AES_128_ECB DATA; +IDS_CHN_SM4_128ECB DATA; IDS_SET_RESOLUTION DATA; IDS_SET_MFR DATA; diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h index 720907e3..728bc32c 100644 --- a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h +++ b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h @@ -49,6 +49,8 @@ extern ENGLISH_API LPCTSTR IDS_CHN_AES256XTS; extern ENGLISH_API LPCTSTR IDS_CHN_AES256GCM; extern ENGLISH_API LPCTSTR IDS_CHN_AES256CCM; extern ENGLISH_API LPCTSTR IDS_CHN_AES256CTR; +extern ENGLISH_API LPCTSTR IDS_CHN_AES_128_ECB; +extern ENGLISH_API LPCTSTR IDS_CHN_SM4_128ECB; extern ENGLISH_API LPCTSTR IDS_SET_RESOLUTION; extern ENGLISH_API LPCTSTR IDS_SET_MFR; diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def index d1e513ec..82d26c22 100644 --- a/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def +++ b/Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def @@ -37,6 +37,8 @@ IDS_CHN_AES256XTS DATA; IDS_CHN_AES256GCM DATA; IDS_CHN_AES256CCM DATA; IDS_CHN_AES256CTR DATA; +IDS_CHN_AES_128_ECB DATA; +IDS_CHN_SM4_128ECB DATA; IDS_SET_RESOLUTION DATA; IDS_SET_MFR DATA;