版本1.6.8 第三次release 修改之前输入限制造成的BUG

GcDevicePc/ConfigMethod/injectionport/IPPIP.cs

@@ -226,9 +226,9 @@ namespace GcDevicePc.ConfigMethod.injectionport
                     txtSeptumBlowingflow.Enabled = false;
                 }
 
-               
-                txtHeater.Text = this.methodconfig.auxs[index].HeaterTmpActual.ToString();
                 textBox1.Text = configTemp.ToString();
+                txtHeater.Text = this.methodconfig.auxs[index].HeaterTmpActual.ToString();
+                
                 lblSamplePortType.Text = (index == 0 ? this.hwconfig.hwconfiginfo.u16AuxHeaterName1 : this.hwconfig.hwconfiginfo.u16AuxHeaterName2);
 
                 combSampleCarrierGas.SelectedIndex = this.methodconfig.auxs[index].CarrierGasType;

GcDevicePc/ProThread/HMISearch.cs

@@ -54,7 +54,7 @@ using System.Collections.Generic;
                 string file = Path.Combine(Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath), "GC_Config\\GC_Set\\启动参数\\startup.ini");
 
                 INIOperation test = new INIOperation(file);
-                string Meshport = test.INIGetStringValue("NetWorkConfig", "网口", null);
+               // string Meshport = test.INIGetStringValue("NetWorkConfig", "网口", null);
                 string MacAddress = test.INIGetStringValue("NetWorkConfig", "MAC地址", null);
                 string SearchOnline = test.INIGetStringValue("NetWorkConfig", "是否只搜索在线", null);
                 string strSearchTiem = test.INIGetStringValue("NetWorkConfig", "搜索时间", null);
@@ -77,7 +77,7 @@ using System.Collections.Generic;
                 foreach (NetworkInterface adapter in nics)
                 {
 
-                    if (adapter.OperationalStatus == OperationalStatus.Up && (adapter.Name == Meshport || string.IsNullOrEmpty(Meshport)))
+                    if (adapter.OperationalStatus == OperationalStatus.Up) //&& (adapter.Name == Meshport || string.IsNullOrEmpty(Meshport)))
                     {
                         bool pd1 = (adapter.NetworkInterfaceType == NetworkInterfaceType.Ethernet || adapter.NetworkInterfaceType == NetworkInterfaceType.Wireless80211); //判断是否是以太网连接
                         if (pd1)

GcDevicePc/StartForm.Designer.cs

@@ -149,6 +149,7 @@
             this.Name = "StartForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "StartForm";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.StartForm_FormClosed);
             this.Load += new System.EventHandler(this.StartForm_Load);
             ((System.ComponentModel.ISupportInitialize)(this.bgpicture)).EndInit();
             this.ResumeLayout(false);

GcDevicePc/StartForm.cs

@@ -29,6 +29,7 @@ namespace GcDevicePc
         private bool bBindOK = false;
         private bool bStartSearchOK = false;
         private bool bWaitOver      = false;
+        private bool bNoSearchOK    = false;
         #region 窗口淡入淡出效果
         private void OpacityTimerProcOpen(object sender, System.Timers.ElapsedEventArgs e)
         {
@@ -148,7 +149,7 @@ namespace GcDevicePc
             
             _tPreload.Start();
 
-            SearchHMIThread = new Thread(new ThreadStart(vSearch_HMI_Poll)); //创建线程                     
+            SearchHMIThread = new Thread(vSearch_HMI_Poll); //创建线程                     
            
         }
 
@@ -220,6 +221,22 @@ namespace GcDevicePc
                         }
                     }));
                 }
+                if (bNoSearchOK == true)
+                {
+                    bNoSearchOK= false;
+                    DialogResult dr = new ConnTimeOut().ShowDialog();
+                    if (dr == DialogResult.OK)
+                    {
+                        globaldata.connection_ip = "";
+                        bBindOK = true;
+                        break;
+                    }
+                    else if (dr == DialogResult.Cancel)
+                    {
+                        System.Diagnostics.Process.GetCurrentProcess().Kill();
+                    }
+                }
+                Thread.Sleep(10);
             }
             //_opacityTimer.Enabled = true;
             bWaitOver = true;
@@ -300,18 +317,8 @@ namespace GcDevicePc
             mysearch.ThStart();
             if (globaldata.DeviceList.Count < 1)
             {
-               
-                DialogResult dr = new ConnTimeOut().ShowDialog();
-                if (dr == DialogResult.OK)
-                {
-                    globaldata.connection_ip = "";
-                    bBindOK = true;
-                }
-                else if (dr == DialogResult.Cancel)
-                {
-                    System.Diagnostics.Process.GetCurrentProcess().Kill();
-                }
 
+                bNoSearchOK = true;
             }
             else
             {
@@ -320,8 +327,11 @@ namespace GcDevicePc
                     mysearch.ThStart();
                 }
             }
-
         }
 
+        private void StartForm_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            System.Environment.Exit(0);
+        }
     }
 }

GcDevicePc/StartForm.resx

@@ -590,7 +590,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>35</value>
+    <value>132</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

VocsSetup/GC_Config/GC_Set/tmpfile/111/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/tmpfile/58/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/tmpfile/66/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器方法/VOC/SingleAnal.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/tvoc/SingleAnal.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/tvoc/测试.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/voc/20200424.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/voc/NMHC.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/测试/测试20200426.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器状态/SPLFID/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器状态/SPLFID/子状态/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器状态/VOC/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器状态/tvoc/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器状态/测试/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/启动参数/startup.ini

 [NetWorkConfig]
 MAC地址=F8:02:78:60:70:A0
-网口=
-搜索时间=60
+网口=本地连接
+搜索时间=10
 [StartUp]
 自启动=0
 打开系统=0
@@ -23,7 +23,7 @@ AppName=
 Name=admin
 Password=0
 [SendData]
-Thirdparty=3
+Thirdparty=1
 Foreign=2
 [SaveData]
 ZBSaveData=1

VocsSetup/GC_Config/GC_Set/运行表/SPLFID/RunMethod.ini

 [运行表]

VocsSetup/GC_Config/GC_Set/运行表/VOC/RunMethod.ini

 [运行表]

VocsSetup/GC_Config/GC_Set/运行表/测试/RunMethod.ini

 [运行表]