LL-28_20250923；增加流量版本，将Form1.cs文件变量 liuliangVersion设置为1则为流量版本

C-Windows-1/Form1.Designer.cs

@@ -99,7 +99,6 @@
             this.Leak = new System.Windows.Forms.Label();
             this.ChkCSV = new System.Windows.Forms.CheckBox();
             this.Timer11 = new System.Windows.Forms.Timer(this.components);
-            this.Baudrate = new System.Windows.Forms.TextBox();
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.codecheck = new System.Windows.Forms.TextBox();
             this.label9 = new System.Windows.Forms.Label();
@@ -111,8 +110,6 @@
             this.Sunzong = new System.Windows.Forms.Label();
             this.label28 = new System.Windows.Forms.Label();
             this.CodePort1 = new System.IO.Ports.SerialPort(this.components);
-            this.timerbar = new System.Windows.Forms.Timer(this.components);
-            this.progressBar1 = new System.Windows.Forms.ProgressBar();
             this.button2 = new System.Windows.Forms.Button();
             this.zhanhao = new System.Windows.Forms.TextBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
@@ -187,6 +184,8 @@
             this.label6 = new System.Windows.Forms.Label();
             this.UDPRead = new System.Windows.Forms.Timer(this.components);
             this.UDPOverTime = new System.Windows.Forms.Timer(this.components);
+            this.bigLeak = new System.Windows.Forms.Label();
+            this.label41 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).BeginInit();
             this.menuStrip1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -202,7 +201,7 @@
             // 
             // ReceiveText
             // 
-            this.ReceiveText.Location = new System.Drawing.Point(486, 374);
+            this.ReceiveText.Location = new System.Drawing.Point(486, 393);
             this.ReceiveText.Multiline = true;
             this.ReceiveText.Name = "ReceiveText";
             this.ReceiveText.Size = new System.Drawing.Size(185, 97);
@@ -210,7 +209,7 @@
             // 
             // SendText
             // 
-            this.SendText.Location = new System.Drawing.Point(486, 477);
+            this.SendText.Location = new System.Drawing.Point(486, 496);
             this.SendText.Multiline = true;
             this.SendText.Name = "SendText";
             this.SendText.Size = new System.Drawing.Size(185, 63);
@@ -253,7 +252,7 @@
             this.Column17,
             this.Column14,
             this.Column15});
-            this.DataGridView1.Location = new System.Drawing.Point(12, 357);
+            this.DataGridView1.Location = new System.Drawing.Point(5, 365);
             this.DataGridView1.Name = "DataGridView1";
             this.DataGridView1.RowTemplate.Height = 23;
             this.DataGridView1.Size = new System.Drawing.Size(894, 248);
@@ -347,7 +346,7 @@
             // 
             // progressBar2
             // 
-            this.progressBar2.Location = new System.Drawing.Point(204, 292);
+            this.progressBar2.Location = new System.Drawing.Point(206, 312);
             this.progressBar2.MarqueeAnimationSpeed = 50;
             this.progressBar2.Name = "progressBar2";
             this.progressBar2.Size = new System.Drawing.Size(583, 31);
@@ -358,9 +357,9 @@
             // 
             this.label36.AutoSize = true;
             this.label36.Font = new System.Drawing.Font("宋体", 12F);
-            this.label36.Location = new System.Drawing.Point(127, 307);
+            this.label36.Location = new System.Drawing.Point(129, 321);
             this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(71, 16);
+            this.label36.Size = new System.Drawing.Size(72, 16);
             this.label36.TabIndex = 89;
             this.label36.Text = "测试进度";
             this.label36.Click += new System.EventHandler(this.label36_Click);
@@ -371,7 +370,7 @@
             this.Manual.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
             this.Manual.Location = new System.Drawing.Point(777, 5);
             this.Manual.Name = "Manual";
-            this.Manual.Size = new System.Drawing.Size(16, 16);
+            this.Manual.Size = new System.Drawing.Size(17, 16);
             this.Manual.TabIndex = 63;
             this.Manual.TabStop = true;
             this.Manual.Text = "?";
@@ -398,7 +397,7 @@
             // 
             this.MachineStatus.AutoSize = true;
             this.MachineStatus.Font = new System.Drawing.Font("宋体", 40F);
