大表通讯服务代码优化

NB_IOT_TCP_HP_SOCKET/DeviceControlForm.Designer.cs

@@ -30,7 +30,7 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DeviceControlForm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.tabControl2 = new System.Windows.Forms.TabControl();
             this.tabPage3 = new System.Windows.Forms.TabPage();
@@ -47,7 +47,6 @@
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.dGV_ShowData = new System.Windows.Forms.DataGridView();
-            this.btn_Refresh = new System.Windows.Forms.Button();
             this.lbl_DeviceID = new System.Windows.Forms.Label();
             this.lbl_DeviceName = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -249,7 +248,6 @@
             // 
             // splitContainer2.Panel2
             // 
-            this.splitContainer2.Panel2.Controls.Add(this.btn_Refresh);
             this.splitContainer2.Panel2.Controls.Add(this.lbl_DeviceID);
             this.splitContainer2.Panel2.Controls.Add(this.lbl_DeviceName);
             this.splitContainer2.Panel2.Controls.Add(this.label1);
@@ -283,8 +281,8 @@
             // 
             this.dGV_ShowData.AllowUserToAddRows = false;
             this.dGV_ShowData.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
-            this.dGV_ShowData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+            this.dGV_ShowData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dGV_ShowData.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
             this.dGV_ShowData.BackgroundColor = System.Drawing.SystemColors.Window;
             this.dGV_ShowData.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -297,15 +295,6 @@
             this.dGV_ShowData.Size = new System.Drawing.Size(558, 225);
             this.dGV_ShowData.TabIndex = 0;
             // 
-            // btn_Refresh
-            // 
-            this.btn_Refresh.Location = new System.Drawing.Point(247, 6);
-            this.btn_Refresh.Name = "btn_Refresh";
-            this.btn_Refresh.Size = new System.Drawing.Size(75, 23);
-            this.btn_Refresh.TabIndex = 8;
-            this.btn_Refresh.Text = "即时刷新";
-            this.btn_Refresh.UseVisualStyleBackColor = true;
-            // 
             // lbl_DeviceID
             // 
             this.lbl_DeviceID.AutoSize = true;
@@ -390,7 +379,6 @@
             this.cbb_ParamNames.Size = new System.Drawing.Size(139, 20);
             this.cbb_ParamNames.TabIndex = 5;
             this.cbb_ParamNames.SelectedIndexChanged += new System.EventHandler(this.cbb_ParamNames_SelectedIndexChanged);
-            
             // 
             // btn_SetParamAsName
             // 
@@ -708,7 +696,6 @@
         private System.Windows.Forms.TabControl tabControl1;
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.DataGridView dGV_ShowData;
-        private System.Windows.Forms.Button btn_Refresh;
         private System.Windows.Forms.Label lbl_DeviceID;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Panel panel2;

NB_IOT_TCP_HP_SOCKET/DeviceControlForm.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAE
-        CQAAAk1TRnQBSQFMAgEBAgEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

NB_IOT_TCP_HP_SOCKET/MainForm_TCP.cs

@@ -7,6 +7,7 @@ using System.Configuration;
 using System.Data;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
@@ -150,7 +151,7 @@ namespace NB_IOT_TCP_HP_SOCKET
             }
             catch (Exception ex)
             {
-                AddMsg(ex.Message, lbErrorData);
+                AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
             }
         }
 
@@ -436,7 +437,7 @@ namespace NB_IOT_TCP_HP_SOCKET
             }
             catch (Exception ex)
             {
-                AddMsg(ex.Message, lbErrorData);
+                AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
                 return HandleResult.Ignore;
             }
         }
