添加程序配置管理界面（可配对外通信和第三方通信等），修改仪器配置界面内容，开始停止状态实现同步

GcDevicePc/AppInit.cs

@@ -613,17 +613,6 @@ namespace GcDevicePc
             globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder = Path.Combine(tmpFolder, "子状态");
             CheckFolderandFile(0, globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder);
 
-            tmpFolder = null;
-            //string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
-            //IniFile ini = new IniFile(file);
-            //string Version = ini.ReadString("Version", "VersionType");
-
-            //if (string.IsNullOrEmpty(Version))
-            //{
-            //    Version = "1";
-            //}
-
-            globaldata.CurrentVersion = "1";
         }
 
         /// <summary>

GcDevicePc/CK_UI/LandIn.cs

@@ -11,7 +11,7 @@ namespace GcDevicePc.CK_UI
 {
     public partial class LandIn : Form
     {
-        private string user = "admin";
+        private string user = globaldata.UserName;
         public static bool Island = false;
         private string dt;
         CKVocAnalyzer.NumForm form;

GcDevicePc/Common/NModbusSlave.cs

@@ -67,15 +67,39 @@ namespace GcDevicePc.Common
                     case ModbusDataType.HoldingRegister:
                         for (int i = 0; i < e.Data.B.Count; i++)
                         {
-                            slave.DataStore.HoldingRegisters[e.StartAddress + i + 1] = slavereadhreg(Convert.ToUInt16(e.StartAddress + i + 1)); 
                             
+                            switch (globaldata.Foreign)
+                            {
+                                case 0:
+                                    slave.DataStore.HoldingRegisters[e.StartAddress + i + 1] = slavereadhreg(Convert.ToUInt16(e.StartAddress + i + 1));
+                                    break;
+                                case 1:
+                                    slave.DataStore.HoldingRegisters[e.StartAddress + i + 1] = newslavereadhreg1(Convert.ToUInt16(e.StartAddress + i + 1));
+                                    break;
+                                default:
+                                    //slave.DataStore.HoldingRegisters[e.StartAddress + i + 1] = slavereadhreg(Convert.ToUInt16(e.StartAddress + i + 1));
+                                    break;
+                            }
                         }
                         break;
                     case ModbusDataType.Coil:
                         for (int i = 0; i < e.Data.A.Count; i++)
                         {
+                            switch (globaldata.Foreign)
+                            {
+                                case 0:
                                     slave.DataStore.CoilDiscretes[e.StartAddress + i + 1] = slavereadcreg(Convert.ToUInt16(e.StartAddress + i + 1)) == 0 ? false : true;
 
+                                    break;
+                                case 1:
+                                    slave.DataStore.CoilDiscretes[e.StartAddress + i + 1] = slavereadcreg(Convert.ToUInt16(e.StartAddress + i + 1)) == 0 ? false : true;
+
+                                    break;
+
+                                default:
+                                    break;
+                            }
+                            
                         }
                         break;
                 }
@@ -97,7 +121,10 @@ namespace GcDevicePc.Common
                 switch (e.ModbusDataType)
                 {
                     case ModbusDataType.HoldingRegister:
-                        //slavewirtehreg(e.StartAddress, e.Data.B.ToArray());
+                        if (globaldata.Foreign == 1)
+                        {
+                            slavewirtehreg(e.StartAddress, e.Data.B.ToArray());
+                        }
                         break;
                     case ModbusDataType.Coil:
 
@@ -429,14 +456,23 @@ namespace GcDevicePc.Common
 
                             //value = globaldata.m_dpbuffer.ShowList.showepc.EPC1_3_Cur;
                             break;
-                        case 1300:
-                            value = (ushort)globaldata.m_pcbuffer.gcpcinfo.adjust.AdjustType;
+                        case 1020:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.fDPower;
+                            break;
+                        case 1021:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.iDPower;
+                            break;
+                        case 1022:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.bDPower;
+                            break;
+                        case 1023:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower;
                             break;
-                        case 1301:
-                            value = (ushort)globaldata.m_pcbuffer.gcpcinfo.adjust.AdjustOS;
+                        case 1024:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower;
                             break;
-                        case 1302:
-                            value = (ushort)(globaldata.m_pcbuffer.gcpcinfo.adjust.AdjustTime*60);
+                        case 1025:
+                            value = (ushort)globaldata.m_dpbuffer.ShowList.pwmInfo.CbPower;
                             break;
                     }
                 }
@@ -716,7 +752,7 @@ namespace GcDevicePc.Common
         /// </summary>
         /// <param name="address"></param>
         /// <returns></returns>
