From 9438e67c1d6cacde5607f8561b2facb719bda2de Mon Sep 17 00:00:00 2001
From: CLuCheng <1551394539@qq.com>
Date: Mon, 7 Sep 2020 13:34:51 +0800
Subject: [PATCH] repair ENCRYPTIONMODE
---
.../OpenVideoCall.vcxproj | 277 ++++++------------
.../OpenVideoCall.vcxproj.filters | 39 +--
.../OpenVideoCall-Windows/agoraobject.cpp | 2 +-
.../OpenVideoCall-Windows/openvideocall.cpp | 4 +-
4 files changed, 107 insertions(+), 215 deletions(-)
diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj b/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj
index f8e56ec7..f618c5a7 100644
--- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj
+++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj
@@ -16,7 +16,8 @@
QtVS_v303
10.0.19041.0
10.0.19041.0
- $(MSBuildProjectDirectory)\QtMsBuild
+ $(MSBuildProjectDirectory)\QtMsBuild
+
v141
@@ -36,7 +37,10 @@
debug\
OpenVideoCall
-
+
+
+
+
@@ -44,11 +48,39 @@
- debug\debug\OpenVideoCalltruetruerelease\release\OpenVideoCalltruefalsetrueQT_5.12_x86core;network;gui;widgets;qml;quickwidgets;quickQT_5.12_x86core;network;gui;widgets;qml;quickwidgets;quick
-
+
+
+
+
+
+ debug\
+ debug\
+ OpenVideoCall
+ true
+ true
+
+
+ release\
+ release\
+ OpenVideoCall
+ true
+ false
+ true
+
+
+ QT_5.12_x86
+ core;network;gui;widgets;qml;quickwidgets;quick
+
+
+ QT_5.12_x86
+ core;network;gui;widgets;qml;quickwidgets;quick
+
+
+
+
- .\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;./../../libs/include;release;/include;%(AdditionalIncludeDirectories)
+ .\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;.\sdk\include;release;/include;%(AdditionalIncludeDirectories)
-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
release\
false
@@ -59,15 +91,17 @@
MaxSpeed
_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;QT_NO_DEBUG;NDEBUG;%(PreprocessorDefinitions)
false
-
+
+
MultiThreadedDLL
true
true
Level3
- true
+ true
+
agora_rtc_sdk.lib;User32.LIB;shell32.lib;%(AdditionalDependencies)
- D:\AgoraIO\basic-video-call\libs\x86;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.6.11-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)
+ .\sdk\lib;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.6.11-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
false
@@ -90,10 +124,30 @@
copy ..\..\libs\x86\*.dll .\Release && windeployqt Release\OpenVideoCall.exe
copy ..\..\libs\x86\*.dll .\Release && windeployqt Release\OpenVideoCall.exe
- msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppopenvideocalldefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h
+
+ msvc
+ ./$(Configuration)/moc_predefs.h
+ Moc'ing %(Identity)...
+ output
+ $(Configuration)
+ moc_%(Filename).cpp
+
+
+ openvideocall
+ default
+ Rcc'ing %(Identity)...
+ $(Configuration)
+ qrc_%(Filename).cpp
+
+
+ Uic'ing %(Identity)...
+ $(ProjectDir)
+ ui_%(Filename).h
+
+
- .\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;./../../libs/include;debug;/include;%(AdditionalIncludeDirectories)
+ .\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;..\..\libs\include;debug;/include;%(AdditionalIncludeDirectories)
-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -Zc:__cplusplus -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
debug\
false
@@ -108,10 +162,11 @@
true
true
Level3
- true
+ true
+
agora_rtc_sdk.lib;User32.LIB;shell32.lib;%(AdditionalDependencies)
- D:\AgoraIO\basic-video-call\libs\x86;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.6.11-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)
+ ..\..\libs\x86;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.6.11-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -133,7 +188,27 @@
copy ..\..\libs\x86\*.dll .\Debug
copy ..\..\libs\x86\*.dll .\Debug
- msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppopenvideocalldefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h
+
+ msvc
+ ./$(Configuration)/moc_predefs.h
+ Moc'ing %(Identity)...
+ output
+ $(Configuration)
+ moc_%(Filename).cpp
+
+
+ openvideocall
+ default
+ Rcc'ing %(Identity)...
+ $(Configuration)
+ qrc_%(Filename).cpp
+
+
+ Uic'ing %(Identity)...
+ $(ProjectDir)
+ ui_%(Filename).h
+
+
@@ -151,116 +226,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Document
true
@@ -277,93 +262,21 @@
release\moc_predefs.h;%(Outputs)
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -407,15 +320,6 @@
-
-
-
-
-
-
-
-
-
@@ -446,6 +350,9 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj.filters b/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj.filters
index 64baa69d..f4a1bfa3 100644
--- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj.filters
+++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall.vcxproj.filters
@@ -130,39 +130,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Generated Files
Generated Files
-
-
-
-
-
-
-
-
-
@@ -338,6 +311,18 @@
Resource Files
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Group-Video/OpenVideoCall-Windows/agoraobject.cpp b/Group-Video/OpenVideoCall-Windows/agoraobject.cpp
index c0b3eaa6..d11a4bb2 100644
--- a/Group-Video/OpenVideoCall-Windows/agoraobject.cpp
+++ b/Group-Video/OpenVideoCall-Windows/agoraobject.cpp
@@ -482,7 +482,7 @@ BOOL CAgoraObject::SetEncryptionMode(const char* secret,const char* secretMode)
BOOL CAgoraObject::EnableEncryption(bool enabled, const EncryptionConfig & config)
{
- int nRet = m_lpAgoraEngine->enableEncryption(enabled, config);
+ int nRet = m_rtcEngine->enableEncryption(enabled, config);
return nRet == 0 ? TRUE : FALSE;
}
diff --git a/Group-Video/OpenVideoCall-Windows/openvideocall.cpp b/Group-Video/OpenVideoCall-Windows/openvideocall.cpp
index f4393569..1ada8e92 100644
--- 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 = ui->com_encryp->currentIndex();
+ config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex() + 1);
// set encrypt key
config.encryptionKey = qsEncrypSecret.toUtf8().data();
// EnableEncryption of engine.
@@ -134,7 +134,7 @@ void OpenVideoCall::on_com_encryp_currentIndexChanged(const QString &arg1)
// configuration of encrypt
EncryptionConfig config;
// set encrypt mode
- config.encryptionMode = ui->com_encryp->currentIndex();
+ config.encryptionMode = (ENCRYPTION_MODE)(ui->com_encryp->currentIndex() + 1);
// set encrypt key
config.encryptionKey = qsEncrypSecret.toUtf8().data();
// EnableEncryption of engine.