-            this.MachineStatus.Location = new System.Drawing.Point(581, 104);
+            this.MachineStatus.Location = new System.Drawing.Point(591, 104);
             this.MachineStatus.Name = "MachineStatus";
             this.MachineStatus.Size = new System.Drawing.Size(185, 54);
             this.MachineStatus.TabIndex = 47;
@@ -408,7 +407,7 @@
             // 
             this.Tlight.AutoSize = true;
             this.Tlight.Font = new System.Drawing.Font("宋体", 80F);
-            this.Tlight.Location = new System.Drawing.Point(419, 108);
+            this.Tlight.Location = new System.Drawing.Point(429, 108);
             this.Tlight.Name = "Tlight";
             this.Tlight.Size = new System.Drawing.Size(153, 107);
             this.Tlight.TabIndex = 42;
@@ -418,17 +417,17 @@
             // 
             this.label31.AutoSize = true;
             this.label31.Font = new System.Drawing.Font("宋体", 18F);
-            this.label31.Location = new System.Drawing.Point(194, 160);
+            this.label31.Location = new System.Drawing.Point(194, 233);
             this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(82, 24);
+            this.label31.Size = new System.Drawing.Size(94, 24);
             this.label31.TabIndex = 83;
-            this.label31.Text = "泄漏量";
+            this.label31.Text = "泄漏量:";
             // 
             // label33
             // 
             this.label33.AutoSize = true;
             this.label33.Font = new System.Drawing.Font("宋体", 18F);
-            this.label33.Location = new System.Drawing.Point(406, 72);
+            this.label33.Location = new System.Drawing.Point(416, 72);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(130, 24);
             this.label33.TabIndex = 85;
@@ -443,6 +442,7 @@
             this.PressureUnit.Size = new System.Drawing.Size(58, 24);
             this.PressureUnit.TabIndex = 116;
             this.PressureUnit.Text = "单位";
+            this.PressureUnit.Visible = false;
             // 
             // label30
             // 
@@ -450,15 +450,15 @@
             this.label30.Font = new System.Drawing.Font("宋体", 18F);
             this.label30.Location = new System.Drawing.Point(194, 74);
             this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(106, 24);
+            this.label30.Size = new System.Drawing.Size(118, 24);
             this.label30.TabIndex = 82;
-            this.label30.Text = "测试压力";
+            this.label30.Text = "测试压力:";
             // 
             // label32
             // 
             this.label32.AutoSize = true;
             this.label32.Font = new System.Drawing.Font("宋体", 18F);
-            this.label32.Location = new System.Drawing.Point(586, 72);
+            this.label32.Location = new System.Drawing.Point(596, 72);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(130, 24);
             this.label32.TabIndex = 84;
@@ -468,11 +468,12 @@
             // 
             this.LeakUnit.AutoSize = true;
             this.LeakUnit.Font = new System.Drawing.Font("宋体", 18F);
-            this.LeakUnit.Location = new System.Drawing.Point(325, 160);
+            this.LeakUnit.Location = new System.Drawing.Point(325, 233);
             this.LeakUnit.Name = "LeakUnit";
             this.LeakUnit.Size = new System.Drawing.Size(58, 24);
             this.LeakUnit.TabIndex = 113;
             this.LeakUnit.Text = "单位";
+            this.LeakUnit.Visible = false;
             // 
             // Station
             // 
@@ -488,7 +489,7 @@
             "08",
             "09",
             "10"});
-            this.Station.Location = new System.Drawing.Point(677, 375);
+            this.Station.Location = new System.Drawing.Point(677, 394);
             this.Station.Name = "Station";
             this.Station.Size = new System.Drawing.Size(61, 20);
             this.Station.TabIndex = 23;
@@ -496,7 +497,7 @@
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(675, 360);
+            this.label8.Location = new System.Drawing.Point(675, 379);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(29, 12);
             this.label8.TabIndex = 24;
@@ -526,7 +527,7 @@
             // 
             // CodeLength
             // 
-            this.CodeLength.Location = new System.Drawing.Point(677, 410);
+            this.CodeLength.Location = new System.Drawing.Point(677, 429);
             this.CodeLength.Name = "CodeLength";
             this.CodeLength.Size = new System.Drawing.Size(61, 21);
             this.CodeLength.TabIndex = 59;
@@ -534,7 +535,7 @@
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(675, 395);
+            this.label19.Location = new System.Drawing.Point(675, 414);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(65, 12);
             this.label19.TabIndex = 71;
@@ -637,7 +638,7 @@
             // 
             this.ChkMES.AutoSize = true;
             this.ChkMES.Font = new System.Drawing.Font("宋体", 9F);
