|
@@ -42,7 +42,7 @@ namespace ST_LINK_MES
|
|
|
|
|
|
private delegate void GenericDelegate();
|
|
|
//private readonly LoginWindow loginWindow;
|
|
|
- private readonly ResultDialog resultDialog;
|
|
|
+ private ResultDialog resultDialog;
|
|
|
private readonly STLinkCliPrograrmService stlinkService;
|
|
|
|
|
|
public string UserId { get; internal set; }
|
|
@@ -168,9 +168,14 @@ namespace ST_LINK_MES
|
|
|
//report
|
|
|
this.Dispatcher.Invoke(() => {
|
|
|
SajetConnect.SajetTranFinishFail(errCode);
|
|
|
+
|
|
|
+
|
|
|
+ resultDialog = new ResultDialog();
|
|
|
+ resultDialog.Owner = this;
|
|
|
+
|
|
|
+ resultDialog.MouseDown += ResultDialog_MouseDown;
|
|
|
+ resultDialog.ShowResult(false);
|
|
|
});
|
|
|
- resultDialog.MouseDown += ResultDialog_MouseDown;
|
|
|
- resultDialog.ShowResult(false);
|
|
|
}
|
|
|
|
|
|
if (result.IsSuccess)
|
|
@@ -178,9 +183,14 @@ namespace ST_LINK_MES
|
|
|
//report
|
|
|
this.Dispatcher.Invoke(() => {
|
|
|
SajetConnect.SajetTranFinishSuccess();
|
|
|
+
|
|
|
+
|
|
|
+ resultDialog = new ResultDialog();
|
|
|
+ resultDialog.Owner = this;
|
|
|
+
|
|
|
+ resultDialog.MouseDown += ResultDialog_MouseDown;
|
|
|
+ resultDialog.ShowResult(true);
|
|
|
});
|
|
|
- resultDialog.MouseDown += ResultDialog_MouseDown;
|
|
|
- resultDialog.ShowResult(true);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -208,13 +218,14 @@ namespace ST_LINK_MES
|
|
|
private void ResultDialog_MouseDown(object sender, MouseButtonEventArgs e)
|
|
|
{
|
|
|
resultDialog.MouseDown -= ResultDialog_MouseDown;
|
|
|
- this.Close();
|
|
|
+ resultDialog.Close();
|
|
|
+ //this.Close();
|
|
|
}
|
|
|
|
|
|
private void ResultDialog_Closing(object sender, CancelEventArgs e)
|
|
|
{
|
|
|
resultDialog.Closing -= ResultDialog_Closing;
|
|
|
- this.Close();
|
|
|
+ //this.Close();
|
|
|
}
|
|
|
|
|
|
private bool ValidateSN()
|