摄像头打开时禁止设备检测

优化摄像头显示逻辑

XHWK.WKTool/App.config

@@ -9,8 +9,8 @@
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="122" />
-    <add key="VersionName" value="3.9.5" />
+    <add key="VersionCode" value="123" />
+    <add key="VersionName" value="3.9.6" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/MainWindow.xaml.cs

@@ -1036,7 +1036,7 @@ namespace XHWK.WKTool
                 (
                     () =>
                     {
-                        Thread.Sleep(500);
+                        Thread.Sleep(300);
                         _isPressButton = false;
                     }
                 );
@@ -1062,13 +1062,12 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private async void BtnDevice_Click(object sender, RoutedEventArgs e)
+        private void BtnDevice_Click(object sender, RoutedEventArgs e)
         {
             if (_isRbnOpen)
             {
-                RbnTurnOff.IsChecked = true;
-                RbnTurnOff_Click(null, null);
-                await Task.Delay(1000);
+                MessageWindow.Show("请从应用右下角关闭摄像头后再进行设备检测！");
+                return;
             }
             DeviceWindow deviceWin = new DeviceWindow();
             deviceWin.ShowDialog();

XHWK.WKTool/Utils/ZAudioRecordHelper.cs

@@ -142,7 +142,7 @@ namespace XHWK.WKTool.Utils
         public static bool IsDeviceGood(RecordType type)
         {
             string tempPath = Path.GetTempPath();
-            Console.WriteLine("临时路径:" + tempPath);
+            // Console.WriteLine("临时路径:" + tempPath);
             WaveInEvent mWaveIn = null;
             WaveFileWriter mWriter = null;
             WasapiLoopbackCapture mCapture = null;
@@ -219,4 +219,4 @@ namespace XHWK.WKTool.Utils
             return true;
         }
     }
-}
+}

XHWK.WKTool/system/CameraHelper.cs

@@ -2,21 +2,16 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Drawing;
     using System.Drawing.Imaging;
     using System.IO;
     using System.Windows.Media.Imaging;
     using System.Windows.Threading;
-    using AForge.Controls;
     using AForge.Video.DirectShow;
 
     public static class CameraHelper
     {
         private static List<FilterInfo> _cameraDevices;
-        private static VideoCaptureDevice _div;
-        private static readonly VideoSourcePlayer SourcePlayer = new VideoSourcePlayer();
-
-        //指示_isDisplay设置为true后，是否设置了其他的sourcePlayer，若未设置则_isDisplay重设为false
+        private static VideoCaptureDevice _vedioCapture;
 
         private static Dispatcher _dispatcher;
         public static Action<BitmapImage> imageCallback;
@@ -68,15 +63,13 @@
                 return false;
             }
             // 设定初始视频设备
-            _div = new VideoCaptureDevice(_cameraDevices[index].MonikerString);
-            _div.NewFrame += _div_NewFrame;
-            SourcePlayer.VideoSource = _div;
-            _div.Start();
-            SourcePlayer.Start();
+            _vedioCapture = new VideoCaptureDevice(_cameraDevices[index].MonikerString);
+            _vedioCapture.NewFrame += VedioCaptureNewFrame;
+            _vedioCapture.Start();
             return true;
         }
 
-        private static void _div_NewFrame(object sender, AForge.Video.NewFrameEventArgs eventArgs)
+        private static void VedioCaptureNewFrame(object sender, AForge.Video.NewFrameEventArgs eventArgs)
         {
             _dispatcher?.Invoke
             (
@@ -96,68 +89,25 @@
         }
 
         /// <summary>
-        /// 截取一帧图像并保存
+        /// 关闭摄像头设备
         /// </summary>
-        /// <param name="filePath">图像保存路径</param>
-        /// <param name="fileName">保存的图像文件名</param>
-        /// <returns>如果保存成功，则返回完整路径，否则为 null</returns>
-        public static string CaptureImage(string filePath, string fileName = null)
+        public static void CloseDevice()
         {
-            if (SourcePlayer.VideoSource == null)
-            {
-                return null;
-            }
-            if (!Directory.Exists(filePath))
-            {
-                Directory.CreateDirectory(filePath);
-            }
             try
             {
-                Image bitmap = SourcePlayer.GetCurrentVideoFrame();
-                if (bitmap != null)
+                if (_vedioCapture != null)
                 {
-                    if (fileName == null)
+                    _vedioCapture.NewFrame -= VedioCaptureNewFrame;
+                    if (_vedioCapture.IsRunning)
                     {
-                        fileName = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+                        _vedioCapture.SignalToStop();
                     }
-                    string fullPath = Path.Combine(filePath, fileName + "-cap.jpg");
-                    Bitmap objNewPic = new Bitmap
-                    (
-                        bitmap,
-                        172,
-                        124
-                    ); //图片保存的大小尺寸  
-                    objNewPic.Save(fullPath, ImageFormat.Jpeg);
-                    //bitmap.Save(fullPath, ImageFormat.Jpeg);
-                    bitmap.Dispose();
-                    objNewPic.Dispose();
-                    return fullPath;
+                    _vedioCapture = null;
                 }
-                return null;
             }
             catch (Exception)
             {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 关闭摄像头设备
-        /// </summary>
-        public static void CloseDevice()
-        {
-            if (_div != null)
-            {
-                _div.NewFrame -= _div_NewFrame;
-                if (SourcePlayer.IsRunning)
-                {
-                    SourcePlayer.Stop();
-                }
-                if (_div.IsRunning)
-                {
-                    _div.SignalToStop();
-                }
-                _div = null;
+                // ignored
             }
         }
     }

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.9.5"
+#define MyAppVersion "3.9.6"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"