修正一些bug!

GWSocketClient/AnaProtocol.Designer.cs

@@ -28,21 +28,39 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.labelSourceData = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
+            // labelSourceData
+            // 
+            this.labelSourceData.AutoSize = true;
+            this.labelSourceData.Location = new System.Drawing.Point(357, 13);
+            this.labelSourceData.Name = "labelSourceData";
+            this.labelSourceData.Size = new System.Drawing.Size(43, 17);
+            this.labelSourceData.TabIndex = 0;
+            this.labelSourceData.Text = "label1";
+            // 
             // AnaProtocol
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(875, 594);
+            this.ClientSize = new System.Drawing.Size(1021, 841);
+            this.Controls.Add(this.labelSourceData);
+            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.Name = "AnaProtocol";
+            this.ShowIcon = false;
             this.ShowInTaskbar = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "AnaProtocol";
+            this.Text = "分析";
+            this.Load += new System.EventHandler(this.AnaProtocol_Load);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
+
+        private System.Windows.Forms.Label labelSourceData;
     }
 }

GWSocketClient/AnaProtocol.cs

@@ -19,5 +19,14 @@ namespace GWSocketClient
             InitializeComponent();
             this.protocolData = pd;
         }
+
+        #region 窗体事件
+
+        private void AnaProtocol_Load(object sender, EventArgs e)
+        {
+            labelSourceData.Text = this.protocolData;
+        }
+
+        #endregion
     }
 }

GWSocketClient/Form1.Designer.cs

@@ -55,6 +55,7 @@
             this.文件FToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiLoadXml = new System.Windows.Forms.ToolStripMenuItem();
             this.心跳HToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.StripMenuItemLoSucHb = new System.Windows.Forms.ToolStripMenuItem();
             this.ToolStripMenuItemHbStart = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
@@ -73,7 +74,6 @@
             this.rightMenuCopyCmd = new System.Windows.Forms.ToolStripMenuItem();
             this.rightMenuClearInfo = new System.Windows.Forms.ToolStripMenuItem();
             this.timerHeartBeat = new System.Windows.Forms.Timer(this.components);
-            this.StripMenuItemLoSucHb = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox1.SuspendLayout();
             this.menuStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -360,6 +360,15 @@
             this.心跳HToolStripMenuItem.Size = new System.Drawing.Size(61, 21);
             this.心跳HToolStripMenuItem.Text = "心跳(&H)";
             // 
+            // StripMenuItemLoSucHb
+            // 
+            this.StripMenuItemLoSucHb.Checked = true;
+            this.StripMenuItemLoSucHb.CheckOnClick = true;
+            this.StripMenuItemLoSucHb.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.StripMenuItemLoSucHb.Name = "StripMenuItemLoSucHb";
+            this.StripMenuItemLoSucHb.Size = new System.Drawing.Size(196, 22);
+            this.StripMenuItemLoSucHb.Text = "登录成功同时开启心跳";
+            // 
             // ToolStripMenuItemHbStart
             // 
             this.ToolStripMenuItemHbStart.CheckOnClick = true;
@@ -368,7 +377,6 @@
             this.ToolStripMenuItemHbStart.Size = new System.Drawing.Size(196, 22);
             this.ToolStripMenuItemHbStart.Text = "开启心跳";
             this.ToolStripMenuItemHbStart.CheckStateChanged += new System.EventHandler(this.ToolStripMenuItemHbStart_CheckStateChanged);
-            this.ToolStripMenuItemHbStart.Click += new System.EventHandler(this.ToolStripMenuItemHbStart_Click);
             // 
             // toolStripSeparator1
             // 
@@ -400,10 +408,10 @@
             // 
             // ToolStripMenuItemLogHb
             // 
+            this.ToolStripMenuItemLogHb.CheckOnClick = true;
             this.ToolStripMenuItemLogHb.Name = "ToolStripMenuItemLogHb";
             this.ToolStripMenuItemLogHb.Size = new System.Drawing.Size(196, 22);
             this.ToolStripMenuItemLogHb.Text = "是否打印心跳";
-            this.ToolStripMenuItemLogHb.Click += new System.EventHandler(this.ToolStripMenuItemLogHb_Click);
             // 
             // statusStrip1
             // 
