zhao：1修改录像倒计时 2修改录像计时 3倒计时页增加快捷键说明

XHWK.WKTool/CountdownWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         mc:Ignorable="d"
-        Title="CountdownWindow" Height="450" Width="800"  AllowsTransparency="True"
+        Title="CountdownWindow" Height="904.335" Width="1235.26"  AllowsTransparency="True"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterOwner" WindowState="Maximized"
     WindowStyle="None">
@@ -22,5 +22,6 @@
                     Width="600"
                     Height="600"
                     Source=".\Images\countdown_3.png" />
+        <Label x:Name="lblShortcut" Content="开始/暂停：Ctrl+F5     停止：Ctrl+S" Height="77" Margin="0,750,0,0" Width="682" Foreground="#FF5B5151" FontSize="36" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
     </Grid>
 </Window>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -23,8 +23,16 @@ namespace XHWK.WKTool
         /// </summary>
         System.Timers.Timer timer;
         int ImgNum = 21;
-        public void Initialize(int changeTime=2100)
+        public void Initialize(bool ShowlblShortcut=false, int changeTime=2100)
         {
+            if (ShowlblShortcut)
+            {
+                lblShortcut.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                lblShortcut.Visibility = Visibility.Hidden;
+            }
             ImgNum = 21;
             bool IsStart = true;
             new Thread(new ThreadStart(new Action(() =>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -201,7 +201,6 @@ namespace XHWK.WKTool
         {
             if (IsSuspend)
             {
-                Stack();
                 if (IsFirstRS)
                 {
                     VideoInfo = new Model_Video();
@@ -231,9 +230,28 @@ namespace XHWK.WKTool
                 txbTime.Visibility = Visibility.Visible;
                 try
                 {
+                    if (APP.W_CountdownWindow == null)
+                    {
+                        APP.W_CountdownWindow = new CountdownWindow();
+                        APP.W_CountdownWindow.Initialize(true, 1800);
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    else
+                    {
+                        APP.W_CountdownWindow.Initialize(true, 1800);
+                        //APP.W_CountdownWindow.Topmost = true;
+                    }
+                    APP.W_CountdownWindow.Show();
                     new Thread(new ThreadStart(new Action(() =>
                     {
+                        Thread.Sleep(1000);
                         APP.FFmpeg.StartRecordingVideo(VideoSavePathName);
+
+                        Thread.Sleep(1800);
+                        Dispatcher.Invoke(() =>
+                        {
+                            Stack();
+                        });
                     }))).Start();
                 }
                 catch (Exception ex)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1226,7 +1226,6 @@ namespace XHWK.WKTool
                     }
                     t.Interval = new TimeSpan(0, 0, 0, 1);
                     txbTime.Visibility = Visibility.Visible;
-                    Stack(); 
                     #endregion
 
                     VideoInfo = new Model_Video();
@@ -1298,6 +1297,7 @@ namespace XHWK.WKTool
 
                     btnLoginType.IsEnabled = false;
                     #endregion
+
                     #region 录像倒计时
                     if (APP.W_CountdownWindow == null)
                     {
@@ -1327,7 +1327,6 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Collapsed;
                 ImgStopTwo.Visibility = Visibility.Visible;
                 TxbRecordingWord.Text = "暂停";
-                Stack();
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1346,13 +1345,15 @@ namespace XHWK.WKTool
                 #endregion
                 try
                 {
-                    APP.FFmpeg.StartRecordingAudio(AudioPathName);
                     new Thread(new ThreadStart(new Action(() =>
                     {
+                        Thread.Sleep(1000);
+                        APP.FFmpeg.StartRecordingAudio(AudioPathName);
                         Thread.Sleep(1000);
                         Dispatcher.Invoke(() =>
                         {
                             IsStartCount = true;
+                            Stack();
                             //timer.Start();
                         });
                     }))).Start();