Merge branch 'master' into dev/3.2.0

AgoraIO · Dec 9, 2020 · abc56e5 · abc56e5
2 parents c43d302 + d6b0cca
commit abc56e5
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 37 deletions.
diff --git a/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h b/Group-Video/OpenVideoCall-Windows-MFC/Language/ChineseSimplified/ChineseSimplified.h
@@ -1,9 +1,9 @@
-// 下列 ifdef 块是创建使从 DLL 导出更简单的
-// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 CHINESESIMPLIFIED_EXPORTS
-// 符号编译的。在使用此 DLL 的
-// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
-// CHINESESIMPLIFIED_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
-// 符号视为是被导出的。
+// 下列 ifdef 块是创建使从 DLL 导出更简单的
+// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 CHINESESIMPLIFIED_EXPORTS
+// 符号编译的。在使用此 DLL 的
+// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
+// CHINESESIMPLIFIED_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
+// 符号视为是被导出的。
 #ifdef CHINESESIMPLIFIED_EXPORTS
 #define CHINESESIMPLIFIED_API __declspec(dllexport)
 #else
@@ -39,17 +39,19 @@ extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_BTJOIN;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_CHTIP;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_KEYTIP;
 
-extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_ENCTYPE;
-extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_ENCTYPE ;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128XTS ;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128GCM;
 extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CCM;
-extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES128CTR ;
 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_CHN_AES256CCM ;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES256CTR ;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_SM4_128ECB ;
+extern CHINESESIMPLIFIED_API LPCTSTR IDS_CHN_AES_128_ECB ;
+
 
 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
@@ -29,6 +29,7 @@ IDS_CHN_CHTIP		DATA;
 IDS_CHN_KEYTIP		DATA;
 IDS_CHN_ENCTYPE		DATA;
 
+IDS_CHN_ENCTYPE		DATA;
 IDS_CHN_AES128XTS	DATA;
 IDS_CHN_AES128GCM	DATA;
 IDS_CHN_AES128CCM	DATA;
@@ -37,8 +38,9 @@ IDS_CHN_AES256XTS	DATA;
 IDS_CHN_AES256GCM	DATA;
 IDS_CHN_AES256CCM	DATA;
 IDS_CHN_AES256CTR	DATA;
+IDS_CHN_SM4_128ECB	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
@@ -1,9 +1,9 @@
-// 下列 ifdef 块是创建使从 DLL 导出更简单的
-// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 ENGLISH_EXPORTS
-// 符号编译的。在使用此 DLL 的
-// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
-// ENGLISH_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
-// 符号视为是被导出的。
+// 下列 ifdef 块是创建使从 DLL 导出更简单的
+// 宏的标准方法。此 DLL 中的所有文件都是用命令行上定义的 ENGLISH_EXPORTS
+// 符号编译的。在使用此 DLL 的
+// 任何其他项目上不应定义此符号。这样，源文件中包含此文件的任何其他项目都会将
+// ENGLISH_API 函数视为是从 DLL 导入的，而此 DLL 则将用此宏定义的
+// 符号视为是被导出的。
 #ifdef ENGLISH_EXPORTS
 #define ENGLISH_API __declspec(dllexport)
 #else
@@ -49,8 +49,9 @@ 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_CHN_AES_128_ECB;
+
 
 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
@@ -29,6 +29,7 @@ IDS_CHN_CHTIP		DATA;
 IDS_CHN_KEYTIP		DATA;
 IDS_CHN_ENCTYPE		DATA;
 
+IDS_CHN_ENCTYPE		DATA;
 IDS_CHN_AES128XTS	DATA;
 IDS_CHN_AES128GCM	DATA;
 IDS_CHN_AES128CCM	DATA;
@@ -37,8 +38,10 @@ IDS_CHN_AES256XTS	DATA;
 IDS_CHN_AES256GCM	DATA;
 IDS_CHN_AES256CCM	DATA;
 IDS_CHN_AES256CTR	DATA;
+IDS_CHN_SM4_128ECB	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/OpenVideoCall/EnterChannelDlg.cpp b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/EnterChannelDlg.cpp
@@ -1,4 +1,4 @@
-// EnterChannelDlg.cpp : 实现文件
+// EnterChannelDlg.cpp : 实现文件
 //
 
 #include "stdafx.h"
@@ -9,7 +9,7 @@
 #include "afxdialogex.h"
 
 
-// CEnterChannelDlg 对话框
+// CEnterChannelDlg 对话框
 
 IMPLEMENT_DYNAMIC(CEnterChannelDlg, CDialogEx)
 
