105040 Update 清理编译警告
This commit is contained in:
parent
dce99c813c
commit
588679c3a1
|
@ -288,7 +288,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Models
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private string _cableModelNo;
|
//private string _cableModelNo;
|
||||||
public string CableModelNo
|
public string CableModelNo
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
|
@ -37,7 +37,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Utils
|
||||||
}
|
}
|
||||||
|
|
||||||
CableLectotypeViewModel viewModel = null;
|
CableLectotypeViewModel viewModel = null;
|
||||||
Task.Factory.StartNew(() =>
|
await Task.Factory.StartNew(() =>
|
||||||
{
|
{
|
||||||
var service = new MotorLectotypeService();
|
var service = new MotorLectotypeService();
|
||||||
var data = service.GetMotorLectotypeData(motor.GetUniqueFlag());
|
var data = service.GetMotorLectotypeData(motor.GetUniqueFlag());
|
||||||
|
@ -55,7 +55,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.Utils
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}).Wait();
|
});
|
||||||
if (viewModel == null)
|
if (viewModel == null)
|
||||||
{
|
{
|
||||||
return new CableLectotypeViewModel(motor);
|
return new CableLectotypeViewModel(motor);
|
||||||
|
|
|
@ -67,7 +67,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
{
|
{
|
||||||
viewModel.User = user;
|
viewModel.User = user;
|
||||||
viewModel.IsRemember = true;
|
viewModel.IsRemember = true;
|
||||||
_ = this.Dispatcher.BeginInvoke(() =>
|
await this.Dispatcher.BeginInvoke(() =>
|
||||||
{
|
{
|
||||||
this.PasswordTxt.Password = user.UserPassword;
|
this.PasswordTxt.Password = user.UserPassword;
|
||||||
LoadGroupAndRole();
|
LoadGroupAndRole();
|
||||||
|
|
|
@ -66,7 +66,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void Button_Click(object sender, RoutedEventArgs e)
|
private void Button_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(_scannerViewModel.S_part)) ;
|
if (string.IsNullOrEmpty(_scannerViewModel.S_part)) { }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_PartID);
|
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_PartID);
|
||||||
|
@ -79,7 +79,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
/// <param name="e"></param>
|
/// <param name="e"></param>
|
||||||
private void Button_Click_1(object sender, RoutedEventArgs e)
|
private void Button_Click_1(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(_scannerViewModel.S_pin)) ;
|
if (string.IsNullOrEmpty(_scannerViewModel.S_pin)) { }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_pinID);
|
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().S_pinID);
|
||||||
|
@ -88,7 +88,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
|
|
||||||
private void Button_Click_2(object sender, RoutedEventArgs e)
|
private void Button_Click_2(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(_scannerViewModel.E_part)) ;
|
if (string.IsNullOrEmpty(_scannerViewModel.E_part)) { }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_PartID);
|
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_PartID);
|
||||||
|
@ -97,7 +97,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.View
|
||||||
|
|
||||||
private void Button_Click_3(object sender, RoutedEventArgs e)
|
private void Button_Click_3(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(_scannerViewModel.E_pin)) ;
|
if (string.IsNullOrEmpty(_scannerViewModel.E_pin)) { }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_pinID);
|
_scannerViewModel.ToSourceById(_scannerViewModel._ScanCableModels.FirstOrDefault().E_pinID);
|
||||||
|
|
|
@ -178,7 +178,7 @@ public partial class MainWindow : System.Windows.Window
|
||||||
Task.WaitAll(dataColumns, data);
|
Task.WaitAll(dataColumns, data);
|
||||||
var stuffedData = ViewModel.StuffData(data.Result);
|
var stuffedData = ViewModel.StuffData(data.Result);
|
||||||
|
|
||||||
_ = stuffedData.ContinueWith(x =>
|
await stuffedData.ContinueWith(x =>
|
||||||
{
|
{
|
||||||
_ = this.Dispatcher.BeginInvoke(delegate ()
|
_ = this.Dispatcher.BeginInvoke(delegate ()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue