添加麦克风设置

XHWK.WKTool/App.config

@@ -5,12 +5,12 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <!--参数是否加密 0不加密 1加密-->
     <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="107" />
-    <add key="VersionName" value="3.1.13" />
+    <add key="VersionCode" value="108" />
+    <add key="VersionName" value="3.1.14" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/DeviceWindow.xaml

@@ -513,6 +513,15 @@
                         SelectionChanged="CmbMicrophoneList_SelectionChanged"
                         Style="{StaticResource stlComboBox}"
                         Text="请选择" />
+
+                    <Button
+                        x:Name="MicrophoneSetting"
+                        Width="60"
+                        Margin="20,0,0,0"
+                        Background="#3f6fff"
+                        Content="设置"
+                        FontSize="14"
+                        Foreground="White" />
                 </StackPanel>
 
                 <Grid Grid.Row="1">

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -8,9 +8,11 @@ using NAudio.Wave;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
@@ -32,9 +34,16 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
 
+            MicrophoneSetting.Click += MicrophoneSetting_Click;
+
             cameraCheck();
         }
 
+        private void MicrophoneSetting_Click(object sender, RoutedEventArgs e)
+        {
+            Process.Start("mmsys.cpl");
+        }
+
         /// <summary>
         /// 初始化
         /// </summary>
@@ -48,8 +57,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 窗体移动
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
             DragMove();
@@ -58,8 +69,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 关闭当前页
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
             imgPlayer.Visibility = Visibility.Hidden;
@@ -98,8 +111,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 检测
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void checkCamera()
         {
             try
@@ -159,8 +174,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 停止
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnCameraStop_Click(object sender, RoutedEventArgs e)
         {
             if (Camera != null)
@@ -176,8 +193,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 扬声器
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void Speaker_Check()
         {
             closeCamera();
@@ -189,8 +208,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 检测扬声器
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnSpeakerDetection_Click(object sender, RoutedEventArgs e)
         {
             Console.WriteLine("播放");
@@ -205,8 +226,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 音频播放 同步进度条和视频进度
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void MediaAudio_MediaOpened(object sender, RoutedEventArgs e)
         {
             Console.WriteLine("播放中。。。");
@@ -227,20 +250,21 @@ namespace XHWK.WKTool
         /// <summary>
         /// 麦克风
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Microphone_Check()
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
+        private async void Microphone_Check()
         {
             MediaAudio.Stop();
             ImgAcousticWave.Visibility = Visibility.Collapsed;
             HidePage();
             GridMicrophone.Visibility = Visibility.Visible;
-
-            ThreadPool.QueueUserWorkItem(s =>
+            DataTable data = new DataTable();
+            data.Columns.Add("Value");
+            data.Columns.Add("Key");
+            await Task.Run(() =>
             {
-                DataTable data = new DataTable();
-                data.Columns.Add("Value");
-                data.Columns.Add("Key");
                 for (int n = 0; n < WaveIn.DeviceCount; n++)
                 {
                     var caps = WaveIn.GetCapabilities(n);
@@ -252,15 +276,13 @@ namespace XHWK.WKTool
                     data.Rows[n]["Value"] = caps.ProductName;
                     data.Rows[n]["Key"] = n + "";
                 }
-                Dispatcher.Invoke(() =>
-                {
-                    CmbMicrophoneList.ItemsSource = data.DefaultView;
-                    if (WaveIn.DeviceCount > 0)
-                    {
-                        CmbMicrophoneList.SelectedIndex = 0;
-                    }
-                });
             });
+
+            CmbMicrophoneList.ItemsSource = data.DefaultView;
+            if (WaveIn.DeviceCount > 0)
+            {
+                CmbMicrophoneList.SelectedIndex = 0;
+            }
         }
 
         private WaveInEvent waveIn = null;
@@ -275,39 +297,43 @@ namespace XHWK.WKTool
 
             if (CmbMicrophoneList.SelectedIndex >= 0)
             {
-                waveIn = new WaveInEvent();
-                waveIn.DeviceNumber = CmbMicrophoneList.SelectedIndex;
-
-                //开始录音，写数据
-                waveIn.DataAvailable += (o, e1) =>
+                var select_index = CmbMicrophoneList.SelectedIndex;
+                ThreadPool.QueueUserWorkItem((item) =>
                 {
-                    byte[] buf = e1.Buffer;
-                    float maxNumber = 0;
-                    for (int index = 0; index < buf.Length; index += 2)
-                    {
-                        short sample = (short)((buf[index + 1] << 8) | buf[index + 0]);
-                        float sample32 = sample / 32768f;
-                        sample32 = Math.Abs(sample32);
+                    waveIn = new WaveInEvent();
+                    waveIn.DeviceNumber = select_index;
 
-                        if (sample32 > maxNumber)
+                    //开始录音，写数据
+                    waveIn.DataAvailable += (o, e1) =>
+                    {
+                        byte[] buf = e1.Buffer;
+                        float maxNumber = 0;
+                        for (int index = 0; index < buf.Length; index += 2)
                         {
-                            maxNumber = sample32;
+                            short sample = (short)((buf[index + 1] << 8) | buf[index + 0]);
+                            float sample32 = sample / 32768f;
+                            sample32 = Math.Abs(sample32);
+
+                            if (sample32 > maxNumber)
+                            {
+                                maxNumber = sample32;
+                            }
                         }
-                    }
 
-                    Dispatcher.Invoke(() =>
-                    {
-                        volumeProgressBar.Value = maxNumber * 100;
-                    });
-                };
+                        Dispatcher.Invoke(() =>
+                        {
+                            volumeProgressBar.Value = maxNumber * 100;
+                        });
+                    };
 
-                //结束录音
-                waveIn.RecordingStopped += (s, a) =>
-                {
-                    waveIn.Dispose();
-                };
+                    //结束录音
+                    waveIn.RecordingStopped += (s, a) =>
+                    {
+                        waveIn.Dispose();
+                    };
 
-                waveIn.StartRecording();
+                    waveIn.StartRecording();
+                });
             }
         }
 
@@ -422,8 +448,10 @@ namespace XHWK.WKTool
         /// <summary>
         /// 重新
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">
+        /// </param>
+        /// <param name="e">
+        /// </param>
         private void BtnDetection_Click(object sender, RoutedEventArgs e)
         {
             cameraCheck();

XHWK.WKTool/MainWindow.xaml.cs

@@ -3223,6 +3223,7 @@ namespace XHWK.WKTool
                     );
 
                     waveIn = new WaveInEvent();
+
                     waveIn_runing = true;
                     writer = new WaveFileWriter(TempAudioPathName, waveIn.WaveFormat);
                     //开始录音，写数据

星火微课/星火微课-正式.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.13"
+#define MyAppVersion "3.1.14"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"

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

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课"  
 #define MyAppDir "xhwk"
-#define MyAppVersion "3.1.13"
+#define MyAppVersion "3.1.14"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"