diff --git a/PipeGallery/ViewModel/HomePageViewModel.cs b/PipeGallery/ViewModel/HomePageViewModel.cs
index b7d1c6b..03cb99f 100644
--- a/PipeGallery/ViewModel/HomePageViewModel.cs
+++ b/PipeGallery/ViewModel/HomePageViewModel.cs
@@ -1,9 +1,4 @@
using PipeGallery.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Threading;
namespace PipeGallery.ViewModel
{
@@ -14,15 +9,11 @@
///
/// 绑定干扰频段值
///
-
string _interfereValue = string.Empty;
public string InterfereValue
{
- get
- {
- return _interfereValue;
- }
+ get { return _interfereValue; }
set
{
if (_interfereValue != value)
@@ -34,19 +25,14 @@
}
-
///
/// 绑定过滤器值
///
-
string _filterValue = string.Empty;
public string FilterValue
{
- get
- {
- return _filterValue;
- }
+ get { return _filterValue; }
set
{
if (_filterValue != value)
@@ -60,15 +46,11 @@
///
/// 绑定过信噪比
///
-
string _snr = string.Empty;
public string SNR
{
- get
- {
- return _snr;
- }
+ get { return _snr; }
set
{
if (_snr != value)
@@ -83,15 +65,11 @@
///
/// 绑定管道值
///
-
string _pipeline = string.Empty;
public string PipeLine
{
- get
- {
- return _pipeline;
- }
+ get { return _pipeline; }
set
{
if (_pipeline != value)
@@ -127,15 +105,11 @@
///
/// 绑定声速值
///
-
string _soundSpeed = string.Empty;
public string SoundSpeed
{
- get
- {
- return _soundSpeed;
- }
+ get { return _soundSpeed; }
set
{
if (_soundSpeed != value)
@@ -149,15 +123,11 @@
///
/// 绑定经过了值
///
-
string _pass = string.Empty;
public string Pass
{
- get
- {
- return _pass;
- }
+ get { return _pass; }
set
{
if (_pass != value)
@@ -172,15 +142,11 @@
///
/// 发射机A电量 0-100
///
-
double _transmitterABattery = 0;
public double TransmitterABattery
{
- get
- {
- return _transmitterABattery;
- }
+ get { return _transmitterABattery; }
set
{
if (_transmitterABattery != value)
@@ -194,15 +160,11 @@
///
/// 发射机B电量 0-100
///
-
double _transmitterBBattery = 0;
public double TransmitterBBattery
{
- get
- {
- return _transmitterBBattery;
- }
+ get { return _transmitterBBattery; }
set
{
if (_transmitterBBattery != value)
@@ -216,15 +178,11 @@
///
/// X总距离
///
-
double _totalDistance = 0;
public double TotalDistance
{
- get
- {
- return _totalDistance;
- }
+ get { return _totalDistance; }
set
{
if (_totalDistance != value)
@@ -238,15 +196,11 @@
///
/// 速度距离
///
-
double _speedDistance = 0;
public double SpeedDistance
{
- get
- {
- return _speedDistance;
- }
+ get { return _speedDistance; }
set
{
if (_speedDistance != value)
@@ -260,15 +214,11 @@
///
/// 速度显示值
///
-
- string _speedValue ;
+ string _speedValue;
public string SpeedValue
{
- get
- {
- return _speedValue;
- }
+ get { return _speedValue; }
set
{
if (_speedValue != value)
@@ -282,15 +232,11 @@
///
/// 速度显示值位置
///
-
int _speedValuePos;
public int SpeedValuePos
{
- get
- {
- return _speedValuePos;
- }
+ get { return _speedValuePos; }
set
{
if (_speedValuePos != value)
@@ -304,15 +250,11 @@
///
/// 发射机A距离
///
-
double _transmitterADistance = 0;
public double TransmitterADistance
{
- get
- {
- return _transmitterADistance;
- }
+ get { return _transmitterADistance; }
set
{
if (_transmitterADistance != value)
@@ -326,15 +268,11 @@
///
/// 发射机B距离
///
-
double _transmitterBDistance = 0;
public double TransmitterBDistance
{
- get
- {
- return _transmitterBDistance;
- }
+ get { return _transmitterBDistance; }
set
{
if (_transmitterBDistance != value)
@@ -348,15 +286,11 @@
///
/// 发射机A信号强度0-5
///
-
int _transmitterASignalIntensity;
public int TransmitterASignalIntensity
{
- get
- {
- return _transmitterASignalIntensity;
- }
+ get { return _transmitterASignalIntensity; }
set
{
if (_transmitterASignalIntensity != value)
@@ -370,15 +304,11 @@
///
/// 发射机B信号强度0-5
///
-
int _transmitterBSignalIntensity;
public int TransmitterBSignalIntensity
{
- get
- {
- return _transmitterBSignalIntensity;
- }
+ get { return _transmitterBSignalIntensity; }
set
{
if (_transmitterBSignalIntensity != value)
@@ -392,15 +322,11 @@
///
/// 发射机A是否故障
///
-
bool _transmitterAFault;
public bool TransmitterAFault
{
- get
- {
- return _transmitterAFault;
- }
+ get { return _transmitterAFault; }
set
{
if (_transmitterAFault != value)
@@ -414,15 +340,11 @@
///
/// 发射机B是否故障
///
-
bool _transmitterBFault;
public bool TransmitterBFault
{
- get
- {
- return _transmitterBFault;
- }
+ get { return _transmitterBFault; }
set
{
if (_transmitterBFault != value)
@@ -437,15 +359,11 @@
///
/// 开始/停止
///
-
bool _startState;
public bool StartState
{
- get
- {
- return _startState;
- }
+ get { return _startState; }
set
{
if (_startState != value)
@@ -459,15 +377,11 @@
///
/// 过滤器按钮是否可用
///
-
bool _btnFilterIsEnabled;
public bool BtnFilterIsEnabled
{
- get
- {
- return _btnFilterIsEnabled;
- }
+ get { return _btnFilterIsEnabled; }
set
{
if (_btnFilterIsEnabled != value)
@@ -481,15 +395,11 @@
///
/// 听音按钮是否可用
///
-
bool _btnAuditionIsEnabled;
public bool BtnAuditionIsEnabled
{
- get
- {
- return _btnAuditionIsEnabled;
- }
+ get { return _btnAuditionIsEnabled; }
set
{
if (_btnAuditionIsEnabled != value)
@@ -503,15 +413,11 @@
///
/// 快照按钮是否可用
///
-
bool _btnSnapshotIsEnabled;
public bool BtnSnapshotIsEnabled
{
- get
- {
- return _btnSnapshotIsEnabled;
- }
+ get { return _btnSnapshotIsEnabled; }
set
{
if (_btnSnapshotIsEnabled != value)
@@ -525,15 +431,11 @@
///
/// 复位按钮是否可用
///
-
bool _btnResetIsEnabled;
public bool BtnResetIsEnabled
{
- get
- {
- return _btnResetIsEnabled;
- }
+ get { return _btnResetIsEnabled; }
set
{
if (_btnResetIsEnabled != value)
@@ -547,15 +449,11 @@
///
/// 开始按钮是否可用
///
-
bool _btnStartIsEnabled;
public bool BtnStartIsEnabled
{
- get
- {
- return _btnStartIsEnabled;
- }
+ get { return _btnStartIsEnabled; }
set
{
if (_btnStartIsEnabled != value)
@@ -569,15 +467,11 @@
///
/// 保存按钮是否可用
///
-
bool _btnSaveIsEnabled;
public bool BtnSaveIsEnabled
{
- get
- {
- return _btnSaveIsEnabled;
- }
+ get { return _btnSaveIsEnabled; }
set
{
if (_btnSaveIsEnabled != value)
@@ -591,15 +485,11 @@
///
/// 测距按钮是否可用
///
-
bool _btnRangingIsEnabled;
public bool BtnRangingIsEnabled
{
- get
- {
- return _btnRangingIsEnabled;
- }
+ get { return _btnRangingIsEnabled; }
set
{
if (_btnRangingIsEnabled != value)
@@ -616,10 +506,10 @@
public HomePageViewModel()
{
-
}
private static HomePageViewModel _instance = null;
+
public static HomePageViewModel Instance
{
get
@@ -627,7 +517,6 @@
if (_instance == null)
{
_instance = new HomePageViewModel();
-
}
return _instance;
@@ -635,6 +524,5 @@
}
#endregion
-
}
-}
+}
\ No newline at end of file
diff --git a/PipeGallery/ViewModel/HomePageViewModel.cs b/PipeGallery/ViewModel/HomePageViewModel.cs
index b7d1c6b..03cb99f 100644
--- a/PipeGallery/ViewModel/HomePageViewModel.cs
+++ b/PipeGallery/ViewModel/HomePageViewModel.cs
@@ -1,9 +1,4 @@
using PipeGallery.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Threading;
namespace PipeGallery.ViewModel
{
@@ -14,15 +9,11 @@
///
/// 绑定干扰频段值
///
-
string _interfereValue = string.Empty;
public string InterfereValue
{
- get
- {
- return _interfereValue;
- }
+ get { return _interfereValue; }
set
{
if (_interfereValue != value)
@@ -34,19 +25,14 @@
}
-
///
/// 绑定过滤器值
///
-
string _filterValue = string.Empty;
public string FilterValue
{
- get
- {
- return _filterValue;
- }
+ get { return _filterValue; }
set
{
if (_filterValue != value)
@@ -60,15 +46,11 @@
///
/// 绑定过信噪比
///
-
string _snr = string.Empty;
public string SNR
{
- get
- {
- return _snr;
- }
+ get { return _snr; }
set
{
if (_snr != value)
@@ -83,15 +65,11 @@
///
/// 绑定管道值
///
-
string _pipeline = string.Empty;
public string PipeLine
{
- get
- {
- return _pipeline;
- }
+ get { return _pipeline; }
set
{
if (_pipeline != value)
@@ -127,15 +105,11 @@
///
/// 绑定声速值
///
-
string _soundSpeed = string.Empty;
public string SoundSpeed
{
- get
- {
- return _soundSpeed;
- }
+ get { return _soundSpeed; }
set
{
if (_soundSpeed != value)
@@ -149,15 +123,11 @@
///
/// 绑定经过了值
///
-
string _pass = string.Empty;
public string Pass
{
- get
- {
- return _pass;
- }
+ get { return _pass; }
set
{
if (_pass != value)
@@ -172,15 +142,11 @@
///
/// 发射机A电量 0-100
///
-
double _transmitterABattery = 0;
public double TransmitterABattery
{
- get
- {
- return _transmitterABattery;
- }
+ get { return _transmitterABattery; }
set
{
if (_transmitterABattery != value)
@@ -194,15 +160,11 @@
///
/// 发射机B电量 0-100
///
-
double _transmitterBBattery = 0;
public double TransmitterBBattery
{
- get
- {
- return _transmitterBBattery;
- }
+ get { return _transmitterBBattery; }
set
{
if (_transmitterBBattery != value)
@@ -216,15 +178,11 @@
///
/// X总距离
///
-
double _totalDistance = 0;
public double TotalDistance
{
- get
- {
- return _totalDistance;
- }
+ get { return _totalDistance; }
set
{
if (_totalDistance != value)
@@ -238,15 +196,11 @@
///
/// 速度距离
///
-
double _speedDistance = 0;
public double SpeedDistance
{
- get
- {
- return _speedDistance;
- }
+ get { return _speedDistance; }
set
{
if (_speedDistance != value)
@@ -260,15 +214,11 @@
///
/// 速度显示值
///
-
- string _speedValue ;
+ string _speedValue;
public string SpeedValue
{
- get
- {
- return _speedValue;
- }
+ get { return _speedValue; }
set
{
if (_speedValue != value)
@@ -282,15 +232,11 @@
///
/// 速度显示值位置
///
-
int _speedValuePos;
public int SpeedValuePos
{
- get
- {
- return _speedValuePos;
- }
+ get { return _speedValuePos; }
set
{
if (_speedValuePos != value)
@@ -304,15 +250,11 @@
///
/// 发射机A距离
///
-
double _transmitterADistance = 0;
public double TransmitterADistance
{
- get
- {
- return _transmitterADistance;
- }
+ get { return _transmitterADistance; }
set
{
if (_transmitterADistance != value)
@@ -326,15 +268,11 @@
///
/// 发射机B距离
///
-
double _transmitterBDistance = 0;
public double TransmitterBDistance
{
- get
- {
- return _transmitterBDistance;
- }
+ get { return _transmitterBDistance; }
set
{
if (_transmitterBDistance != value)
@@ -348,15 +286,11 @@
///
/// 发射机A信号强度0-5
///
-
int _transmitterASignalIntensity;
public int TransmitterASignalIntensity
{
- get
- {
- return _transmitterASignalIntensity;
- }
+ get { return _transmitterASignalIntensity; }
set
{
if (_transmitterASignalIntensity != value)
@@ -370,15 +304,11 @@
///
/// 发射机B信号强度0-5
///
-
int _transmitterBSignalIntensity;
public int TransmitterBSignalIntensity
{
- get
- {
- return _transmitterBSignalIntensity;
- }
+ get { return _transmitterBSignalIntensity; }
set
{
if (_transmitterBSignalIntensity != value)
@@ -392,15 +322,11 @@
///
/// 发射机A是否故障
///
-
bool _transmitterAFault;
public bool TransmitterAFault
{
- get
- {
- return _transmitterAFault;
- }
+ get { return _transmitterAFault; }
set
{
if (_transmitterAFault != value)
@@ -414,15 +340,11 @@
///
/// 发射机B是否故障
///
-
bool _transmitterBFault;
public bool TransmitterBFault
{
- get
- {
- return _transmitterBFault;
- }
+ get { return _transmitterBFault; }
set
{
if (_transmitterBFault != value)
@@ -437,15 +359,11 @@
///
/// 开始/停止
///
-
bool _startState;
public bool StartState
{
- get
- {
- return _startState;
- }
+ get { return _startState; }
set
{
if (_startState != value)
@@ -459,15 +377,11 @@
///
/// 过滤器按钮是否可用
///
-
bool _btnFilterIsEnabled;
public bool BtnFilterIsEnabled
{
- get
- {
- return _btnFilterIsEnabled;
- }
+ get { return _btnFilterIsEnabled; }
set
{
if (_btnFilterIsEnabled != value)
@@ -481,15 +395,11 @@
///
/// 听音按钮是否可用
///
-
bool _btnAuditionIsEnabled;
public bool BtnAuditionIsEnabled
{
- get
- {
- return _btnAuditionIsEnabled;
- }
+ get { return _btnAuditionIsEnabled; }
set
{
if (_btnAuditionIsEnabled != value)
@@ -503,15 +413,11 @@
///
/// 快照按钮是否可用
///
-
bool _btnSnapshotIsEnabled;
public bool BtnSnapshotIsEnabled
{
- get
- {
- return _btnSnapshotIsEnabled;
- }
+ get { return _btnSnapshotIsEnabled; }
set
{
if (_btnSnapshotIsEnabled != value)
@@ -525,15 +431,11 @@
///
/// 复位按钮是否可用
///
-
bool _btnResetIsEnabled;
public bool BtnResetIsEnabled
{
- get
- {
- return _btnResetIsEnabled;
- }
+ get { return _btnResetIsEnabled; }
set
{
if (_btnResetIsEnabled != value)
@@ -547,15 +449,11 @@
///
/// 开始按钮是否可用
///
-
bool _btnStartIsEnabled;
public bool BtnStartIsEnabled
{
- get
- {
- return _btnStartIsEnabled;
- }
+ get { return _btnStartIsEnabled; }
set
{
if (_btnStartIsEnabled != value)
@@ -569,15 +467,11 @@
///
/// 保存按钮是否可用
///
-
bool _btnSaveIsEnabled;
public bool BtnSaveIsEnabled
{
- get
- {
- return _btnSaveIsEnabled;
- }
+ get { return _btnSaveIsEnabled; }
set
{
if (_btnSaveIsEnabled != value)
@@ -591,15 +485,11 @@
///
/// 测距按钮是否可用
///
-
bool _btnRangingIsEnabled;
public bool BtnRangingIsEnabled
{
- get
- {
- return _btnRangingIsEnabled;
- }
+ get { return _btnRangingIsEnabled; }
set
{
if (_btnRangingIsEnabled != value)
@@ -616,10 +506,10 @@
public HomePageViewModel()
{
-
}
private static HomePageViewModel _instance = null;
+
public static HomePageViewModel Instance
{
get
@@ -627,7 +517,6 @@
if (_instance == null)
{
_instance = new HomePageViewModel();
-
}
return _instance;
@@ -635,6 +524,5 @@
}
#endregion
-
}
-}
+}
\ No newline at end of file
diff --git a/PipeGallery/ViewModel/MainViewModel.cs b/PipeGallery/ViewModel/MainViewModel.cs
index 6b0a4bd..654755c 100644
--- a/PipeGallery/ViewModel/MainViewModel.cs
+++ b/PipeGallery/ViewModel/MainViewModel.cs
@@ -15,7 +15,7 @@
public struct SYSTEM_POWER_STATUS
{
- public Byte ACLineStatus;//0 = offline, 1 = Online, 255 = UnKnown Status.
+ public Byte ACLineStatus; //0 = offline, 1 = Online, 255 = UnKnown Status.
public Byte BatteryFlag;
public Byte BatteryLifePercent;
public Byte Reserved1;
@@ -27,10 +27,7 @@
public string CurrentTime
{
- get
- {
- return _currentTime;
- }
+ get { return _currentTime; }
set
{
if (_currentTime != value)
@@ -44,15 +41,11 @@
///
/// 电量 0-100
///
-
double _battery = 0;
public double Battery
{
- get
- {
- return _battery;
- }
+ get { return _battery; }
set
{
if (_battery != value)
@@ -68,10 +61,10 @@
public MainViewModel()
{
-
}
private static MainViewModel _instance = null;
+
public static MainViewModel Instance
{
get
@@ -86,9 +79,10 @@
timer.Tick += delegate
{
DateTime dateTime = DateTime.Now;
- String strDateTime = dateTime.ToString("yyyy年MM月dd日 ") + dateTime.ToString("dddd", new System.Globalization.CultureInfo("zh-cn")) + dateTime.ToString(" HH:mm:ss");
+ String strDateTime = dateTime.ToString("yyyy年MM月dd日 ") +
+ dateTime.ToString("dddd", new System.Globalization.CultureInfo("zh-cn")) +
+ dateTime.ToString(" HH:mm:ss");
MainViewModel.Instance.CurrentTime = strDateTime;
-
};
timer.Start();
@@ -98,7 +92,7 @@
SYSTEM_POWER_STATUS SysPower = new SYSTEM_POWER_STATUS();
GetSystemPowerStatus(ref SysPower);
MainViewModel.Instance.Battery = SysPower.BatteryLifePercent;
-
+
timerBattery.Tick += delegate
{
GetSystemPowerStatus(ref SysPower);
@@ -112,6 +106,5 @@
}
#endregion
-
}
-}
+}
\ No newline at end of file