Merge pull request #140 from davidkline-ms/master

merging per approval

Author: David Kline

HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControl.xaml

@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     d:DesignHeight="40"
-    d:DesignWidth="750">
+    d:DesignWidth="800">
 
     <UserControl.Resources>
         <Style TargetType="CheckBox">
@@ -80,7 +80,7 @@
                     Command="{Binding Path=SetTagCommand}"
                     FontFamily="Segoe MDL2 Assets" FontSize="10"
                     Width="32" Height="22" 
-                    Canvas.Left="186" Canvas.Top="24">
+                    Canvas.Left="186" Canvas.Top="22">
                     <Button.RenderTransform>
                         <CompositeTransform ScaleX="1.0" ScaleY=".8"/>
                     </Button.RenderTransform>
@@ -125,9 +125,9 @@
                     Content="&#xEB7E;" 
                     Command="{Binding Path=SetIpdCommand}"
                     Visibility="{Binding Path=IpdVisibility}"
-                    FontFamily="Segoe MDL2 Assets"  FontSize="10"
+                    FontFamily="Segoe MDL2 Assets" FontSize="10"
                     Height="22" Width="32"
-                    Canvas.Left="89" Canvas.Top="24" >
+                    Canvas.Left="89" Canvas.Top="22" >
                     <Button.RenderTransform>
                         <CompositeTransform ScaleX="1.0" ScaleY="0.8"/>
                     </Button.RenderTransform>
@@ -150,6 +150,18 @@
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
                     Width="262"/>
             </ScrollViewer>
+            <Button 
+                x:Name="clearStatus"
+                Content="&#xE947;"
+                ToolTipService.ToolTip="Clear status message"
+                Command="{Binding Path=ClearStatusMessageCommand}"
+                FontFamily="Segoe MDL2 Assets" FontSize="10"
+                Height="22" Width="32"
+                Canvas.Left="750" Canvas.Top="22">
+                <Button.RenderTransform>
+                    <CompositeTransform ScaleX="0.8" ScaleY="0.8"/>
+                </Button.RenderTransform>
+            </Button>
         </Canvas>
     </Grid>
 </Page>

HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControl.xaml.cs

@@ -123,6 +123,17 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
+        /// <summary>
+        /// Clears the status message for this device.
+        /// </summary>
+        internal void ClearStatusMessage()
+        {
+            if (this.ViewModel.IsSelected)
+            {
+                this.ViewModel.ClearStatusMessage();
+            }
+        }
+
         /// <summary>
         /// Closes all applications running on this device.
         /// </summary>

HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModel.cs

@@ -32,9 +32,9 @@ partial class DeviceMonitorControlViewModel : INotifyPropertyChanged, IDisposabl
         /// <summary>
         /// Text labels describing the type of device.
         /// </summary>
-        private static readonly string DeviceIsHoloLensLabel = "";  // no image
-        private static readonly string DeviceIsPCLabel = "";       // E7F4 (PC monitor)
-        private static readonly string DeviceIsUnknownLabel = "";  // E897 (question mark)
+        private static readonly string DeviceIsHoloLensLabel = string.Empty;    // no image
+        private static readonly string DeviceIsPCLabel = "";                   // E7F4 (PC monitor)
+        private static readonly string DeviceIsUnknownLabel = "";              // E897 (question mark)
 
         /// <summary>
         /// Text label indicating that an initial connection has not yet been established