-            this.ChkMES.Location = new System.Drawing.Point(677, 534);
+            this.ChkMES.Location = new System.Drawing.Point(677, 553);
             this.ChkMES.Name = "ChkMES";
             this.ChkMES.Size = new System.Drawing.Size(78, 16);
             this.ChkMES.TabIndex = 133;
@@ -647,7 +648,7 @@
             // label35
             // 
             this.label35.AutoSize = true;
-            this.label35.Location = new System.Drawing.Point(675, 434);
+            this.label35.Location = new System.Drawing.Point(675, 453);
             this.label35.Name = "label35";
             this.label35.Size = new System.Drawing.Size(29, 12);
             this.label35.TabIndex = 132;
@@ -657,7 +658,7 @@
             // 
             this.ChkExcel.AutoSize = true;
             this.ChkExcel.Font = new System.Drawing.Font("宋体", 9F);
-            this.ChkExcel.Location = new System.Drawing.Point(677, 473);
+            this.ChkExcel.Location = new System.Drawing.Point(677, 492);
             this.ChkExcel.Name = "ChkExcel";
             this.ChkExcel.Size = new System.Drawing.Size(90, 16);
             this.ChkExcel.TabIndex = 129;
@@ -668,7 +669,7 @@
             // 
             this.ChkTXT.AutoSize = true;
             this.ChkTXT.Font = new System.Drawing.Font("宋体", 9F);
-            this.ChkTXT.Location = new System.Drawing.Point(677, 493);
+            this.ChkTXT.Location = new System.Drawing.Point(677, 512);
             this.ChkTXT.Name = "ChkTXT";
             this.ChkTXT.Size = new System.Drawing.Size(78, 16);
             this.ChkTXT.TabIndex = 130;
@@ -677,7 +678,7 @@
             // 
             // path
             // 
-            this.path.Location = new System.Drawing.Point(677, 449);
+            this.path.Location = new System.Drawing.Point(677, 468);
             this.path.Name = "path";
             this.path.Size = new System.Drawing.Size(61, 21);
             this.path.TabIndex = 127;
@@ -686,7 +687,7 @@
             // 
             this.ChkSql.AutoSize = true;
             this.ChkSql.Font = new System.Drawing.Font("宋体", 9F);
-            this.ChkSql.Location = new System.Drawing.Point(677, 515);
+            this.ChkSql.Location = new System.Drawing.Point(677, 534);
             this.ChkSql.Name = "ChkSql";
             this.ChkSql.Size = new System.Drawing.Size(114, 16);
             this.ChkSql.TabIndex = 131;
@@ -697,7 +698,7 @@
             // 
             this.MESStatus.AutoSize = true;
             this.MESStatus.Font = new System.Drawing.Font("宋体", 40F);
-            this.MESStatus.Location = new System.Drawing.Point(586, 188);
+            this.MESStatus.Location = new System.Drawing.Point(596, 212);
             this.MESStatus.Name = "MESStatus";
             this.MESStatus.Size = new System.Drawing.Size(131, 54);
             this.MESStatus.TabIndex = 135;
@@ -707,7 +708,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("宋体", 18F);
-            this.label7.Location = new System.Drawing.Point(586, 158);
+            this.label7.Location = new System.Drawing.Point(596, 182);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(118, 24);
             this.label7.TabIndex = 136;
@@ -717,7 +718,7 @@
             // 
             this.LeakPressure.AutoSize = true;
             this.LeakPressure.Font = new System.Drawing.Font("宋体", 36F);
-            this.LeakPressure.Location = new System.Drawing.Point(191, 98);
+            this.LeakPressure.Location = new System.Drawing.Point(191, 100);
             this.LeakPressure.Name = "LeakPressure";
             this.LeakPressure.Size = new System.Drawing.Size(212, 48);
             this.LeakPressure.TabIndex = 137;
@@ -727,7 +728,7 @@
             // 
             this.Leak.AutoSize = true;
             this.Leak.Font = new System.Drawing.Font("宋体", 36F);
-            this.Leak.Location = new System.Drawing.Point(191, 190);
+            this.Leak.Location = new System.Drawing.Point(191, 259);
             this.Leak.Name = "Leak";
             this.Leak.Size = new System.Drawing.Size(212, 48);
             this.Leak.TabIndex = 138;
