diff --git a/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 6feff10..288b9bc 100644
Binary files a/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Diaoyong/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache b/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache
index 2cf4336..aaa4787 100644
Binary files a/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache and b/Diaoyong/obj/Debug/Diaoyong.csproj.AssemblyReference.cache differ
diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache b/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache
index 77e5cd5..d34a181 100644
--- a/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache
+++ b/Diaoyong/obj/Debug/Diaoyong.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-12c1d82ba3f096dfcfda848bfe12ce5b52201374
+dd5f1753fb63c681d3738811b550e3f060083be3
diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt b/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt
index 0b85830..163cc63 100644
--- a/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt
+++ b/Diaoyong/obj/Debug/Diaoyong.csproj.FileListAbsolute.txt
@@ -88,3 +88,15 @@ C:\Users\Administrator\Desktop\UDP\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompil
C:\Users\Administrator\Desktop\UDP\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete
C:\Users\Administrator\Desktop\UDP\Diaoyong\obj\Debug\Diaoyong.exe
C:\Users\Administrator\Desktop\UDP\Diaoyong\obj\Debug\Diaoyong.pdb
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\Diaoyong.exe.config
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\Diaoyong.exe
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\Diaoyong.pdb
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.csproj.AssemblyReference.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.ConnectionTest.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.Form1.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.Properties.Resources.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.csproj.GenerateResource.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.csproj.CoreCompileInputs.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.csproj.CopyComplete
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.exe
+D:\烟厂资料\程序测试\远程端\231114-最新\Diaoyong\obj\Debug\Diaoyong.pdb
diff --git a/Diaoyong/obj/Debug/Diaoyong.csproj.GenerateResource.cache b/Diaoyong/obj/Debug/Diaoyong.csproj.GenerateResource.cache
index b1c9e20..80b6b8c 100644
Binary files a/Diaoyong/obj/Debug/Diaoyong.csproj.GenerateResource.cache and b/Diaoyong/obj/Debug/Diaoyong.csproj.GenerateResource.cache differ
diff --git a/Diaoyong/obj/Debug/Diaoyong.exe b/Diaoyong/obj/Debug/Diaoyong.exe
index 84d53fa..9cfce76 100644
Binary files a/Diaoyong/obj/Debug/Diaoyong.exe and b/Diaoyong/obj/Debug/Diaoyong.exe differ
diff --git a/Diaoyong/obj/Debug/Diaoyong.pdb b/Diaoyong/obj/Debug/Diaoyong.pdb
index 06d309e..f3b4cf7 100644
Binary files a/Diaoyong/obj/Debug/Diaoyong.pdb and b/Diaoyong/obj/Debug/Diaoyong.pdb differ
diff --git a/WindowsFormsApp2/Properties/Resources.Designer.cs b/WindowsFormsApp2/Properties/Resources.Designer.cs
index 493470d..f4c4857 100644
--- a/WindowsFormsApp2/Properties/Resources.Designer.cs
+++ b/WindowsFormsApp2/Properties/Resources.Designer.cs
@@ -109,5 +109,35 @@ namespace WindowsFormsApp2.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
+
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap 复位 {
+ get {
+ object obj = ResourceManager.GetObject("复位", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap 复位1 {
+ get {
+ object obj = ResourceManager.GetObject("复位1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap 复位2 {
+ get {
+ object obj = ResourceManager.GetObject("复位2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
}
}
diff --git a/WindowsFormsApp2/Properties/Resources.resx b/WindowsFormsApp2/Properties/Resources.resx
index 269afc8..ad1ddcf 100644
--- a/WindowsFormsApp2/Properties/Resources.resx
+++ b/WindowsFormsApp2/Properties/Resources.resx
@@ -118,19 +118,28 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ ..\Resources\复位.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\复位.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\rotate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\unlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\rotate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\复位.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/WindowsFormsApp2/Resources/复位.png b/WindowsFormsApp2/Resources/复位.png
new file mode 100644
index 0000000..be65d52
Binary files /dev/null and b/WindowsFormsApp2/Resources/复位.png differ
diff --git a/WindowsFormsApp2/Resources/换班.png b/WindowsFormsApp2/Resources/换班.png
new file mode 100644
index 0000000..d832e9b
Binary files /dev/null and b/WindowsFormsApp2/Resources/换班.png differ
diff --git a/WindowsFormsApp2/Resources/清理图片.png b/WindowsFormsApp2/Resources/清理图片.png
new file mode 100644
index 0000000..1c1ff0d
Binary files /dev/null and b/WindowsFormsApp2/Resources/清理图片.png differ
diff --git a/WindowsFormsApp2/UserControl1.Designer.cs b/WindowsFormsApp2/UserControl1.Designer.cs
index bcfd216..7c1dd0a 100644
--- a/WindowsFormsApp2/UserControl1.Designer.cs
+++ b/WindowsFormsApp2/UserControl1.Designer.cs
@@ -30,16 +30,13 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserControl1));
- this.button5 = new System.Windows.Forms.Button();
this.button6 = new System.Windows.Forms.Button();
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.checkBox2 = new System.Windows.Forms.CheckBox();
- this.button2 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
- this.ReSet = new System.Windows.Forms.Button();
this.label8 = new System.Windows.Forms.Label();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
@@ -55,30 +52,26 @@
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.button4 = new System.Windows.Forms.Button();
this.button3 = new System.Windows.Forms.Button();
+ this.button2 = new System.Windows.Forms.Button();
+ this.ReSet = new System.Windows.Forms.Button();
+ this.button5 = new System.Windows.Forms.Button();
this.statusStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
- // button5
- //
- this.button5.Location = new System.Drawing.Point(4, 675);
- this.button5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(104, 32);
- this.button5.TabIndex = 4;
- this.button5.Text = "换班";
- this.button5.UseVisualStyleBackColor = true;
- this.button5.Click += new System.EventHandler(this.button5_Click);
- //
// button6
//
+ this.button6.BackColor = System.Drawing.SystemColors.HotTrack;
+ this.button6.FlatAppearance.BorderSize = 0;
+ this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.button6.ForeColor = System.Drawing.SystemColors.Control;
this.button6.Location = new System.Drawing.Point(4, 711);
this.button6.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(104, 32);
this.button6.TabIndex = 5;
this.button6.Text = "清理图片";
- this.button6.UseVisualStyleBackColor = true;
+ this.button6.UseVisualStyleBackColor = false;
this.button6.Click += new System.EventHandler(this.button6_Click);
//
// checkBox1
@@ -107,20 +100,6 @@
this.checkBox2.UseVisualStyleBackColor = true;
this.checkBox2.Click += new System.EventHandler(this.checkBox2_Click);
//
- // button2
- //
- this.button2.BackColor = System.Drawing.Color.Black;
- this.button2.BackgroundImage = global::WindowsFormsApp2.Properties.Resources.pause;
- this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
- this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.button2.Location = new System.Drawing.Point(4, 174);
- this.button2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(104, 91);
- this.button2.TabIndex = 1;
- this.button2.UseVisualStyleBackColor = false;
- this.button2.Click += new System.EventHandler(this.button2_Click);
- //
// label1
//
this.label1.AutoSize = true;
@@ -164,17 +143,6 @@
this.label2.TabIndex = 10;
this.label2.Text = "当班";
//
- // ReSet
- //
- this.ReSet.Location = new System.Drawing.Point(4, 459);
- this.ReSet.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.ReSet.Name = "ReSet";
- this.ReSet.Size = new System.Drawing.Size(109, 30);
- this.ReSet.TabIndex = 14;
- this.ReSet.Text = "复位";
- this.ReSet.UseVisualStyleBackColor = true;
- this.ReSet.Click += new System.EventHandler(this.ReSet_Click);
- //
// label8
//
this.label8.BackColor = System.Drawing.Color.Lime;
@@ -358,11 +326,57 @@
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
//
+ // button2
+ //
+ this.button2.BackColor = System.Drawing.Color.Black;
+ this.button2.BackgroundImage = global::WindowsFormsApp2.Properties.Resources.pause;
+ this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.button2.Location = new System.Drawing.Point(4, 174);
+ this.button2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(104, 91);
+ this.button2.TabIndex = 1;
+ this.button2.UseVisualStyleBackColor = false;
+ this.button2.Click += new System.EventHandler(this.button2_Click);
+ //
+ // ReSet
+ //
+ this.ReSet.BackColor = System.Drawing.SystemColors.HotTrack;
+ this.ReSet.FlatAppearance.BorderSize = 0;
+ this.ReSet.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.ReSet.ForeColor = System.Drawing.SystemColors.Control;
+ this.ReSet.Location = new System.Drawing.Point(4, 457);
+ this.ReSet.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.ReSet.Name = "ReSet";
+ this.ReSet.Size = new System.Drawing.Size(104, 32);
+ this.ReSet.TabIndex = 28;
+ this.ReSet.Text = "复位";
+ this.ReSet.UseVisualStyleBackColor = false;
+ this.ReSet.Click += new System.EventHandler(this.ReSet_Click);
+ //
+ // button5
+ //
+ this.button5.BackColor = System.Drawing.SystemColors.HotTrack;
+ this.button5.FlatAppearance.BorderSize = 0;
+ this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.button5.ForeColor = System.Drawing.SystemColors.Control;
+ this.button5.Location = new System.Drawing.Point(3, 676);
+ this.button5.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.button5.Name = "button5";
+ this.button5.Size = new System.Drawing.Size(105, 32);
+ this.button5.TabIndex = 29;
+ this.button5.Text = "换班";
+ this.button5.UseVisualStyleBackColor = false;
+ this.button5.Click += new System.EventHandler(this.button5_Click);
+ //
// UserControl1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Black;
+ this.Controls.Add(this.button5);
+ this.Controls.Add(this.ReSet);
this.Controls.Add(this.button1);
this.Controls.Add(this.label7);
this.Controls.Add(this.button7);
@@ -373,7 +387,6 @@
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label8);
- this.Controls.Add(this.ReSet);
this.Controls.Add(this.textBox2);
this.Controls.Add(this.label2);
this.Controls.Add(this.textBox1);
@@ -381,7 +394,6 @@
this.Controls.Add(this.checkBox2);
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.button6);
- this.Controls.Add(this.button5);
this.Controls.Add(this.button4);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
@@ -403,7 +415,6 @@
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button4;
- private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button button6;
private System.Windows.Forms.CheckBox checkBox1;
private System.Windows.Forms.CheckBox checkBox2;
@@ -411,7 +422,6 @@
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Button ReSet;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.StatusStrip statusStrip1;
@@ -424,5 +434,7 @@
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Button button7;
private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Button ReSet;
+ private System.Windows.Forms.Button button5;
}
}
diff --git a/WindowsFormsApp2/UserControl1.resx b/WindowsFormsApp2/UserControl1.resx
index 0cecbc4..4aeb5a2 100644
--- a/WindowsFormsApp2/UserControl1.resx
+++ b/WindowsFormsApp2/UserControl1.resx
@@ -566,7 +566,7 @@
RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
- j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAUN1JREFUeF7tfXecHcWV
+ j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDwAACw8BkvkDpQAAUN1JREFUeF7tfXecHcWV
9fMuXu+3BiRAQtKMZjQ5aXKWNAqjGYWRNEGTNUE5h9EoZwkEIgsFQBIgkTMIMNHGxnG9a7wOa+MAxgSD
SYvDOizLguF+59zq6tfz1BPeIDA2+uP8uru6urrqnlO3blV3vxe48sor+4y9e/cGtm3bFti8eXNg8eLF
gbq6ukBjY6OioaEhMGvWrMC0adMCpaWlgbKyskB5eXlg0qRJul9dXR245ZZbAnfddVfggQceCNx77726
diff --git a/WindowsFormsApp2/WindowsFormsApp2.csproj b/WindowsFormsApp2/WindowsFormsApp2.csproj
index c55e135..faa6e46 100644
--- a/WindowsFormsApp2/WindowsFormsApp2.csproj
+++ b/WindowsFormsApp2/WindowsFormsApp2.csproj
@@ -26,6 +26,7 @@
prompt
4
false
+ true
AnyCPU
@@ -35,6 +36,7 @@
TRACE
prompt
1
+ true
@@ -135,6 +137,11 @@
+
+ True
+ True
+ Resources.resx
+
UserControl
@@ -185,14 +192,9 @@
ResXFileCodeGenerator
- Resources.Designer.cs
Designer
+ Resources.Designer.cs
-
- True
- Resources.resx
- True
-
singleCam.cs
@@ -235,6 +237,9 @@
+
+
+
diff --git a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index c90028f..a41552f 100644
Binary files a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 1134c78..3463951 100644
Binary files a/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/WindowsFormsApp2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index 576f7e1..2d1cd30 100644
Binary files a/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/WindowsFormsApp2/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.Properties.Resources.resources b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.Properties.Resources.resources
index 9225cea..95a3a1c 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.Properties.Resources.resources and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.Properties.Resources.resources differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources
index cc4ac99..b9de11e 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.UserControl1.resources differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache
index f08a8ef..1148e55 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.AssemblyReference.cache differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache
index 5bb7961..38dde74 100644
--- a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache
+++ b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e59955340ef496cc91298f0dfbe926cd5bb5dc47
+9c9b8393333a0be8cfbbdbde65fba7671b7418a8
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt
index 2eadaed..4b217e5 100644
--- a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt
+++ b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.FileListAbsolute.txt
@@ -169,3 +169,29 @@ D:\udp\Publish\dll\x86\opencv_videoio_ffmpeg480.dll
D:\udp\Publish\dll\x64\OpenCvSharpExtern.dll
D:\udp\Publish\dll\x64\opencv_videoio_ffmpeg480_64.dll
D:\udp\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CopyComplete
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\WindowsFormsApp2.dll.config
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\WindowsFormsApp2.dll
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\WindowsFormsApp2.pdb
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.AssemblyReference.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Alarm_Record.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Camera_glue.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Change_shift.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.displayResult.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Form1.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogSetup.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.FullScreen.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Output_statistic.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.Properties.Resources.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.singleCam2.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.UserControl1.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.DialogLogin.resources
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.GenerateResource.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CoreCompileInputs.cache
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.csproj.CopyComplete
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.dll
+D:\烟厂资料\程序测试\远程端\231114-最新\WindowsFormsApp2\obj\Debug\WindowsFormsApp2.pdb
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\dll\x86\OpenCvSharpExtern.dll
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\dll\x86\opencv_videoio_ffmpeg480.dll
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\dll\x64\OpenCvSharpExtern.dll
+D:\烟厂资料\程序测试\远程端\231114-最新\Publish\dll\x64\opencv_videoio_ffmpeg480_64.dll
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache
index e2f5286..14220e3 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.csproj.GenerateResource.cache differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll
index 65358e3..0114973 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.dll differ
diff --git a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb
index c16f849..438eccc 100644
Binary files a/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb and b/WindowsFormsApp2/obj/Debug/WindowsFormsApp2.pdb differ
diff --git a/WindowsFormsApp2/singleCam.cs b/WindowsFormsApp2/singleCam.cs
index e2b9180..c546c62 100644
--- a/WindowsFormsApp2/singleCam.cs
+++ b/WindowsFormsApp2/singleCam.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using System.Drawing.Imaging;
namespace WindowsFormsApp2
{
@@ -105,6 +106,8 @@ namespace WindowsFormsApp2
Bitmap bmp0 = null;
private void updateImage(int Num,Bitmap data)
{
+
+
if (pictureBox1.InvokeRequired) {
if(Num==0)
pictureBox1.Invoke(new Action(updateImage), Num, data);
@@ -119,6 +122,7 @@ namespace WindowsFormsApp2
bmp0.Dispose();
bmp0 = null;
}
+
bmp0 = new Bitmap(data);
pictureBox1.Image = bmp0;
}