diff --git a/Calling/CallingQuickstart.csproj b/Calling/CallingQuickstart.csproj index 14b1cc1d..9bc8dce5 100644 --- a/Calling/CallingQuickstart.csproj +++ b/Calling/CallingQuickstart.csproj @@ -1,182 +1,182 @@ - - - - - Debug - x86 - {70AC1FDD-4763-43F9-BD14-0A655B296E0B} - AppContainerExe - Properties - Calling - Calling - en-US - UAP - 10.0.22621.0 - 10.0.17763.0 - 14 - 512 - {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - true - false - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x86 - false - prompt - true - true - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 - full - ARM64 - false - prompt - true - true - - - bin\ARM64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - ARM64 - false - prompt - true - true - - - true - bin\x64\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS;ACS - ;2008 - full - x64 - false - prompt - true - true - - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - - - PackageReference - - - - App.xaml - - - MainPage.xaml - - - MainPage.xaml - - - - - - Designer - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - 1.6.0 - - - 6.2.14 - - - 7.1.3 - - - 0.1.7.9 - - - - 14.0 - - - + + + + + Debug + x86 + {70AC1FDD-4763-43F9-BD14-0A655B296E0B} + AppContainerExe + Properties + Calling + Calling + en-US + UAP + 10.0.22621.0 + 10.0.17763.0 + 14 + 512 + {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + true + false + + + true + bin\x86\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + x86 + false + prompt + true + + + bin\x86\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x86 + false + prompt + true + true + + + true + bin\ARM\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM + false + prompt + true + + + bin\ARM\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM + false + prompt + true + true + + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP + ;2008 + full + ARM64 + false + prompt + true + true + + + bin\ARM64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + ARM64 + false + prompt + true + true + + + true + bin\x64\Debug\ + TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS;ACS + ;2008 + full + x64 + false + prompt + true + true + + + bin\x64\Release\ + TRACE;NETFX_CORE;WINDOWS_UWP + true + ;2008 + pdbonly + x64 + false + prompt + true + true + + + PackageReference + + + + App.xaml + + + MainPage.xaml + + + MainPage.xaml + + + + + + Designer + + + + + + + + + + + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + + + 1.7.0 + + + 6.2.14 + + + 7.1.3 + + + 0.1.7.9 + + + + 14.0 + + + - + --> + \ No newline at end of file diff --git a/Calling/MainPage.xaml b/Calling/MainPage.xaml index facabeb6..8534b58a 100644 --- a/Calling/MainPage.xaml +++ b/Calling/MainPage.xaml @@ -23,8 +23,13 @@ - - + + + + + + + diff --git a/Calling/MainPage.xaml.cs b/Calling/MainPage.xaml.cs index 89eb76f6..2d489deb 100644 --- a/Calling/MainPage.xaml.cs +++ b/Calling/MainPage.xaml.cs @@ -121,6 +121,8 @@ private async void CameraList_SelectionChanged(object sender, SelectionChangedEv private async void CallButton_Click(object sender, RoutedEventArgs e) { var callString = CalleeTextBox.Text.Trim(); + var meetingId = CalleeMeetingId.Text.Trim(); + var passcode = CalleeMeetingPasscode.Text.Trim(); if (!string.IsNullOrEmpty(callString)) { @@ -145,6 +147,10 @@ private async void CallButton_Click(object sender, RoutedEventArgs e) call = await JoinTeamsMeetingByLinkWithAcsAsync(teamsMeetinglink); } } + else if (!string.IsNullOrEmpty(meetingId) && !string.IsNullOrEmpty(passcode)) + { + call = await JoinTeamsMeetingByMeetingIdWithAcsAsync(meetingId, passcode); + } call.RemoteParticipantsUpdated += OnRemoteParticipantsUpdatedAsync; call.StateChanged += OnStateChangedAsync; @@ -501,6 +507,15 @@ private async Task JoinTeamsMeetingByLinkWithAcsAsync(Uri mee return call; } + private async Task JoinTeamsMeetingByMeetingIdWithAcsAsync(String meetingId, String passcode) + { + var joinCallOptions = GetJoinCallOptions(); + + var teamsMeetingIdLocator = new TeamsMeetingIdLocator(meetingId, passcode); + var call = await callAgent.JoinAsync(teamsMeetingIdLocator, joinCallOptions); + return call; + } + private async Task StartRoomsCallAsync(String roomId) { var joinCallOptions = GetJoinCallOptions();