@@ -504,15 +512,6 @@
             this.timerHeartBeat.Interval = 1000;
             this.timerHeartBeat.Tick += new System.EventHandler(this.timerHeartBeat_Tick);
             // 
-            // StripMenuItemLoSucHb
-            // 
-            this.StripMenuItemLoSucHb.Checked = true;
-            this.StripMenuItemLoSucHb.CheckOnClick = true;
-            this.StripMenuItemLoSucHb.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.StripMenuItemLoSucHb.Name = "StripMenuItemLoSucHb";
-            this.StripMenuItemLoSucHb.Size = new System.Drawing.Size(196, 22);
-            this.StripMenuItemLoSucHb.Text = "登录成功同时开启心跳";
-            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);

GWSocketClient/Form1.cs

@@ -27,18 +27,25 @@ namespace GWSocketClient
 
     public partial class Form1 : Form
     {
-        public Form1()
-        {
-            InitializeComponent();
-        }
+        #region 属性定义
 
         private string ip;
         private string port;
         private SocketHelper.TcpClients sockeTcpClients;
+
         private VcarecityPD vcarecityProtocolBean = null;
-        private volatile bool hbRunFlag = false; //心跳线程标志
+
         private ThreadFormDelegate uiDelegate;
 
+        #endregion
+
+
+        #region Form 事件
+
+        public Form1()
+        {
+            InitializeComponent();
+        }
 
         private void Form1_Load(object sender, EventArgs e)
         {
@@ -60,6 +67,141 @@ namespace GWSocketClient
             timerHeartBeat.Enabled = ToolStripMenuItemHbStart.Checked;
         }
 
+        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            timerHeartBeat.Enabled = false;
+            try
+            {
+                sockeTcpClients.Stop();
+            }
+            catch (Exception exception)
+            {
+            }
+            finally
+            {
+                sockeTcpClients = null;
+            }
+
+            AccsessDbLoader.getInstance().closeConnection();
+        }
+
+        #endregion
+
+
+        #region 点击事件
+
+        private void btnLogin_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!showTopForNoLoadXML())
+                    return;
+
+                ip = tbIpaddress.Text.Trim();
+                port = tbPort.Text.Trim();
+
+                sockeTcpClients.InitSocket(ip, int.Parse(port));
+                sockeTcpClients.Start();
+            }
+            catch (Exception ex)
+            {
+                //                statuslist.Items.Add(string.Format("连接失败!原因：{0}", ex.Message
+                Console.WriteLine(ex.Message);
+            }
+        }
+
+        private void btnQuickLogout_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                sockeTcpClients.Stop();
+            }
+            catch (Exception exception)
+            {
+                addToListboxItem("你还没有登录!!" + exception.Message);
+            }
+        }
+
+        private void tsmiLoadXml_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.Filter = "XML文件|*.xml|所有文件|*.*";
+            ofd.InitialDirectory = Application.StartupPath;
+
+            if (ofd.ShowDialog() == DialogResult.OK)
+            {
+                string xmlFilepath = ofd.FileName;
+
+                vcarecityProtocolBean = new XmlLoader().load(xmlFilepath).getVcarecityPD();
+                this.Text = vcarecityProtocolBean.ProtocolName + " - " + vcarecityProtocolBean.ProtocolNo + " - " +
+                            vcarecityProtocolBean.ProtocolStartSymbol;
+            }
+        }
+
+        private void btnSendData_Click(object sender, EventArgs e)
+        {
+            string trim = tfTmpSendData.Text.Trim();
+            trim = trim.Replace("\n", "").Replace("\r", "").Replace("\t", "").Replace(" ", "").Replace("-", "");
+
+            if (!trim.Equals(""))
+            {
+                byte[] ts = HexUtil.hexToBytes(trim);
+
+                addToListboxItem(string.Format("发送到服务端:[{0}]", trim));
+
+                sockeTcpClients.SendData(ts);
+            }
+        }
+
+        /// <summary>
+        /// 压力测试
+        /// </summary>
+        private void btnPressureTest_Click(object sender, EventArgs e)
+        {
+            ip = tbIpaddress.Text.Trim();
+            port = tbPort.Text.Trim();
+
+            int count = int.Parse(tbPresureTestCount.Text);
+
+            ThreadPool.QueueUserWorkItem(o =>
+            {
+                for (int i = 1024; i < 1024 + count; i++)
+                {
+                    SocketHelper.TcpClients clientx = new SocketHelper.TcpClients(); //初始化类库  
+                    clientx.InitSocket(ip, int.Parse(port));
+                    clientx.Start();
+
+                    string loginCmd = "7e7e7e";
+                    loginCmd += "4442832e" + i;
+                    loginCmd += "820014383938363032423131393135353034373938" + i;
+                    loginCmd = Utils.calcCrcCode(loginCmd);
+                    sockeTcpClients.SendData(HexUtil.hexToBytes(loginCmd));
+                    Thread.Sleep(200);
+                }
+            });
+        }
+
+
+        private void buttonCmdManager_Click(object sender, EventArgs e)
+        {
+            InfoEditor ie = new InfoEditor();
+            ie.ShowDialog();
+        }
+
+
+        private void btnTextCmd_Click(object sender, EventArgs e)
+        {
+            //beta test tool
+            if (tfTmpSendData.Text.Trim().ToLower().Equals("pre"))
+            {
+                btnPressureTest.Visible = !btnPressureTest.Visible;
+                tbPresureTestCount.Visible = !tbPresureTestCount.Visible;
+                label4.Visible = !label4.Visible;
+            }
+        }
+
+        #endregion
+
 
         #region 处理心跳相关的
 