@@ -445,26 +446,45 @@ namespace NB_IOT_TCP_HP_SOCKET
         #region OnClose(IServer sender, IntPtr connId, SocketOperation enOperation, int errorCode)
         HandleResult OnClose(IServer sender, IntPtr connId, SocketOperation enOperation, int errorCode)
         {
-            if (errorCode == 0)
-                AddMsg($" > [{connId},OnClose]", lbReceiveData);
-            else
-                AddMsg($" > [{connId},OnError] -> OP:{enOperation},CODE:{errorCode}", lbReceiveData);
-
-            // 移除设备的链接关联关系
-            foreach (KeyValuePair<string, IntPtr> conn in deveiceConnId)
+            try
             {
-                IntPtr deviceConnId = conn.Value;
-                if (connId == deviceConnId)
+                if (errorCode == 0)
+                    AddMsg($" > [{connId},OnClose]", lbReceiveData);
+                else
+                    AddMsg($" > [{connId},OnError] -> OP:{enOperation},CODE:{errorCode}", lbErrorData);
+
+                if (deveiceConnId != null && deveiceConnId.Count > 0)
                 {
-                    deveiceConnId.Remove(conn.Key);
-                    break;
+                    KeyValuePair<string, IntPtr>[] nowDeveiceConnId = new KeyValuePair<string, IntPtr>[0];
+                    
+                    nowDeveiceConnId = new KeyValuePair<string, IntPtr>[deveiceConnId.Count];
+                    deveiceConnId.ToArray().CopyTo(nowDeveiceConnId, 0);
+                    
+                    // 移除设备的链接关联关系
+                    foreach (KeyValuePair<string, IntPtr> conn in nowDeveiceConnId)
+                    {
+                        IntPtr deviceConnId = conn.Value;
+                        if (connId == deviceConnId)
+                        {
+                            if (deveiceConnId.Count > 0 && deveiceConnId.ContainsKey(conn.Key))
+                            {
+                                deveiceConnId.Remove(conn.Key);
+                                break;
+                            }
+
+                        }
+                    }
                 }
-            }
 
-            // 移除附加数据
-            if (server.RemoveExtra(connId) == false)
+                // 移除附加数据
+                if (server.RemoveExtra(connId) == false)
+                {
+                    AddMsg($" > [{connId},OnClose] -> SetConnectionExtra({connId}, null) fail", lbErrorData);
+                }
+            }
+            catch (Exception ex)
             {
-                AddMsg($" > [{connId},OnClose] -> SetConnectionExtra({connId}, null) fail", lbErrorData);
+                LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
             }
 
             return HandleResult.Ok;
@@ -582,7 +602,7 @@ namespace NB_IOT_TCP_HP_SOCKET
         /// </summary>
         private void DisconnectConnections()
         {
-            while (true)
+            while (this.Visible)
             {
                 if (!isHeartBeatRuning)
                 {
@@ -595,8 +615,14 @@ namespace NB_IOT_TCP_HP_SOCKET
 
                         List<string> disconnectId = new List<string>();
 
+                        KeyValuePair<string, IntPtr>[] nowDeveiceConnId = new KeyValuePair<string, IntPtr>[0];
+                        if (deveiceConnId != null && deveiceConnId.Count > 0)
+                        {
+                            nowDeveiceConnId = new KeyValuePair<string, IntPtr>[deveiceConnId.Count];
+                            deveiceConnId.ToArray().CopyTo(nowDeveiceConnId , 0);
+                        }
                         // 处理设备对应的链接，如果超时则断开链接并移除设备-链接对应关系
-                        foreach (KeyValuePair<string, IntPtr> conn in deveiceConnId)
+                        foreach (KeyValuePair<string, IntPtr> conn in nowDeveiceConnId)
                         {
                             IntPtr connId = conn.Value;
                             if (allConnIds == null || Array.IndexOf(allConnIds, connId) == -1)
@@ -626,18 +652,24 @@ namespace NB_IOT_TCP_HP_SOCKET
                             }
                         }
 
+                        // 关闭所有静默链接
+                        server.DisconnectSilenceConnections(Convert.ToUInt32(ConfigurationManager.AppSettings["ConnectionTimeOut"]));
+
                         foreach (string key in disconnectId)
                         {
-                            deveiceConnId.Remove(key);
+                            if (deveiceConnId != null && deveiceConnId.Count > 0 && deveiceConnId.ContainsKey(key))
+                            {
+                                deveiceConnId.Remove(key);
+                            }
                         }
-                        // 关闭所有静默链接（主要是只建立链接没有上报过数据的链接）
-                        server.DisconnectSilenceConnections(Convert.ToUInt32(ConfigurationManager.AppSettings["ConnectionTimeOut"]));
 
                         isHeartBeatRuning = false;
                     }
                     catch (Exception ex)
                     {
-                        AddMsg(ex.Message, lbErrorData);
+                        AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
+                        // 关闭所有静默链接（主要是只建立链接没有上报过数据的链接）
+                        server.DisconnectSilenceConnections(Convert.ToUInt32(ConfigurationManager.AppSettings["ConnectionTimeOut"]));
                         isHeartBeatRuning = false;
                     }
                 }
@@ -741,7 +773,7 @@ namespace NB_IOT_TCP_HP_SOCKET
                         }
                         catch (Exception ex)
                         {
-                            AddMsg(ex.Message, lbErrorData);
+                            AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
                             continue;
                         }
                     }
@@ -749,7 +781,7 @@ namespace NB_IOT_TCP_HP_SOCKET
                 }
                 catch (Exception ex)
                 {
-                    AddMsg(ex.Message, lbErrorData);
+                    AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
                     isTimeRuning = false;
                 }
 
