modify something

This commit is contained in:
thuannd88
2024-09-04 20:08:28 +07:00
parent 6219298497
commit f4f433b838
2 changed files with 61 additions and 1 deletions
+7
View File
@@ -17,6 +17,13 @@
Margin="10" Margin="10"
Click="btnResetCounter_Click"/> Click="btnResetCounter_Click"/>
<Button <Button
Content="RESET LỖI"
x:Name="btnSoftResetError"
HorizontalAlignment="Stretch"
Height="40"
Margin="10"
Click="btnSoftResetError_Click"/>
<Button
Content="MỞ NGĂN PHỤ" Content="MỞ NGĂN PHỤ"
x:Name="btnOpenEscrow" x:Name="btnOpenEscrow"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
+54 -1
View File
@@ -68,7 +68,7 @@ namespace SafeBagDE70.Admin
((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen(); ((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
Task.Run(() => Task.Run(() =>
{ {
Thread.Sleep(2); Thread.Sleep(2000);
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
lblCounterStatus.Text = ""; lblCounterStatus.Text = "";
@@ -95,5 +95,58 @@ namespace SafeBagDE70.Admin
var state = AppData.GetCDMState(); var state = AppData.GetCDMState();
lblDeviceStatus.Text = state.GetFullStatus(); lblDeviceStatus.Text = state.GetFullStatus();
} }
private void btnSoftResetError_Click(object sender, RoutedEventArgs e)
{
try
{
var cCmdRsp = AppData.cCmdRsp;
bool bSuccess = true;
if (cCmdRsp != null)
{
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_SENSE);
var recvData = cCmdRsp.recv_dat;
if (recvData.dat[14] == recvData.dat[16])
{
cCmdRsp.SendLock();
}
else
{
cCmdRsp.SendEventFix(recvData.dat[16]);
}
if (cCmdRsp.recv_dat.dat[0] != 0x40)
{
bSuccess = false;
}
if (bSuccess)
{
Thread.Sleep(1000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_RESET);
Thread.Sleep(2000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_SENSE);
if (cCmdRsp.recv_dat.dat[1] == 0x04 && cCmdRsp.recv_dat.dat[2] == 0x41)
{
lblCounterStatus.Text = "Reset lỗi thành công";
((MainWindow)Application.Current.MainWindow).ShowWelcomeScreen();
Task.Run(() =>
{
Thread.Sleep(2000);
Dispatcher.Invoke(() =>
{
lblCounterStatus.Text = "";
});
});
}
}
}
}
catch (Exception ex) {
Log.Fatal(ex, "SoftReset");
}
}
} }
} }