增加打开自动启动选项

NB_IOT_TCP_HP_SOCKET/App.config

@@ -22,6 +22,10 @@
     <!-- 农村供水预付费系统阀门状态控制结果通知接口 （http://xxxxx/RuralWater/MeterValveStatusApi.ashx）-->
     <add key="RuralWaterCommdURL" value="" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <!--自动启动标志1：自动启动；0：不自动启动-->
+    <add key="AutoStart" value="0" />
+    <!--上报端口-->
+    <add key="ReportPort" value="" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

NB_IOT_TCP_HP_SOCKET/MainForm_TCP.cs

@@ -86,6 +86,15 @@ namespace NB_IOT_TCP_HP_SOCKET
                 server.OnShutdown += new ServerEvent.OnShutdownEventHandler(OnShutdown);
 
                 SetAppState(AppState.UnStart);
+
+                this.txtPort.Text = ConfigurationManager.AppSettings["ReportPort"];
+                string AutoStart = ConfigurationManager.AppSettings["AutoStart"];
+                String ip = this.txtIpAddress.Text.Trim();
+                string port = this.txtPort.Text.Trim();
+                if ("1".Equals(AutoStart) && !string.IsNullOrEmpty(ip) && !string.IsNullOrEmpty(port))
+                {
+                    StartServer(ip, ushort.Parse(port));
+                }
             }
             catch (Exception ex)
             {
@@ -100,12 +109,16 @@ namespace NB_IOT_TCP_HP_SOCKET
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void btnStart_Click(object sender, EventArgs e)
+        {
+            String ip = this.txtIpAddress.Text.Trim();
+            ushort port = ushort.Parse(this.txtPort.Text.Trim());
+            StartServer(ip, port);
+        }
+
+        private void StartServer(string ip, ushort port)
         {
             try
             {
-                String ip = this.txtIpAddress.Text.Trim();
-                ushort port = ushort.Parse(this.txtPort.Text.Trim());
-
                 // 写在这个位置是上面可能会异常
                 SetAppState(AppState.Starting);
                 server.IpAddress = ip;
@@ -175,7 +188,10 @@ namespace NB_IOT_TCP_HP_SOCKET
 
                 if ("1".Equals(deviceType))
                 {
-                    setParamThread.Suspend(); // 挂起电池供电设参线程
+                    if (setParamThread != null && setParamThread.ThreadState == ThreadState.Running)
+                    {
+                        setParamThread.Suspend(); // 挂起电池供电设参线程
+                    }
                 }
                 else if ("2".Equals(deviceType))
                 {
@@ -1477,9 +1493,15 @@ namespace NB_IOT_TCP_HP_SOCKET
         private void button3_Click(object sender, EventArgs e)
         {
             ParamSetForm paramSetForm = new ParamSetForm();
+            paramSetForm.SetReportPort += SetReportPort;
             paramSetForm.ShowDialog();
         }
 
+        private void SetReportPort(string reportPort)
+        {
+            this.txtPort.Text = reportPort;
+        }
+
         /// <summary>
         /// 下发设参指令
         /// </summary>

NB_IOT_TCP_HP_SOCKET/ParamSetForm.Designer.cs

@@ -38,6 +38,7 @@
             this.label1 = new System.Windows.Forms.Label();
             this.dataBaseIP = new System.Windows.Forms.TextBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.isBatteryDevice = new System.Windows.Forms.CheckBox();
             this.isHaveModBus = new System.Windows.Forms.CheckBox();
             this.label5 = new System.Windows.Forms.Label();
             this.connectionTimeOutInterval = new System.Windows.Forms.TextBox();
@@ -48,13 +49,18 @@
             this.connectionTimeOut = new System.Windows.Forms.TextBox();
             this.button1 = new System.Windows.Forms.Button();
             this.button2 = new System.Windows.Forms.Button();
-            this.isBatteryDevice = new System.Windows.Forms.CheckBox();
+            this.isAutoStart = new System.Windows.Forms.CheckBox();
+            this.ReportPort = new System.Windows.Forms.TextBox();
+            this.label9 = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.label9);
+            this.groupBox1.Controls.Add(this.ReportPort);
+            this.groupBox1.Controls.Add(this.isAutoStart);
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.dataBase);
             this.groupBox1.Controls.Add(this.label3);
@@ -73,7 +79,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(26, 89);
+            this.label4.Location = new System.Drawing.Point(26, 70);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(41, 12);
             this.label4.TabIndex = 7;
@@ -81,7 +87,7 @@
             // 
             // dataBase
             // 
-            this.dataBase.Location = new System.Drawing.Point(87, 86);
+            this.dataBase.Location = new System.Drawing.Point(87, 67);
             this.dataBase.Name = "dataBase";
             this.dataBase.Size = new System.Drawing.Size(172, 21);
             this.dataBase.TabIndex = 6;
@@ -89,7 +95,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(26, 195);
+            this.label3.Location = new System.Drawing.Point(26, 156);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(29, 12);
             this.label3.TabIndex = 5;
@@ -97,7 +103,7 @@
             // 
             // passWord
             // 
-            this.passWord.Location = new System.Drawing.Point(87, 192);
+            this.passWord.Location = new System.Drawing.Point(87, 153);
             this.passWord.Name = "passWord";
             this.passWord.Size = new System.Drawing.Size(172, 21);
             this.passWord.TabIndex = 4;
@@ -105,7 +111,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(26, 140);
+            this.label2.Location = new System.Drawing.Point(26, 114);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(41, 12);
             this.label2.TabIndex = 3;
@@ -113,7 +119,7 @@
             // 
             // userName
             // 
-            this.userName.Location = new System.Drawing.Point(87, 137);
+            this.userName.Location = new System.Drawing.Point(87, 111);
             this.userName.Name = "userName";
             this.userName.Size = new System.Drawing.Size(172, 21);
             this.userName.TabIndex = 2;
@@ -121,7 +127,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(26, 43);
+            this.label1.Location = new System.Drawing.Point(26, 32);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(41, 12);
             this.label1.TabIndex = 1;
@@ -129,7 +135,7 @@
             // 
             // dataBaseIP
             // 
-            this.dataBaseIP.Location = new System.Drawing.Point(87, 40);
+            this.dataBaseIP.Location = new System.Drawing.Point(87, 29);
             this.dataBaseIP.Name = "dataBaseIP";
             this.dataBaseIP.Size = new System.Drawing.Size(172, 21);
             this.dataBaseIP.TabIndex = 0;
@@ -152,6 +158,16 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "参数配置";
             // 
+            // isBatteryDevice
+            // 
+            this.isBatteryDevice.AutoSize = true;
+            this.isBatteryDevice.Location = new System.Drawing.Point(182, 173);
+            this.isBatteryDevice.Name = "isBatteryDevice";
+            this.isBatteryDevice.Size = new System.Drawing.Size(96, 16);
+            this.isBatteryDevice.TabIndex = 17;
+            this.isBatteryDevice.Text = "电池供电设备";
+            this.isBatteryDevice.UseVisualStyleBackColor = true;
+            // 
             // isHaveModBus
             // 
             this.isHaveModBus.AutoSize = true;
@@ -239,15 +255,31 @@
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
-            // isBatteryDevice
+            // isAutoStart
             // 
-            this.isBatteryDevice.AutoSize = true;
-            this.isBatteryDevice.Location = new System.Drawing.Point(182, 173);
-            this.isBatteryDevice.Name = "isBatteryDevice";
-            this.isBatteryDevice.Size = new System.Drawing.Size(96, 16);
-            this.isBatteryDevice.TabIndex = 17;
-            this.isBatteryDevice.Text = "电池供电设备";
-            this.isBatteryDevice.UseVisualStyleBackColor = true;
+            this.isAutoStart.AutoSize = true;
+            this.isAutoStart.Location = new System.Drawing.Point(87, 236);
+            this.isAutoStart.Name = "isAutoStart";
+            this.isAutoStart.Size = new System.Drawing.Size(120, 16);
+            this.isAutoStart.TabIndex = 9;
+            this.isAutoStart.Text = "是否打开自动启动";
+            this.isAutoStart.UseVisualStyleBackColor = true;
+            // 
+            // ReportPort
+            // 
+            this.ReportPort.Location = new System.Drawing.Point(87, 191);
+            this.ReportPort.Name = "ReportPort";
+            this.ReportPort.Size = new System.Drawing.Size(100, 21);
+            this.ReportPort.TabIndex = 11;
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(28, 196);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(53, 12);
+            this.label9.TabIndex = 12;
+            this.label9.Text = "上报端口";
             // 
             // ParamSetForm
             // 
@@ -294,5 +326,8 @@
         private System.Windows.Forms.TextBox connectionTimeOut;
         private System.Windows.Forms.CheckBox isHaveModBus;
         private System.Windows.Forms.CheckBox isBatteryDevice;
+        private System.Windows.Forms.CheckBox isAutoStart;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TextBox ReportPort;
     }
 }