-        static ushort newslavereadhreg2(ushort address)
+        static ushort newslavereadhreg1(ushort address)
         {
             try
             {

GcDevicePc/ConfigMethod/MethodMain.cs

@@ -436,9 +436,11 @@ namespace GcDevicePc.ConfigMethod
                                 globaldata.m_configDlg.m_AuxDlg.reflashContent();
                                 globaldata.m_configDlg.m_SignalDlg.reflashContent();
                             }
-
-                            //SignalDataToHw.methodconfig = this.gcmethodconfig;
+                            globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
+                            SignalDataToHw.methodconfig = this.gcmethodconfig;
                             SendDataToZB.methodconfig = this.gcmethodconfig;
+
+
                             //string message = "提交成功！";
                             //MessageBox.Show(message, "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         }

GcDevicePc/DataState.cs

@@ -1045,6 +1045,14 @@ namespace GcDevicePc
                 this.datalist.BeginUpdate();
                 this.datalist.Items.Clear();
 
+                tempshow = new ListViewItem();
+                tempshow.Text = "系统状态";
+                tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
+                tempshow.BackColor = globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue ? Color.LightGreen : Color.White;
+                tempshow.SubItems.Add(globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue ? "打开" : "关闭");
+                this.datalist.Items.Add(tempshow);
+
+
                 tempshow = new ListViewItem();
                 tempshow.Text = "时间显示(min)";
                 tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
@@ -1057,6 +1065,7 @@ namespace GcDevicePc
                 {
                     if (globaldata.m_dpbuffer.ShowList.showtime.runtimenow <= globaldata.m_dpbuffer.ShowList.showtime.alltime)
                     {
+                        
                         tempshow.SubItems.Add((globaldata.m_dpbuffer.ShowList.showtime.runtimenow / 60.0f).ToString("0.00") + "/" + (globaldata.m_dpbuffer.ShowList.showtime.alltime / 60.0f).ToString("0.0"));
                     }
                     else
@@ -1134,9 +1143,6 @@ namespace GcDevicePc
 
                 if (globaldata.m_hmibuffer.gcinfo.HmiAbnormal[0] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[1] != 0 || globaldata.m_hmibuffer.gcinfo.HmiAbnormal[2] != 0)
                 {
-                    tempshow = new ListViewItem();
-                    this.datalist.Items.Add(tempshow);
-
                     tempshow = new ListViewItem();
                     tempshow.Text = "异常";
                     tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
@@ -1179,8 +1185,6 @@ namespace GcDevicePc
 
                 }
 
-                tempshow = new ListViewItem();
-                this.datalist.Items.Add(tempshow);
 
                 //温度显示
                 #region 温度显示部分
@@ -1616,8 +1620,6 @@ namespace GcDevicePc
 
                 //阀状态显示
                 tempshow = new ListViewItem();
-                this.datalist.Items.Add(tempshow);
-                tempshow = new ListViewItem();
                 tempshow.Text = "事件显示";
                 tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
                 tempshow.SubItems.Add(" ");
@@ -1742,8 +1744,6 @@ namespace GcDevicePc
                 //tempshow = new ListViewItem();
                 //this.datalist.Items.Add(tempshow);
 
-                tempshow = new ListViewItem();
-                this.datalist.Items.Add(tempshow);
 
                 #region 检测器状态
 
@@ -2139,8 +2139,6 @@ namespace GcDevicePc
 
                 #endregion
 
-                tempshow = new ListViewItem();
-                this.datalist.Items.Add(tempshow);
                 //tempshow = new ListViewItem();
 
                 if (CProfileDevice.m_DevParam.syspara.u16StartType == 1 || CProfileDevice.m_DevParam.syspara.u16StartType == 3)
@@ -2163,40 +2161,38 @@ namespace GcDevicePc
                     this.datalist.Items.Add(tempshow);
                 }
 
-                tempshow = new ListViewItem();
-                tempshow.SubItems.Add("");
-                this.datalist.Items.Add(tempshow);
 
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("6路功率");
+                tempshow.Text = GettempName("六路功率(%)");
                 tempshow.Font = new Font(tempshow.Font, tempshow.Font.Style | FontStyle.Bold);
                 tempshow.SubItems.Add("");
                 this.datalist.Items.Add(tempshow);
 
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("前检测器功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.fDPower.ToString());
+                tempshow.Text = GettempName("前进样口");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower));
                 this.datalist.Items.Add(tempshow);
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("中检测器功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.iDPower.ToString());
+                tempshow.Text = GettempName("后进样口");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower));
                 this.datalist.Items.Add(tempshow);
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("后检测器功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.bDPower.ToString());
+                tempshow.Text = GettempName("柱箱功率");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.CbPower));
                 this.datalist.Items.Add(tempshow);
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("前进样器功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower.ToString());
+                tempshow.Text = GettempName("前检测器");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.fDPower));
                 this.datalist.Items.Add(tempshow);
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("后进样器功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower.ToString());
+                tempshow.Text = GettempName("中检测器/辅助一");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.iDPower));
                 this.datalist.Items.Add(tempshow);
                 tempshow = new ListViewItem();
-                tempshow.Text = GettempName("柱箱功率");
-                tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.pwmInfo.CbPower.ToString());
+                tempshow.Text = GettempName("后检测器/辅助二");
+                tempshow.SubItems.Add(Getpower(globaldata.m_dpbuffer.ShowList.pwmInfo.bDPower));
                 this.datalist.Items.Add(tempshow);
+
                 #region
                 //if (CProfileDevice.m_DevParam.syspara.u16InjPortCtlMode_Behind == 3 &&
                 //    CProfileDevice.m_DevParam.syspara.u16InjPortCtlMode_Front == 3)
@@ -2373,6 +2369,12 @@ namespace GcDevicePc
             return name;
         }
 
