diff --git a/Correlator/Converter/BatteryColorConverter.cs b/Correlator/Converter/BatteryColorConverter.cs index d7143c7..0a010ec 100644 --- a/Correlator/Converter/BatteryColorConverter.cs +++ b/Correlator/Converter/BatteryColorConverter.cs @@ -9,31 +9,40 @@ { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - try + if (value == null) { - var state = (double)value; + return new SolidColorBrush + { + Color = Colors.Red + }; + } - if (state > 15) - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#545454") - }; - return solidColorBrush; - } - else - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#ff0000") - }; - return solidColorBrush; - } - } - catch + var battery = (int)value; + + SolidColorBrush solidColorBrush; + if (battery > 80) { - return null; + solidColorBrush = new SolidColorBrush + { + Color = Colors.LimeGreen + }; } + else if (battery < 20) + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Red + }; + } + else + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Orange + }; + } + + return solidColorBrush; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Correlator/Converter/BatteryColorConverter.cs b/Correlator/Converter/BatteryColorConverter.cs index d7143c7..0a010ec 100644 --- a/Correlator/Converter/BatteryColorConverter.cs +++ b/Correlator/Converter/BatteryColorConverter.cs @@ -9,31 +9,40 @@ { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - try + if (value == null) { - var state = (double)value; + return new SolidColorBrush + { + Color = Colors.Red + }; + } - if (state > 15) - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#545454") - }; - return solidColorBrush; - } - else - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#ff0000") - }; - return solidColorBrush; - } - } - catch + var battery = (int)value; + + SolidColorBrush solidColorBrush; + if (battery > 80) { - return null; + solidColorBrush = new SolidColorBrush + { + Color = Colors.LimeGreen + }; } + else if (battery < 20) + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Red + }; + } + else + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Orange + }; + } + + return solidColorBrush; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index b70c8f7..758d2fd 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="780" + Width="800" Height="660" AllowsTransparency="True" Background="Transparent" diff --git a/Correlator/Converter/BatteryColorConverter.cs b/Correlator/Converter/BatteryColorConverter.cs index d7143c7..0a010ec 100644 --- a/Correlator/Converter/BatteryColorConverter.cs +++ b/Correlator/Converter/BatteryColorConverter.cs @@ -9,31 +9,40 @@ { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - try + if (value == null) { - var state = (double)value; + return new SolidColorBrush + { + Color = Colors.Red + }; + } - if (state > 15) - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#545454") - }; - return solidColorBrush; - } - else - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#ff0000") - }; - return solidColorBrush; - } - } - catch + var battery = (int)value; + + SolidColorBrush solidColorBrush; + if (battery > 80) { - return null; + solidColorBrush = new SolidColorBrush + { + Color = Colors.LimeGreen + }; } + else if (battery < 20) + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Red + }; + } + else + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Orange + }; + } + + return solidColorBrush; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index b70c8f7..758d2fd 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="780" + Width="800" Height="660" AllowsTransparency="True" Background="Transparent" diff --git a/Correlator/View/HomePageProWindow.xaml b/Correlator/View/HomePageProWindow.xaml index 55bfae1..aacb1d0 100644 --- a/Correlator/View/HomePageProWindow.xaml +++ b/Correlator/View/HomePageProWindow.xaml @@ -1093,6 +1093,7 @@ Margin="1" VerticalAlignment="Center" Background="Transparent" + Foreground="{Binding ComputerBattery, Converter={StaticResource BatteryConverter}}" Value="{Binding ComputerBattery}" /> 15) - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#545454") - }; - return solidColorBrush; - } - else - { - var solidColorBrush = new SolidColorBrush - { - Color = (Color)ColorConverter.ConvertFromString("#ff0000") - }; - return solidColorBrush; - } - } - catch + var battery = (int)value; + + SolidColorBrush solidColorBrush; + if (battery > 80) { - return null; + solidColorBrush = new SolidColorBrush + { + Color = Colors.LimeGreen + }; } + else if (battery < 20) + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Red + }; + } + else + { + solidColorBrush = new SolidColorBrush + { + Color = Colors.Orange + }; + } + + return solidColorBrush; } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Correlator/Dialog/CheckResponseDialog.xaml b/Correlator/Dialog/CheckResponseDialog.xaml index b70c8f7..758d2fd 100644 --- a/Correlator/Dialog/CheckResponseDialog.xaml +++ b/Correlator/Dialog/CheckResponseDialog.xaml @@ -6,7 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="780" + Width="800" Height="660" AllowsTransparency="True" Background="Transparent" diff --git a/Correlator/View/HomePageProWindow.xaml b/Correlator/View/HomePageProWindow.xaml index 55bfae1..aacb1d0 100644 --- a/Correlator/View/HomePageProWindow.xaml +++ b/Correlator/View/HomePageProWindow.xaml @@ -1093,6 +1093,7 @@ Margin="1" VerticalAlignment="Center" Background="Transparent" + Foreground="{Binding ComputerBattery, Converter={StaticResource BatteryConverter}}" Value="{Binding ComputerBattery}" /> /// 红色发射机电量 0-100 /// - private double _redTransmitterBattery; + private int _redTransmitterBattery; - public double RedTransmitterBattery + public int RedTransmitterBattery { get => _redTransmitterBattery; set @@ -257,9 +257,9 @@ /// /// 蓝色发射机电量 0-100 /// - private double _blueTransmitterBattery; + private int _blueTransmitterBattery; - public double BlueTransmitterBattery + public int BlueTransmitterBattery { get => _blueTransmitterBattery; set @@ -270,6 +270,21 @@ } /// + /// 电脑电量 0-100 + /// + private int _computerBattery; + + public int ComputerBattery + { + get => _computerBattery; + set + { + _computerBattery = value; + RaisePropertyChanged(); + } + } + + /// /// 绑定经过了值 /// private string _elapseTime = "0"; @@ -284,18 +299,6 @@ } } - private double _computerBattery; - - public double ComputerBattery - { - get => _computerBattery; - set - { - _computerBattery = value; - RaisePropertyChanged(); - } - } - private string _connectColorBrush = "LightGray"; public string ConnectColorBrush @@ -475,7 +478,7 @@ "HomePageProViewModel".WriteLog("Red Sensor收到消息：" + JsonConvert.SerializeObject(dev)); //新协议不计算实际信号 - RedTransmitterBattery = Convert.ToDouble(dev.Cell); + RedTransmitterBattery = Convert.ToInt32(dev.Cell); RedTransmitterSignalIntensity = 5; RedTransmitterState = true; FlowStatus.RedSensorIsEnable = true; @@ -486,7 +489,7 @@ "HomePageProViewModel".WriteLog("Blue Sensor收到消息：" + JsonConvert.SerializeObject(dev)); //新协议不计算实际信号 - BlueTransmitterBattery = Convert.ToDouble(dev.Cell); + BlueTransmitterBattery = Convert.ToInt32(dev.Cell); BlueTransmitterSignalIntensity = 5; BlueTransmitterState = true; FlowStatus.BlueSensorIsEnable = true;