diff --git a/App.xaml.cs b/App.xaml.cs index 7950444..c3f7f46 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -206,6 +206,7 @@ namespace SafeBagDE70 protected override void OnExit(ExitEventArgs e) { // Release the mutex when the application is closed + AppData.UpdateDeviceStatusToFile(); mutex?.ReleaseMutex(); base.OnExit(e); } diff --git a/AppData.cs b/AppData.cs index eeec314..a48d727 100644 --- a/AppData.cs +++ b/AppData.cs @@ -551,11 +551,8 @@ namespace SafeBagDE70 { lock (deviceStatusFileName) { - if (File.Exists(deviceStatusFileName)) - { - var fileContent = JsonConvert.SerializeObject(DeviceStatusFile); - File.WriteAllText(deviceStatusFileName, fileContent); - } + var fileContent = JsonConvert.SerializeObject(DeviceStatusFile); + File.WriteAllText(deviceStatusFileName, fileContent); } Log.Information("UpdatePrinterStatusFromFile success"); } diff --git a/UserControl/DepositSMUCv2.xaml.cs b/UserControl/DepositSMUCv2.xaml.cs index 7b77ce2..6e3ef81 100644 --- a/UserControl/DepositSMUCv2.xaml.cs +++ b/UserControl/DepositSMUCv2.xaml.cs @@ -448,10 +448,14 @@ namespace SafeBagDE70 private void GetPrinterStatus() { var status = printerManager.GetStatus(); + var strPrinterMessage = ""; + if (status != null) { - if (status.StsNOPAPER|| AppData.IsStopPrinting()) + bool StsNOPAPER = status.StsNOPAPER; + bool StsNEARENDPAP = status.StsNEARENDPAP; + if (StsNOPAPER || (StsNEARENDPAP && AppData.IsStopPrinting())) { AppData.DeviceStatus.PrinterStatus = (int)PrinterStatusCode.PAPEROUT; StopTimers(); @@ -459,7 +463,7 @@ namespace SafeBagDE70 ShowError(strPrinterMessage); AppData.ADMINDEVICESTATUS.PrinterStatus = strPrinterMessage; } - else if (status.StsNEARENDPAP) + else if (StsNEARENDPAP) { AppData.UpdatePrinterStatus(true); strPrinterMessage = "MÁY IN: GẦN HẾT GIẤY";