FIX 心跳时间

.gitignore

@@ -40,4 +40,5 @@ GWSocketClient/obj/Release/GWSocketClient.AnaProtocol.resources
 GWSocketClientTests/bin
 GWSocketClientTests/obj
 packages/
-TestResults/
+TestResults/
+GWSocketClient/obj/

GWSocketClient/Form1.Designer.cs

@@ -31,6 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cbCCIDIsSource = new System.Windows.Forms.CheckBox();
             this.btnTextCmd = new System.Windows.Forms.Button();
             this.buttonCmdManager = new System.Windows.Forms.Button();
             this.label7 = new System.Windows.Forms.Label();
@@ -58,8 +59,6 @@
             this.ToolStripMenuItemHbStart = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.ToolStripMenuItemHb30abc = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripTextBoxHbtime = new System.Windows.Forms.ToolStripTextBox();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.ToolStripMenuItemLogHb = new System.Windows.Forms.ToolStripMenuItem();
             this.statusStrip1 = new System.Windows.Forms.StatusStrip();
@@ -73,7 +72,8 @@
             this.rightMenuCopyCmd = new System.Windows.Forms.ToolStripMenuItem();
             this.rightMenuClearInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.timerHeartBeat = new System.Windows.Forms.Timer(this.components);
-            this.cbCCIDIsSource = new System.Windows.Forms.CheckBox();
+            this.toolStripMenuItemHBtime = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripStatusLabelHbShow = new System.Windows.Forms.ToolStripStatusLabel();
             this.groupBox1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -114,6 +114,16 @@
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "基本信息栏";
             // 
+            // cbCCIDIsSource
+            // 
+            this.cbCCIDIsSource.AutoSize = true;
+            this.cbCCIDIsSource.Location = new System.Drawing.Point(625, 23);
+            this.cbCCIDIsSource.Name = "cbCCIDIsSource";
+            this.cbCCIDIsSource.Size = new System.Drawing.Size(82, 21);
+            this.cbCCIDIsSource.TabIndex = 19;
+            this.cbCCIDIsSource.Text = "CCID ? 源";
+            this.cbCCIDIsSource.UseVisualStyleBackColor = true;
+            // 
             // btnTextCmd
             // 
             this.btnTextCmd.Location = new System.Drawing.Point(596, 61);
@@ -343,8 +353,7 @@
             this.ToolStripMenuItemHbStart,
             this.toolStripSeparator1,
             this.toolStripSeparator3,
-            this.ToolStripMenuItemHb30abc,
-            this.toolStripTextBoxHbtime,
+            this.toolStripMenuItemHBtime,
             this.toolStripSeparator2,
             this.ToolStripMenuItemLogHb});
             this.心跳HToolStripMenuItem.Name = "心跳HToolStripMenuItem";
@@ -379,19 +388,6 @@
             this.toolStripSeparator3.Name = "toolStripSeparator3";
             this.toolStripSeparator3.Size = new System.Drawing.Size(193, 6);
             // 
-            // ToolStripMenuItemHb30abc
-            // 
-            this.ToolStripMenuItemHb30abc.Name = "ToolStripMenuItemHb30abc";
-            this.ToolStripMenuItemHb30abc.Size = new System.Drawing.Size(196, 22);
-            this.ToolStripMenuItemHb30abc.Text = "下面输入心跳时间";
-            // 
-            // toolStripTextBoxHbtime
-            // 
-            this.toolStripTextBoxHbtime.Name = "toolStripTextBoxHbtime";
-            this.toolStripTextBoxHbtime.Size = new System.Drawing.Size(100, 23);
-            this.toolStripTextBoxHbtime.Text = "5";
-            this.toolStripTextBoxHbtime.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.toolStripTextBoxHbtime_KeyPress);
-            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -410,7 +406,8 @@
             this.toolStripStatusLabel1,
             this.tsslEquipmentAddress,
             this.toolStripStatusLabel2,
-            this.tsslCCIDLEN});
+            this.tsslCCIDLEN,
+            this.toolStripStatusLabelHbShow});
             this.statusStrip1.Location = new System.Drawing.Point(0, 883);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0);