@@ -89,6 +231,11 @@ namespace GWSocketClient
             }
         }
 
+        private void ToolStripMenuItemHbStart_CheckStateChanged(object sender, EventArgs e)
+        {
+            timerHeartBeat.Enabled = ToolStripMenuItemHbStart.Checked;
+        }
+
         #endregion
 
         private bool showTopForNoLoadXML()
@@ -111,28 +258,28 @@ namespace GWSocketClient
                     {
                         case SocketHelper.Sockets.ErrorCodes.objectNull:
                             addToListboxItem("状态信息:服务器连接已断开");
-                            hbRunFlag = false;
                             checkLogin(false);
                             break;
                         case SocketHelper.Sockets.ErrorCodes.ConnectError:
                             //连接不成功
                             addToListboxItem("状态信息:连接服务器失败,可能是服务器未开启!");
+                            checkLogin(false);
                             break;
                         case SocketHelper.Sockets.ErrorCodes.ConnectSuccess:
                             //连接成功
                             addToListboxItem("状态信息:与服务器连接成功");
                             addToListboxItem(string.Format("客户端信息{0}", sks.ex));
-                            checkLogin(true);
                             sendLoginCmd();
+                            checkLogin(true);
+
                             if (StripMenuItemLoSucHb.Checked)
                             {
                                 ToolStripMenuItemHbStart.Checked = true;
                             }
-                            hbRunFlag = true;
-//                            startHeartBeatThread();
                             break;
                         case SocketHelper.Sockets.ErrorCodes.TrySendData:
                             addToListboxItem("状态信息:ErrorCodes");
+                            checkLogin(false);
                             break;
                         default:
                             addToListboxItem(string.Format("客户端信息{0}", sks.ex));
@@ -189,7 +336,7 @@ namespace GWSocketClient
 
             if (!(funcode == 16 || funcode == 32))
             {
-                Console.WriteLine("功能码10进制=" + funcode + ",所以不用回复!");
+                Console.WriteLine("功能码10进制=" + funcode + ",所以不用回复! data=" + reqData);
                 return;
             }
 
@@ -302,77 +449,21 @@ namespace GWSocketClient
             sockeTcpClients.SendData(ts);
         }
 