+        private string Getpower(int p)
+        {
+            string kw = Convert.ToInt32(((float)p / 1700f) * 100) + "%";
+            return kw;
+        }
+
         public string GetValue(ushort num)
         {
             return (num / 10.0f).ToString("#0.0");

GcDevicePc/DeviceConfigUI/ColumnBox.cs

@@ -38,18 +38,7 @@ namespace GcDevicePc.DeviceConfigUI
                 this.ColType.SelectedIndex = this.hWConfig.hwconfiginfo.u16ColType;
                 this.ColPTemp.Text = this.hWConfig.hwconfiginfo.u16ColPTemp.ToString();
 
-                this.ChromNum.SelectedIndex = this.hWConfig.hwconfiginfo.u16ChromNum;
-                this.ChromFront.Checked = this.hWConfig.hwconfiginfo.u16ChromFront == 1 ? true: false;
-                this.ChromFrontType.SelectedIndex = this.hWConfig.hwconfiginfo.u16ChromFrontType;
-                this.ChromFront_Length.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Length.ToString();
-                this.ChromFront_Caliber.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Caliber.ToString();
-                this.ChromFront_Thickness.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Thickness.ToString();
 
-                this.ChromBehind.Checked = this.hWConfig.hwconfiginfo.u16ChromBehind == 1 ? true : false;
-                this.ChromBehindType.SelectedIndex = this.hWConfig.hwconfiginfo.u16ChromBehindType;
-                this.ChromBehind_Length.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Length.ToString();
-                this.ChromBehind_Caliber.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Caliber.ToString();
-                this.ChromBehind_Thickness.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Thickness.ToString();
             }
 
         }
@@ -66,19 +55,6 @@ namespace GcDevicePc.DeviceConfigUI
                 this.hWConfig.hwconfiginfo.u16ColType = this.ColType.SelectedIndex;
                 this.hWConfig.hwconfiginfo.u16ColPTemp = int.Parse(this.ColPTemp.Text);
 
-                this.hWConfig.hwconfiginfo.u16ChromNum = (this.ChromFront.Checked ? 1 : 0) + (this.ChromBehind.Checked ? 1 : 0);
-
-                this.hWConfig.hwconfiginfo.u16ChromFront = this.ChromFront.Checked ? 1: 0;
-                this.hWConfig.hwconfiginfo.u16ChromFrontType = this.ChromFrontType.SelectedIndex;
-                this.hWConfig.hwconfiginfo.u16ChromFront_Length = int.Parse(this.ChromFront_Length.Text);
-                this.hWConfig.hwconfiginfo.u16ChromFront_Caliber = int.Parse(this.ChromFront_Caliber.Text);
-                this.hWConfig.hwconfiginfo.u16ChromFront_Thickness = int.Parse(this.ChromFront_Thickness.Text);
-
-                this.hWConfig.hwconfiginfo.u16ChromBehind  = this.ChromBehind.Checked ? 1 : 0;
-                this.hWConfig.hwconfiginfo.u16ChromBehindType = this.ChromBehindType.SelectedIndex;
-                this.hWConfig.hwconfiginfo.u16ChromBehind_Length = int.Parse(this.ChromBehind_Length.Text); 
-                this.hWConfig.hwconfiginfo.u16ChromBehind_Caliber = int.Parse(this.ChromBehind_Caliber.Text);
-                this.hWConfig.hwconfiginfo.u16ChromBehind_Thickness = int.Parse(this.ChromBehind_Thickness.Text);
             }
             this.Close();
         }

GcDevicePc/DeviceConfigUI/Device.Designer.cs

@@ -30,72 +30,54 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Device));
             this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.StartType = new System.Windows.Forms.ComboBox();
             this.GCName = new System.Windows.Forms.TextBox();
             this.GCNum = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.okbtn = new System.Windows.Forms.Button();
             this.cancelbtn = new System.Windows.Forms.Button();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.radioButton3 = new System.Windows.Forms.RadioButton();
             this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.StartType);
+            this.groupBox1.Controls.Add(this.groupBox2);
             this.groupBox1.Controls.Add(this.GCName);
             this.groupBox1.Controls.Add(this.GCNum);
-            this.groupBox1.Controls.Add(this.label3);
             this.groupBox1.Controls.Add(this.label2);
             this.groupBox1.Controls.Add(this.label1);
             this.groupBox1.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.groupBox1.Location = new System.Drawing.Point(12, 12);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(477, 213);
+            this.groupBox1.Size = new System.Drawing.Size(397, 223);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "仪器配置";
             // 
-            // StartType
-            // 
-            this.StartType.FormattingEnabled = true;
-            this.StartType.Items.AddRange(new object[] {
-            "进样EPC",
-            "机械阀",
-            "全EPC"});
-            this.StartType.Location = new System.Drawing.Point(157, 143);
-            this.StartType.Name = "StartType";
-            this.StartType.Size = new System.Drawing.Size(121, 23);
-            this.StartType.TabIndex = 5;
-            // 
             // GCName
             // 
-            this.GCName.Location = new System.Drawing.Point(157, 94);
+            this.GCName.Location = new System.Drawing.Point(157, 60);
             this.GCName.Name = "GCName";
             this.GCName.Size = new System.Drawing.Size(100, 24);
             this.GCName.TabIndex = 4;
             // 
             // GCNum
             // 
-            this.GCNum.Location = new System.Drawing.Point(157, 44);
+            this.GCNum.Location = new System.Drawing.Point(157, 30);
             this.GCNum.Name = "GCNum";
-            this.GCNum.Size = new System.Drawing.Size(100, 24);
+            this.GCNum.ReadOnly = true;
+            this.GCNum.Size = new System.Drawing.Size(161, 24);
             this.GCNum.TabIndex = 3;
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(83, 146);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(82, 15);
-            this.label3.TabIndex = 2;
-            this.label3.Text = "仪器系统：";
-            // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(83, 97);
+            this.label2.Location = new System.Drawing.Point(83, 63);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(82, 15);
             this.label2.TabIndex = 1;
@@ -104,7 +86,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(81, 47);
+            this.label1.Location = new System.Drawing.Point(81, 33);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(82, 15);
             this.label1.TabIndex = 0;
@@ -112,7 +94,7 @@
             // 
             // okbtn
             // 
