From c76e14db056a2216e8f4dfb1eb3170a845821f09 Mon Sep 17 00:00:00 2001
From: Tino Hager <tino.hager@nager.at>
Date: Mon, 28 Feb 2022 12:19:01 +0100
Subject: [PATCH] Optimize ControlPanel ConfigurationDialog

---
 .../Dialogs/DeviceConfigurationDialog.xaml      | 17 ++++++++++-------
 .../Dialogs/DeviceConfigurationDialog.xaml.cs   |  8 ++++++++
 .../MainWindow.xaml.cs                          |  7 ++++++-
 .../Models/DeviceConfiguration.cs               |  2 ++
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml b/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml
index 1b070ab..b0d1bb1 100644
--- a/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml
+++ b/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml
@@ -11,13 +11,16 @@
             <DropShadowEffect BlurRadius="12" Direction="-90" RenderingBias="Quality" ShadowDepth="1"/>
         </Grid.Effect>
         <Button Content="Connect" HorizontalAlignment="Center" Margin="0,392,0,0" VerticalAlignment="Top" Click="ButtonConnect_Click" Width="500" RenderTransformOrigin="0.525,2.063" FontSize="16" Background="White" Height="39"/>
-        <ComboBox x:Name="ComboBoxLanguage" HorizontalAlignment="Left" Margin="214,279,0,0" VerticalAlignment="Top" Width="177" FontSize="16"/>
-        <TextBox x:Name="TextBoxIpAddress" HorizontalAlignment="Left"  Text="192.168.100.20" TextWrapping="Wrap" VerticalAlignment="Top" Width="122" Margin="214,245,0,0" Height="24" FontSize="16" KeyDown="TextBoxIpAddress_KeyDown" GotFocus="TextBoxIpAddress_GotFocus"/>
-        <Label Content="IpAddress:" HorizontalAlignment="Left" Margin="125,242,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
-        <Label Content="Language:" HorizontalAlignment="Left" Margin="126,277,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
-        <ComboBox x:Name="ComboBoxEncoding" HorizontalAlignment="Left" Margin="214,315,0,0" VerticalAlignment="Top" Width="177" FontSize="16" />
-        <Label Content="Encoding:" HorizontalAlignment="Left" Margin="130,313,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
+        <ComboBox x:Name="ComboBoxLanguage" HorizontalAlignment="Left" Margin="214,308,0,0" VerticalAlignment="Top" Width="177" FontSize="16"/>
+        <TextBox x:Name="TextBoxIpAddress" HorizontalAlignment="Left"  Text="192.168.100.20" TextWrapping="Wrap" VerticalAlignment="Top" Width="122" Margin="214,212,0,0" Height="24" FontSize="16" KeyDown="TextBoxIpAddress_KeyDown" GotFocus="TextBoxIpAddress_GotFocus"/>
+        <Label Content="IpAddress" HorizontalAlignment="Left" Margin="125,208,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
+        <Label Content="Language" HorizontalAlignment="Left" Margin="126,306,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
+        <ComboBox x:Name="ComboBoxEncoding" HorizontalAlignment="Left" Margin="214,341,0,0" VerticalAlignment="Top" Width="177" FontSize="16"/>
+        <Label Content="Encoding" HorizontalAlignment="Left" Margin="130,339,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
         <Image HorizontalAlignment="Left" Height="220" VerticalAlignment="Top" Width="500" Source="SplashScreen.png"/>
-
+        <TextBox x:Name="TextBoxPort" HorizontalAlignment="Left"  Text="20007" TextWrapping="Wrap" VerticalAlignment="Top" Width="51" Margin="214,245,0,0" Height="24" FontSize="16" TextAlignment="Right"/>
+        <Label Content="Port" HorizontalAlignment="Left" Margin="166,241,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
+        <CheckBox x:Name="CheckBoxTcpKeepalive" Content="" HorizontalAlignment="Left" Margin="214,283,0,0" VerticalAlignment="Top"/>
+        <Label Content="TCP Keepalive" HorizontalAlignment="Left" Margin="97,273,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
     </Grid>
 </Window>
diff --git a/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml.cs b/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml.cs
index 177d58f..7a1b4b4 100644
--- a/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml.cs
+++ b/src/Portalum.Zvt.ControlPanel/Dialogs/DeviceConfigurationDialog.xaml.cs
@@ -27,9 +27,17 @@ public DeviceConfigurationDialog()
 
         private void CloseDialog()
         {
+            if (!int.TryParse(this.TextBoxPort.Text, out var port))
+            {
+                MessageBox.Show("Cannot parse port", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
             this.DeviceConfiguration.IpAddress = this.TextBoxIpAddress.Text.Trim();
+            this.DeviceConfiguration.Port = port;
             this.DeviceConfiguration.Language = (Language)this.ComboBoxLanguage.SelectedItem;
             this.DeviceConfiguration.Encoding = (ZvtEncoding)this.ComboBoxEncoding.SelectedItem;
+            this.DeviceConfiguration.TcpKeepalive = (bool)this.CheckBoxTcpKeepalive.IsChecked;
 
             this.DialogResult = true;
             this.Close();
diff --git a/src/Portalum.Zvt.ControlPanel/MainWindow.xaml.cs b/src/Portalum.Zvt.ControlPanel/MainWindow.xaml.cs
index e41e39d..307f275 100644
--- a/src/Portalum.Zvt.ControlPanel/MainWindow.xaml.cs
+++ b/src/Portalum.Zvt.ControlPanel/MainWindow.xaml.cs
@@ -95,7 +95,12 @@ private async Task<bool> ConnectAsync()
             var loggerCommunication = this._loggerFactory.CreateLogger<TcpNetworkDeviceCommunication>();
             var loggerZvtClient = this._loggerFactory.CreateLogger<ZvtClient>();
 
-            this._deviceCommunication = new TcpNetworkDeviceCommunication(this._deviceConfiguration.IpAddress, logger: loggerCommunication);
+            this._deviceCommunication = new TcpNetworkDeviceCommunication(
+                ipAddress: this._deviceConfiguration.IpAddress,
+                port:this._deviceConfiguration.Port,
+                enableKeepAlive: this._deviceConfiguration.TcpKeepalive,
+                logger: loggerCommunication);
+
             this._deviceCommunication.ConnectionStateChanged += this.ConnectionStateChanged;
 
             this.CommunicationUserControl.SetDeviceCommunication(this._deviceCommunication);
diff --git a/src/Portalum.Zvt.ControlPanel/Models/DeviceConfiguration.cs b/src/Portalum.Zvt.ControlPanel/Models/DeviceConfiguration.cs
index 035b35f..243e1f9 100644
--- a/src/Portalum.Zvt.ControlPanel/Models/DeviceConfiguration.cs
+++ b/src/Portalum.Zvt.ControlPanel/Models/DeviceConfiguration.cs
@@ -3,7 +3,9 @@
     public class DeviceConfiguration
     {
         public string IpAddress { get; set; }
+        public int Port { get; set; }
         public ZvtEncoding Encoding { get; set; }
         public Language Language { get; set; }
+        public bool TcpKeepalive { get; set; }
     }
 }