@@ -83,8 +83,6 @@ public DeviceMonitorControlViewModel(
         {
             this.deviceMonitorControl = control;
 
-            this.RegisterCommands();
-
             this.firstContact = false;
             this.deviceMonitor = monitor;
             this.deviceMonitor.HeartbeatLost += Device_HeartbeatLost;
@@ -98,6 +96,7 @@ public DeviceMonitorControlViewModel(
             this.Address = deviceMonitor.Address;
             this.IsSelected = true;
 
+            this.RegisterCommands();
         }
 
         /// <summary>
@@ -633,7 +632,7 @@ private void Device_HeartbeatReceived(DeviceMonitor sender)
             // Did we recover from a heartbeat loss?
             if (this.StatusMessage == HeartbeatLostMessage)
             {
-                this.StatusMessage = "";
+                this.ClearStatusMessage();
             }
 
             // Handle whether or not we were previously selected
@@ -702,6 +701,12 @@ private void NotifyPropertyChanged(string propertyName)
         /// </summary>
         private void RegisterCommands()
         {
+            this.ClearStatusMessageCommand = new Command(
+                (parameter) =>
+                {
+                    this.ClearStatusMessage();
+                });
+
             this.DisconnectCommand = new Command(
                 (parameter) =>
                 {
@@ -711,13 +716,31 @@ private void RegisterCommands()
             this.SetIpdCommand = new Command(
                 async (parameter) =>
                 {
-                    await this.SetIpdAsync();
+                    try
+                    {
+                        await this.SetIpdAsync();
+                    }
+                    catch(Exception e)
+                    {
+                        this.StatusMessage = string.Format(
+                            "Failed to set IPD ({0})",
+                            e.Message);
+                    }
                 });
 
             this.SetTagCommand = new Command(
                 async (parameter) =>
                 {
-                    await this.TagDeviceAsync();
+                    try
+                    {
+                        await this.TagDeviceAsync();
+                    }
+                    catch (Exception e)
+                    {
+                        this.StatusMessage = string.Format(
+                            "Failed to set the device name ({0})",
+                            e.Message);
+                    }
                 });
 
             this.ShowContextMenuCommand = new Command(

HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModelCommands.cs

@@ -35,6 +35,14 @@ private enum MonitorContextMenuCommandIds
         public ICommand ClearStatusMessageCommand
         { get; private set; }
 
+        /// <summary>
+        /// Implementation of the clear status message command.
+        /// </summary>
+        internal void ClearStatusMessage()
+        {
+            this.StatusMessage = string.Empty;
+        }
+
         /// <summary>
         /// Command used to disconnect from the device.
         /// </summary>

HoloLensCommander/HoloLensCommander/Controls/DeviceMonitorControlViewModelProperties.cs

@@ -36,7 +36,7 @@ private set
         /// Gets the battery level of this device, as a percentage remaining.
         /// </summary>
         /// <remarks>The returned string is formatted to two significant decimal places.</remarks>
-        private string batteryLevel = "";
+        private string batteryLevel = string.Empty;
         public string BatteryLevel
         {
             get
@@ -99,7 +99,7 @@ private set
         /// <summary>
         /// Gets or sets a string representation of the interpuplliary distance recorded on this device.
         /// </summary>
-        private string ipd = "";
+        private string ipd = string.Empty;
         public string Ipd
         {
             get

HoloLensCommander/HoloLensCommander/Device/DeviceMonitor.cs

@@ -46,9 +46,14 @@ public partial class DeviceMonitor : IDisposable
         public static readonly string DefaultConnectionAddressAsIp = "127.0.0.1:10080";
 
         /// <summary>
-        /// The executable name of the HoloLens shell application.
+        /// The file names of applications that will remain running after the user
+        /// requests all apps to be closed.
         /// </summary>
-        private static readonly string ShellApp = "HoloShellApp.exe";
+        private static readonly string[] DoNotCloseApps = new string[] 
+            {
+                "HoloShellApp.exe",
+                "MixedRealityPortal.exe"
+            };
 
         /// <summary>
         /// Options used to connect to this device.

HoloLensCommander/HoloLensCommander/Device/DeviceMonitorCommands.cs

@@ -2,12 +2,14 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Security.Cryptography.Certificates;
+using Windows.UI.Core;
 using Microsoft.Tools.WindowsDevicePortal;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
-using Windows.UI.Core;
 
 namespace HoloLensCommander
 {
@@ -154,6 +156,39 @@ public void Disconnect()
                 Timeout.Infinite);
         }
 
+        /// <summary>
+        /// Find the installed application name that is associated with the specified package name.
+        /// </summary>
+        /// <param name="packageName">Name of the application package.</param>
+        /// <returns>The application display name, or null if not found.</returns>
+        private async Task<string> FindAppNameFromPackageName(string packageName)
+        {
+            string appName = null;
+
+            // Get the collection of installed applications.
+            AppPackages apps = await this.GetInstalledApplicationsAsync();
+
+            // Remove the version/plaform from the package name and squash 
+            string squashedPackageName = SquashPackageName(packageName);
+
+            foreach (PackageInfo package in apps.Packages)
+            {
+                // Squash the name so there are no underscores or spaces
+                string squashedName = SquashName(package.FamilyName);
+
+
+                // Try to match with the squashed package name
+                if (squashedPackageName == squashedName)
+                {
+                    appName = package.Name;
+                    break;
+                }
+            }
+
+            // Return the un-squashed name
+            return appName;
+        }
+
         /// <summary>
         /// Gets the collection of installed applications.
         /// </summary>
@@ -202,8 +237,8 @@ public Uri GetMixedRealityViewUri()
             return this.devicePortal.GetLowResolutionMrcLiveStreamUri(
                 true,   // Include holograms.
                 true,   // Include color camera.
-                true,  // Include microphone.
-                true); // Include application audio.
+                true,   // Include microphone.
+                true);  // Include application audio.
         }
 
         /// <summary>
@@ -225,8 +260,10 @@ public async Task InstallApplicationAsync(AppInstallFiles installFiles)
             await Task.Run(
                 async () =>
                 {
+                    string appName = await this.FindAppNameFromPackageName(installFiles.AppPackageFile.Name);
+
                     await this.devicePortal.InstallApplicationAsync(
-                        null,
+                        appName,
                         installFiles.AppPackageFile,
                         installFiles.AppDependencyFiles,
                         installFiles.AppCertificateFile);
@@ -296,6 +333,47 @@ public async Task ShutdownAsync()
             await this.devicePortal.ShutdownAsync();    
         }
 
+        /// <summary>
+        /// Returns a "compressed" (spaces and underscores removed) string.
+        /// </summary>
+        /// <param name="name">The name to squash.</param>
+        /// <returns>The modified name.</returns>
+        private string SquashName(string name)
+        {
+            string squashedName = name;
+
+            squashedName = squashedName.Replace(" ", "");
+            squashedName = squashedName.Replace("_", "");
+
+            return squashedName;
+        }
+
+        /// <summary>
+        /// Returns a "compressed" (spaces, underscores, version and platform info removed) version of a package name
+        /// </summary>
+        /// <param name="name">The package name to squash.</param>
+        /// <returns>The modified package name.</returns>
+        private string SquashPackageName(string name)
+        {
+            string squashedName = "";
+            int versionIndex = -1;
+
+            string[] nameParts = name.Split('_');
+            for (int i = 0; i < nameParts.Length; i++)
+            {
+                Version v;
+                if (Version.TryParse(nameParts[i], out v))
+                {
+                    versionIndex = i;
+                    break;
+                }
+
+                squashedName += nameParts[i];
+            }
+
+            return squashedName;
+        }
+
         /// <summary>
         /// Starts a mixed reality recording on this device.
         /// </summary>
@@ -326,10 +404,15 @@ public async Task TerminateAllApplicationsAsync()
         {
             RunningProcesses runningApps = await this.GetRunningProcessesAsync();
 
+            List<string> doNotClose = new List<string>();
+            doNotClose.AddRange(DoNotCloseApps);
+
             foreach (DeviceProcessInfo processInfo in runningApps.Processes)
             {
-                // Do not terminate the shell.
-                if (ShellApp.ToLower() == processInfo.Name.ToLower())
+                // Skip applications that should not be closed.
+                if (doNotClose.Contains(
+                    processInfo.Name, 
+                    StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }

HoloLensCommander/HoloLensCommander/Dialogs/ConnectToDeviceDialog.xaml

@@ -127,7 +127,7 @@
                 Canvas.Top="5" Canvas.Left="25"/>
         </Canvas>
         <Canvas 
-            Width="450" Height="90"
+            Width="450" Height="95"
             Visibility="{Binding Path=ShowNetworkSettings}">
             <TextBlock 
                 x:Name="ssidLabel"
@@ -137,7 +137,7 @@
             <TextBox 
                 x:Name="ssid" 
                 Text="{Binding Path=Ssid, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
-                ToolTipService.ToolTip="The SSID on which to configure the device"
+                ToolTipService.ToolTip="The SSID on which to configure the device (this may make the device unreachable from this network)"
                 TextWrapping="NoWrap" 
                 Width="360"
                 Canvas.Left="80" Canvas.Top="5" />
@@ -155,7 +155,7 @@
                 Canvas.Left="80" Canvas.Top="45" />
         </Canvas>
         <Canvas 
-            Width="450" Height="40">
+            Width="450" Height="35">
             <CheckBox 
                 x:Name="useInstalledCertificate" 
                 Content="Use Installed Device Certificate" 
@@ -164,7 +164,7 @@
                 Canvas.Top="0"/>
         </Canvas>
         <Canvas 
-            Width="450" Height="40">
+            Width="450" Height="35">
             <CheckBox 
                 x:Name="updateConnection" 
                 Content="Update Connection"