-            this.okbtn.Location = new System.Drawing.Point(271, 241);
+            this.okbtn.Location = new System.Drawing.Point(203, 250);
             this.okbtn.Name = "okbtn";
             this.okbtn.Size = new System.Drawing.Size(75, 23);
             this.okbtn.TabIndex = 1;
@@ -122,7 +104,7 @@
             // 
             // cancelbtn
             // 
-            this.cancelbtn.Location = new System.Drawing.Point(385, 241);
+            this.cancelbtn.Location = new System.Drawing.Point(317, 250);
             this.cancelbtn.Name = "cancelbtn";
             this.cancelbtn.Size = new System.Drawing.Size(75, 23);
             this.cancelbtn.TabIndex = 2;
@@ -130,12 +112,57 @@
             this.cancelbtn.UseVisualStyleBackColor = true;
             this.cancelbtn.Click += new System.EventHandler(this.cancelbtn_Click);
             // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.radioButton3);
+            this.groupBox2.Controls.Add(this.radioButton2);
+            this.groupBox2.Controls.Add(this.radioButton1);
+            this.groupBox2.Location = new System.Drawing.Point(86, 92);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(232, 111);
+            this.groupBox2.TabIndex = 6;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "仪器模型";
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Location = new System.Drawing.Point(53, 23);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(79, 19);
+            this.radioButton1.TabIndex = 0;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "进样EPC";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Location = new System.Drawing.Point(53, 48);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(70, 19);
+            this.radioButton2.TabIndex = 0;
+            this.radioButton2.TabStop = true;
+            this.radioButton2.Text = "机械阀";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // radioButton3
+            // 
+            this.radioButton3.AutoSize = true;
+            this.radioButton3.Location = new System.Drawing.Point(53, 73);
+            this.radioButton3.Name = "radioButton3";
+            this.radioButton3.Size = new System.Drawing.Size(64, 19);
+            this.radioButton3.TabIndex = 0;
+            this.radioButton3.TabStop = true;
+            this.radioButton3.Text = "全EPC";
+            this.radioButton3.UseVisualStyleBackColor = true;
+            // 
             // Device
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(501, 285);
+            this.ClientSize = new System.Drawing.Size(422, 285);
             this.Controls.Add(this.cancelbtn);
             this.Controls.Add(this.okbtn);
             this.Controls.Add(this.groupBox1);
@@ -146,6 +173,8 @@
             this.Load += new System.EventHandler(this.Device_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -155,11 +184,13 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Button okbtn;
         private System.Windows.Forms.Button cancelbtn;
-        private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.TextBox GCName;
         private System.Windows.Forms.TextBox GCNum;
-        private System.Windows.Forms.ComboBox StartType;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.RadioButton radioButton3;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.RadioButton radioButton1;
     }
 }
\ No newline at end of file

GcDevicePc/DeviceConfigUI/Device.cs

@@ -37,9 +37,24 @@ namespace GcDevicePc.DeviceConfigUI
             {
                 if (hWConfig != null)
                 {
-                    this.GCNum.Text = this.hWConfig.hwconfiginfo.GCNum;
+                    this.GCNum.Text = ((globaldata.DeviceInfo)globaldata.DeviceList[0]).MacAddr;
                     this.GCName.Text = this.hWConfig.hwconfiginfo.GCName;
-                    this.StartType.SelectedIndex = this.hWConfig.hwconfiginfo.u16StartType - 1;
+
+                    switch (this.hWConfig.hwconfiginfo.u16StartType)
+                    {
+                        case 1:
+                            this.radioButton1.Checked = true;
+                            break;
+                        case 2:
+                            this.radioButton2.Checked = true;
+                            break;
+                        case 3:
+                            this.radioButton3.Checked = true;
+                            break;
+                        default:
+                            this.radioButton2.Checked = true;
+                            break;
+                    }
                 }
             }
             catch 
@@ -57,7 +72,19 @@ namespace GcDevicePc.DeviceConfigUI
             {
                 this.hWConfig.hwconfiginfo.GCNum = this.GCNum.Text;
                 this.hWConfig.hwconfiginfo.GCName = this.GCName.Text;
-                this.hWConfig.hwconfiginfo.u16StartType = this.StartType.SelectedIndex + 1;
+
+                if (this.radioButton1.Checked)
+                {
+                    this.hWConfig.hwconfiginfo.u16StartType = 1;
+                }
+                else if (this.radioButton2.Checked)
+                {
+                    this.hWConfig.hwconfiginfo.u16StartType = 2;
+                }
+                else if (this.radioButton3.Checked)
+                {
+                    this.hWConfig.hwconfiginfo.u16StartType = 3;
+                }
             }
             this.Close();
         }

GcDevicePc/DeviceConfigUI/Sampling.cs

