开启摄像头的时候进行设备检测问题处理

XHWK.WKTool/App.config

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

XHWK.WKTool/App.xaml.cs

@@ -15,6 +15,8 @@ using XHWK.WKTool.Skin;
 
 namespace XHWK.WKTool
 {
+    using system;
+
     public partial class App
     {
         #region 全局变量

XHWK.WKTool/MainWindow.xaml

@@ -293,7 +293,8 @@
                                     </Grid>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
+                                            <Setter TargetName="ImgSetUp" Property="Source"
+                                                    Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
                                             <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
@@ -495,15 +496,20 @@
                                         </Grid>
                                         <ControlTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
+                                                        Value="/SkinImages/White/Toolbar_LP_MI.png" />
                                             </Trigger>
                                             <Trigger Property="IsPressed" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFFFFFFF" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
+                                                        Value="/SkinImages/White/Toolbar_LP_CL.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
+                                                        Value="#FFFFFFFF" />
                                             </Trigger>
                                             <Trigger Property="IsEnabled" Value="False">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFC3C3C3" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
+                                                        Value="/SkinImages/White/Toolbar_LP_N.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
+                                                        Value="#FFC3C3C3" />
                                             </Trigger>
                                         </ControlTemplate.Triggers>
                                     </ControlTemplate>
@@ -658,7 +664,7 @@
                                                 VerticalAlignment="Top"
                                                 Visibility="Visible" />
                                             <!--  导入图片  -->
-                                            <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#3f6fff" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed" />-->
+
                                             <InkCanvas
                                                 x:Name="BlackboardCanvas"
                                                 Grid.Row="0"
@@ -940,6 +946,7 @@
                                     Style="{StaticResource RadBase}" />
                             </StackPanel>
                             <StackPanel
+                                Name="SheXiangTouSp"
                                 Grid.Column="2"
                                 Margin="5"
                                 HorizontalAlignment="Right"
@@ -1033,11 +1040,13 @@
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_White.png" />
+                                                            <Image x:Name="ImgRecord"
+                                                                   Source="/SkinImages/Skin/Skin_White.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_White_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source"
+                                                                        Value="/SkinImages/Skin/Skin_White_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>
@@ -1063,11 +1072,13 @@
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
+                                                            <Image x:Name="ImgRecord"
+                                                                   Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source"
+                                                                        Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>

XHWK.WKTool/MainWindow.xaml.cs

@@ -925,8 +925,6 @@ namespace XHWK.WKTool
 
         private bool _isRbnOpen;
 
-        private System.Timers.Timer _times;
-
         /// <summary>
         /// 摄像头打开事件
         /// </summary>
@@ -973,18 +971,6 @@ namespace XHWK.WKTool
                     }
                     CameraHelper.imageCallback = LoadImage;
                     CameraHelper.StartCameraDevice(cameraIndex, this.Dispatcher);
-                    if (_timer != null)
-                    {
-                        _times.Elapsed -= Times_Elapsed;
-                        _times.Enabled = false;
-                        _times.Dispose();
-                    }
-                    _times = new System.Timers.Timer(200) //初始值为300
-                    {
-                        AutoReset = true //设置是否执行System.Timers.Timer.Elapsed事件
-                    }; //设置执行一次（false）还是一直执行(true)
-                    _times.Elapsed += Times_Elapsed;
-                    _times.Enabled = true; //启动计时器
                     _isRbnOpen = true;
                     string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
                     FileToolsCommon.CreateDirectory(imgPath);
@@ -1062,30 +1048,6 @@ namespace XHWK.WKTool
                 RbnOpen.IsEnabled = false;
                 CameraHelper.CloseDevice();
                 RbnOpen.IsEnabled = true;
-                if (_timer != null)
-                {
-                    _times.Elapsed -= Times_Elapsed;
-                    _times.Enabled = false;
-                    _times.Dispose();
-                    _times = null;
-                }
-            }
-        }
-
-        private void Times_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            if (_isRbnOpen)
-            {
-                try
-                {
-                    long time = Timestamp();
-                    string imgPath = FileToolsCommon.GetFileAbsolutePath("Temp/imgplayer");
-                    CameraHelper.CaptureImage(imgPath, time.ToString());
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteErrLog("【摄像】(Times_Elapsed)生成图片错误:" + ex.Message, ex);
-                }
             }
         }
 
@@ -1102,7 +1064,7 @@ namespace XHWK.WKTool
         /// </param>
         private async void BtnDevice_Click(object sender, RoutedEventArgs e)
         {
-            if (RbnTurnOff.IsChecked != null && !(bool)RbnTurnOff.IsChecked)
+            if (_isRbnOpen)
             {
                 RbnTurnOff.IsChecked = true;
                 RbnTurnOff_Click(null, null);
@@ -2619,6 +2581,8 @@ namespace XHWK.WKTool
                     App.W_CountdownWindow = new CountdownWindow();
                 }
                 App.W_CountdownWindow.InitAndShow();
+                _recordType = 3;
+                RecordBtnStatus();
 
                 #endregion 录像倒计时
 
@@ -2645,6 +2609,7 @@ namespace XHWK.WKTool
                 BtnScreenRecording.IsEnabled = true;
                 BtnRecord.IsEnabled = true;
                 BtnStop.IsEnabled = false;
+                SheXiangTouSp.Visibility = Visibility.Visible;
             }
             else if (_recordType == 1)
             {
@@ -2652,6 +2617,7 @@ namespace XHWK.WKTool
                 TxbType.Text = "录制中";
                 BtnRecord.Visibility = Visibility.Collapsed;
                 BtnRecordSuspend.Visibility = Visibility.Visible;
+                SheXiangTouSp.Visibility = Visibility.Hidden;
             }
             else if (_recordType == 2)
             {
@@ -2659,16 +2625,19 @@ namespace XHWK.WKTool
                 TxbType.Text = "暂停中";
                 BtnRecord.Visibility = Visibility.Visible;
                 BtnRecordSuspend.Visibility = Visibility.Collapsed;
+                SheXiangTouSp.Visibility = Visibility.Hidden;
             }
             else if (_recordType == 3)
             {
                 TxbType.Text = "倒计时";
+                SheXiangTouSp.Visibility = Visibility.Hidden;
             }
             else if (_recordType == 4)
             {
                 TxbType.Text = "合并中";
                 StartPauseGrid.Visibility = Visibility.Hidden;
                 BtnScreenRecording.IsEnabled = false;
+                SheXiangTouSp.Visibility = Visibility.Hidden;
             }
         }
 
@@ -2745,6 +2714,7 @@ namespace XHWK.WKTool
             BtnScreenRecording.IsEnabled = false;
             _timer.Change(-1, 0);
             _timer.Dispose();
+            _timer = null;
             TxbTime.Text = "00:00";
             TxbType.Text = "保存中";
             _recordType = 4;

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

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