NB_IOT_TCP_HP_SOCKET/ParamSetForm.cs

@@ -16,6 +16,8 @@ namespace NB_IOT_TCP_HP_SOCKET
     {
         private delegate void ShowMessageInvoke(string Caption, string Message);
 
+        public delegate void SetReportPortEvent(string reportPort);
+        public event SetReportPortEvent SetReportPort;
         public ParamSetForm()
         {
             InitializeComponent();
@@ -26,6 +28,8 @@ namespace NB_IOT_TCP_HP_SOCKET
             var cfg = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
             cfg.AppSettings.Settings["ConnectionTimeOut"].Value = (this.connectionTimeOut.Text.Trim() == "" ? "0" : this.connectionTimeOut.Text.Trim());
             cfg.AppSettings.Settings["ConnectionTimeOutInterval"].Value = (this.connectionTimeOutInterval.Text.Trim() == "" ? "0" : this.connectionTimeOutInterval.Text.Trim());
+            cfg.AppSettings.Settings["AutoStart"].Value = (this.isAutoStart.Checked ? "1" : "0");
+            cfg.AppSettings.Settings["ReportPort"].Value = (this.ReportPort.Text.Trim() == "" ? "" : this.ReportPort.Text.Trim());
             string deviceType = "";
             if (this.isHaveModBus.Checked && this.isBatteryDevice.Checked)
             {
@@ -81,7 +85,9 @@ namespace NB_IOT_TCP_HP_SOCKET
             cfg.AppSettings.Settings["db"].Value = dbTmp.ToString();
             cfg.Save();
             ConfigurationManager.RefreshSection("appSettings");
+            SetReportPort(this.ReportPort.Text.Trim());
             this.ShowMessage("提示", "保存成功！");
+            this.Close();
         }
 
         private void ParamSetForm_Load(object sender, EventArgs e)
@@ -91,6 +97,8 @@ namespace NB_IOT_TCP_HP_SOCKET
             string ConnectionTimeOutInterval = ConfigurationManager.AppSettings["ConnectionTimeOutInterval"]; // 执行断开静默链接间隔时间毫秒
             string IsHaveModBus = ConfigurationManager.AppSettings["IsHaveModBus"]; // 是否有MODBUS类设备1：有；0：无
             string ModBusQueryInterval = ConfigurationManager.AppSettings["ModBusQueryInterval"]; // MODBUS轮询获取抄表数据时间毫秒
+            string AutoStart = ConfigurationManager.AppSettings["AutoStart"]; // 自动启动标志1：自动启动；0：不自动启动
+            string ReportPort = ConfigurationManager.AppSettings["ReportPort"]; // 上报端口
 
             string[] dbParamArr = db.Split(';');
 
@@ -136,6 +144,12 @@ namespace NB_IOT_TCP_HP_SOCKET
                 this.isBatteryDevice.Checked = true;
             }
             this.modBusQueryInterval.Text = ModBusQueryInterval;
+
+            if ("1".Equals(AutoStart))
+            {
+                this.isAutoStart.Checked = true;
+            }
+            this.ReportPort.Text = ReportPort;
         }
 
         private void button2_Click(object sender, EventArgs e)