@@ -34,19 +34,15 @@ namespace GcDevicePc.DeviceConfigUI
         {
             InitializeComponent();
             this.hWConfig = hwconfig;
-            if (type >= 4 && type <= 5)
+            if (type == 4)
             {
                 this.sampling_type = SamplingDevice.Sample;
             }
-            else if (type >= 6 && type <= 11)
+            else if (type == 5)
             {
                 this.sampling_type = SamplingDevice.Valve;
             }
-            else if (type >= 12 && type <= 13)
-            {
-                this.sampling_type = SamplingDevice.InjPortValve;
-            }
-            else if (type >= 14 && type <= 15)
+            else if (type == 6)
             {
                 this.sampling_type = SamplingDevice.InjPortValve;
             }
@@ -90,45 +86,18 @@ namespace GcDevicePc.DeviceConfigUI
                 this.InjPortType_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortType_Behind;
                 this.InjPortLoadGas_Behind.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind;
 
+                //色谱柱
+                this.ChromFront.Checked = this.hWConfig.hwconfiginfo.u16ChromFront == 1 ? true : false;
+                this.ChromFrontType.SelectedIndex = this.hWConfig.hwconfiginfo.u16ChromFrontType;
+                this.ChromFront_Length.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Length.ToString();
+                this.ChromFront_Caliber.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Caliber.ToString();
+                this.ChromFront_Thickness.Text = this.hWConfig.hwconfiginfo.u16ChromFront_Thickness.ToString();
 
-                this.InjValveVA1.Checked = this.hWConfig.hwconfiginfo.u16InjValveVA1 == 1 ? true : false; //VA1阀
-                this.InjValveTemp_VA1.Text = this.hWConfig.hwconfiginfo.u16InjValveTemp_VA1.ToString(); //VA1阀保护温度
-
-                this.InjValveVA2.Checked = this.hWConfig.hwconfiginfo.u16InjValveVA2 == 1 ? true : false; //VA1阀
-                this.InjValveTemp_VA2.Text = this.hWConfig.hwconfiginfo.u16InjValveTemp_VA2.ToString(); //VA1阀保护温度
-                //进样阀
-                if (this.hWConfig.hwconfiginfo.u16StartType==0)
-                {
-                    this.InjValveLoadGas_VA1.Enabled = false; //VA1阀载气类型
-                    this.InjValveLoadGas1.Enabled = false; //VA1阀载气1
-                    this.InjValveLoadGas2.Enabled = false; //VA1阀载气2
-                    this.InjValveLoadGas3.Enabled = false; //VA1阀载气3
-
-
-                    this.InjValveLoadGas_VA2.Enabled = false; //VA1阀载气类型
-                    this.InjValveLoadGas4.Enabled = false; //VA1阀载气1
-                    this.InjValveLoadGas5.Enabled = false; //VA1阀载气2
-                    this.InjValveLoadGas6.Enabled = false;     //VA1阀载气3
-                }
-                else
-                {
-                    
-                    this.InjValveLoadGas_VA1.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjValveLoadGas_VA1; //VA1阀载气类型
-                    this.InjValveLoadGas1.Checked =
-                        this.hWConfig.hwconfiginfo.u16InjValveLoadGas1 == 1 ? true : false; //VA1阀载气1
-                    this.InjValveLoadGas2.Checked =
-                        this.hWConfig.hwconfiginfo.u16InjValveLoadGas2 == 1 ? true : false; //VA1阀载气2
-                    this.InjValveLoadGas3.Checked =
-                        this.hWConfig.hwconfiginfo.u16InjValveLoadGas3 == 1 ? true : false; //VA1阀载气3
-
-                    
-                    this.InjValveLoadGas_VA2.SelectedIndex = this.hWConfig.hwconfiginfo.u16InjValveLoadGas_VA2; //VA1阀载气类型
-                    this.InjValveLoadGas4.Checked =
-                        this.hWConfig.hwconfiginfo.u16InjValveLoadGas4 == 1 ? true : false; //VA1阀载气1
-                    this.InjValveLoadGas5.Checked =
-                        this.hWConfig.hwconfiginfo.u16InjValveLoadGas5 == 1 ? true : false; //VA1阀载气2
-                    this.InjValveLoadGas6.Checked = this.hWConfig.hwconfiginfo.u16InjValveLoadGas6 == 1 ? true : false;     //VA1阀载气3
-                }
+                this.ChromBehind.Checked = this.hWConfig.hwconfiginfo.u16ChromBehind == 1 ? true : false;
+                this.ChromBehindType.SelectedIndex = this.hWConfig.hwconfiginfo.u16ChromBehindType;
+                this.ChromBehind_Length.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Length.ToString();
+                this.ChromBehind_Caliber.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Caliber.ToString();
+                this.ChromBehind_Thickness.Text = this.hWConfig.hwconfiginfo.u16ChromBehind_Thickness.ToString();
             }
         }
         #endregion
@@ -174,20 +143,21 @@ namespace GcDevicePc.DeviceConfigUI
                 this.hWConfig.hwconfiginfo.u16InjPortType_Behind = this.InjPortType_Behind.SelectedIndex;
                 this.hWConfig.hwconfiginfo.u16InjPortLoadGas_Behind = this.InjPortLoadGas_Behind.SelectedIndex;
 
+                //色谱柱
+                this.hWConfig.hwconfiginfo.u16ChromNum = (this.ChromFront.Checked ? 1 : 0) + (this.ChromBehind.Checked ? 1 : 0);
+
+                this.hWConfig.hwconfiginfo.u16ChromFront = this.ChromFront.Checked ? 1 : 0;
+                this.hWConfig.hwconfiginfo.u16ChromFrontType = this.ChromFrontType.SelectedIndex;
+                this.hWConfig.hwconfiginfo.u16ChromFront_Length = int.Parse(this.ChromFront_Length.Text);
+                this.hWConfig.hwconfiginfo.u16ChromFront_Caliber = int.Parse(this.ChromFront_Caliber.Text);
+                this.hWConfig.hwconfiginfo.u16ChromFront_Thickness = int.Parse(this.ChromFront_Thickness.Text);
+
+                this.hWConfig.hwconfiginfo.u16ChromBehind = this.ChromBehind.Checked ? 1 : 0;
+                this.hWConfig.hwconfiginfo.u16ChromBehindType = this.ChromBehindType.SelectedIndex;
+                this.hWConfig.hwconfiginfo.u16ChromBehind_Length = int.Parse(this.ChromBehind_Length.Text);
+                this.hWConfig.hwconfiginfo.u16ChromBehind_Caliber = int.Parse(this.ChromBehind_Caliber.Text);
+                this.hWConfig.hwconfiginfo.u16ChromBehind_Thickness = int.Parse(this.ChromBehind_Thickness.Text);
 
