监控恢复采图

DeviceLibrary/DeviceLibrary.csproj

@@ -32,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   </PropertyGroup>
   <ItemGroup>
   <ItemGroup>
-    <Reference Include="Asa.Camera.VisionLib, Version=1.3.8398.28384, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Asa.Camera.VisionLib, Version=1.3.8482.30580, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\DLL\Asa.Camera.VisionLib.dll</HintPath>
       <HintPath>..\DLL\Asa.Camera.VisionLib.dll</HintPath>
     </Reference>
     </Reference>

DeviceLibrary/DeviceLibrary/Camera.cs

@@ -66,15 +66,16 @@ public class HIKCamera
             LogUtil.error(Name + "加载监控相机配置文件失败:" + e.ToString());
             LogUtil.error(Name + "加载监控相机配置文件失败:" + e.ToString());
             return false;
             return false;
         }
         }
-        //PictureBox p1 = new PictureBox();
-        if (preview == null)
-        {
-            camera.PreviewImage(DeviceName, picture.Handle);
-        }
-        else
-        {
-            camera.PreviewImage(DeviceName, (IntPtr)preview);
-        }
+        PictureBox p1 = new PictureBox();
+        camera.PreviewImage(DeviceName, p1.Handle);
+        //if (preview == null)
+        //{
+        //    camera.PreviewImage(DeviceName, picture.Handle);
+        //}
+        //else
+        //{
+        //    camera.PreviewImage(DeviceName, (IntPtr)preview);
+        //}
         camera.Open(DeviceName);
         camera.Open(DeviceName);
         Bitmap bmp = camera.GetImage(DeviceName);
         Bitmap bmp = camera.GetImage(DeviceName);
         if (bmp == null)
         if (bmp == null)

TheMachine/Form1.cs

@@ -150,7 +150,7 @@ namespace TheMachine
             this.Invoke((EventHandler<Bitmap>)delegate
             this.Invoke((EventHandler<Bitmap>)delegate
             {
             {
                 pictureBox1.Visible = true;
                 pictureBox1.Visible = true;
-                //pictureBox1.Image = e;
+                pictureBox1.Image = e;
             }, sender, e);
             }, sender, e);
         }
         }
         private void CameraB_camera_event(object sender, Bitmap e)
         private void CameraB_camera_event(object sender, Bitmap e)