Fix Some Bug

GWSocketClient/Form1.Designer.cs

@@ -411,7 +411,7 @@
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "Form1";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Form1";
+            this.Text = "DTU模拟器";
             this.Load += new System.EventHandler(this.Form1_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();

GWSocketClient/Form1.cs

@@ -26,15 +26,17 @@ namespace GWSocketClient
         private string ip;
         private string port;
         private SocketHelper.TcpClients sockeTcpClients;
-        private VcarecityPD vcarecityProtocolBean;
+        private VcarecityPD vcarecityProtocolBean = null;
 
         private void Form1_Load(object sender, EventArgs e)
         {
             XmlLoader xmlLoader = new XmlLoader();
             vcarecityProtocolBean = xmlLoader.loadXml();
-            this.Text = vcarecityProtocolBean.ProtocolName + " - " + vcarecityProtocolBean.ProtocolNo + " - " +
-                        vcarecityProtocolBean.ProtocolStartSymbol;
-
+            if (vcarecityProtocolBean != null)
+            {
+                this.Text = vcarecityProtocolBean.ProtocolName + " - " + vcarecityProtocolBean.ProtocolNo + " - " +
+                            vcarecityProtocolBean.ProtocolStartSymbol;
+            }
 
             SocketHelper.pushSockets = new SocketHelper.PushSockets(receiveData); //注册推送器
             sockeTcpClients = new SocketHelper.TcpClients();
@@ -42,6 +44,15 @@ namespace GWSocketClient
             port = tbPort.Text.Trim();
         }
 
+        private bool showTopForNoLoadXML()
+        {
+            if (vcarecityProtocolBean == null)
+            {
+                MessageBox.Show("请先加载XML协议文件");
+                return false;
+            }
+            return true;
+        }
 
         private void receiveData(SocketHelper.Sockets sks)
         {
@@ -134,6 +145,9 @@ namespace GWSocketClient
         {
             try
             {
+                if (!showTopForNoLoadXML())
+                    return;
+
                 ip = tbIpaddress.Text.Trim();
                 port = tbPort.Text.Trim();
 
@@ -141,7 +155,7 @@ namespace GWSocketClient
                 sockeTcpClients.Start();
 
                 //                string loginCmd = "7e7e7e4442832e833c8200143839383630324231313931353530343739383737f7";
-                string loginCmd = "7e7e7e";
+                string loginCmd = vcarecityProtocolBean.ProtocolStartSymbol;
                 loginCmd += tbEquipmentAddress.Text.Trim() + "82" +
                             Utils.stringWith0(Utils.tenToHex(tbCCID.Text.Trim().Length / 2), 4);
                 loginCmd += tbCCID.Text.Trim();
@@ -170,7 +184,14 @@ namespace GWSocketClient
 
         private void btnQuickLogout_Click(object sender, EventArgs e)
         {
-            sockeTcpClients.Stop();
+            try
+            {
+                sockeTcpClients.Stop();
+            }
+            catch (Exception exception)
+            {
+//                addToListboxItem("你还没有登录!!" + exception.Message);
+            }
         }
 
         private void tsmiLoadXml_Click(object sender, EventArgs e)