Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

6 files changed, 96 insertions, 15 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
index e01003c0b..444c1d09e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Management;
+using System.Net;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
@@ -40,6 +42,20 @@ namespace Tango.PPC.Technician.ViewModels
             set { _temperature = value; RaisePropertyChangedAuto(); }
         }
 
+        private TimeSpan _upTime;
+        public TimeSpan UpTime
+        {
+            get { return _upTime; }
+            set { _upTime = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _ipAddress;
+        public String IPAddress
+        {
+            get { return _ipAddress; }
+            set { _ipAddress = value; RaisePropertyChangedAuto(); }
+        }
+
         public RelayCommand ResetDeviceCommand { get; set; }
 
         public RelayCommand RestartCommand { get; set; }
@@ -132,6 +148,12 @@ namespace Tango.PPC.Technician.ViewModels
             _statsTimer.Start();
         }
 
+        public override void OnApplicationReady()
+        {
+            base.OnApplicationReady();
+            IPAddress = GetIpv4Address();
+        }
+
         private void _statsTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             if (IsVisible)
@@ -139,6 +161,7 @@ namespace Tango.PPC.Technician.ViewModels
                 CPU = GetAppCPU();
                 RAM = GetAppRam();
                 //Temperature = GetTemperature();
+                UpTime = DateTime.Now - ApplicationManager.StartUpDate;
             }
         }
 
@@ -201,5 +224,25 @@ namespace Tango.PPC.Technician.ViewModels
                 return 0;
             }
         }
+
+        public String GetIpv4Address()
+        {
+            try
+            {
+                var host = Dns.GetHostEntry(Dns.GetHostName());
+                foreach (var ip in host.AddressList)
+                {
+                    if (ip.AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        return ip.ToString();
+                    }
+                }
+                return "N/A";
+            }
+            catch (Exception ex)
+            {
+                return "N/A";
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
index f6e6370c1..f2bfcdf7d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
@@ -49,19 +49,34 @@
                     </TextBlock>
                 </UniformGrid>
 
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
-                    <touch:TouchButton Command="{Binding ResetDeviceCommand}" Height="60" Content="Reset Machine">
-                        <touch:TouchButton.Style>
-                            <Style TargetType="touch:TouchButton" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
-                                <Setter Property="Background" Value="{StaticResource TangoErrorBrush}"></Setter>
-                            </Style>
-                        </touch:TouchButton.Style>
-                    </touch:TouchButton>
-                    <touch:TouchButton Command="{Binding RestartCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Restart Device</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ShutdownCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Shutdown Device</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding FactoryResetCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Factory Reset</touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Exit To Shell</touch:TouchButton>
-                </StackPanel>
+                <DockPanel>
+
+                    <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center">
+                        <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold" FontSize="{StaticResource TangoHeaderFontSize}">
+                        <Run>UP TIME:</Run>
+                        <Run Text="{Binding UpTime,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></Run>
+                        </TextBlock>
+
+                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontWeight="SemiBold" FontSize="{StaticResource TangoHeaderFontSize}">
+                        <Run>IP ADDRESS:</Run>
+                        <Run Text="{Binding IPAddress}"></Run>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                        <touch:TouchButton Command="{Binding ResetDeviceCommand}" Height="60" Content="Reset Machine">
+                            <touch:TouchButton.Style>
+                                <Style TargetType="touch:TouchButton" BasedOn="{StaticResource {x:Type touch:TouchButton}}">
+                                    <Setter Property="Background" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </Style>
+                            </touch:TouchButton.Style>
+                        </touch:TouchButton>
+                        <touch:TouchButton Command="{Binding RestartCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Restart Device</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ShutdownCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Shutdown Device</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding FactoryResetCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Factory Reset</touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Exit To Shell</touch:TouchButton>
+                    </StackPanel>
+                </DockPanel>
             </DockPanel>
         </Grid>
     </Grid>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
index 5f58be48b..7c67ac1a3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
@@ -96,6 +96,11 @@ namespace Tango.PPC.Common.Application
         String BuildDate { get; }
 
         /// <summary>
+        /// Gets the application startup date.
+        /// </summary>
+        DateTime StartUpDate { get; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether the screen is currently locked.
         /// </summary>
         bool IsScreenLocked { get; set; }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 6a9e42ce5..c7351aa4a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -120,6 +120,11 @@ namespace Tango.PPC.UI.PPCApplication
             }
         }
 
+        /// <summary>
+        /// Gets the application startup date.
+        /// </summary>
+        public DateTime StartUpDate { get; private set; }
+
         private bool _isScreenLocked;
         /// <summary>
         /// Gets or sets a value indicating whether the screen is currently locked.
@@ -171,6 +176,8 @@ namespace Tango.PPC.UI.PPCApplication
             bool initialized = false;
             bool isAfterSetup = false;
 
+            StartUpDate = DateTime.Now;
+
             await Task.Factory.StartNew(() =>
             {
                 try
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index db8540db7..a572fe23e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.47.0")]
+[assembly: AssemblyVersion("1.0.48.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
index 5accd8ff3..0ee8058c0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml
@@ -63,7 +63,18 @@
 
                         <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="AccessPointNetwork" Visibility="{Binding HotSpotProvider.IsEnabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
 
-                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Foreground="{StaticResource TangoSuccessBrush}" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        <touch:TouchIcon Margin="10 0 0 0" Width="18" Height="18" VerticalAlignment="Center" Icon="Bridge" Visibility="{Binding ExternalBridgeService.Enabled,Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <touch:TouchIcon.Style>
+                                <Style TargetType="touch:TouchIcon">
+                                    <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding ExternalBridgeService.IsInSession}" Value="True">
+                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </touch:TouchIcon.Style>
+                        </touch:TouchIcon>
 
                         <ItemsControl ItemsSource="{Binding NotificationProvider.TaskBarItems}">
                             <ItemsControl.ItemsPanel>