@@ -43,7 +43,7 @@ BEGIN_MESSAGE_MAP(CEnterChannelDlg, CDialogEx)
 END_MESSAGE_MAP()
 
 
-// CEnterChannelDlg 消息处理程序
+// CEnterChannelDlg 消息处理程序
 BOOL CEnterChannelDlg::PreTranslateMessage(MSG* pMsg)
 {
 	if (pMsg->message == WM_KEYDOWN){
@@ -63,7 +63,7 @@ BOOL CEnterChannelDlg::OnInitDialog()
 {
 	CDialogEx::OnInitDialog();
 
-	// TODO:  在此添加额外的初始化
+	// TODO:  在此添加额外的初始化
     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"));
     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"));
 	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()
 	InitCtrls();
 
 	return TRUE;  // return TRUE unless you set the focus to a control
-	// 异常:  OCX 属性页应返回 FALSE
+
 }
 
 void CEnterChannelDlg::InitCtrls()
@@ -184,18 +184,15 @@ void CEnterChannelDlg::DrawClient(CDC *lpDC)
 
 void CEnterChannelDlg::OnBnClickedBtntestChannel()
 {
-	// TODO:  在此添加控件通知处理程序代码
 	m_dlgDevice.ShowWindow(SW_SHOW);
 	m_dlgDevice.CenterWindow();
 }
 
 
 void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
 {
-	// TODO:  在此添加控件通知处理程序代码
 //	CString str = CAgoraObject::GetAgoraObject()->GetCallID();
 	CString strKey;
-
 	m_ctrEncKey.GetWindowText(strKey);
 	if (strKey.GetLength() > 0)
 	{
@@ -204,9 +201,9 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
 		// set encrypt mode
 		config.encryptionMode = ENCRYPTION_MODE(m_cmbEncType.GetCurSel() + 1);
 		// set encrypt key
-        char szKey[520] = { 0 };
-        WideCharToMultiByte(CP_UTF8, 0, strKey.GetBuffer(0), strKey.GetLength(), szKey, 520, NULL, NULL);
-        config.encryptionKey = szKey;
+    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);
 	}
@@ -216,7 +213,6 @@ void CEnterChannelDlg::OnBnClickedBtnjoinChannel()
 
 void CEnterChannelDlg::OnBnClickedBtnsetChannel()
 {
-	// TODO:  在此添加控件通知处理程序代码
 //	SHORT sKeyStat = ::GetAsyncKeyState(VK_CONTROL);
 
 	GetParent()->SendMessage(WM_GONEXT, 0, 0);

diff --git a/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/OpenVideoCall.vcxproj b/Group-Video/OpenVideoCall-Windows-MFC/OpenVideoCall/OpenVideoCall.vcxproj
@@ -106,10 +106,12 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\sdk\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\sdk\lib</AdditionalLibraryDirectories>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>
@@ -165,12 +167,14 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\sdk\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>..\sdk\lib</AdditionalLibraryDirectories>
     </Link>
     <Midl>
       <MkTypLibCompatible>false</MkTypLibCompatible>

diff --git a/Group-Video/OpenVideoCall-Windows/openvideocall.cpp b/Group-Video/OpenVideoCall-Windows/openvideocall.cpp
@@ -116,7 +116,7 @@ void OpenVideoCall::on_btn_join_clicked()
     // configuration of encrypt
     EncryptionConfig config;
     // set encrypt mode
-    config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex()+1);
+	config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex() + 1);
     // set encrypt key
     config.encryptionKey = qsEncrypSecret.toUtf8().data();
     // EnableEncryption of engine.

diff --git a/One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/package.json b/One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/package.json
@@ -17,7 +17,7 @@
     "lint-fix": "eslint --fix src/ "
   },
   "dependencies": {
-    "agora-rtc-sdk": "^3.0.2",
+    "agora-rtc-sdk": "^3.2.3",
     "jquery": "^3.4.1",
     "materialize-css": "^1.0.0"
   },

diff --git a/One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/src/rtc-client.js b/One-to-One-Video/Agora-Web-Tutorial-1to1-Webpack/src/rtc-client.js
@@ -276,7 +276,7 @@ export default class RTCClient {
   _updateVideoInfo () {
     this._localStream && this._localStream.getStats((stats) => {
       const localStreamProfile = [
-        ['Uid: ', this._localStream.getId()].join(''),
+        ['Uid: ', this._localStream && this._localStream.getId()].join(''),
         ['SDN access delay: ', stats.accessDelay, 'ms'].join(''),
         ['Video send: ', stats.videoSendFrameRate, 'fps ', stats.videoSendResolutionWidth + 'x' + stats.videoSendResolutionHeight].join(''),
       ].join('<br/>')