新增功能：
1 解决根据相应阈值无法更改前景色的问题，并对所有需要提醒的数值进行判断； 2 对FTP删除进行测试，解决无法删除的问题； 3 解决FTP上传下载不提示的问题；
This commit is contained in:
parent
a63c18e22a
commit
d405d4b3b6
Binary file not shown.
Binary file not shown.
@ -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",
|
||||
|
||||
@ -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); // 返回大于某个值的颜色
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertBoosterStationVoltage x:Key="ValueToBrushConvertBoosterStationVoltage"/>
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertBoosterStationCurrent x:Key="ValueToBrushConvertBoosterStationCurrent"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid>
|
||||
@ -223,10 +227,28 @@
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding RecordTime, StringFormat='yyyy/MM/dd HH:mm:ss'}" Width="1.8*" Header="记录时间"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding In_Vol,StringFormat=F2}" Width="*" Header="输入电压 V"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding In_Cur,StringFormat=F2}" Width="*" Header="输入电流 A"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding In_Vol,StringFormat=F2}" Width="*" Header="输入电压 V"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--升压站输入电压设置范围为：200-240-->
|
||||
<DataGridTemplateColumn Width="*" Header="输入电压 V" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding In_Vol,StringFormat=F2}"
|
||||
Foreground="{Binding Path=In_Vol, Converter={StaticResource ValueToBrushConvertBoosterStationVoltage},ConverterParameter=240}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding In_Cur,StringFormat=F2}" Width="*" Header="输入电流 A"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--升压站输入电流设置范围为：0-5-->
|
||||
<DataGridTemplateColumn Width="*" Header="输入电流 A" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding In_Cur,StringFormat=F2}"
|
||||
Foreground="{Binding Path=In_Cur, Converter={StaticResource ValueToBrushConvertBoosterStationCurrent},ConverterParameter=5}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Binding="{Binding Power,StringFormat=F2}" Width="*" Header="功率 W"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding RelayStatus}" Width="*" Header="继电器状态"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
xmlns:local="clr-namespace:JiangsuEarthquake.Views"
|
||||
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
|
||||
xmlns:hc="https://handyorg.github.io/handycontrol"
|
||||
xmlns:Common="clr-namespace:JiangsuEarthquake.Common"
|
||||
xmlns:CommonValueToBrushConvert="clr-namespace:JiangsuEarthquake.Common.ValueToBrushConvert"
|
||||
mc:Ignorable="d"
|
||||
FontFamily="{StaticResource DigitalDisplay}"
|
||||
Name="SystemStateDataPage"
|
||||
@ -120,7 +120,8 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Common:ValueToBrushConvert x:Key="ValueToBrushConvert"/>
|
||||
<CommonValueToBrushConvert:ValueToBrushConvert x:Key="ValueToBrushConvert"/>
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertAttitude x:Key="ValueToBrushConvertAttitude"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid>
|
||||
@ -224,16 +225,26 @@
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding Temperature,StringFormat=F2}" Width="0.7*" Header="温度 ℃"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--接驳盒内部温度设置范围为：0-50-->
|
||||
<DataGridTemplateColumn Width="0.7*" Header="温度 ℃" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Temperature,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Temperature, Converter={StaticResource ValueToBrushConvert},ConverterParameter=20}"/>
|
||||
Foreground="{Binding Path=Temperature, Converter={StaticResource ValueToBrushConvert},ConverterParameter=50}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding Humidity,StringFormat=F2}" Width="0.7*" Header="湿度 %"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--接驳盒内部湿度设置范围为：0-60-->
|
||||
<DataGridTemplateColumn Width="0.7*" Header="湿度 %" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Humidity,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Humidity, Converter={StaticResource ValueToBrushConvert},ConverterParameter=60}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Binding="{Binding Humidity,StringFormat=F2}" Width="0.7*" Header="湿度 %"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTemplateColumn Header="舱门状态" Width="0.9*" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
@ -248,12 +259,39 @@
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Binding="{Binding AttitudeX,StringFormat=F2}" Width="0.8*" Header="横滚角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding AttitudeY,StringFormat=F2}" Width="0.8*" Header="俯仰角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding AttitudeZ,StringFormat=F2}" Width="0.8*" Header="偏航角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding AttitudeX,StringFormat=F2}" Width="0.8*" Header="横滚角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--接驳盒横滚角设置范围为：-20-20-->
|
||||
<DataGridTemplateColumn Width="0.8*" Header="横滚角 °" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding AttitudeX,StringFormat=F2}"
|
||||
Foreground="{Binding Path=AttitudeX, Converter={StaticResource ValueToBrushConvertAttitude},ConverterParameter=20}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding AttitudeY,StringFormat=F2}" Width="0.8*" Header="俯仰角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--接驳盒俯仰角设置范围为：-20-20-->
|
||||
<DataGridTemplateColumn Width="0.8*" Header="俯仰角 °" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding AttitudeY,StringFormat=F2}"
|
||||
Foreground="{Binding Path=AttitudeY, Converter={StaticResource ValueToBrushConvertAttitude},ConverterParameter=20}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding AttitudeZ,StringFormat=F2}" Width="0.8*" Header="偏航角 °"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--接驳盒偏航角设置范围为：-20-20-->
|
||||
<DataGridTemplateColumn Width="0.8*" Header="偏航角 °" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding AttitudeZ,StringFormat=F2}"
|
||||
Foreground="{Binding Path=AttitudeZ, Converter={StaticResource ValueToBrushConvertAttitude},ConverterParameter=20}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
|
||||
@ -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 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertSeisVoltage x:Key="ValueToBrushConvertSeisVoltage"/>
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertSeisCurrent x:Key="ValueToBrushConvertSeisCurrent"/>
|
||||
<CommonValueToBrushConvert:ValueToBrushConvertElectCurrent x:Key="ValueToBrushConvertElectCurrent"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid>
|
||||
@ -185,16 +190,61 @@
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding RecordTime, StringFormat='yyyy/MM/dd HH:mm:ss'}" Width="1.8*" Header="记录时间"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Seis1_Voltage}" Width="*" Header="主地震仪电压"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Seis1_Current}" Width="*" Header="主地震仪电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Seis2_Voltage}" Width="*" Header="备地震仪电压"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Seis2_Current}" Width="*" Header="备地震仪电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Elect_Current}" Width="0.8*" Header="电磁电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<!--<DataGridTextColumn Binding="{Binding Seis1_Voltage}" Width="*" Header="主地震仪电压"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--主地震仪电压设置范围为：46-50-->
|
||||
<DataGridTemplateColumn Width="*" Header="主地震仪电压 V" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Seis1_Voltage,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Seis1_Voltage, Converter={StaticResource ValueToBrushConvertSeisVoltage},ConverterParameter=50}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding Seis1_Current}" Width="*" Header="主地震仪电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--主地震仪电流设置范围为：0-5-->
|
||||
<DataGridTemplateColumn Width="*" Header="主地震仪电流 A" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Seis1_Current,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Seis1_Current, Converter={StaticResource ValueToBrushConvertSeisCurrent},ConverterParameter=5}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding Seis2_Voltage}" Width="*" Header="备地震仪电压"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--备地震仪电压设置范围为：46-50-->
|
||||
<DataGridTemplateColumn Width="*" Header="备地震仪电压 V" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Seis2_Voltage,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Seis2_Voltage, Converter={StaticResource ValueToBrushConvertSeisVoltage},ConverterParameter=50}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding Seis2_Current}" Width="*" Header="备地震仪电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--备地震仪电流设置范围为：0-5-->
|
||||
<DataGridTemplateColumn Width="*" Header="备地震仪电流 A" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Seis2_Current,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Seis2_Current, Converter={StaticResource ValueToBrushConvertSeisCurrent},ConverterParameter=5}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<!--<DataGridTextColumn Binding="{Binding Elect_Current}" Width="0.8*" Header="电磁电流"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>-->
|
||||
<!--电磁电流设置范围为：0-5-->
|
||||
<DataGridTemplateColumn Width="*" Header="电磁电流 A" CellStyle="{StaticResource DataGridCellCenter}">
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
<TextBlock HorizontalAlignment="Center" Text="{Binding Elect_Current,StringFormat=F2}"
|
||||
Foreground="{Binding Path=Elect_Current, Converter={StaticResource ValueToBrushConvertElectCurrent},ConverterParameter=5}"/>
|
||||
</DataTemplate>
|
||||
</DataGridTemplateColumn.CellTemplate>
|
||||
</DataGridTemplateColumn>
|
||||
<DataGridTextColumn Binding="{Binding Out_Voltage12_Reserved1}" Width="*" Header="预留12V输出电压1"
|
||||
CanUserSort="False" CellStyle="{StaticResource DataGridCellCenter}"/>
|
||||
<DataGridTextColumn Binding="{Binding Out_Voltage12_Reserved2}" Width="*" Header="预留12V输出电压2"
|
||||
|
||||
@ -367,9 +367,7 @@
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<TextBlock Name="DownloadFileMsg" Text="{Binding DownloadFileMsg}"
|
||||
Foreground="{Binding DownloadFileMsgForeground}" FontSize="14"
|
||||
Margin="0,10,0,0" Visibility="{Binding DownloadFileMsgVisibility}"
|
||||
<TextBlock Name="DownloadFileMsg" FontSize="14" Margin="0,10,0,0"
|
||||
HorizontalAlignment="Center"/>
|
||||
|
||||
<Button Name="UploadFileBtn" Style="{StaticResource ButtonStyle}" Margin="0,50,0,0"
|
||||
@ -391,9 +389,7 @@
|
||||
</Button.Content>
|
||||
</Button>
|
||||
|
||||
<TextBlock Name="UploadFileMsg" Text="{Binding UploadFileMsg}"
|
||||
Foreground="{Binding UploadFileMsgForeground}" FontSize="14"
|
||||
Margin="0,10,0,0" Visibility="{Binding UploadFileMsgVisibility}"
|
||||
<TextBlock Name="UploadFileMsg" FontSize="14" Margin="0,10,0,0"
|
||||
HorizontalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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")]
|
||||
|
||||
@ -1 +1 @@
|
||||
7bf5efeac69639c23ca08f4c4595a9e9bebc11ac630cc88303a67dad3f176a4a
|
||||
3fb8aeb6426e7d5762f43ce379d38917fc37fbba0d2c06c7236ec44f650e0d55
|
||||
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
3cd7b80e311dd15b7ccd8cb1726d7fdfaa361e0f77a6cbd65d8c0136377baf0a
|
||||
dacee3c7ea62742a6e1a0d6d0bba5a3e83779f4cd5fa0d9160a8e371a0bbf091
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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"
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
@ -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;
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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")]
|
||||
|
||||
@ -1 +1 @@
|
||||
3ff762f67b08840642491b1010933790442ecfba24d82f7ada35259350440267
|
||||
0bb923e93dae729920b733d856d011d9f5592f03d291c3acb80288a83abc81d1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user