zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-490: Ensured users can't hangup call, automatically unmuting microphone and camera if users attempt to mute them, fixed window visibility on end of broadcast from SEB server, made initial proctoring view size bigger and fixed icon when proctoring is active.

Browse source
This commit is contained in:
Damian Büchel 2021-05-19 01:35:01 +02:00
parent ce625e4074
commit fd2eab589c
9 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SafeExamBrowser.Proctoring/JitsiMeet/index.html
View file

@ -17,7 +17,7 @@
SHOW_JITSI_WATERMARK: false,
TOOLBAR_BUTTONS: [
'microphone', 'camera', '%%_ALLOW_CLOSED_CAPTIONS_%%', /*'desktop',*/ 'embedmeeting', 'fullscreen',
'fodeviceselection', 'hangup', 'profile', '%%_ALLOW_CHAT_%%', '%%_ALLOW_RECORDING_%%',
'fodeviceselection', /*'hangup',*/ 'profile', '%%_ALLOW_CHAT_%%', '%%_ALLOW_RECORDING_%%',
'livestreaming', 'etherpad', /*'sharedvideo',*/ 'settings', '%%_ALLOW_RAISE_HAND_%%',
'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts',
'%%_ALLOW_TILE_VIEW_%%', 'select-background', 'download', 'help', /*'mute-everyone',*/ 'mute-video-everyone', 'security'
@ -34,6 +34,17 @@
};
var api = new JitsiMeetExternalAPI("%%_DOMAIN_%%", options);
api.addListener('audioMuteStatusChanged', args => {
if (args.muted) {
api.executeCommand('toggleAudio');
}
});
api.addListener('videoMuteStatusChanged', args => {
if (args.muted) {
api.executeCommand('toggleVideo');
}
});
api.executeCommand("subject", "%%_SUBJECT_%%");
</script>
</body>

6
SafeExamBrowser.Proctoring/ProctoringController.cs
View file

@ -39,6 +39,7 @@ namespace SafeExamBrowser.Proctoring
private ProctoringControl control;
private ProctoringSettings settings;
private IProctoringWindow window;
private WindowVisibility windowVisibility;
public IconResource IconResource { get; set; }
public string Tooltip { get; set; }
@ -81,6 +82,7 @@ namespace SafeExamBrowser.Proctoring
var start = false;
this.settings = settings;
this.windowVisibility = settings.WindowVisibility;
server.ProctoringConfigurationReceived += Server_ProctoringConfigurationReceived;
server.ProctoringInstructionReceived += Server_ProctoringInstructionReceived;
@ -134,6 +136,10 @@ namespace SafeExamBrowser.Proctoring
{
settings.WindowVisibility = WindowVisibility.AllowToHide;
}
else
{
settings.WindowVisibility = windowVisibility;
}
StopProctoring();
StartProctoring();

5
SafeExamBrowser.UserInterface.Desktop/Images/ProctoringNotification_Active.xaml
View file