@@ -448,11 +445,11 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox2.Controls.Add(this.listBoxShow);
-            this.groupBox2.Location = new System.Drawing.Point(14, 561);
+            this.groupBox2.Location = new System.Drawing.Point(14, 380);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.groupBox2.Size = new System.Drawing.Size(1123, 309);
+            this.groupBox2.Size = new System.Drawing.Size(1123, 490);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息栏";
@@ -471,7 +468,7 @@
             this.listBoxShow.Location = new System.Drawing.Point(9, 28);
             this.listBoxShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.listBoxShow.Name = "listBoxShow";
-            this.listBoxShow.Size = new System.Drawing.Size(1106, 274);
+            this.listBoxShow.Size = new System.Drawing.Size(1106, 454);
             this.listBoxShow.TabIndex = 0;
             this.listBoxShow.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listBoxShow_DrawItem);
             this.listBoxShow.DoubleClick += new System.EventHandler(this.listBoxShow_DoubleClick);
@@ -500,18 +497,21 @@
             // 
             // timerHeartBeat
             // 
-            this.timerHeartBeat.Interval = 1000;
+            this.timerHeartBeat.Interval = 5000;
             this.timerHeartBeat.Tick += new System.EventHandler(this.timerHeartBeat_Tick);
             // 
-            // cbCCIDIsSource
+            // toolStripMenuItemHBtime
             // 
-            this.cbCCIDIsSource.AutoSize = true;
-            this.cbCCIDIsSource.Location = new System.Drawing.Point(625, 23);
-            this.cbCCIDIsSource.Name = "cbCCIDIsSource";
-            this.cbCCIDIsSource.Size = new System.Drawing.Size(82, 21);
-            this.cbCCIDIsSource.TabIndex = 19;
-            this.cbCCIDIsSource.Text = "CCID ? 源";
-            this.cbCCIDIsSource.UseVisualStyleBackColor = true;
+            this.toolStripMenuItemHBtime.Name = "toolStripMenuItemHBtime";
+            this.toolStripMenuItemHBtime.Size = new System.Drawing.Size(196, 22);
+            this.toolStripMenuItemHBtime.Text = "设置心跳间隔";
+            this.toolStripMenuItemHBtime.Click += new System.EventHandler(this.toolStripMenuItemHBtime_Click);
+            // 
+            // toolStripStatusLabelHbShow
+            // 
+            this.toolStripStatusLabelHbShow.Name = "toolStripStatusLabelHbShow";
+            this.toolStripStatusLabelHbShow.Size = new System.Drawing.Size(82, 17);
+            this.toolStripStatusLabelHbShow.Text = "心跳时间: 5秒";
             // 
             // Form1
             // 
@@ -581,14 +581,14 @@
         private System.Windows.Forms.ToolStripMenuItem 心跳HToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemHbStart;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemHb30abc;
-        private System.Windows.Forms.ToolStripTextBox toolStripTextBoxHbtime;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
         private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItemLogHb;
         private System.Windows.Forms.Timer timerHeartBeat;
         private System.Windows.Forms.ToolStripMenuItem StripMenuItemLoSucHb;
         private System.Windows.Forms.CheckBox cbCCIDIsSource;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemHBtime;
+        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelHbShow;
     }
 }
 

GWSocketClient/Form1.cs

@@ -200,6 +200,24 @@ namespace GWSocketClient
             }
         }
 
+        private void toolStripMenuItemHBtime_Click(object sender, EventArgs e)
+        {
+            InputDialog id = new InputDialog();
+            id.InputResult += (string topmost) =>
+            {
+                timerHeartBeat.Interval = int.Parse(topmost) * 1000;
+                //5秒
+                toolStripStatusLabelHbShow.Text = "心跳时间: " + topmost + "秒";
+
+            };
+            id.ShowDialog();
+        }
+
+        private void Id_InputResult(string topmost)
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
 
@@ -627,5 +645,7 @@ namespace GWSocketClient
         }
 
         #endregion
+
+       
     }
 }

