zhao：修改倒计时

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -1,4 +1,6 @@
-using System;
+using Common.system;
+
+using System;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -12,24 +14,56 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class CountdownWindow : Window
     {
-        public CountdownWindow(int changeTime = 650)
+        public CountdownWindow()
         {
             InitializeComponent();
-            timer = new System.Timers.Timer(changeTime);//设置执行一次（false）还是一直执行(true)
-            timer.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
-            timer.Elapsed +=new System.Timers.ElapsedEventHandler(Timer_Elapsed);
-            Initialize();
         }
         /// <summary>
         /// 计时器
         /// </summary>
         System.Timers.Timer timer;
-        int ImgNum = 9;
-        public void Initialize(int changeTime=650)
+        int ImgNum = 21;
+        public void Initialize(int changeTime=2100)
         {
-            timer.Interval = changeTime/3;
-            timer.Enabled = true; //启动计时器
-            ImgNum = 9;
+            ImgNum = 21;
+            bool IsStart = true;
+            new Thread(new ThreadStart(new Action(() =>
+            {
+                while (IsStart)
+                {
+                    try
+                    {
+                        if (ImgNum >= 1)
+                        {
+                            loadingImg(ImgNum);
+                            LogHelper.WriteInfoLog("【" + ImgNum + "】");
+                            ImgNum--;
+                            Thread.Sleep(changeTime / 21);
+                        }
+                        else
+                        {
+                            IsStart = false;
+                            Dispatcher.Invoke(
+                                      DispatcherPriority.Send,
+                                      new Action(() =>
+                                      {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
+                          Hide();
+                      }));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteErrLog("【录屏等待】(Initialize)" + ex.Message, ex);
+                    }
+                }
+            }))).Start();
+            //timer = new System.Timers.Timer(changeTime/21);//设置执行一次（false）还是一直执行(true)
+            //timer.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
+            //timer.Elapsed +=new System.Timers.ElapsedEventHandler(Timer_Elapsed);
+            ////timer.Interval = changeTime/21;
+            //timer.Enabled = true; //启动计时器
+            //ImgNum = 21;
         }
 
         private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -38,6 +72,7 @@ namespace XHWK.WKTool
             {
                 loadingImg(ImgNum);
                 ImgNum--;
+                LogHelper.WriteInfoLog("【"+ImgNum+"】");
             }
             else
             {
@@ -46,7 +81,7 @@ namespace XHWK.WKTool
                   DispatcherPriority.Send,
                   new Action(() =>
                   {
-                      imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
+                      imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
                       Hide();
                   }));
             }
@@ -63,14 +98,14 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => { 
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_5.png"));
                       }));
                     break;
                 case 2:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_4.png"));
                       }));
                     break;
                 case 3:
@@ -84,44 +119,128 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_2.png"));
                       }));
                     break;
                 case 5:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown1_1.png"));
                       }));
                     break;
                 case 6:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_7.png"));
                       }));
                     break;
                 case 7:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_6.png"));
                       }));
                     break;
                 case 8:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
-                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_5.png"));
                       }));
                     break;
                 case 9:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_4.png"));
+                      }));
+                    break;
+                case 10:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_3.png"));
+                      }));
+                    break;
+                case 11:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_2.png"));
+                      }));
+                    break;
+                case 12:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown2_1.png"));
+                      }));
+                    break;
+                case 13:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_9.png"));
+                      }));
+                    break;
+                case 14:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_8.png"));
+                      }));
+                    break;
+                case 15:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_7.png"));
+                      }));
+                    break;
+                case 16:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_6.png"));
+                      }));
+                    break;
+                case 17:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_5.png"));
+                      }));
+                    break;
+                case 18:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_4.png"));
+                      }));
+                    break;
+                case 19:
                     Dispatcher.Invoke(
                       DispatcherPriority.Send,
                       new Action(() => {
                           imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
                       }));
                     break;
+                case 20:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_2.png"));
+                      }));
+                    break;
+                case 21:
+                    Dispatcher.Invoke(
+                      DispatcherPriority.Send,
+                      new Action(() => {
+                          imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_1.png"));
+                      }));
+                    break;
                 default:
                     break;
             }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1273,6 +1273,7 @@ namespace XHWK.WKTool
                     if (APP.W_CountdownWindow == null)
                     {
                         APP.W_CountdownWindow = new CountdownWindow();
+                        APP.W_CountdownWindow.Initialize();
                         //APP.W_CountdownWindow.Topmost = true;
                     }
                     else

XHWK.WKTool/XHWK.WKTool.csproj

@@ -1525,5 +1525,19 @@
   <ItemGroup>
     <Resource Include="Images\img_load.gif" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\countdown1_4.png" />
+    <Resource Include="Images\countdown1_5.png" />
+    <Resource Include="Images\countdown2_4.png" />
+    <Resource Include="Images\countdown2_5.png" />
+    <Resource Include="Images\countdown2_6.png" />
+    <Resource Include="Images\countdown2_7.png" />
+    <Resource Include="Images\countdown3_4.png" />
+    <Resource Include="Images\countdown3_5.png" />
+    <Resource Include="Images\countdown3_6.png" />
+    <Resource Include="Images\countdown3_7.png" />
+    <Resource Include="Images\countdown3_8.png" />
+    <Resource Include="Images\countdown3_9.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>