@@ -737,7 +738,7 @@
             // 
             this.ChkCSV.AutoSize = true;
             this.ChkCSV.Font = new System.Drawing.Font("宋体", 9F);
-            this.ChkCSV.Location = new System.Drawing.Point(677, 551);
+            this.ChkCSV.Location = new System.Drawing.Point(677, 570);
             this.ChkCSV.Name = "ChkCSV";
             this.ChkCSV.Size = new System.Drawing.Size(78, 16);
             this.ChkCSV.TabIndex = 139;
@@ -748,14 +749,6 @@
             // 
             this.Timer11.Tick += new System.EventHandler(this.Timer11_Tick);
             // 
-            // Baudrate
-            // 
-            this.Baudrate.Location = new System.Drawing.Point(724, 328);
-            this.Baudrate.Name = "Baudrate";
-            this.Baudrate.Size = new System.Drawing.Size(113, 21);
-            this.Baudrate.TabIndex = 140;
-            this.Baudrate.Visible = false;
-            // 
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
@@ -783,7 +776,7 @@
             this.label9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label9.Location = new System.Drawing.Point(903, 29);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(87, 16);
+            this.label9.Size = new System.Drawing.Size(88, 16);
             this.label9.TabIndex = 143;
             this.label9.Text = "条形码长度";
             // 
@@ -793,7 +786,7 @@
             this.Scancode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Scancode.Location = new System.Drawing.Point(800, 38);
             this.Scancode.Name = "Scancode";
-            this.Scancode.Size = new System.Drawing.Size(90, 20);
+            this.Scancode.Size = new System.Drawing.Size(91, 20);
             this.Scancode.TabIndex = 144;
             this.Scancode.Text = "扫码启动";
             this.Scancode.UseVisualStyleBackColor = true;
@@ -831,7 +824,7 @@
             this.Passzong.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Passzong.Location = new System.Drawing.Point(84, 99);
             this.Passzong.Name = "Passzong";
-            this.Passzong.Size = new System.Drawing.Size(23, 16);
+            this.Passzong.Size = new System.Drawing.Size(24, 16);
             this.Passzong.TabIndex = 3;
             this.Passzong.Text = "10";
             // 
@@ -851,7 +844,7 @@
             this.Sunzong.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Sunzong.Location = new System.Drawing.Point(84, 49);
             this.Sunzong.Name = "Sunzong";
-            this.Sunzong.Size = new System.Drawing.Size(23, 16);
+            this.Sunzong.Size = new System.Drawing.Size(24, 16);
             this.Sunzong.TabIndex = 1;
             this.Sunzong.Text = "10";
             this.Sunzong.Click += new System.EventHandler(this.label29_Click);
@@ -871,19 +864,6 @@
             // 
             this.CodePort1.DataReceived += new System.IO.Ports.SerialDataReceivedEventHandler(this.CodePort1_DataReceived_1);
             // 
-            // timerbar
-            // 
-            this.timerbar.Interval = 200;
-            this.timerbar.Tick += new System.EventHandler(this.timerbar_Tick);
-            // 
-            // progressBar1
-            // 
-            this.progressBar1.Location = new System.Drawing.Point(410, 258);
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(100, 23);
-            this.progressBar1.TabIndex = 146;
-            this.progressBar1.Visible = false;
-            // 
             // button2
             // 
             this.button2.Location = new System.Drawing.Point(926, 457);
@@ -918,7 +898,7 @@
             this.labelyinjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelyinjian.Location = new System.Drawing.Point(6, 140);
             this.labelyinjian.Name = "labelyinjian";
-            this.labelyinjian.Size = new System.Drawing.Size(95, 16);
+            this.labelyinjian.Size = new System.Drawing.Size(96, 16);
             this.labelyinjian.TabIndex = 24;
             this.labelyinjian.Text = "硬件版本号:";
             // 
@@ -928,7 +908,7 @@
             this.labelruanjian.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelruanjian.Location = new System.Drawing.Point(6, 71);
             this.labelruanjian.Name = "labelruanjian";
-            this.labelruanjian.Size = new System.Drawing.Size(95, 16);
+            this.labelruanjian.Size = new System.Drawing.Size(96, 16);
             this.labelruanjian.TabIndex = 23;
             this.labelruanjian.Text = "软件版本号:";
             // 
@@ -954,7 +934,7 @@
             this.myGroupBox4.Controls.Add(this.label17);
             this.myGroupBox4.Controls.Add(this.FPlowlimit);
             this.myGroupBox4.Controls.Add(this.BLeakTPre);