-        private void btnLogin_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                if (!showTopForNoLoadXML())
-                    return;
-
-                ip = tbIpaddress.Text.Trim();
-                port = tbPort.Text.Trim();
-
-                sockeTcpClients.InitSocket(ip, int.Parse(port));
-                sockeTcpClients.Start();
-            }
-            catch (Exception ex)
-            {
-//                statuslist.Items.Add(string.Format("连接失败!原因：{0}", ex.Message
-                Console.WriteLine(ex.Message);
-            }
-        }
-
 
         private void tbCCID_TextChanged(object sender, EventArgs e)
         {
             string ccid = tbCCID.Text.Trim();
-
             tsslCCIDLEN.Text = ccid.Length / 2.0 + "";
         }
 
-        private void btnQuickLogout_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                sockeTcpClients.Stop();
-            }
-            catch (Exception exception)
-            {
-                addToListboxItem("你还没有登录!!" + exception.Message);
-            }
-        }
-
-        private void tsmiLoadXml_Click(object sender, EventArgs e)
-        {
-            OpenFileDialog ofd = new OpenFileDialog();
-            ofd.Filter = "XML文件|*.xml|所有文件|*.*";
-            ofd.InitialDirectory = Application.StartupPath;
-
-            if (ofd.ShowDialog() == DialogResult.OK)
-            {
-                string xmlFilepath = ofd.FileName;
-
-                vcarecityProtocolBean = new XmlLoader().load(xmlFilepath).getVcarecityPD();
-                this.Text = vcarecityProtocolBean.ProtocolName + " - " + vcarecityProtocolBean.ProtocolNo + " - " +
-                            vcarecityProtocolBean.ProtocolStartSymbol;
-            }
-        }
-
-        private void btnSendData_Click(object sender, EventArgs e)
-        {
-            string trim = tfTmpSendData.Text.Trim();
-            trim = trim.Replace("\n", "").Replace("\r", "").Replace("\t", "").Replace(" ", "").Replace("-", "");
-
-            if (!trim.Equals(""))
-            {
-                byte[] ts = HexUtil.hexToBytes(trim);
-
-                addToListboxItem(string.Format("发送到服务端:[{0}]", trim));
 
-                sockeTcpClients.SendData(ts);
-            }
-        }
+        #region ListBox相关
 
+        /// <summary>
+        /// ListBox右键菜单-点击复制
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void rightMenuCopyCmd_Click(object sender, EventArgs e)
         {
             int index = listBoxShow.SelectedIndex;
@@ -404,13 +495,12 @@ namespace GWSocketClient
             }
         }
 
-
         private void addToListboxItem(object info)
         {
             if (listBoxShow.Items.Count > 1000)
             {
                 listBoxShow.Items.Remove(0);
-//                listBoxShow.Items.Clear();
+                //                listBoxShow.Items.Clear();
             }
 
             Console.WriteLine(info);
@@ -418,7 +508,6 @@ namespace GWSocketClient
             listBoxShow.TopIndex = listBoxShow.Items.Count - 1;
         }
 
-
         private void rightMenuClearInfo_Click(object sender, EventArgs e)
         {
             listBoxShow.Items.Clear();
@@ -461,34 +550,6 @@ namespace GWSocketClient
             }
         }
 
-        /// <summary>
-        /// 压力测试
-        /// </summary>
-        private void btnPressureTest_Click(object sender, EventArgs e)
-        {
-            ip = tbIpaddress.Text.Trim();
-            port = tbPort.Text.Trim();
-
-            int count = int.Parse(tbPresureTestCount.Text);
-
-            ThreadPool.QueueUserWorkItem(o =>
-            {
-                for (int i = 1024; i < 1024 + count; i++)
-                {
-                    SocketHelper.TcpClients clientx = new SocketHelper.TcpClients(); //初始化类库  
-                    clientx.InitSocket(ip, int.Parse(port));
-                    clientx.Start();
-
-                    string loginCmd = "7e7e7e";
-                    loginCmd += "4442832e" + i;
-                    loginCmd += "820014383938363032423131393135353034373938" + i;
-                    loginCmd = Utils.calcCrcCode(loginCmd);
-                    sockeTcpClients.SendData(HexUtil.hexToBytes(loginCmd));
-                    Thread.Sleep(200);
-                }
-            });
-        }
-
         private void listBoxShow_DoubleClick(object sender, EventArgs e)
         {
             int index = listBoxShow.SelectedIndex;
@@ -505,7 +566,7 @@ namespace GWSocketClient
                         ifs = ifs.Replace("[", "").Replace("]", "");
                         if (!info.Equals(""))
                         {
-//                            MessageBox.Show(ifs);
+                            //                            MessageBox.Show(ifs);
                             AnaProtocol ap = new AnaProtocol(ifs);
                             ap.ShowDialog();
                         }
@@ -514,59 +575,10 @@ namespace GWSocketClient
             }
         }
 