-                //进样阀
-                this.hWConfig.hwconfiginfo.u16InjValveVA1 = this.InjValveVA1.Checked ? 1 : 0;
-                this.hWConfig.hwconfiginfo.u16InjValveTemp_VA1 = int.Parse(this.InjValveTemp_VA1.Text); //VA1阀保护温度
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas_VA1 = this.InjValveLoadGas_VA1.SelectedIndex; //VA1阀载气类型
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas1 = this.InjValveLoadGas1.Checked ? 1 : 0; //VA1阀载气1
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas2 = this.InjValveLoadGas2.Checked ? 1 : 0; //VA1阀载气2
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas3 = this.InjValveLoadGas3.Checked ? 1 : 0; //VA1阀载气3
-                this.hWConfig.hwconfiginfo.u16InjValveVA2 = this.InjValveVA2.Checked ? 1 : 0; //VA1阀
-                this.hWConfig.hwconfiginfo.u16InjValveTemp_VA2 = int.Parse(this.InjValveTemp_VA2.Text); //VA1阀保护温度
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas_VA2 = this.InjValveLoadGas_VA2.SelectedIndex; //VA1阀载气类型
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas4 = this.InjValveLoadGas4.Checked ? 1 : 0; //VA1阀载气1
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas5 = this.InjValveLoadGas5.Checked ? 1 : 0; //VA1阀载气2
-                this.hWConfig.hwconfiginfo.u16InjValveLoadGas6 = this.InjValveLoadGas6.Checked ? 1 : 0; //VA1阀载气3
             }
 
             this.Close();

GcDevicePc/GCBuffer/HMIBuffer.cs

@@ -49,9 +49,9 @@ namespace GcDevicePc.GCBuffer
 
 
             ///////////////////////////////////////
-            public ushort[] EPCStatus;
+            public ushort[] EPCStatus;//epc状态
 
-            public ushort[] HmiAbnormal;
+            public ushort[] HmiAbnormal;//hmi异常报警
         }
 
         public hmiinfo gcinfo = new hmiinfo();

GcDevicePc/GCBuffer/PCBuffer.cs

@@ -45,6 +45,7 @@ namespace GcDevicePc.GCBuffer
             public ushort RunType;  //运行类型  0 打开运行  1 智能运行 2 批处理
             public bool sendtohw;
             public bool sendtoZb;
+            public bool BeamTube;
             public bool info_log;
             public bool error_log;
             public string hmimac;
@@ -124,6 +125,7 @@ namespace GcDevicePc.GCBuffer
             gcpcinfo.pcworkinfo.hmi_log = false;
             gcpcinfo.pcworkinfo.sendtoZb = false;
             gcpcinfo.pcworkinfo.sendtohw = false;
+            gcpcinfo.pcworkinfo.BeamTube = false;
             gcpcinfo.moduleinfo.ip = "";
 
             gcpcinfo.outputinfo.port = 0;
@@ -143,10 +145,22 @@ namespace GcDevicePc.GCBuffer
 
                     int opensys = ini.ReadInteger("StartUp", "打开系统");
                     int runtype = ini.ReadInteger("StartUp", "运行类型");
-                    int senddatatohw = ini.ReadInteger("StartUp", "SendDataToHw");
-                    int senddatatozb = ini.ReadInteger("StartUp", "SendDataToZB");
+
+
                     gcpcinfo.pcfolderinfo.DataFolder = ini.ReadString("DataFolder", "历史数据");
 
+                    int Version = ini.ReadInteger("Version", "VersionType");
+                    string uname = ini.ReadString("User", "Name");
+                    string upwd = ini.ReadString("User", "Password");
+
+                    
+                    int dsf = ini.ReadInteger("SendData", "Thirdparty");
+                    int dw = ini.ReadInteger("SendData", "Foreign");
+
+                    globaldata.UserName = uname;
+                    globaldata.UserPwd = upwd;
+                    globaldata.CurrentVersion = Version;
+                    globaldata.Foreign = dw;
                     gcpcinfo.pcworkinfo.hmimac = ini.ReadString("NetWorkConfig", "MAC地址");
 
                     if (opensys == 1)
@@ -158,23 +172,25 @@ namespace GcDevicePc.GCBuffer
                         gcpcinfo.pcworkinfo.RunType = 0;
                     }
 
-                    if (senddatatohw == 1)
+                    if (dsf == 0)
                     {
                         gcpcinfo.pcworkinfo.sendtohw = true;
                     }
-                    else if (senddatatozb == 1)
+                    else if (dsf == 1)
                     {
                         gcpcinfo.pcworkinfo.sendtoZb = true;
                     }
+                    else if(dsf == 2)
+                    {
+                        gcpcinfo.pcworkinfo.BeamTube = true;
+                    }
                     else
                     {
                         gcpcinfo.pcworkinfo.sendtohw = false;
                         gcpcinfo.pcworkinfo.sendtoZb = false;
+                        gcpcinfo.pcworkinfo.BeamTube = false;
                     }
 
-                    //INIOperation test = new INIOperation(file);
-                    //string opensys = test.INIGetStringValue("StartUp", "打开系统", null);
-                    //string runtype = test.INIGetStringValue("StartUp", "运行类型", null);
 
                     string wtd624x_ip = ini.ReadString("WTD624X", "IP");
                     string wtd624x_mask = ini.ReadString("WTD624X", "MASK");