@ -3,10 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Canvas Width="1024.000" Height="1024.000">
<Canvas>
<Path Fill="Green" Data="F1 M 556.000,505.189 C 645.504,506.389 716.387,430.101 716.387,329.785 C 716.387,235.474 645.504,157.984 556.000,157.984 C 466.496,157.984 395.614,235.474 396.215,329.785 C 396.816,430.101 466.496,503.987 556.000,505.189 Z"/>
<Path Fill="Green" Data="F1 M 842.535,0.000 L 269.467,0.000 C 174.557,0.000 126.501,47.455 126.501,141.765 L 126.501,533.171 C 133.375,529.423 140.444,525.997 147.700,522.909 C 162.465,516.624 177.660,511.878 193.178,508.681 L 193.178,145.369 C 193.178,93.709 220.810,66.677 270.669,66.677 L 841.333,66.677 C 890.590,66.677 918.823,93.709 918.823,145.369 L 918.823,714.232 C 918.823,741.263 911.014,761.086 896.597,774.302 C 844.336,663.173 728.401,583.880 556.000,583.880 C 511.826,583.880 471.014,589.399 433.878,599.528 C 446.051,615.497 456.175,632.869 464.091,651.466 C 476.793,681.309 483.234,712.908 483.234,745.383 C 483.234,777.859 476.793,809.457 464.091,839.300 C 461.226,846.031 458.062,852.597 454.628,859.000 L 842.535,859.000 C 938.045,859.000 985.500,811.545 985.500,717.835 L 985.500,141.765 C 985.500,48.057 938.045,0.000 842.535,0.000 Z"/>
<Path StrokeThickness="60.0" Stroke="Green" StrokeMiterLimit="1.0" Fill="#00000000" Data="F1 M 219.477,857.005 C 212.097,857.005 203.333,854.238 197.799,848.241 L 129.072,773.058 C 125.383,769.367 123.076,761.988 123.076,755.530 C 123.076,738.926 135.530,727.855 150.290,727.855 C 159.053,727.855 165.972,731.084 170.585,736.619 L 218.093,788.279 L 309.882,660.513 C 314.955,653.594 323.258,648.521 332.944,648.521 C 347.704,648.521 360.158,660.513 360.158,675.734 C 360.158,680.347 358.313,686.343 354.623,691.417 L 242.079,846.858 C 237.466,852.854 228.702,857.005 219.477,857.005 Z M 241.617,933.573 C 344.937,933.573 429.806,848.703 429.806,745.383 C 429.806,642.063 344.937,557.193 241.617,557.193 C 138.298,557.193 53.427,642.063 53.427,745.383 C 53.427,848.703 138.298,933.573 241.617,933.573 Z"/>
<Path Data="F1 M 241.617,503.766 C 209.141,503.766 177.543,510.206 147.700,522.909 C 118.995,535.127 93.189,552.574 70.998,574.764 C 48.808,596.955 31.361,622.761 19.143,651.466 C 6.441,681.309 0.000,712.907 0.000,745.383 C 0.000,777.859 6.441,809.457 19.143,839.300 C 31.361,868.005 48.808,893.811 70.999,916.002 C 93.189,938.192 118.995,955.639 147.700,967.857 C 177.543,980.559 209.141,987.000 241.617,987.000 C 274.092,987.000 305.691,980.559 335.534,967.857 C 364.239,955.639 390.045,938.192 412.236,916.002 C 434.426,893.811 451.873,868.005 464.091,839.300 C 476.793,809.457 483.234,777.859 483.234,745.383 C 483.234,712.908 476.793,681.309 464.091,651.466 C 451.873,622.761 434.427,596.955 412.236,574.764 C 390.045,552.574 364.239,535.127 335.534,522.909 C 305.691,510.206 274.092,503.766 241.617,503.766 L 241.617,503.766 Z M 218.093,788.279 L 170.585,736.619 C 165.972,731.084 159.053,727.855 150.290,727.855 C 135.530,727.855 123.076,738.925 123.076,755.530 C 123.076,761.988 125.383,769.367 129.072,773.058 L 197.799,848.241 C 203.333,854.238 212.097,857.005 219.477,857.005 C 228.702,857.005 237.466,852.854 242.079,846.858 L 354.623,691.417 C 358.314,686.343 360.158,680.347 360.158,675.734 C 360.158,660.513 347.704,648.521 332.944,648.521 C 323.258,648.521 314.955,653.594 309.882,660.513 L 218.093,788.279 M 241.617,557.193 C 344.937,557.193 429.807,642.063 429.807,745.383 C 429.807,848.703 344.937,933.573 241.617,933.573 C 138.298,933.573 53.427,848.703 53.427,745.383 C 53.427,642.063 138.298,557.193 241.617,557.193"/>
<Path Fill="Green" Data="F1 M 511.000,587.189 C 600.504,588.389 671.387,512.101 671.387,411.785 C 671.387,317.474 600.504,239.984 511.000,239.984 C 421.496,239.984 350.614,317.474 351.215,411.785 C 351.816,512.101 421.496,585.987 511.000,587.189 Z M 511.000,665.880 C 342.805,665.880 223.266,745.773 170.404,856.302 C 155.987,843.687 148.178,823.263 148.178,796.232 L 148.178,227.369 C 148.178,175.709 175.810,148.677 225.669,148.677 L 796.333,148.677 C 845.590,148.677 873.823,175.709 873.823,227.369 L 873.823,796.232 C 873.823,823.263 866.014,843.086 851.597,856.302 C 799.336,745.173 683.401,665.880 511.000,665.880 Z M 224.467,941.000 L 797.535,941.000 C 893.045,941.000 940.500,893.545 940.500,799.835 L 940.500,223.765 C 940.500,130.057 893.045,82.000 797.535,82.000 L 224.467,82.000 C 129.557,82.000 81.501,129.455 81.501,223.765 L 81.501,799.835 C 81.501,893.545 129.557,941.000 224.467,941.000 Z"/>
</Canvas>
</Canvas>
</Viewbox>

