diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 index 5b9ead6..ab8c4de 100644 Binary files a/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 and b/JiangsuEarthquake/.vs/JiangsuEarthquake/DesignTimeBuild/.dtbcache.v2 differ diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo index 9a5988b..6e4b7cf 100644 Binary files a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo and b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo differ diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json index 795e787..27a7911 100644 --- a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json +++ b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/DocumentLayout.json @@ -3,21 +3,33 @@ "WorkspaceRootPath": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\systemenvirondataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml.cs||{8B382828-6202-11D1-8870-0000F87579D2}|" }, { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\common\\valuetobrushconvert.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\usercontrols\\ftpsettingview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { - "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", - "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\views\\seismometerstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\seismometerstatedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + }, + { + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\mainwindow.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + }, + { + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\views\\realtimedataview.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" }, { "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\viewmodels\\mainviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|f:\\code\\jseq\\20240301_jseq_upperpc\\jiangsuearthquake\\jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}", + "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.xaml||{F11ACC28-31D1-4C80-A34B-F4E09D3D753C}" + }, { "AbsoluteMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}", "RelativeMoniker": "D:0:0:{51CD2C1B-B7CD-4AC0-8087-846E14D316AD}|JiangsuEarthquake\\JiangsuEarthquake.csproj|solutionrelative:jiangsuearthquake\\app.config||{FA3CD31E-987B-443A-9B81-186104E8DAC1}" @@ -30,11 +42,11 @@ "DocumentGroups": [ { "DockedWidth": 163, - "SelectedChildIndex": 3, + "SelectedChildIndex": 1, "Children": [ { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "App.config", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.config", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.config", @@ -46,9 +58,58 @@ "IsPinned": true, "EditorCaption": "" }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "FTPSettingView.xaml.cs", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", + "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml.cs", + "ViewState": "AQIAAEMAAAAAAAAAAAAkwFYAAAAbAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-07-02T08:28:45.445Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "FTPSettingView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", + "RelativeToolTip": "JiangsuEarthquake\\Views\\UserControls\\FTPSettingView.xaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-07-02T08:27:40.833Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 2, + "Title": "SeismometerStateDataView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", + "RelativeToolTip": "JiangsuEarthquake\\Views\\SeismometerStateDataView.xaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-07-02T08:18:15.039Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "MainWindow.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\MainWindow.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\MainWindow.xaml", + "RelativeToolTip": "JiangsuEarthquake\\MainWindow.xaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-07-02T06:09:17.045Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "App.xaml", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\App.xaml", "RelativeDocumentMoniker": "JiangsuEarthquake\\App.xaml", @@ -60,32 +121,19 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "ValueToBrushConvert.cs", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", - "RelativeToolTip": "JiangsuEarthquake\\Common\\ValueToBrushConvert.cs", - "ViewState": "AQIAAAMAAAAAAAAAAAAAAB8AAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-07-01T05:48:58.03Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "SystemEnvironDataView.xaml", - "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml", - "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml", - "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*", - "RelativeToolTip": "JiangsuEarthquake\\Views\\SystemEnvironDataView.xaml*", + "DocumentIndex": 4, + "Title": "RealTimeDataView.xaml", + "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", + "RelativeDocumentMoniker": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", + "ToolTip": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\Views\\RealTimeDataView.xaml", + "RelativeToolTip": "JiangsuEarthquake\\Views\\RealTimeDataView.xaml", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", - "WhenOpened": "2024-07-01T01:00:30.386Z", + "WhenOpened": "2024-06-27T09:38:54.977Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 5, "Title": "MainViewModel.cs", "DocumentMoniker": "F:\\Code\\JSEQ\\20240301_JSEQ_upperpc\\JiangsuEarthquake\\JiangsuEarthquake\\ViewModels\\MainViewModel.cs", "RelativeDocumentMoniker": "JiangsuEarthquake\\ViewModels\\MainViewModel.cs", diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvert.cs similarity index 89% rename from JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs rename to JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvert.cs index e9ccbc1..f231750 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvert.cs @@ -7,14 +7,14 @@ using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -namespace JiangsuEarthquake.Common +namespace JiangsuEarthquake.Common.ValueToBrushConvert { public class ValueToBrushConvert : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { double number = ConvertToDouble(value); - if (number > ConvertToDouble(parameter)) + if (number > ConvertToDouble(parameter) || number < 0) { return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 } diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertAttitude.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertAttitude.cs new file mode 100644 index 0000000..0670316 --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertAttitude.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertAttitude : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < -20) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationCurrent.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationCurrent.cs new file mode 100644 index 0000000..ad8668f --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationCurrent.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertBoosterStationCurrent : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < 0) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationVoltage.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationVoltage.cs new file mode 100644 index 0000000..b8da69f --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertBoosterStationVoltage.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertBoosterStationVoltage : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < 200) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertElectCurrent.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertElectCurrent.cs new file mode 100644 index 0000000..51cccfa --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertElectCurrent.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertElectCurrent : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < 0) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisCurrent.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisCurrent.cs new file mode 100644 index 0000000..fb6f187 --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisCurrent.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertSeisCurrent : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < 0) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisVoltage.cs b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisVoltage.cs new file mode 100644 index 0000000..26b8376 --- /dev/null +++ b/JiangsuEarthquake/JiangsuEarthquake/Common/ValueToBrushConvert/ValueToBrushConvertSeisVoltage.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using System.Windows.Media; + +namespace JiangsuEarthquake.Common.ValueToBrushConvert +{ + public class ValueToBrushConvertSeisVoltage : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + double number = ConvertToDouble(value); + if (number > ConvertToDouble(parameter) || number < 46) + { + return new SolidColorBrush(Colors.Red); // 返回大于某个值的颜色 + } + else + { + return new SolidColorBrush(Colors.White); // 返回默认颜色或背景色 + } + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return new SolidColorBrush(Colors.Green); // 返回默认颜色或背景色 + } + + + private double ConvertToDouble(object value) + { + double d; + double.TryParse(value.ToString(), out d); + return d; + } + } +} diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/BoosterStationStateDataView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/BoosterStationStateDataView.xaml index 9b3b47a..845a775 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/BoosterStationStateDataView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/BoosterStationStateDataView.xaml @@ -7,6 +7,7 @@ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:CommonValueToBrushConvert="clr-namespace:JiangsuEarthquake.Common.ValueToBrushConvert" mc:Ignorable="d" FontFamily="{StaticResource DigitalDisplay}" Name="BoosterStationStateDataPage" @@ -93,6 +94,9 @@ + + + @@ -223,10 +227,28 @@ CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/> - - + + + + + + + + + + + + + + + + + + + + Foreground="{Binding Path=Temperature, Converter={StaticResource ValueToBrushConvert},ConverterParameter=50}"/> + + + + + + + + + - @@ -248,12 +259,39 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemMonitorDataView.xaml b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemMonitorDataView.xaml index 16e962a..203707f 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/SystemMonitorDataView.xaml +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/SystemMonitorDataView.xaml @@ -5,6 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:JiangsuEarthquake.Views" xmlns:hc="https://handyorg.github.io/handycontrol" + xmlns:CommonValueToBrushConvert="clr-namespace:JiangsuEarthquake.Common.ValueToBrushConvert" mc:Ignorable="d" FontFamily="{StaticResource DigitalDisplay}" Name="SystemMonitorDataPage" @@ -91,6 +92,10 @@ + + + + @@ -185,16 +190,61 @@ CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml.cs b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml.cs index 6c36f38..de74a37 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/Views/UserControls/FTPSettingView.xaml.cs @@ -84,7 +84,7 @@ namespace JiangsuEarthquake.Views.UserControls private void TimerDownloadFileMsgHidden_Tick(object sender, EventArgs e) { - DownloadFileBtn.Visibility = Visibility.Hidden; + DownloadFileMsg.Visibility = Visibility.Hidden; // 停止定时器 (sender as DispatcherTimer).Stop(); @@ -109,6 +109,11 @@ namespace JiangsuEarthquake.Views.UserControls { ftpcon.Download(ftpList.datagrid2Path, ft.FileName); RefreshLocalList(ftpList.datagrid2Path); + + DownloadFileMsg.Visibility = Visibility.Visible; + DownloadFileMsg.Text = "文件下载成功"; + DownloadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerDownloadFileMsgHidden.Start(); } else { @@ -121,6 +126,11 @@ namespace JiangsuEarthquake.Views.UserControls //再将新文件拷贝进来 ftpcon.Download(ftpList.datagrid2Path, ft.FileName); RefreshLocalList(ftpList.datagrid2Path); + + DownloadFileMsg.Visibility = Visibility.Visible; + DownloadFileMsg.Text = "文件下载成功"; + DownloadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerDownloadFileMsgHidden.Start(); break; case MessageBoxResult.No: return; @@ -131,7 +141,7 @@ namespace JiangsuEarthquake.Views.UserControls private void TimerUploadFileMsgHidden_Tick(object sender, EventArgs e) { - UploadFileBtn.Visibility = Visibility.Hidden; + UploadFileMsg.Visibility = Visibility.Hidden; // 停止定时器 (sender as DispatcherTimer).Stop(); @@ -158,6 +168,11 @@ namespace JiangsuEarthquake.Views.UserControls { ftpcon.Upload(item.FilePath); //上传 RefreshFTPList(ftpList.datagrid1Path); //刷新 + + UploadFileMsg.Visibility = Visibility.Visible; + UploadFileMsg.Text = "文件上传成功"; + UploadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerUploadFileMsgHidden.Start(); } else //文件夹存在 { @@ -171,6 +186,11 @@ namespace JiangsuEarthquake.Views.UserControls ftpcon.Upload(item.FilePath); //上传文件夹 //刷新一下界面 RefreshFTPList(ftpList.datagrid1Path); + + UploadFileMsg.Visibility = Visibility.Visible; + UploadFileMsg.Text = "文件上传成功"; + UploadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerUploadFileMsgHidden.Start(); break; case MessageBoxResult.No: return; @@ -183,6 +203,11 @@ namespace JiangsuEarthquake.Views.UserControls { ftpcon.Upload(item.FilePath); //上传 RefreshFTPList(ftpList.datagrid1Path); //刷新 + + UploadFileMsg.Visibility = Visibility.Visible; + UploadFileMsg.Text = "文件上传成功"; + UploadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerUploadFileMsgHidden.Start(); } else //文件存在 { @@ -196,6 +221,11 @@ namespace JiangsuEarthquake.Views.UserControls ftpcon.Upload(item.FilePath); //上传文件 //刷新一下界面 RefreshFTPList(ftpList.datagrid1Path); + + UploadFileMsg.Visibility = Visibility.Visible; + UploadFileMsg.Text = "文件上传成功"; + UploadFileMsg.Foreground = new SolidColorBrush(Colors.Green); + timerUploadFileMsgHidden.Start(); break; case MessageBoxResult.No: return; diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll index 85c2bca..316f34b 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe index 6b6bdcb..a10c1a1 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.exe differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb index 2ca8093..ac521a6 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/JiangsuEarthquake.pdb differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.dll b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.dll index b54abe5..8e0d00a 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.dll and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.pdb b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.pdb index 50c297c..bba9dee 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.pdb and b/JiangsuEarthquake/JiangsuEarthquake/bin/Debug/net6.0-windows/Models.pdb differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs index 2ed19bd..e896909 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e4f33fb92f9b7b188935537dac455facf0d42e")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a63c18e22aa6a442f53b0452bfd8ff0a6d0c46d3")] [assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache index b0005c3..cfbbf8d 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache @@ -1 +1 @@ -7bf5efeac69639c23ca08f4c4595a9e9bebc11ac630cc88303a67dad3f176a4a +3fb8aeb6426e7d5762f43ce379d38917fc37fbba0d2c06c7236ec44f650e0d55 diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.AssemblyReference.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.AssemblyReference.cache index a544004..02cfba6 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.AssemblyReference.cache and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.AssemblyReference.cache differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.CoreCompileInputs.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.CoreCompileInputs.cache index 0b26ef5..9b661df 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.CoreCompileInputs.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3cd7b80e311dd15b7ccd8cb1726d7fdfaa361e0f77a6cbd65d8c0136377baf0a +dacee3c7ea62742a6e1a0d6d0bba5a3e83779f4cd5fa0d9160a8e371a0bbf091 diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll index 85c2bca..316f34b 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources index ff31770..c6a13f2 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.g.resources differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb index 2ca8093..ac521a6 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.pdb differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.cache index ff855fe..52acdb7 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.cache @@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml 20-1982183921 11052456543 -831881365496 +89-1062356394 227-921550327 Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SeismometerParameterView.xaml;Views\SeismometerStateDataView.xaml;Views\SystemControlView.xaml;Views\SystemEnvironDataView.xaml;Views\SystemMonitorDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\FTPConnectSstView.xaml;Views\UserControls\FTPSettingView.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\OtherSettingView.xaml;Views\UserControls\TextDialog.xaml; diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache index 13dbab5..c0f921e 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake_MarkupCompile.i.cache @@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP F:\Code\JSEQ\20240301_JSEQ_upperpc\JiangsuEarthquake\JiangsuEarthquake\App.xaml 20-1982183921 11052456543 -85-1284398623 +9166846783 227-921550327 Assets\Styles\DefaultStyle.xaml;ImageDictionary.xaml;MainWindow.xaml;Views\AlarmRecordView.xaml;Views\BoosterStationStateDataView.xaml;Views\LogRecordView.xaml;Views\RealTimeDataView.xaml;Views\SeismometerParameterView.xaml;Views\SeismometerStateDataView.xaml;Views\SystemControlView.xaml;Views\SystemEnvironDataView.xaml;Views\SystemMonitorDataView.xaml;Views\UserControls\AlarmSettingView.xaml;Views\UserControls\BaseStationModel.xaml;Views\UserControls\FTPConnectSstView.xaml;Views\UserControls\FTPSettingView.xaml;Views\UserControls\InitialView.xaml;Views\UserControls\InitialView1.xaml;Views\UserControls\OtherSettingView.xaml;Views\UserControls\TextDialog.xaml; diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.cs index 78945e0..849cc0d 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\BoosterStationStateDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F7BE1EB62BF34D4A638701CD64377EA4139DCC61" +#pragma checksum "..\..\..\..\Views\BoosterStationStateDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F2C24F73E4E73974793972B681E0BC1BF8A04CBC" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -21,6 +21,7 @@ using HandyControl.Themes; using HandyControl.Tools; using HandyControl.Tools.Converter; using HandyControl.Tools.Extension; +using JiangsuEarthquake.Common.ValueToBrushConvert; using JiangsuEarthquake.Views; using LiveCharts.Wpf; using MaterialDesignThemes.Wpf; @@ -59,7 +60,7 @@ namespace JiangsuEarthquake.Views { public partial class BoosterStationStateDataView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 12 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 13 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal JiangsuEarthquake.Views.BoosterStationStateDataView BoosterStationStateDataPage; @@ -67,7 +68,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 196 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 200 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid BoosterStationStateDataGrid; @@ -75,7 +76,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 270 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 292 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button DownloadDataBtn; @@ -83,7 +84,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 282 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 304 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock DownloadDataMsg; @@ -91,7 +92,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 301 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 323 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal LiveCharts.Wpf.CartesianChart CartesianChart; @@ -99,7 +100,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 429 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 451 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock AskDataMsg; @@ -107,7 +108,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 440 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 462 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox CycleRequestCycleTextBox; @@ -115,7 +116,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 448 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 470 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button AskDataBtn; @@ -123,7 +124,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 465 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 487 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button RefreshDataBtn; diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.i.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.i.cs index 78945e0..849cc0d 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.i.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/Views/BoosterStationStateDataView.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\..\..\Views\BoosterStationStateDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F7BE1EB62BF34D4A638701CD64377EA4139DCC61" +#pragma checksum "..\..\..\..\Views\BoosterStationStateDataView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F2C24F73E4E73974793972B681E0BC1BF8A04CBC" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -21,6 +21,7 @@ using HandyControl.Themes; using HandyControl.Tools; using HandyControl.Tools.Converter; using HandyControl.Tools.Extension; +using JiangsuEarthquake.Common.ValueToBrushConvert; using JiangsuEarthquake.Views; using LiveCharts.Wpf; using MaterialDesignThemes.Wpf; @@ -59,7 +60,7 @@ namespace JiangsuEarthquake.Views { public partial class BoosterStationStateDataView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { - #line 12 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 13 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal JiangsuEarthquake.Views.BoosterStationStateDataView BoosterStationStateDataPage; @@ -67,7 +68,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 196 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 200 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.DataGrid BoosterStationStateDataGrid; @@ -75,7 +76,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 270 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 292 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button DownloadDataBtn; @@ -83,7 +84,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 282 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 304 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock DownloadDataMsg; @@ -91,7 +92,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 301 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 323 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal LiveCharts.Wpf.CartesianChart CartesianChart; @@ -99,7 +100,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 429 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 451 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBlock AskDataMsg; @@ -107,7 +108,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 440 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 462 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.TextBox CycleRequestCycleTextBox; @@ -115,7 +116,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 448 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 470 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button AskDataBtn; @@ -123,7 +124,7 @@ namespace JiangsuEarthquake.Views { #line hidden - #line 465 "..\..\..\..\Views\BoosterStationStateDataView.xaml" + #line 487 "..\..\..\..\Views\BoosterStationStateDataView.xaml" [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] internal System.Windows.Controls.Button RefreshDataBtn; diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe index 6b6bdcb..a10c1a1 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/apphost.exe differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll index 6a700fe..37e4179 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/ref/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll index 6a700fe..37e4179 100644 Binary files a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll and b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/refint/JiangsuEarthquake.dll differ diff --git a/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.dll b/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.dll index b54abe5..8e0d00a 100644 Binary files a/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.dll and b/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.dll differ diff --git a/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.pdb b/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.pdb index 50c297c..bba9dee 100644 Binary files a/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.pdb and b/JiangsuEarthquake/Models/bin/Debug/net6.0-windows/Models.pdb differ diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfo.cs b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfo.cs index 5f38a87..55e8e5f 100644 --- a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfo.cs +++ b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Models")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e4f33fb92f9b7b188935537dac455facf0d42e")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a63c18e22aa6a442f53b0452bfd8ff0a6d0c46d3")] [assembly: System.Reflection.AssemblyProductAttribute("Models")] [assembly: System.Reflection.AssemblyTitleAttribute("Models")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfoInputs.cache b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfoInputs.cache index 3a8d6ce..75576d7 100644 --- a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfoInputs.cache +++ b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.AssemblyInfoInputs.cache @@ -1 +1 @@ -3ff762f67b08840642491b1010933790442ecfba24d82f7ada35259350440267 +0bb923e93dae729920b733d856d011d9f5592f03d291c3acb80288a83abc81d1 diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.dll b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.dll index b54abe5..8e0d00a 100644 Binary files a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.dll and b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.dll differ diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.pdb b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.pdb index 50c297c..bba9dee 100644 Binary files a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.pdb and b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/Models.pdb differ diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/ref/Models.dll b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/ref/Models.dll index f5a6d95..bb297a7 100644 Binary files a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/ref/Models.dll and b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/ref/Models.dll differ diff --git a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/refint/Models.dll b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/refint/Models.dll index f5a6d95..bb297a7 100644 Binary files a/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/refint/Models.dll and b/JiangsuEarthquake/Models/obj/Debug/net6.0-windows/refint/Models.dll differ