@@ -761,7 +793,7 @@ namespace NB_IOT_TCP_HP_SOCKET
         /// </summary>
         private void DealWithSendThread()
         {
-            while (true)
+            while (this.Visible)
             {
                 try
                 {
@@ -1042,7 +1074,7 @@ namespace NB_IOT_TCP_HP_SOCKET
                 }
                 catch (Exception ex)
                 {
-                    AddMsg(ex.Message, lbErrorData);
+                    AddMsg(ex.Message + ">>>" + ex.StackTrace, lbErrorData);
                 }
             }
         }
@@ -1052,7 +1084,7 @@ namespace NB_IOT_TCP_HP_SOCKET
         /// </summary>
         private void InsourcingProcess()
         {
-            while (true)
+            while (this.Visible)
             {
                 try
                 {
@@ -1267,7 +1299,7 @@ namespace NB_IOT_TCP_HP_SOCKET
         /// </summary>
         private void SetParamThread()
         {
-            while (true)
+            while (this.Visible)
             {
                 // 获取所有链接ID
                 IntPtr[] allConnIds = server.GetAllConnectionIDs();
@@ -1306,7 +1338,7 @@ namespace NB_IOT_TCP_HP_SOCKET
                         }
                         catch (Exception ex)
                         {
-                            AddMsg($" > [{clientInfo.ConnId},OnSend] -> {clientInfo.IpAddress}:{clientInfo.Port} {sourceNumber}  CD_CellMonitor最后发送设参指令失败 \n {ex.Message}", lbErrorData);
+                            AddMsg($" > [{clientInfo.ConnId},OnSend] -> {clientInfo.IpAddress}:{clientInfo.Port} {sourceNumber}  CD_CellMonitor最后发送设参指令失败 \n {ex.StackTrace}", lbErrorData);
                         }
                     }
                 }
@@ -1526,6 +1558,11 @@ namespace NB_IOT_TCP_HP_SOCKET
             DeviceControlForm deviceControlForm = new DeviceControlForm();
             deviceControlForm.ShowDialog();
         }
+
+        private void MainForm_TCP_FormClosing(object sender, EventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
     }
 
     [StructLayout(LayoutKind.Sequential)]

NB_IOT_TCP_HP_SOCKET/ParamSetForm.cs

@@ -13,6 +13,8 @@ namespace NB_IOT_TCP_HP_SOCKET
 {
     public partial class ParamSetForm : Form
     {
+        private delegate void ShowMessageInvoke(string Caption, string Message);
+
         public ParamSetForm()
         {
             InitializeComponent();
@@ -78,7 +80,7 @@ namespace NB_IOT_TCP_HP_SOCKET
             cfg.AppSettings.Settings["db"].Value = dbTmp.ToString();
             cfg.Save();
             ConfigurationManager.RefreshSection("appSettings");
-
+            this.ShowMessage("提示", "保存成功！");
         }
 
         private void ParamSetForm_Load(object sender, EventArgs e)
@@ -139,5 +141,24 @@ namespace NB_IOT_TCP_HP_SOCKET
         {
             this.Close();
         }
+
+        private void ShowMessage(string caption, string message)
+        {
+            if (base.InvokeRequired)
+            {
+                ShowMessageInvoke method = new ShowMessageInvoke(this.ShowMessage);
+                base.BeginInvoke(method, new string[] { caption, message });
+            }
+            else
+            {
+                try
+                {
+                    MessageBox.Show(this, message, caption, MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                }
+                catch
+                {
+                }
+            }
+        }
     }
 }

NB_IOT_TCP_HP_SOCKET/WWKJUtil/ProtocolAnalysisTools.cs

@@ -399,8 +399,9 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
             {
                 time2 = time.AddSeconds(double.Parse(seconds));
             }
-            catch
+            catch(Exception ex)
             {
+                LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
             }
             return time2;
         }
@@ -590,8 +591,9 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
                         }
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
                     continue;
                 }
             }
@@ -603,8 +605,9 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
                 {
                     UpdateDeviceLastData(kvp);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
                     continue;
                 }
             }
@@ -781,8 +784,9 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
                         }
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
                     continue;
                 }
             }
@@ -810,8 +814,9 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
                     
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
                     continue;
                 }
             }
@@ -890,6 +895,7 @@ namespace NB_IOT_TCP_HP_SOCKET.WWKJUtil
             }
             catch (WebException ex)
             {
+                LogUtil.WriteLog(ex.Message + ">>>" + ex.StackTrace);
                 return "";
             }
         }