diff --git a/Correlator/View/MainWindow.xaml.cs b/Correlator/View/MainWindow.xaml.cs index 5dbefd4..de405f7 100644 --- a/Correlator/View/MainWindow.xaml.cs +++ b/Correlator/View/MainWindow.xaml.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.IO.Ports; +using System.Threading.Tasks; using System.Windows.Threading; using Correlator.Util; @@ -16,23 +17,28 @@ Interval = new TimeSpan(0, 0, 1) }; - private int _counterOneTime = 3; + private int _counterOneTime = 5; private readonly DispatcherTimer _checkSerialPortTimer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 7) }; + private Task GetHomePageProWindow() + { + return Task.FromResult(new HomePageProWindow()); + } + public MainWindow() { InitializeComponent(); - var homePageProWindow = new HomePageProWindow(); _checkSerialPortTimer.Start(); _checkSerialPortTimer.Tick += CheckSerialPortState; - + //倒计时显示大屏Logo - _timer.Tick += delegate + _timer.Start(); + _timer.Tick += async delegate { if (_counterOneTime > 0) { @@ -42,16 +48,18 @@ else { _timer.Stop(); + var homePageProWindow = await GetHomePageProWindow(); homePageProWindow.Show(); Close(); } }; - _timer.Start(); //点击事件 - SkipButton.Click += (sender, args) => + SkipButton.Click += async (sender, args) => { - homePageProWindow.Show(); + _timer.Stop(); + var homePageProWindow = await GetHomePageProWindow(); + homePageProWindow.Show(); Close(); }; } @@ -71,7 +79,7 @@ SerialPortManager.Get.Sp.StopBits = (StopBits)int.Parse("1"); //停止位 SerialPortManager.Get.Sp.Open(); //打开串口 Debug.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " MainWindow.xaml => 打开串口"); - + break; }