Skip to content

Commit 4b402d9

Browse files
CLuChengCLuCheng
authored
Merge branch 'master' into dev/3.1.0
2 parents 9438e67 + 34755e5 commit 4b402d9

File tree

27 files changed

+92
-80
lines changed

27 files changed

+92
-80
lines changed

‎Group-Video/OpenVideoCall-Android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ dependencies {
5252
exclude group: 'com.google.android', module: 'android'
5353
}
5454

55-
implementation 'io.agora.rtc:full-sdk:2.9.2'
55+
implementation 'io.agora.rtc:full-sdk:3.1.0'
5656
androidTestImplementation 'com.android.support.test:rules:1.0.2'
5757
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
5858
}

‎Group-Video/OpenVideoCall-Android/app/src/main/java/io/agora/openvcall/ui/BaseActivity.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.agora.openvcall.model.*;
2121
import io.agora.propeller.Constant;
2222
import io.agora.rtc.RtcEngine;
23+
import io.agora.rtc.internal.EncryptionConfig;
2324
import io.agora.rtc.video.VideoCanvas;
2425
import io.agora.rtc.video.VideoEncoderConfiguration;
2526

@@ -361,9 +362,18 @@ protected void disablePreProcessor() {
361362
}
362363

363364
protected void configEngine(VideoEncoderConfiguration.VideoDimensions videoDimension, VideoEncoderConfiguration.FRAME_RATE fps, String encryptionKey, String encryptionMode) {
365+
EncryptionConfig config = new EncryptionConfig();
364366
if (!TextUtils.isEmpty(encryptionKey)) {
365-
rtcEngine().setEncryptionMode(encryptionMode);
366-
rtcEngine().setEncryptionSecret(encryptionKey);
367+
config.encryptionKey = encryptionKey;
368+
369+
if(TextUtils.equals(encryptionMode, "AES-128-XTS")) {
370+
config.encryptionMode = EncryptionConfig.EncryptionMode.AES_128_XTS;
371+
} else if(TextUtils.equals(encryptionMode, "AES-256-XTS")) {
372+
config.encryptionMode = EncryptionConfig.EncryptionMode.AES_256_XTS;
373+
}
374+
rtcEngine().enableEncryption(true, config);
375+
} else {
376+
rtcEngine().enableEncryption(false, config);
367377
}
368378

369379
log.debug("configEngine " + videoDimension + " " + fps + " " + encryptionMode);

‎Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// 下列 ifdef 块是创建使从 DLL 导出更简单的
2-
// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 CHINESESIMPLIFIED_EXPORTS
3-
// 符号编译的。在使用此 DLL 的
4-
// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
5-
// CHINESESIMPLIFIED_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
6-
// 符号视为是被导出的。
1+
// 下列 ifdef 块是创建使从 DLL 导出更简单的
2+
// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 CHINESESIMPLIFIED_EXPORTS
3+
// 符号编译的。在使用此 DLL 的
4+
// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
5+
// CHINESESIMPLIFIED_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
6+
// 符号视为是被导出的。
77
#ifdef CHINESESIMPLIFIED_EXPORTS
88
#define CHINESESIMPLIFIED_API __declspec(dllexport)
99
#else
@@ -46,11 +46,13 @@ extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CCM;
4646
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR ;
4747
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS;
4848
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256GCM;
49+
4950
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM ;
5051
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR ;
5152
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB ;
5253
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB ;
5354

55+
5456
extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_RESOLUTION;
5557
extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MFR;
5658
extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MR;

‎Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/Source.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ IDS_CHN_AES256CTR DATA;
4141
IDS_CHN_SM4_128ECB DATA;
4242
IDS_CHN_AES_128_ECB DATA;
4343

44+
4445
IDS_SET_RESOLUTION DATA;
4546
IDS_SET_MFR DATA;
4647
IDS_SET_MR DATA;

‎Group-Video/OpenVideoCall-Windows-MFC/Language/English/English.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// 下列 ifdef 块是创建使从 DLL 导出更简单的
2-
// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 ENGLISH_EXPORTS
3-
// 符号编译的。在使用此 DLL 的
4-
// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
5-
// ENGLISH_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
6-
// 符号视为是被导出的。
1+
// 下列 ifdef 块是创建使从 DLL 导出更简单的
2+
// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 ENGLISH_EXPORTS
3+
// 符号编译的。在使用此 DLL 的
4+
// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
5+
// ENGLISH_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
6+
// 符号视为是被导出的。
77
#ifdef ENGLISH_EXPORTS
88
#define ENGLISH_API __declspec(dllexport)
99
#else

‎Group-Video/OpenVideoCall-Windows-MFC/Language/English/Source.def‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ IDS_CHN_SM4_128ECB DATA;
4242
IDS_CHN_AES_128_ECB DATA;
4343

4444

45+
4546
IDS_SET_RESOLUTION DATA;
4647
IDS_SET_MFR DATA;
4748
IDS_SET_MR DATA;

‎Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// EnterChannelDlg.cpp : 实现文件
1+
// EnterChannelDlg.cpp : 实现文件
22
//
33

44
#include "stdafx.h"
@@ -9,7 +9,7 @@
99
#include "afxdialogex.h"
1010

1111

12-
// CEnterChannelDlg 对话框
12+
// CEnterChannelDlg 对话框
1313

1414
IMPLEMENT_DYNAMIC(CEnterChannelDlg, CDialogEx)
1515

@@ -43,7 +43,7 @@ BEGIN_MESSAGE_MAP(CEnterChannelDlg, CDialogEx)
4343
END_MESSAGE_MAP()
4444

4545

46-
// CEnterChannelDlg 消息处理程序
46+
// CEnterChannelDlg 消息处理程序
4747
BOOL CEnterChannelDlg::PreTranslateMessage(MSG* pMsg)
4848
{
4949
if (pMsg->message == WM_KEYDOWN){
@@ -63,7 +63,7 @@ BOOL CEnterChannelDlg::OnInitDialog()
6363
{
6464
CDialogEx::OnInitDialog();
6565

66-
// TODO: 在此添加额外的初始化
66+
// TODO: 在此添加额外的初始化
6767
m_ftEncy.CreateFont(17, 0, 0, 0, FW_BOLD, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
6868
m_ftHead.CreateFont(15, 0, 0, 0, FW_NORMAL, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
6969
m_ftDesc.CreateFont(15, 0, 0, 0, FW_NORMAL, FALSE, FALSE, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, _T("Arial"));
@@ -193,19 +193,17 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
193193
{
194194
// CString str = CAgoraObject::GetAgoraObject()->GetCallID();
195195
CString strKey;
196-
197196
m_ctrEncKey.GetWindowText(strKey);
198197
if (strKey.GetLength() > 0)
199198
{
200-
201-
char szEncryptKey[2 * MAX_PATH] = { 0 };
202-
WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szEncryptKey, 2 * MAX_PATH, NULL, NULL);
203199
// configuration of encrypt
204200
EncryptionConfig config;
205201
// set encrypt mode
206-
config.encryptionMode = (agora::rtc::ENCRYPTION_MODE)m_cmbEncType.GetCurSel();
202+
config.encryptionMode = ENCRYPTION_MODE(m_cmbEncType.GetCurSel() + 1);
207203
// set encrypt key
208-
config.encryptionKey = szEncryptKey;
204+
char szKey[520] = { 0 };
205+
WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL);
206+
config.encryptionKey = szKey;
209207
// EnableEncryption of engine.
210208
CAgoraObject::GetAgoraObject()->EnableEncryption(true, config);
211209
}

‎Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
TargetAttributes = {
293293
076C59711DDDBC3500F813E2 = {
294294
CreatedOnToolsVersion = 8.1;
295-
DevelopmentTeam = SW3CA7M752;
295+
DevelopmentTeam = GM72UGLGZW;
296296
ProvisioningStyle = Manual;
297297
};
298298
};
@@ -495,9 +495,9 @@
495495
isa = XCBuildConfiguration;
496496
buildSettings = {
497497
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
498-
CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)";
498+
CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)";
499499
CODE_SIGN_STYLE = Manual;
500-
DEVELOPMENT_TEAM = SW3CA7M752;
500+
DEVELOPMENT_TEAM = GM72UGLGZW;
501501
ENABLE_BITCODE = NO;
502502
FRAMEWORK_SEARCH_PATHS = (
503503
"$(inherited)",
@@ -513,7 +513,7 @@
513513
PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall;
514514
PRODUCT_NAME = "$(TARGET_NAME)";
515515
PROVISIONING_PROFILE = "dc253ab3-71e4-40a3-a57c-a3a763407202";
516-
PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile;
516+
PROVISIONING_PROFILE_SPECIFIER = App;
517517
TARGETED_DEVICE_FAMILY = "1,2";
518518
};
519519
name = Debug;
@@ -522,9 +522,9 @@
522522
isa = XCBuildConfiguration;
523523
buildSettings = {
524524
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
525-
CODE_SIGN_IDENTITY = "iPhone Developer: Yuhua Gong (YBKA3W5TF4)";
525+
CODE_SIGN_IDENTITY = "Apple Development: Qianze Zhang (3C9KJFP729)";
526526
CODE_SIGN_STYLE = Manual;
527-
DEVELOPMENT_TEAM = SW3CA7M752;
527+
DEVELOPMENT_TEAM = GM72UGLGZW;
528528
ENABLE_BITCODE = NO;
529529
FRAMEWORK_SEARCH_PATHS = (
530530
"$(inherited)",
@@ -540,7 +540,7 @@
540540
PRODUCT_BUNDLE_IDENTIFIER = io.agora.OpenVideoCall;
541541
PRODUCT_NAME = "$(TARGET_NAME)";
542542
PROVISIONING_PROFILE = "dc253ab3-71e4-40a3-a57c-a3a763407202";
543-
PROVISIONING_PROFILE_SPECIFIER = AgoraAppsDevProfile;
543+
PROVISIONING_PROFILE_SPECIFIER = App;
544544
TARGETED_DEVICE_FAMILY = "1,2";
545545
};
546546
name = Release;

‎Group-Video/OpenVideoCall-iOS-Objective-C/OpenVideoCall/Encryption.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10+
#import <AgoraRtcKit/AgoraRtcEngineKit.h>
1011

1112
typedef NS_ENUM(int, EncryptionType) {
1213
EncryptionTypeXTS128,
@@ -16,7 +17,7 @@ typedef NS_ENUM(int, EncryptionType) {
1617

1718
@interface Encryption : NSObject
1819
@property (nonatomic, copy, readonly) NSString *modeString;
19-
@property (nonatomic, copy, readonly) AgoraEncryptionMode modeValue;
20+
@property (nonatomic, readonly) AgoraEncryptionMode modeValue;
2021
@property (nonatomic, copy, readonly) NSString *description;
2122
@property (nonatomic, assign) EncryptionType type;
2223
@property (nonatomic, copy) NSString *secret;

‎Group-Video/OpenVideoCall-iOS-Objective-C/exportPlist.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>provisioningProfiles</key>
1010
<dict>
1111
<key>io.agora.OpenVideoCall</key>
12-
<string>AgoraAppsDevProfile</string>
12+
<string>App</string>
1313
</dict>
1414
</dict>
1515
</plist>

0 commit comments

Comments
 (0)