GWSocketClient/GWSocketClient.csproj

@@ -84,6 +84,12 @@
     <Compile Include="InfoEditor.Designer.cs">
       <DependentUpon>InfoEditor.cs</DependentUpon>
     </Compile>
+    <Compile Include="InputDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="InputDialog.Designer.cs">
+      <DependentUpon>InputDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="model\WvBean.cs" />
     <Compile Include="MyMessageBox.cs">
       <SubType>Form</SubType>
@@ -123,6 +129,9 @@
     <EmbeddedResource Include="InfoEditor.resx">
       <DependentUpon>InfoEditor.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="InputDialog.resx">
+      <DependentUpon>InputDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MyMessageBox.resx">
       <DependentUpon>MyMessageBox.cs</DependentUpon>
     </EmbeddedResource>

GWSocketClient/InputDialog.Designer.cs

@@ -0,0 +1,117 @@
+namespace GWSocketClient
+{
+    partial class InputDialog
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.textBoxInput = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.labelLen = new System.Windows.Forms.Label();
+            this.buttonOK = new System.Windows.Forms.Button();
+            this.buttonCancle = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // textBoxInput
+            // 
+            this.textBoxInput.Location = new System.Drawing.Point(12, 53);
+            this.textBoxInput.Name = "textBoxInput";
+            this.textBoxInput.Size = new System.Drawing.Size(444, 23);
+            this.textBoxInput.TabIndex = 0;
+            this.textBoxInput.TextChanged += new System.EventHandler(this.textBoxInput_TextChanged);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(211, 9);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(44, 17);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "请输入";
+            // 
+            // labelLen
+            // 
+            this.labelLen.AutoSize = true;
+            this.labelLen.Location = new System.Drawing.Point(413, 89);
+            this.labelLen.Name = "labelLen";
+            this.labelLen.Size = new System.Drawing.Size(15, 17);
+            this.labelLen.TabIndex = 2;
+            this.labelLen.Text = "0";
+            // 
+            // buttonOK
+            // 
+            this.buttonOK.Location = new System.Drawing.Point(381, 139);
+            this.buttonOK.Name = "buttonOK";
+            this.buttonOK.Size = new System.Drawing.Size(75, 23);
+            this.buttonOK.TabIndex = 3;
+            this.buttonOK.Text = "确定";
+            this.buttonOK.UseVisualStyleBackColor = true;
+            this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);
+            // 
+            // buttonCancle
+            // 
+            this.buttonCancle.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.buttonCancle.Location = new System.Drawing.Point(300, 139);
+            this.buttonCancle.Name = "buttonCancle";
+            this.buttonCancle.Size = new System.Drawing.Size(75, 23);
+            this.buttonCancle.TabIndex = 4;
+            this.buttonCancle.Text = "取消";
+            this.buttonCancle.UseVisualStyleBackColor = true;
+            // 
+            // InputDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.buttonCancle;
+            this.ClientSize = new System.Drawing.Size(468, 221);
+            this.Controls.Add(this.buttonCancle);
+            this.Controls.Add(this.buttonOK);
+            this.Controls.Add(this.labelLen);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.textBoxInput);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "InputDialog";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "对话框";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBoxInput;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label labelLen;
+        private System.Windows.Forms.Button buttonOK;
+        private System.Windows.Forms.Button buttonCancle;
+    }
+}

GWSocketClient/InputDialog.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace GWSocketClient
+{
+
+    public delegate void OnInputResult(string topmost);
+
+
+    public partial class InputDialog : Form
+    {
+
+        public event OnInputResult InputResult;
+
+        public InputDialog()
+        {
+            InitializeComponent();
+        }
+
+     
+
+        private void textBoxInput_TextChanged(object sender, EventArgs e)
+        {
+            labelLen.Text = (textBoxInput.TextLength / 2.0) + "";
+        }
+
+        private void buttonOK_Click(object sender, EventArgs e)
+        {
+            InputResult(textBoxInput.Text.Trim());
+            this.Close();
+        }
+    }
+}

GWSocketClient/InputDialog.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>