Command support improvements
This commit is contained in:
@@ -5,6 +5,7 @@ using System.Net;
|
|||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace SamaPager_Client
|
namespace SamaPager_Client
|
||||||
{
|
{
|
||||||
@@ -41,6 +42,23 @@ namespace SamaPager_Client
|
|||||||
UdpStack.Send(msgData, msgData.Length, serverEndPoint);
|
UdpStack.Send(msgData, msgData.Length, serverEndPoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal string SendCommand(string command)
|
||||||
|
{
|
||||||
|
byte[] msgData = Encoding.UTF8.GetBytes(command);
|
||||||
|
UdpStack.Send(msgData, msgData.Length, serverEndPoint);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
UdpStack.Client.ReceiveTimeout = 5000;
|
||||||
|
IPEndPoint receiveEndPoint = serverEndPoint;
|
||||||
|
byte[] receivedBytes = UdpStack.Receive(ref receiveEndPoint);
|
||||||
|
return $"Server replied: {Encoding.UTF8.GetString(receivedBytes)}";
|
||||||
|
}
|
||||||
|
catch(Exception ex)
|
||||||
|
{
|
||||||
|
return $"ERROR: {ex.Message}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal void KillClient()
|
internal void KillClient()
|
||||||
{
|
{
|
||||||
this.UdpStack.Close();
|
this.UdpStack.Close();
|
||||||
|
|||||||
28
SamaPager_Client/Form1.Designer.cs
generated
28
SamaPager_Client/Form1.Designer.cs
generated
@@ -31,7 +31,7 @@
|
|||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
|
||||||
this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel();
|
this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel();
|
||||||
this.kryptonComboBox1 = new Krypton.Toolkit.KryptonComboBox();
|
this.cmdLst = new Krypton.Toolkit.KryptonComboBox();
|
||||||
this.logLst = new Krypton.Toolkit.KryptonListBox();
|
this.logLst = new Krypton.Toolkit.KryptonListBox();
|
||||||
this.kryptonPictureBox1 = new Krypton.Toolkit.KryptonPictureBox();
|
this.kryptonPictureBox1 = new Krypton.Toolkit.KryptonPictureBox();
|
||||||
this.sendBtn = new Krypton.Toolkit.KryptonButton();
|
this.sendBtn = new Krypton.Toolkit.KryptonButton();
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
this.kryptonManager2 = new Krypton.Toolkit.KryptonManager(this.components);
|
this.kryptonManager2 = new Krypton.Toolkit.KryptonManager(this.components);
|
||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit();
|
||||||
this.kryptonPanel1.SuspendLayout();
|
this.kryptonPanel1.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.cmdLst)).BeginInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).BeginInit();
|
||||||
this.kryptonStatusStrip1.SuspendLayout();
|
this.kryptonStatusStrip1.SuspendLayout();
|
||||||
this.menuStrip1.SuspendLayout();
|
this.menuStrip1.SuspendLayout();
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
//
|
//
|
||||||
// kryptonPanel1
|
// kryptonPanel1
|
||||||
//
|
//
|
||||||
this.kryptonPanel1.Controls.Add(this.kryptonComboBox1);
|
this.kryptonPanel1.Controls.Add(this.cmdLst);
|
||||||
this.kryptonPanel1.Controls.Add(this.logLst);
|
this.kryptonPanel1.Controls.Add(this.logLst);
|
||||||
this.kryptonPanel1.Controls.Add(this.kryptonPictureBox1);
|
this.kryptonPanel1.Controls.Add(this.kryptonPictureBox1);
|
||||||
this.kryptonPanel1.Controls.Add(this.sendBtn);
|
this.kryptonPanel1.Controls.Add(this.sendBtn);
|
||||||
@@ -63,16 +63,16 @@
|
|||||||
resources.ApplyResources(this.kryptonPanel1, "kryptonPanel1");
|
resources.ApplyResources(this.kryptonPanel1, "kryptonPanel1");
|
||||||
this.kryptonPanel1.Name = "kryptonPanel1";
|
this.kryptonPanel1.Name = "kryptonPanel1";
|
||||||
//
|
//
|
||||||
// kryptonComboBox1
|
// cmdLst
|
||||||
//
|
//
|
||||||
this.kryptonComboBox1.DropDownWidth = 318;
|
this.cmdLst.DropDownWidth = 318;
|
||||||
this.kryptonComboBox1.Items.AddRange(new object[] {
|
this.cmdLst.Items.AddRange(new object[] {
|
||||||
resources.GetString("kryptonComboBox1.Items"),
|
resources.GetString("cmdLst.Items"),
|
||||||
resources.GetString("kryptonComboBox1.Items1"),
|
resources.GetString("cmdLst.Items1"),
|
||||||
resources.GetString("kryptonComboBox1.Items2")});
|
resources.GetString("cmdLst.Items2")});
|
||||||
resources.ApplyResources(this.kryptonComboBox1, "kryptonComboBox1");
|
resources.ApplyResources(this.cmdLst, "cmdLst");
|
||||||
this.kryptonComboBox1.Name = "kryptonComboBox1";
|
this.cmdLst.Name = "cmdLst";
|
||||||
this.kryptonComboBox1.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near;
|
this.cmdLst.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near;
|
||||||
//
|
//
|
||||||
// logLst
|
// logLst
|
||||||
//
|
//
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).EndInit();
|
||||||
this.kryptonPanel1.ResumeLayout(false);
|
this.kryptonPanel1.ResumeLayout(false);
|
||||||
this.kryptonPanel1.PerformLayout();
|
this.kryptonPanel1.PerformLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonComboBox1)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.cmdLst)).EndInit();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).EndInit();
|
((System.ComponentModel.ISupportInitialize)(this.kryptonPictureBox1)).EndInit();
|
||||||
this.kryptonStatusStrip1.ResumeLayout(false);
|
this.kryptonStatusStrip1.ResumeLayout(false);
|
||||||
this.kryptonStatusStrip1.PerformLayout();
|
this.kryptonStatusStrip1.PerformLayout();
|
||||||
@@ -181,7 +181,7 @@
|
|||||||
private System.Windows.Forms.ToolStripMenuItem changeDestinationAddressToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem changeDestinationAddressToolStripMenuItem;
|
||||||
private System.Windows.Forms.ToolStripMenuItem restartUDPClientToolStripMenuItem;
|
private System.Windows.Forms.ToolStripMenuItem restartUDPClientToolStripMenuItem;
|
||||||
private Krypton.Toolkit.KryptonListBox logLst;
|
private Krypton.Toolkit.KryptonListBox logLst;
|
||||||
private Krypton.Toolkit.KryptonComboBox kryptonComboBox1;
|
private Krypton.Toolkit.KryptonComboBox cmdLst;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ namespace SamaPager_Client
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
pageClient.SendMessage(messageTxt.Text);
|
pageClient.SendMessage(messageTxt.Text);
|
||||||
|
logLst.Items.Add($"Sent: {messageTxt.Text}");
|
||||||
messageTxt.Text = String.Empty;
|
messageTxt.Text = String.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,16 +122,16 @@
|
|||||||
</data>
|
</data>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="kryptonStatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="kryptonStatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 556</value>
|
<value>0, 550</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonStatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="kryptonStatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>347, 22</value>
|
<value>349, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>347, 24</value>
|
<value>349, 24</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="kryptonPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>347, 578</value>
|
<value>349, 572</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>42, 20</value>
|
<value>42, 20</value>
|
||||||
@@ -152,6 +152,6 @@
|
|||||||
<value>Riavvia il socket UDP</value>
|
<value>Riavvia il socket UDP</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>347, 578</value>
|
<value>349, 572</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -117,36 +117,36 @@
|
|||||||
<resheader name="writer">
|
<resheader name="writer">
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<data name="kryptonComboBox1.Items" xml:space="preserve">
|
<data name="cmdLst.Items" xml:space="preserve">
|
||||||
<value>!getDateTime</value>
|
<value>!getDateTime</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonComboBox1.Items1" xml:space="preserve">
|
<data name="cmdLst.Items1" xml:space="preserve">
|
||||||
<value>!getCurrentDir</value>
|
<value>!getCurrentDir</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonComboBox1.Items2" xml:space="preserve">
|
<data name="cmdLst.Items2" xml:space="preserve">
|
||||||
<value>!getCurrentUser</value>
|
<value>!getCurrentUser</value>
|
||||||
</data>
|
</data>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="kryptonComboBox1.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="cmdLst.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>12, 524</value>
|
<value>12, 524</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonComboBox1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="cmdLst.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>318, 22</value>
|
<value>318, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="kryptonComboBox1.TabIndex" type="System.Int32, mscorlib">
|
<data name="cmdLst.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>6</value>
|
<value>6</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>kryptonComboBox1.Name" xml:space="preserve">
|
<data name=">>cmdLst.Name" xml:space="preserve">
|
||||||
<value>kryptonComboBox1</value>
|
<value>cmdLst</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>kryptonComboBox1.Type" xml:space="preserve">
|
<data name=">>cmdLst.Type" xml:space="preserve">
|
||||||
<value>Krypton.Toolkit.KryptonComboBox, Krypton.Toolkit, Version=95.25.8.235, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e</value>
|
<value>Krypton.Toolkit.KryptonComboBox, Krypton.Toolkit, Version=95.25.8.235, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>kryptonComboBox1.Parent" xml:space="preserve">
|
<data name=">>cmdLst.Parent" xml:space="preserve">
|
||||||
<value>kryptonPanel1</value>
|
<value>kryptonPanel1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>kryptonComboBox1.ZOrder" xml:space="preserve">
|
<data name=">>cmdLst.ZOrder" xml:space="preserve">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="logLst.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="logLst.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
@@ -235,10 +235,10 @@
|
|||||||
<value>STATUS: Off</value>
|
<value>STATUS: Off</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonStatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="kryptonStatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 554</value>
|
<value>0, 536</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonStatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="kryptonStatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>344, 22</value>
|
<value>350, 22</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonStatusStrip1.TabIndex" type="System.Int32, mscorlib">
|
<data name="kryptonStatusStrip1.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>1</value>
|
<value>1</value>
|
||||||
@@ -264,6 +264,18 @@
|
|||||||
<data name="menuStrip1.Font" type="System.Drawing.Font, System.Drawing">
|
<data name="menuStrip1.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
<value>Segoe UI, 9pt</value>
|
<value>Segoe UI, 9pt</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="changeDestinationAddressToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>220, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="changeDestinationAddressToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Change destination address</value>
|
||||||
|
</data>
|
||||||
|
<data name="restartUDPClientToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
|
<value>220, 22</value>
|
||||||
|
</data>
|
||||||
|
<data name="restartUDPClientToolStripMenuItem.Text" xml:space="preserve">
|
||||||
|
<value>Restart UDP Client</value>
|
||||||
|
</data>
|
||||||
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>64, 20</value>
|
<value>64, 20</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -274,7 +286,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="menuStrip1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>344, 24</value>
|
<value>350, 24</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
|
<data name="menuStrip1.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>4</value>
|
<value>4</value>
|
||||||
@@ -325,7 +337,7 @@
|
|||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="kryptonPanel1.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>344, 576</value>
|
<value>350, 558</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="kryptonPanel1.TabIndex" type="System.Int32, mscorlib">
|
<data name="kryptonPanel1.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
@@ -342,18 +354,6 @@
|
|||||||
<data name=">>kryptonPanel1.ZOrder" xml:space="preserve">
|
<data name=">>kryptonPanel1.ZOrder" xml:space="preserve">
|
||||||
<value>0</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="changeDestinationAddressToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>220, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="changeDestinationAddressToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Change destination address</value>
|
|
||||||
</data>
|
|
||||||
<data name="restartUDPClientToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
|
||||||
<value>220, 22</value>
|
|
||||||
</data>
|
|
||||||
<data name="restartUDPClientToolStripMenuItem.Text" xml:space="preserve">
|
|
||||||
<value>Restart UDP Client</value>
|
|
||||||
</data>
|
|
||||||
<metadata name="kryptonManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="kryptonManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>17, 17</value>
|
<value>17, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
@@ -364,7 +364,7 @@
|
|||||||
<value>6, 13</value>
|
<value>6, 13</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>344, 576</value>
|
<value>350, 558</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
||||||
<value>CenterScreen</value>
|
<value>CenterScreen</value>
|
||||||
|
|||||||
@@ -61,9 +61,11 @@
|
|||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
<EmbeddedResource Include="Form1.it-IT.resx">
|
<EmbeddedResource Include="Form1.it-IT.resx">
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
<DependentUpon>Form1.cs</DependentUpon>
|
||||||
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Form1.resx">
|
<EmbeddedResource Include="Form1.resx">
|
||||||
<DependentUpon>Form1.cs</DependentUpon>
|
<DependentUpon>Form1.cs</DependentUpon>
|
||||||
|
<SubType>Designer</SubType>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="Properties\Resources.resx">
|
<EmbeddedResource Include="Properties\Resources.resx">
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
<Generator>ResXFileCodeGenerator</Generator>
|
||||||
|
|||||||
Reference in New Issue
Block a user