2
SafeExamBrowser.UserInterface.Desktop/Images/ProctoringNotification_Inactive.xaml
View file

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Canvas Width="1024.000" Height="1024.000">
<Canvas>
<Path Fill="#ff000000" Data="F1 M 511.000,587.189 C 600.504,588.389 671.387,512.101 671.387,411.785 C 671.387,317.474 600.504,239.984 511.000,239.984 C 421.496,239.984 350.614,317.474 351.215,411.785 C 351.816,512.101 421.496,585.987 511.000,587.189 Z M 511.000,665.880 C 342.805,665.880 223.266,745.773 170.404,856.302 C 155.987,843.687 148.178,823.263 148.178,796.232 L 148.178,227.369 C 148.178,175.709 175.810,148.677 225.669,148.677 L 796.333,148.677 C 845.590,148.677 873.823,175.709 873.823,227.369 L 873.823,796.232 C 873.823,823.263 866.014,843.086 851.597,856.302 C 799.336,745.173 683.401,665.880 511.000,665.880 Z M 224.467,941.000 L 797.535,941.000 C 893.045,941.000 940.500,893.545 940.500,799.835 L 940.500,223.765 C 940.500,130.057 893.045,82.000 797.535,82.000 L 224.467,82.000 C 129.557,82.000 81.501,129.455 81.501,223.765 L 81.501,799.835 C 81.501,893.545 129.557,941.000 224.467,941.000 Z"/>
<Path Fill="Black" Data="F1 M 511.000,587.189 C 600.504,588.389 671.387,512.101 671.387,411.785 C 671.387,317.474 600.504,239.984 511.000,239.984 C 421.496,239.984 350.614,317.474 351.215,411.785 C 351.816,512.101 421.496,585.987 511.000,587.189 Z M 511.000,665.880 C 342.805,665.880 223.266,745.773 170.404,856.302 C 155.987,843.687 148.178,823.263 148.178,796.232 L 148.178,227.369 C 148.178,175.709 175.810,148.677 225.669,148.677 L 796.333,148.677 C 845.590,148.677 873.823,175.709 873.823,227.369 L 873.823,796.232 C 873.823,823.263 866.014,843.086 851.597,856.302 C 799.336,745.173 683.401,665.880 511.000,665.880 Z M 224.467,941.000 L 797.535,941.000 C 893.045,941.000 940.500,893.545 940.500,799.835 L 940.500,223.765 C 940.500,130.057 893.045,82.000 797.535,82.000 L 224.467,82.000 C 129.557,82.000 81.501,129.455 81.501,223.765 L 81.501,799.835 C 81.501,893.545 129.557,941.000 224.467,941.000 Z"/>
</Canvas>
</Canvas>
</Viewbox>

2
SafeExamBrowser.UserInterface.Desktop/Windows/ProctoringWindow.xaml
View file

@ -4,5 +4,5 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Desktop.Windows"
mc:Ignorable="d" Height="250" Width="350" MinHeight="250" MinWidth="250" Topmost="True" WindowStyle="ToolWindow">
mc:Ignorable="d" Height="350" Width="450" MinHeight="250" MinWidth="250" Topmost="True" WindowStyle="ToolWindow">
</Window>

