diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index d619ef9..1e06e05 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -6,7 +6,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Title="听音" MinWidth="1366" MinHeight="768" Background="White" diff --git a/Correlator/View/AuditionWindow.xaml b/Correlator/View/AuditionWindow.xaml index d619ef9..1e06e05 100644 --- a/Correlator/View/AuditionWindow.xaml +++ b/Correlator/View/AuditionWindow.xaml @@ -6,7 +6,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Title="听音" MinWidth="1366" MinHeight="768" Background="White" diff --git a/Correlator/View/HomePageProWindow.xaml b/Correlator/View/HomePageProWindow.xaml index 7a6de12..2974eef 100644 --- a/Correlator/View/HomePageProWindow.xaml +++ b/Correlator/View/HomePageProWindow.xaml @@ -293,7 +293,7 @@ VerticalAlignment="Center" FontSize="22" Foreground="{StaticResource MainThemeColor}" - Text="2023年6月26日 08:56:27 星期一" /> + Text="{Binding CurrentTime}" /> @@ -939,7 +939,7 @@ Margin="1" VerticalAlignment="Center" Background="Transparent" - Value="99" /> + Value="{Binding Battery}" /> + Text="{Binding CurrentTime}" /> @@ -939,7 +939,7 @@ Margin="1" VerticalAlignment="Center" Background="Transparent" - Value="99" /> + Value="{Binding Battery}" /> + /// 各种定时器 + /// + private void TimerTick() + { + //实时显示时间 + _timer.Tick += delegate + { + var dateTime = DateTime.Now; + var strDateTime = dateTime.ToString("yyyy年MM月dd日") + + dateTime.ToString("\0 \0 \0 dddd \0 \0 \0", new CultureInfo("zh-cn")) + + dateTime.ToString("HH:mm:ss"); + CurrentTime = strDateTime; + }; + _timer.Start(); + + //获取电池电量 + var sysPower = new SystemConfig.SystemPowerStatus(); + GetSystemPowerStatus(ref sysPower); + Battery = sysPower.BatteryPercent == 255 ? 100 : sysPower.BatteryPercent; + + _batteryTimer.Tick += delegate + { + GetSystemPowerStatus(ref sysPower); + Battery = sysPower.BatteryPercent == 255 ? 100 : sysPower.BatteryPercent; + }; + _batteryTimer.Start(); + + //计算时间Timer + _runningTimer.Tick += delegate + { + _runningSeconds++; + PassTime = _runningSeconds.ToString(); + if (_runningSeconds >= 90) + { + _runningTimer.Stop(); + MessageBox.Show("接收不到数据,请点击复位并重新开始采集数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); + } + }; + + //自动截屏Timer + _snapShotTimer.Tick += delegate + { + _snapShotTimer.Stop(); + if (!string.IsNullOrEmpty(_snapShotPath)) + { + _snapShotPath.SnapShot(); + "HomePageViewModel".WriteLog("截屏路径:" + _snapShotPath); + } + }; + + //加速度计下发指令Timer + _accelerometerCommandTimer.Tick += delegate + { + if (FlowStatus.CanCollectData) + { + CommandSender.SendCorrelatorWakeUpCmd(SerialPortManager.Get.Sp); + } + }; + + //水听器下发指令Timer + _hydrophoneCommandTimer.Tick += delegate + { + if (FlowStatus.CanCollectData) + { + CommandSender.SendHydrophoneWakeUpCmd(SerialPortManager.Get.Sp); + } + }; + } + + /// /// 消息监听 /// private void RegisterMessage() @@ -754,75 +824,5 @@ DialogHub.Get.DismissLoadingDialog(); return true; } - - /// - /// 各种定时器 - /// - private void TimerTick() - { - //实时显示时间 - _timer.Tick += delegate - { - var dateTime = DateTime.Now; - var strDateTime = dateTime.ToString("yyyy年MM月dd日") + - dateTime.ToString("\0 \0 \0 dddd \0 \0 \0", new CultureInfo("zh-cn")) + - dateTime.ToString("HH:mm:ss"); - CurrentTime = strDateTime; - }; - _timer.Start(); - - //获取电池电量 - var sysPower = new SystemConfig.SystemPowerStatus(); - GetSystemPowerStatus(ref sysPower); - Battery = sysPower.BatteryPercent == 255 ? 100 : sysPower.BatteryPercent; - - _batteryTimer.Tick += delegate - { - GetSystemPowerStatus(ref sysPower); - Battery = sysPower.BatteryPercent == 255 ? 100 : sysPower.BatteryPercent; - }; - _batteryTimer.Start(); - - //计算时间Timer - _runningTimer.Tick += delegate - { - _runningSeconds++; - PassTime = _runningSeconds.ToString(); - if (_runningSeconds >= 90) - { - _runningTimer.Stop(); - MessageBox.Show("接收不到数据,请点击复位并重新开始采集数据", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Error); - } - }; - - //自动截屏Timer - _snapShotTimer.Tick += delegate - { - _snapShotTimer.Stop(); - if (!string.IsNullOrEmpty(_snapShotPath)) - { - _snapShotPath.SnapShot(); - "HomePageViewModel".WriteLog("截屏路径:" + _snapShotPath); - } - }; - - //加速度计下发指令Timer - _accelerometerCommandTimer.Tick += delegate - { - if (FlowStatus.CanCollectData) - { - CommandSender.SendCorrelatorWakeUpCmd(SerialPortManager.Get.Sp); - } - }; - - //水听器下发指令Timer - _hydrophoneCommandTimer.Tick += delegate - { - if (FlowStatus.CanCollectData) - { - CommandSender.SendHydrophoneWakeUpCmd(SerialPortManager.Get.Sp); - } - }; - } } } \ No newline at end of file