-        private void buttonCmdManager_Click(object sender, EventArgs e)
-        {
-            InfoEditor ie = new InfoEditor();
-            ie.ShowDialog();
-        }
-
-        private void Form1_FormClosing(object sender, FormClosingEventArgs e)
-        {
-            timerHeartBeat.Enabled = false;
-            try
-            {
-                sockeTcpClients.Stop();
-            }
-            catch (Exception exception)
-            {
-            }
-            finally
-            {
-                sockeTcpClients = null;
-            }
-
-            AccsessDbLoader.getInstance().closeConnection();
-        }
-
-        private void btnTextCmd_Click(object sender, EventArgs e)
-        {
-            //beta test tool
-            if (tfTmpSendData.Text.Trim().ToLower().Equals("pre"))
-            {
-                btnPressureTest.Visible = !btnPressureTest.Visible;
-                tbPresureTestCount.Visible = !tbPresureTestCount.Visible;
-                label4.Visible = !label4.Visible;
-            }
-
-//            string code = Utils.calcCrcCode("7e7e7e123456789abc20000701010107030001");
-//            code = Utils.calcCrcCode("7e7e7e123456789abc10000501010107023f");
-//            Console.WriteLine(code);
-
-//            handleResponse(null, code);
+        #endregion
 
 
-            /*try
-            {
-                Dictionary<string, string> abc = AccsessDbLoader.getInstance().getUserIdInfo();
-                MessageBox.Show(abc.Count + "");
-                string ac = abc["0400"];
-                MessageBox.Show(ac);
-            }
-            catch (Exception exception)
-            {
-                Console.WriteLine(exception);
-            }*/
-        }
+        #region 检验工具类
 
         private void toolStripTextBoxHbtime_KeyPress(object sender, KeyPressEventArgs e)
         {
@@ -576,11 +588,6 @@ namespace GWSocketClient
             }
         }
 
-        private void ToolStripMenuItemLogHb_Click(object sender, EventArgs e)
-        {
-            ToolStripMenuItemLogHb.Checked = !ToolStripMenuItemLogHb.Checked;
-        }
-
 
         private void checkLogin(bool isLogin)
         {
@@ -589,24 +596,24 @@ namespace GWSocketClient
                 btnLogin.Enabled = false;
                 btnQuickLogout.Enabled = true;
                 btnSendData.Enabled = true;
-                ToolStripMenuItemHbStart.Enabled = true;
+                ToolStripMenuItemHbStart.Enabled = true; //开启心中的点击选项
+                if (StripMenuItemLoSucHb.Checked)
+                {
+                    //如果勾选了登录成功并心跳
+                    timerHeartBeat.Enabled = true;
+                }
             }
             else
             {
                 btnLogin.Enabled = true;
                 btnQuickLogout.Enabled = false;
                 btnSendData.Enabled = false;
+                ToolStripMenuItemHbStart.Checked = false;
                 ToolStripMenuItemHbStart.Enabled = false;
+                timerHeartBeat.Enabled = false;
             }
         }
 
-        private void ToolStripMenuItemHbStart_CheckStateChanged(object sender, EventArgs e)
-        {
-            timerHeartBeat.Enabled = ToolStripMenuItemHbStart.Checked;
-        }
-
-        private void ToolStripMenuItemHbStart_Click(object sender, EventArgs e)
-        {
-        }
+        #endregion
     }
 }

GWSocketClient/GWSocketClient.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{1E7C256A-9CA5-4937-A5DD-7F281A2EBB21}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>GWSocketClient</RootNamespace>
     <AssemblyName>GWSocketClient</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>

GWSocketClient/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("GWSocketClient")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("DTU模拟器")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Vcarecity")]
 [assembly: AssemblyProduct("GWSocketClient")]