9
SafeExamBrowser.UserInterface.Mobile/Images/ProctoringNotification_Active.xaml Normal file
View file

@ -0,0 +1,9 @@
<Viewbox
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Canvas Width="1024.000" Height="1024.000">
<Canvas>
<Path Fill="Green" Data="F1 M 511.000,587.189 C 600.504,588.389 671.387,512.101 671.387,411.785 C 671.387,317.474 600.504,239.984 511.000,239.984 C 421.496,239.984 350.614,317.474 351.215,411.785 C 351.816,512.101 421.496,585.987 511.000,587.189 Z M 511.000,665.880 C 342.805,665.880 223.266,745.773 170.404,856.302 C 155.987,843.687 148.178,823.263 148.178,796.232 L 148.178,227.369 C 148.178,175.709 175.810,148.677 225.669,148.677 L 796.333,148.677 C 845.590,148.677 873.823,175.709 873.823,227.369 L 873.823,796.232 C 873.823,823.263 866.014,843.086 851.597,856.302 C 799.336,745.173 683.401,665.880 511.000,665.880 Z M 224.467,941.000 L 797.535,941.000 C 893.045,941.000 940.500,893.545 940.500,799.835 L 940.500,223.765 C 940.500,130.057 893.045,82.000 797.535,82.000 L 224.467,82.000 C 129.557,82.000 81.501,129.455 81.501,223.765 L 81.501,799.835 C 81.501,893.545 129.557,941.000 224.467,941.000 Z"/>
</Canvas>
</Canvas>
</Viewbox>

9
SafeExamBrowser.UserInterface.Mobile/Images/ProctoringNotification_Inactive.xaml Normal file
View file

@ -0,0 +1,9 @@
<Viewbox
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Canvas Width="1024.000" Height="1024.000">
<Canvas>
<Path Fill="Black" Data="F1 M 511.000,587.189 C 600.504,588.389 671.387,512.101 671.387,411.785 C 671.387,317.474 600.504,239.984 511.000,239.984 C 421.496,239.984 350.614,317.474 351.215,411.785 C 351.816,512.101 421.496,585.987 511.000,587.189 Z M 511.000,665.880 C 342.805,665.880 223.266,745.773 170.404,856.302 C 155.987,843.687 148.178,823.263 148.178,796.232 L 148.178,227.369 C 148.178,175.709 175.810,148.677 225.669,148.677 L 796.333,148.677 C 845.590,148.677 873.823,175.709 873.823,227.369 L 873.823,796.232 C 873.823,823.263 866.014,843.086 851.597,856.302 C 799.336,745.173 683.401,665.880 511.000,665.880 Z M 224.467,941.000 L 797.535,941.000 C 893.045,941.000 940.500,893.545 940.500,799.835 L 940.500,223.765 C 940.500,130.057 893.045,82.000 797.535,82.000 L 224.467,82.000 C 129.557,82.000 81.501,129.455 81.501,223.765 L 81.501,799.835 C 81.501,893.545 129.557,941.000 224.467,941.000 Z"/>
</Canvas>
</Canvas>
</Viewbox>

8
SafeExamBrowser.UserInterface.Mobile/SafeExamBrowser.UserInterface.Mobile.csproj
View file

@ -239,6 +239,14 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\ProctoringNotification_Inactive.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Resource>
<Resource Include="Images\ProctoringNotification_Active.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Resource>
<Page Include="Windows\AboutWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>

2
SafeExamBrowser.UserInterface.Mobile/Windows/ProctoringWindow.xaml
View file

@ -4,5 +4,5 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Mobile.Windows"
mc:Ignorable="d" Height="250" Width="350" MinHeight="250" MinWidth="250" Topmost="True" WindowStyle="ToolWindow">
mc:Ignorable="d" Height="350" Width="450" MinHeight="250" MinWidth="250" Topmost="True" WindowStyle="ToolWindow">
</Window>