Merge pull request #114 from dasgarner/feature/wpf

WPF Player
xibosignage · Mar 9, 2020 · 13365b0 · 13365b0
2 parents f104c73 + ef6f708
commit 13365b0
Show file tree

Hide file tree

Showing 112 changed files with 5,537 additions and 7,439 deletions.
diff --git a/Action/Command.cs b/Action/Command.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Logic
 {

diff --git a/Action/LayoutChangePlayerAction.cs b/Action/LayoutChangePlayerAction.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Action
 {

diff --git a/Action/OverlayLayoutPlayerAction.cs b/Action/OverlayLayoutPlayerAction.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Action
 {

diff --git a/Action/PlayerAction.cs b/Action/PlayerAction.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Action
 {

diff --git a/Action/PlayerActionInterface.cs b/Action/PlayerActionInterface.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Action
 {

diff --git a/Action/RevertToSchedulePlayerAction.cs b/Action/RevertToSchedulePlayerAction.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace XiboClient.Action
+namespace XiboClient.Action
 {
     class RevertToSchedulePlayerAction : PlayerActionInterface
     {
         public const string Name = "revertToSchedule";
-            
+
         public string GetActionName()
         {
             return Name;

diff --git a/Action/Rs232Command.cs b/Action/Rs232Command.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO.Ports;
 using System.Linq;
-using System.Text;
 
 namespace XiboClient.Logic
 {

diff --git a/Action/ScheduleCommand.cs b/Action/ScheduleCommand.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace XiboClient.Logic
 {

diff --git a/Action/XmrSubscriber.cs b/Action/XmrSubscriber.cs
@@ -5,8 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using XiboClient.Action;
 using XiboClient.Log;
@@ -42,18 +40,6 @@ public HardwareKey HardwareKey
         }
         private HardwareKey _hardwareKey;
 
-        /// <summary>
-        /// Client Info Form
-        /// </summary>
-        public ClientInfo ClientInfoForm
-        {
-            set
-            {
-                _clientInfoForm = value;
-            }
-        }
-        private ClientInfo _clientInfoForm;
-
         /// <summary>
         /// The MQ Poller
         /// </summary>
@@ -81,52 +67,59 @@ public void Run()
                         _manualReset.Reset();
 
                         // Check we have an address to connect to.
-                        if (string.IsNullOrEmpty(ApplicationSettings.Default.XmrNetworkAddress))
-                            throw new Exception("Empty XMR Network Address");
-
-                        // Cache the address for this socket (the setting may change outside).
-                        _address = ApplicationSettings.Default.XmrNetworkAddress;
-
-                        // Get the Private Key
-                        AsymmetricCipherKeyPair rsaKey = _hardwareKey.getXmrKey();
-
-                        // Connect to XMR
-                        try
+                        if (!string.IsNullOrEmpty(ApplicationSettings.Default.XmrNetworkAddress) && ApplicationSettings.Default.XmrNetworkAddress != "DISABLED")
                         {
-                            // Create a Poller
-                            _poller = new NetMQPoller();
+                            // Cache the address for this socket (the setting may change outside).
+                            _address = ApplicationSettings.Default.XmrNetworkAddress;
+
+                            // Get the Private Key
+                            AsymmetricCipherKeyPair rsaKey = _hardwareKey.getXmrKey();
 
-                            // Create a Socket
-                            using (SubscriberSocket socket = new SubscriberSocket())
+                            // Connect to XMR
+                            try
                             {
-                                // Options
-                                socket.Options.ReconnectInterval = TimeSpan.FromSeconds(5);
-                                socket.Options.Linger = TimeSpan.FromSeconds(0);
+                                // Create a Poller
+                                _poller = new NetMQPoller();
+
+                                // Create a Socket
+                                using (SubscriberSocket socket = new SubscriberSocket())
+                                {
+                                    // Options
+                                    socket.Options.ReconnectInterval = TimeSpan.FromSeconds(5);
+                                    socket.Options.Linger = TimeSpan.FromSeconds(0);
 
-                                // Bind
-                                socket.Connect(ApplicationSettings.Default.XmrNetworkAddress);
-                                socket.Subscribe("H");
-                                socket.Subscribe(_hardwareKey.Channel);
+                                    // Bind
+                                    socket.Connect(ApplicationSettings.Default.XmrNetworkAddress);
+                                    socket.Subscribe("H");
+                                    socket.Subscribe(_hardwareKey.Channel);
 
-                                // Add Socket to Poller
-                                _poller.Add(socket);
+                                    // Add Socket to Poller
+                                    _poller.Add(socket);
 
-                                // Bind to the receive ready event
-                                socket.ReceiveReady += _socket_ReceiveReady;
+                                    // Bind to the receive ready event
+                                    socket.ReceiveReady += _socket_ReceiveReady;
 
-                                // Notify
-                                _clientInfoForm.XmrSubscriberStatus = "Connected to " + ApplicationSettings.Default.XmrNetworkAddress + ". Waiting for messages.";
+                                    // Notify
+                                    ClientInfo.Instance.XmrSubscriberStatus = "Connected to " + ApplicationSettings.Default.XmrNetworkAddress + ". Waiting for messages.";
 
-                                // Sit and wait, processing messages, indefinitely or until we are interrupted.
-                                _poller.Run();
+                                    // Sit and wait, processing messages, indefinitely or until we are interrupted.
+                                    _poller.Run();
+                                }
+                            }
+                            finally
+                            {
+                                _poller.Dispose();
                             }
+
+                            Trace.WriteLine(new LogMessage("XmrSubscriber - Run", "Socket Disconnected, waiting to reconnect."), LogType.Info.ToString());
+
+                            // Update status
+                            ClientInfo.Instance.XmrSubscriberStatus = "Disconnected, waiting to reconnect, last activity: " + LastHeartBeat.ToString();
                         }
-                        finally
+                        else
                         {
-                            _poller.Dispose();
+                            ClientInfo.Instance.XmrSubscriberStatus = "Not configured or Disabled";
                         }
-
-                        Trace.WriteLine(new LogMessage("XmrSubscriber - Run", "Socket Disconnected, waiting to reconnect."), LogType.Info.ToString());
                     }
                     catch (TerminatingException terminatingEx)
                     {
@@ -135,12 +128,9 @@ public void Run()
                     catch (Exception e)
                     {
                         Trace.WriteLine(new LogMessage("XmrSubscriber - Run", "Unable to Subscribe: " + e.Message), LogType.Info.ToString());
-                        _clientInfoForm.XmrSubscriberStatus = e.Message;
+                        ClientInfo.Instance.XmrSubscriberStatus = e.Message;
                     }
 
-                    // Update status
-                    _clientInfoForm.XmrSubscriberStatus = "Disconnected, waiting to reconnect, last activity: " + LastHeartBeat.ToString();
-
                     // Sleep for 60 seconds.
                     _manualReset.WaitOne(60 * 1000);
                 }
@@ -169,7 +159,7 @@ private void _socket_ReceiveReady(object sender, NetMQSocketEventArgs e)
                 // Log this message, but dont abort the thread
                 Trace.WriteLine(new LogMessage("XmrSubscriber - _socket_ReceiveReady", "Exception in Run: " + ex.Message), LogType.Error.ToString());
                 Trace.WriteLine(new LogMessage("XmrSubscriber - _socket_ReceiveReady", e.ToString()), LogType.Audit.ToString());
-                _clientInfoForm.XmrSubscriberStatus = "Error. " + ex.Message;
+                ClientInfo.Instance.XmrSubscriberStatus = "Error. " + ex.Message;
             }
         }
 
@@ -182,7 +172,7 @@ private void processMessage(NetMQMessage message, AsymmetricCipherKeyPair rsaKey
             string statusMessage = "Connected (" + ApplicationSettings.Default.XmrNetworkAddress + "), last activity: " + DateTime.Now.ToString();
 
             // Write this out to a log
-            _clientInfoForm.XmrSubscriberStatus = statusMessage;
+            ClientInfo.Instance.XmrSubscriberStatus = statusMessage;
             Trace.WriteLine(new LogMessage("XmrSubscriber - Run", statusMessage), LogType.Audit.ToString());
 
             // Deal with heart beat
@@ -254,7 +244,7 @@ private void processMessage(NetMQMessage message, AsymmetricCipherKeyPair rsaKey
 
                 case "screenShot":
                     ScreenShot.TakeAndSend();
-                    _clientInfoForm.notifyStatusToXmds();
+                    ClientInfo.Instance.NotifyStatusToXmds();
                     break;
 
                 default:

diff --git a/App.xaml b/App.xaml
@@ -0,0 +1,8 @@
+<Application x:Class="XiboClient.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:XiboClient">
+    <Application.Resources>
+
+    </Application.Resources>
+</Application>