From 3278480b5c5d2302c58ebadbce96c6d8f41fa08a Mon Sep 17 00:00:00 2001 From: sbd021 Date: Tue, 11 Feb 2020 18:48:09 +0800 Subject: [PATCH] fix win bug --- Group-Video/OpenVideoCall-Windows/.gitignore | 354 ++++++++++++++++++ .../OpenVideoCall/AGVideoWnd.cpp | 2 +- .../OpenVideoCall/EnterChannelDlg.cpp | 17 + .../OpenVideoCall/EnterChannelDlg.h | 2 +- .../OpenVideoCall/OpenVideoCall.vcxproj | 5 +- .../OpenVideoCall/OpenVideoCallDlg.cpp | 1 + .../OpenVideoCall/VideoDlg.cpp | 4 +- .../AgoraTutorial/AGEngineEventHandler.cpp | 4 +- .../AgoraTutorial/AgoraTutorial.vcxproj | 5 +- 9 files changed, 386 insertions(+), 8 deletions(-) create mode 100644 Group-Video/OpenVideoCall-Windows/.gitignore diff --git a/Group-Video/OpenVideoCall-Windows/.gitignore b/Group-Video/OpenVideoCall-Windows/.gitignore new file mode 100644 index 00000000..e4c2d321 --- /dev/null +++ b/Group-Video/OpenVideoCall-Windows/.gitignore @@ -0,0 +1,354 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ +**/Properties/launchSettings.json + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + + +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app \ No newline at end of file diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/AGVideoWnd.cpp b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/AGVideoWnd.cpp index 7ea120e2..e4bf55f3 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/AGVideoWnd.cpp +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/AGVideoWnd.cpp @@ -261,7 +261,7 @@ int CAGVideoWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) return -1; // TODO: 在此添加您专用的创建代码 - m_wndInfo.Create(NULL, NULL, WS_CHILD | WS_VISIBLE, CRect(0, 0, 192, 28), this, IDC_STATIC); + m_wndInfo.Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CRect(0, 0, 192, 28), this, IDC_STATIC); return 0; } diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.cpp b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.cpp index 77381973..e712e156 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.cpp +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.cpp @@ -226,4 +226,21 @@ void CEnterChannelDlg::SetVideoString(LPCTSTR lpVideoString) void CEnterChannelDlg::CleanEncryptionSecret() { m_ctrEncKey.SetWindowText(_T("")); +} + + +void CEnterChannelDlg::SetCtrlPos() +{ + CRect ClientRect; + + GetClientRect(&ClientRect); + + m_ctrChannel.MoveWindow(ClientRect.Width() / 2 - 160, 128, 320, 22, TRUE); + m_ctrEncKey.MoveWindow(ClientRect.Width() / 2 - 160, 176, 140, 22, TRUE); + m_cmbEncType.MoveWindow(ClientRect.Width() / 2 + 50, 173, 120, 22, TRUE); + + int height = 36; + m_btnJoin.MoveWindow(ClientRect.Width() / 2 - 180, 310, 360, height, TRUE); + m_btnTest.MoveWindow(ClientRect.Width() / 2 - 180, 355, 108, height, TRUE); + m_btnSetup.MoveWindow(ClientRect.Width() / 2 - 60, 355, 240, height, TRUE); } \ No newline at end of file diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.h b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.h index b0a221d8..3662766c 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.h +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/EnterChannelDlg.h @@ -19,7 +19,7 @@ class CEnterChannelDlg : public CDialogEx void SetVideoString(LPCTSTR lpVideoString); void CleanEncryptionSecret(); - + void SetCtrlPos(); // 对话框数据 enum { IDD = IDD_ENTERCHANNEL_DIALOG }; diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCall.vcxproj b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCall.vcxproj index 01097bac..29c22608 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCall.vcxproj +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCall.vcxproj @@ -120,7 +120,7 @@ $(IntDir);%(AdditionalIncludeDirectories) - if exist ..\sdk (copy ..\sdk\dll\*.dll ..\Debug\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\Debug\) + if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\) @@ -171,6 +171,9 @@ NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) + + if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\) + diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCallDlg.cpp b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCallDlg.cpp index 177dfd67..ba59569b 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCallDlg.cpp +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/OpenVideoCallDlg.cpp @@ -163,6 +163,7 @@ void COpenVideoCallDlg::InitChildDialog() m_dlgSetup.MoveWindow(110, 70, 500, 450, TRUE); m_dlgEnterChannel.ShowWindow(SW_SHOW); + m_dlgEnterChannel.SetCtrlPos(); m_lpCurDialog = &m_dlgEnterChannel; m_dlgEnterChannel.SetVideoString(m_dlgSetup.GetVideoSolutionDes()); diff --git a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/VideoDlg.cpp b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/VideoDlg.cpp index d891f9dd..796c68fc 100644 --- a/Group-Video/OpenVideoCall-Windows/OpenVideoCall/VideoDlg.cpp +++ b/Group-Video/OpenVideoCall-Windows/OpenVideoCall/VideoDlg.cpp @@ -893,12 +893,12 @@ void CVideoDlg::InitCtrls() m_btnShow.Create(NULL, WS_VISIBLE | WS_CHILD, CRect(0, 0, 1, 1), this, IDC_BTNSCR_VIDEO); for (int nIndex = 0; nIndex < 4; nIndex++){ - m_wndVideo[nIndex].Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER, CRect(0, 0, 1, 1), this, IDC_BASEWND_VIDEO + nIndex); + m_wndVideo[nIndex].Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CRect(0, 0, 1, 1), this, IDC_BASEWND_VIDEO + nIndex); m_wndVideo[nIndex].SetBackImage(IDB_BACKGROUND_VIDEO, 96, 96, RGB(0x44, 0x44, 0x44)); m_wndVideo[nIndex].SetFaceColor(RGB(0x58, 0x58, 0x58)); } - m_wndLocal.Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER, CRect(0, 0, 1, 1), this, IDC_BASEWND_VIDEO + 4); + m_wndLocal.Create(NULL, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CRect(0, 0, 1, 1), this, IDC_BASEWND_VIDEO + 4); m_wndLocal.SetBackImage(IDB_BACKGROUND_VIDEO, 96, 96, RGB(0x44, 0x44, 0x44)); m_wndLocal.SetFaceColor(RGB(0x58, 0x58, 0x58)); m_wndLocal.SetUID(0); diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp index 643236f0..c4ae8085 100644 --- a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp +++ b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AGEngineEventHandler.cpp @@ -338,9 +338,9 @@ void CAGEngineEventHandler::onRemoteVideoStats(const RemoteVideoStats& stats) lpData->delay = stats.delay; lpData->width = stats.width; lpData->height = stats.height; - lpData->receivedFrameRate = stats.receivedFrameRate; + lpData->receivedFrameRate = stats.decoderOutputFrameRate; lpData->receivedBitrate = stats.receivedBitrate; - lpData->receivedFrameRate = stats.receivedFrameRate; + lpData->receivedFrameRate = stats.decoderOutputFrameRate; ::PostMessage(m_hMainWnd, WM_MSGID(EID_REMOTE_VIDEO_STAT), (WPARAM)lpData, 0); } diff --git a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj index 38caf4f0..0ec5edf5 100644 --- a/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj +++ b/One-to-One-Video/Agora-Windows-Tutorial-1to1/AgoraTutorial/AgoraTutorial.vcxproj @@ -70,7 +70,7 @@ $(IntDir);%(AdditionalIncludeDirectories) - copy ..\sdk\dll\*.dll ..\Debug\ + if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\) @@ -103,6 +103,9 @@ NDEBUG;%(PreprocessorDefinitions) $(IntDir);%(AdditionalIncludeDirectories) + + if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\) +