@@ -242,6 +258,7 @@ namespace GcDevicePc.GCBuffer
                     gcpcinfo.pcworkinfo.RunType = 0;
                     gcpcinfo.pcworkinfo.sendtohw = false;
                     gcpcinfo.pcworkinfo.sendtoZb = false;
+                    gcpcinfo.pcworkinfo.BeamTube = false;
                     gcpcinfo.pcfolderinfo.DataFolder = null;
                 }
             }
@@ -250,5 +267,6 @@ namespace GcDevicePc.GCBuffer
                 Log.Error(e.Message);
             }
         }
+
     }
 }

GcDevicePc/GcDevicePc.csproj

@@ -690,6 +690,12 @@
     <Compile Include="StartForm.Designer.cs">
       <DependentUpon>StartForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="SysConfig.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SysConfig.Designer.cs">
+      <DependentUpon>SysConfig.cs</DependentUpon>
+    </Compile>
     <Compile Include="TestForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -956,6 +962,9 @@
     <EmbeddedResource Include="StartForm.resx">
       <DependentUpon>StartForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="SysConfig.resx">
+      <DependentUpon>SysConfig.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="TestForm.resx">
       <DependentUpon>TestForm.cs</DependentUpon>
     </EmbeddedResource>

GcDevicePc/ProThread/HMIControl.cs