-            this.myGroupBox4.Location = new System.Drawing.Point(344, 357);
+            this.myGroupBox4.Location = new System.Drawing.Point(344, 376);
             this.myGroupBox4.Name = "myGroupBox4";
             this.myGroupBox4.Size = new System.Drawing.Size(141, 222);
             this.myGroupBox4.TabIndex = 122;
@@ -1177,7 +1157,7 @@
             this.myGroupBox3.Controls.Add(this.DelayTime1);
             this.myGroupBox3.Controls.Add(this.label39);
             this.myGroupBox3.Controls.Add(this.DelayTime2);
-            this.myGroupBox3.Location = new System.Drawing.Point(104, 357);
+            this.myGroupBox3.Location = new System.Drawing.Point(104, 376);
             this.myGroupBox3.Name = "myGroupBox3";
             this.myGroupBox3.Size = new System.Drawing.Size(234, 222);
             this.myGroupBox3.TabIndex = 121;
@@ -1594,21 +1574,41 @@
             // 
             this.UDPOverTime.Tick += new System.EventHandler(this.UDPOverTime_Tick);
             // 
+            // bigLeak
+            // 
+            this.bigLeak.AutoSize = true;
+            this.bigLeak.Font = new System.Drawing.Font("宋体", 36F);
+            this.bigLeak.Location = new System.Drawing.Point(192, 180);
+            this.bigLeak.Name = "bigLeak";
+            this.bigLeak.Size = new System.Drawing.Size(212, 48);
+            this.bigLeak.TabIndex = 152;
+            this.bigLeak.Text = "11111111";
+            // 
+            // label41
+            // 
+            this.label41.AutoSize = true;
+            this.label41.Font = new System.Drawing.Font("宋体", 18F);
+            this.label41.Location = new System.Drawing.Point(195, 155);
+            this.label41.Name = "label41";
+            this.label41.Size = new System.Drawing.Size(142, 24);
+            this.label41.TabIndex = 150;
+            this.label41.Text = "大漏泄漏量:";
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1045, 617);
+            this.Controls.Add(this.bigLeak);
+            this.Controls.Add(this.label41);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.zhanhao);
             this.Controls.Add(this.button2);
-            this.Controls.Add(this.progressBar1);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.Scancode);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.codecheck);
             this.Controls.Add(this.checkBox1);
-            this.Controls.Add(this.Baudrate);
             this.Controls.Add(this.DataGridView1);
             this.Controls.Add(this.ChkCSV);
             this.Controls.Add(this.Leak);
@@ -1648,7 +1648,7 @@
             this.Controls.Add(this.ReceiveText);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "Form1";
-            this.Text = "20240819";
+            this.Text = "LL-28_20250923";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             ((System.ComponentModel.ISupportInitialize)(this.DataGridView1)).EndInit();
@@ -1785,7 +1785,6 @@
         public System.Windows.Forms.TextBox URL;
         public System.Windows.Forms.CheckBox ChkCSV;
         private System.Windows.Forms.Timer Timer11;
-        public System.Windows.Forms.TextBox Baudrate;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox Scancode;
         public System.Windows.Forms.TextBox codecheck;
@@ -1814,8 +1813,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column15;
-        private System.Windows.Forms.Timer timerbar;
-        private System.Windows.Forms.ProgressBar progressBar1;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.TextBox zhanhao;
         public System.Windows.Forms.TextBox Code;
@@ -1827,5 +1824,7 @@
         private System.Windows.Forms.Label labelruanjian;
         private System.Windows.Forms.Timer UDPRead;
         private System.Windows.Forms.Timer UDPOverTime;
+        private System.Windows.Forms.Label bigLeak;
+        private System.Windows.Forms.Label label41;
     }
 }

C-Windows-1/Form1.resx

@@ -183,57 +183,6 @@
   <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="Timer8.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>670, 5</value>
   </metadata>
@@ -255,9 +204,6 @@
   <metadata name="CodePort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1042, 6</value>
   </metadata>
-  <metadata name="timerbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1159, 6</value>
-  </metadata>
   <metadata name="UDPRead.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1264, 6</value>
   </metadata>

C-Windows-1/PortSetting.cs

@@ -91,7 +91,6 @@ namespace C_Windows_1
                     Baudrate.Enabled = false;
                     SetPort();
                     Form1.f1.PortNum.Text = PortNum.Text;
