Skip to content

Commit abc56e5

Browse files
plutolessplutoless
committed
Merge branch 'master' into dev/3.2.0
2 parents c43d302 + d6b0cca commit abc56e5

File tree

9 files changed

+45
-37
lines changed

9 files changed

+45
-37
lines changed

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

Lines changed: 15 additions & 13 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
@@ -39,17 +39,19 @@ extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_BTJOIN;
3939
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_CHTIP;
4040
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_KEYTIP;
4141

42-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_ENCTYPE;
43-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS;
42+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_ENCTYPE ;
43+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS ;
4444
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128GCM;
4545
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CCM;
46-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR;
46+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR ;
4747
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256XTS;
4848
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256GCM;
49-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM;
50-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR;
51-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB;
52-
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB;
49+
50+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CCM ;
51+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR ;
52+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB ;
53+
extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB ;
54+
5355

5456
extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_RESOLUTION;
5557
extern CHINESESIMPLIFIED_API LPCTSTR IDS_SET_MFR;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ IDS_CHN_CHTIP DATA;
2929
IDS_CHN_KEYTIP DATA;
3030
IDS_CHN_ENCTYPE DATA;
3131

32+
IDS_CHN_ENCTYPE DATA;
3233
IDS_CHN_AES128XTS DATA;
3334
IDS_CHN_AES128GCM DATA;
3435
IDS_CHN_AES128CCM DATA;
@@ -37,8 +38,9 @@ IDS_CHN_AES256XTS DATA;
3738
IDS_CHN_AES256GCM DATA;
3839
IDS_CHN_AES256CCM DATA;
3940
IDS_CHN_AES256CTR DATA;
41+
IDS_CHN_SM4_128ECB DATA;
4042
IDS_CHN_AES_128_ECB DATA;
41-
IDS_CHN_SM4_128ECB DATA;
43+
4244

4345
IDS_SET_RESOLUTION DATA;
4446
IDS_SET_MFR DATA;

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

Lines changed: 8 additions & 7 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
@@ -49,8 +49,9 @@ extern ENGLISH_API LPCTSTR IDS_CHN_AES256XTS;
4949
extern ENGLISH_API LPCTSTR IDS_CHN_AES256GCM;
5050
extern ENGLISH_API LPCTSTR IDS_CHN_AES256CCM;
5151
extern ENGLISH_API LPCTSTR IDS_CHN_AES256CTR;
52-
extern ENGLISH_API LPCTSTR IDS_CHN_AES_128_ECB;
5352
extern ENGLISH_API LPCTSTR IDS_CHN_SM4_128ECB;
53+
extern ENGLISH_API LPCTSTR IDS_CHN_AES_128_ECB;
54+
5455

5556
extern ENGLISH_API LPCTSTR IDS_SET_RESOLUTION;
5657
extern ENGLISH_API LPCTSTR IDS_SET_MFR;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ IDS_CHN_CHTIP DATA;
2929
IDS_CHN_KEYTIP DATA;
3030
IDS_CHN_ENCTYPE DATA;
3131

32+
IDS_CHN_ENCTYPE DATA;
3233
IDS_CHN_AES128XTS DATA;
3334
IDS_CHN_AES128GCM DATA;
3435
IDS_CHN_AES128CCM DATA;
@@ -37,8 +38,10 @@ IDS_CHN_AES256XTS DATA;
3738
IDS_CHN_AES256GCM DATA;
3839
IDS_CHN_AES256CCM DATA;
3940
IDS_CHN_AES256CTR DATA;
41+
IDS_CHN_SM4_128ECB DATA;
4042
IDS_CHN_AES_128_ECB DATA;
41-
IDS_CHN_SM4_128ECB DATA;
43+
44+
4245

4346
IDS_SET_RESOLUTION DATA;
4447
IDS_SET_MFR DATA;

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

Lines changed: 8 additions & 12 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"));
@@ -77,7 +77,7 @@ BOOL CEnterChannelDlg::OnInitDialog()
7777
InitCtrls();
7878

7979
return TRUE; // return TRUE unless you set the focus to a control
80-
// 异常: OCX 属性页应返回 FALSE
80+
8181
}
8282

8383
void CEnterChannelDlg::InitCtrls()
@@ -184,18 +184,15 @@ void CEnterChannelDlg::DrawClient(CDC *lpDC)
184184