@@ -42,8 +42,22 @@ namespace GcDevicePc.ProThread
         {
             int ret = -1;
             ushort mystate = (ushort)0x1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteHoldingReg(147, mystate, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
                 ret = m_modbus.WriteHoldingReg(147, mystate, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
+                    ret = m_modbus.WriteHoldingReg(147, mystate, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 
@@ -51,8 +65,22 @@ namespace GcDevicePc.ProThread
         {
             int ret = -1;
             ushort mystate = (ushort)0x1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteHoldingReg(148, mystate, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
+                ret = m_modbus.WriteHoldingReg(148, mystate, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
                     ret = m_modbus.WriteHoldingReg(148, mystate, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 
@@ -60,8 +88,22 @@ namespace GcDevicePc.ProThread
         {
             int ret = -1;
             ushort mystate = (ushort)0x1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteHoldingReg(151, mystate, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
                 ret = m_modbus.WriteHoldingReg(151, mystate, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
+                    ret = m_modbus.WriteHoldingReg(151, mystate, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 
@@ -69,8 +111,22 @@ namespace GcDevicePc.ProThread
         {
             int ret = -1;
             ushort mystate = (ushort)0x1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteHoldingReg(150, mystate, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
+                ret = m_modbus.WriteHoldingReg(150, mystate, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
                     ret = m_modbus.WriteHoldingReg(150, mystate, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 
@@ -100,8 +156,22 @@ namespace GcDevicePc.ProThread
         public int WriteStartVal()
         {
             int ret = -1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteSingleCoil(30, (ushort)65280, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
                 ret = m_modbus.WriteSingleCoil(30, (ushort)65280, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
+                    ret = m_modbus.WriteSingleCoil(30, (ushort)65280, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 
@@ -133,16 +203,44 @@ namespace GcDevicePc.ProThread
         public int WriteEndVal()
         {
             int ret = -1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteSingleCoil(33, (ushort)65280, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
                 ret = m_modbus.WriteSingleCoil(33, (ushort)65280, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
+                    ret = m_modbus.WriteSingleCoil(33, (ushort)65280, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;     
         }
 
         public int WriteCancalVal()
         {
             int ret = -1;
+            //if (this.setflag)
+            //    ret = m_modbus.WriteSingleCoil(32, (ushort)65280, this.strIP, this.netPost);
+
+            int count = 0;
             if (this.setflag)
+            {
+                ret = m_modbus.WriteSingleCoil(32, (ushort)65280, this.strIP, this.netPost);
+                while (ret != 0)
+                {
+                    count++;
                     ret = m_modbus.WriteSingleCoil(32, (ushort)65280, this.strIP, this.netPost);
+                    Thread.Sleep(100);
+                    if (count == 3)
+                        break;
+                }
+            }
             return ret;
         }
 

GcDevicePc/Program.cs

@@ -12,7 +12,7 @@ namespace GcDevicePc
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             bool createNew;
-            //Application.Run(new TestForm());
+            //Application.Run(new SysConfig());
             {
                 using (System.Threading.Mutex mutex = new System.Threading.Mutex(true, Application.ProductName, out createNew))
                 {

GcDevicePc/RunTables.cs

@@ -598,8 +598,10 @@ namespace GcDevicePc
         private void stopbat_Click(object sender, EventArgs e)
         {
             if (!String.IsNullOrEmpty(globaldata.connection_ip))
+            {
+                globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
                 sendstopcmd();
-
+            }
         }
 
         private void LocalRunTableView_CellDoubleClick(object sender, DataGridViewCellEventArgs e)

GcDevicePc/SysConfig.resx

+<?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>
\ No newline at end of file

GcDevicePc/UserConfig.Designer.cs

@@ -47,11 +47,6 @@
             this.mac1 = new System.Windows.Forms.TextBox();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.appstartup = new System.Windows.Forms.CheckBox();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.runbat = new System.Windows.Forms.CheckBox();
-            this.runsingle = new System.Windows.Forms.CheckBox();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.label9 = new System.Windows.Forms.Label();
@@ -69,15 +64,10 @@
             this.label14 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
-            this.groupBox7 = new System.Windows.Forms.GroupBox();
-            this.permin = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.groupBox3.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox5.SuspendLayout();
-            this.groupBox7.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBox1
@@ -284,64 +274,6 @@
             this.label1.Text = "目前MAC绑定：";
             this.label1.Visible = false;
             // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.appstartup);
-            this.groupBox2.Location = new System.Drawing.Point(12, 131);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(104, 47);
-            this.groupBox2.TabIndex = 1;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "开机配置";
-            // 
-            // appstartup
-            // 
-            this.appstartup.AutoSize = true;
-            this.appstartup.Location = new System.Drawing.Point(6, 20);
-            this.appstartup.Name = "appstartup";
-            this.appstartup.Size = new System.Drawing.Size(84, 16);
-            this.appstartup.TabIndex = 0;
-            this.appstartup.Text = "开机自启动";
-            this.appstartup.UseVisualStyleBackColor = true;
-            this.appstartup.CheckedChanged += new System.EventHandler(this.appstartup_CheckedChanged);
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.runbat);
-            this.groupBox3.Controls.Add(this.runsingle);
-            this.groupBox3.Location = new System.Drawing.Point(122, 131);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(164, 49);
-            this.groupBox3.TabIndex = 2;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "开机自动运行";
-            // 
-            // runbat
-            // 
-            this.runbat.AutoSize = true;
-            this.runbat.Location = new System.Drawing.Point(89, 20);
-            this.runbat.Name = "runbat";
-            this.runbat.Size = new System.Drawing.Size(60, 16);
-            this.runbat.TabIndex = 1;
-            this.runbat.Tag = "2";
-            this.runbat.Text = "批处理";
-            this.runbat.UseVisualStyleBackColor = true;
-            this.runbat.CheckedChanged += new System.EventHandler(this.autorun_CheckedChanged);
-            // 
-            // runsingle
-            // 
-            this.runsingle.AutoSize = true;
-            this.runsingle.Enabled = false;
-            this.runsingle.Location = new System.Drawing.Point(11, 20);
-            this.runsingle.Name = "runsingle";
-            this.runsingle.Size = new System.Drawing.Size(72, 16);
-            this.runsingle.TabIndex = 0;
-            this.runsingle.Tag = "0";
-            this.runsingle.Text = "单次分析";
-            this.runsingle.UseVisualStyleBackColor = true;
-            this.runsingle.Visible = false;
-            this.runsingle.CheckedChanged += new System.EventHandler(this.autorun_CheckedChanged);
-            // 
             // groupBox4
             // 
             this.groupBox4.Controls.Add(this.groupBox6);
@@ -501,36 +433,12 @@
             this.label12.TabIndex = 0;
             this.label12.Text = "设置IP：";
             // 
-            // groupBox7
-            // 
-            this.groupBox7.Controls.Add(this.permin);
-            this.groupBox7.Location = new System.Drawing.Point(297, 133);
-            this.groupBox7.Name = "groupBox7";
-            this.groupBox7.Size = new System.Drawing.Size(118, 47);
-            this.groupBox7.TabIndex = 4;
-            this.groupBox7.TabStop = false;
-            this.groupBox7.Text = "状态记录";
-            // 
-            // permin
-            // 
-            this.permin.AutoSize = true;
-            this.permin.Location = new System.Drawing.Point(11, 18);
-            this.permin.Name = "permin";
-            this.permin.Size = new System.Drawing.Size(84, 16);
-            this.permin.TabIndex = 0;
-            this.permin.Text = "每分钟记录";
-            this.permin.UseVisualStyleBackColor = true;
-            this.permin.CheckedChanged += new System.EventHandler(this.permin_CheckedChanged);
-            // 
             // UserConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(426, 354);
-            this.Controls.Add(this.groupBox7);
             this.Controls.Add(this.groupBox4);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -541,17 +449,11 @@
             this.Load += new System.EventHandler(this.UserConfig_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.groupBox3.ResumeLayout(false);
-            this.groupBox3.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox6.ResumeLayout(false);
             this.groupBox6.PerformLayout();
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
-            this.groupBox7.ResumeLayout(false);
-            this.groupBox7.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -561,8 +463,6 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.CheckBox appstartup;
         private System.Windows.Forms.Button changemac;
         private System.Windows.Forms.TextBox mac4;
         private System.Windows.Forms.TextBox mac3;
@@ -576,9 +476,6 @@
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.CheckBox runbat;
-        private System.Windows.Forms.CheckBox runsingle;
         private System.Windows.Forms.GroupBox groupBox4;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label10;
@@ -596,8 +493,6 @@
         private System.Windows.Forms.TextBox localgw;
         private System.Windows.Forms.TextBox localip;
         private System.Windows.Forms.Button changelocal;
-        private System.Windows.Forms.GroupBox groupBox7;
-        private System.Windows.Forms.CheckBox permin;
         private System.Windows.Forms.ComboBox cmbMeshport;
         private System.Windows.Forms.Label label15;
     }

GcDevicePc/globaldata.cs

@@ -70,7 +70,13 @@ namespace GcDevicePc
         //public static string cur_RunTab;      //当前运行表名
         //public static string cur_DataName;      //保存数据文件名
         public static string show_MethodName;  //显示方法名
-        public static string CurrentVersion;  //当前版本
+
+        public static int CurrentVersion;  //当前版本(是否显示用户界面)
+
+        public static string UserName;//用户名
+        public static string UserPwd;//密码
+
+        public static int Foreign;//对外通信
 
         //public static bool system_Statue;  //系统开启状态
         //public static ushort work_Statue;  //系统工作状态