-                    Form1.f1.Baudrate.Text = Baudrate.Text;
 
                 }
                 else

C-Windows-1/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.1")]

C-Windows-1/TestPara.Designer.cs

@@ -318,8 +318,9 @@
             "Pa",
             "KPa",
             "mbar",
+            "atm",
             "sccm",
-            "ccm/s",
+            "ccm3/s",
             "Pa/s"});
             this.LUnit.Location = new System.Drawing.Point(20, 222);
             this.LUnit.Name = "LUnit";

C-Windows-1/TestPara.cs

@@ -14,6 +14,15 @@ namespace C_Windows_1
         public TestPara()
         {
             InitializeComponent();
+
+            if (Form1.f1.liuliangVersion == 1)
+            {
+                label44.Text = "平衡流量上限";
+                label45.Text = "平衡流量下限";
+
+                label16.Text = "测试流量上限";
+                label17.Text = "测试流量下限";
+            }
         }
 
 
@@ -371,8 +380,6 @@ namespace C_Windows_1
             label25.Text = PUnit.Text;
             label28.Text = LUnit.Text;
             label29.Text = LUnit.Text;
-
-
         }
 
 

C-Windows-1/obj/Debug/C-Windows-LL18.csproj.FileListAbsolute.txt

@@ -1121,3 +1121,83 @@ C:\Users\Administrator\Desktop\git\ll-28\C-Windows-1\obj\Debug\C-Windows-LL18.cs
 C:\Users\Administrator\Desktop\git\ll-28\C-Windows-1\obj\Debug\C-Window.5B87B986.Up2Date
 C:\Users\Administrator\Desktop\git\ll-28\C-Windows-1\obj\Debug\LL28-Control.exe
 C:\Users\Administrator\Desktop\git\ll-28\C-Windows-1\obj\Debug\LL28-Control.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\LL28-Control.exe.config
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\LL28-Control.exe
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\LL28-Control.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\BouncyCastle.Cryptography.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Enums.NET.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ExtendedNumerics.BigDecimal.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\HslCommunication.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ICSharpCode.SharpZipLib.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\MathNet.Numerics.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Microsoft.IO.RecyclableMemoryStream.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Newtonsoft.Json.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.Core.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OOXML.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXml4Net.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXmlFormats.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\SixLabors.Fonts.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\SixLabors.ImageSharp.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Buffers.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Memory.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Numerics.Vectors.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.AccessControl.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Cryptography.Pkcs.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Cryptography.Xml.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Principal.Windows.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Text.Encoding.CodePages.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.ValueTuple.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ZXing.Net.Mobile.Core.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\zxing.portable.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ZXingNetMobile.dll
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\BouncyCastle.Cryptography.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Enums.NET.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Enums.NET.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ExtendedNumerics.BigDecimal.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\HslCommunication.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ICSharpCode.SharpZipLib.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\ICSharpCode.SharpZipLib.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\MathNet.Numerics.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Microsoft.IO.RecyclableMemoryStream.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\Newtonsoft.Json.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.Core.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.Core.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OOXML.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OOXML.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXml4Net.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXml4Net.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXmlFormats.pdb
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\NPOI.OpenXmlFormats.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\SixLabors.Fonts.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\SixLabors.ImageSharp.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Buffers.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Memory.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Numerics.Vectors.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.AccessControl.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Cryptography.Pkcs.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Cryptography.Xml.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Security.Principal.Windows.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.Text.Encoding.CodePages.xml
+E:\platform\LL-28_liuliang\C-Windows-1\bin\Debug\System.ValueTuple.xml
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C-Windows-LL18.csproj.AssemblyReference.cache
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Config.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.configIP.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Form1.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Form2.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Form3.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Form4.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.LogOn.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.MESConfig.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.MyGroupBox.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.PortSetting.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Properties.Resources.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.Save.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.TestPara.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C_Windows_1.UserPassword.resources
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C-Windows-LL18.csproj.GenerateResource.cache
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C-Windows-LL18.csproj.CoreCompileInputs.cache
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\C-Windows-LL18.csproj.CopyComplete
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\LL28-Control.exe
+E:\platform\LL-28_liuliang\C-Windows-1\obj\Debug\LL28-Control.pdb

README.MD

@@ -0,0 +1,2 @@
+流量版本：Form1中 liuliangVersion设置为1
+普通版本：Form1中 liuliangVersion设置为0