185185
void CEnterChannelDlg::OnBnClickedBtntestChannel()
186186
{
187-
// TODO: 在此添加控件通知处理程序代码
188187
m_dlgDevice.ShowWindow(SW_SHOW);
189188
m_dlgDevice.CenterWindow();
190189
}
191190

192191

193192
void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
194193
{
195-
// TODO: 在此添加控件通知处理程序代码
196194
// CString str = CAgoraObject::GetAgoraObject()->GetCallID();
197195
CString strKey;
198-
199196
m_ctrEncKey.GetWindowText(strKey);
200197
if (strKey.GetLength() > 0)
201198
{
@@ -204,9 +201,9 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
204201
// set encrypt mode
205202
config.encryptionMode = ENCRYPTION_MODE(m_cmbEncType.GetCurSel() + 1);
206203
// set encrypt key
207-
char szKey[520] = { 0 };
208-
WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL);
209-
config.encryptionKey = szKey;
204+
char szKey[520] = { 0 };
205+
WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL);
206+
config.encryptionKey = szKey;
210207
// EnableEncryption of engine.
211208
CAgoraObject::GetAgoraObject()->EnableEncryption(true, config);
212209
}
@@ -216,7 +213,6 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
216213

217214
void CEnterChannelDlg::OnBnClickedBtnsetChannel()
218215
{
219-
// TODO: 在此添加控件通知处理程序代码
220216
// SHORT sKeyStat = ::GetAsyncKeyState(VK_CONTROL);
221217

222218
GetParent()->SendMessage(WM_GONEXT, 0, 0);

‎Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/OpenVideoCall.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,12 @@
106106
<Optimization>Disabled</Optimization>
107107
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108108
<SDLCheck>true</SDLCheck>
109+
<AdditionalIncludeDirectories>..\sdk\include</AdditionalIncludeDirectories>
109110
</ClCompile>
110111
<Link>
111112
<SubSystem>Windows</SubSystem>
112113
<GenerateDebugInformation>true</GenerateDebugInformation>
114+
<AdditionalLibraryDirectories>..\sdk\lib</AdditionalLibraryDirectories>
113115
</Link>
114116
<Midl>
115117
<MkTypLibCompatible>false</MkTypLibCompatible>
@@ -165,12 +167,14 @@
165167
<IntrinsicFunctions>true</IntrinsicFunctions>
166168
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167169
<SDLCheck>true</SDLCheck>
170+
<AdditionalIncludeDirectories>..\sdk\include</AdditionalIncludeDirectories>
168171
</ClCompile>
169172
<Link>
170173
<SubSystem>Windows</SubSystem>
171174
<GenerateDebugInformation>true</GenerateDebugInformation>
172175
<EnableCOMDATFolding>true</EnableCOMDATFolding>
173176
<OptimizeReferences>true</OptimizeReferences>
177+
<AdditionalLibraryDirectories>..\sdk\lib</AdditionalLibraryDirectories>
174178
</Link>
175179
<Midl>
176180
<MkTypLibCompatible>false</MkTypLibCompatible>

‎Group-Video/OpenVideoCall-Windows/openvideocall.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void OpenVideoCall::on_btn_join_clicked()
116116
// configuration of encrypt
117117
EncryptionConfig config;
118118
// set encrypt mode
119-
config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex()+1);
119+
config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex() + 1);
120120
// set encrypt key
121121
config.encryptionKey = qsEncrypSecret.toUtf8().data();
122122
// EnableEncryption of engine.

‎One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"lint-fix": "eslint --fix src/ "
1818
},
1919
"dependencies": {
20-
"agora-rtc-sdk": "^3.0.2",
20+
"agora-rtc-sdk": "^3.2.3",
2121
"jquery": "^3.4.1",
2222
"materialize-css": "^1.0.0"
2323
},

‎One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/src/rtc-client.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ export default class RTCClient {
276276
_updateVideoInfo () {
277277
this._localStream && this._localStream.getStats((stats) => {
278278
const localStreamProfile = [
279-
['Uid: ', this._localStream.getId()].join(''),
279+
['Uid: ', this._localStream && this._localStream.getId()].join(''),
280280
['SDN access delay: ', stats.accessDelay, 'ms'].join(''),
281281
['Video send: ', stats.videoSendFrameRate, 'fps ', stats.videoSendResolutionWidth + 'x' + stats.videoSendResolutionHeight].join(''),
282282
].join('<br/>')

0 commit comments

Comments
 (0)