dinhthuanbk88/DE70
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back GetCassete

Browse Source 
Chỉ cho phép login qrcode 1 lần
Thêm timeout cho read cassete
This commit is contained in:
Nguyen Dinh Thuan
2024-10-01 22:45:16 +07:00
parent a40462a7b6
commit ac6074c9bf
4 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData.cs
+56 -12
View File
@@ -268,16 +268,17 @@ namespace SafeBagDE70
} }
public static byte[] GetCassetteData() public static byte[] GetCassetteData()
{ {
for(int i = 0; i < 2; i++)//Retry if failed //for(int i = 0; i < 2; i++)//Retry if failed
{ //{
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE); // cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE);
if (cCmdRsp.recv_dat.dat[0] != 0x40) // if (cCmdRsp.recv_dat.dat[0] != 0x40)
{ // {
Thread.Sleep(1000); // Thread.Sleep(1000);
} // }
else // else
break; // break;
} //}
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE);
var data = cCmdRsp.recv_dat.dat; var data = cCmdRsp.recv_dat.dat;
StringBuilder str = new StringBuilder(); StringBuilder str = new StringBuilder();
var recv_dat = cCmdRsp.recv_dat; var recv_dat = cCmdRsp.recv_dat;
@@ -465,8 +466,7 @@ namespace SafeBagDE70
break; break;
} }
// //
if(bResult) await APIModels.UpdateDeviceCommand(command.Id, bResult?1:2);
await APIModels.UpdateDeviceCommand(command.Id, bResult?1:0);
} }
} }
} }
@@ -692,6 +692,50 @@ namespace SafeBagDE70
} }
return bSuccess; return bSuccess;
} }
public static bool ResetAbnormalStorage605()
{
var cCmdRsp = AppData.cCmdRsp;
bool bSuccess = false;
if (cCmdRsp != null && cCmdRsp.recv_dat != null)
{
if (cCmdRsp.recv_dat.dat[1] == 0x1C && cCmdRsp.recv_dat.dat[2] == 0x4A)
{
// cCmdRsp.SendXXCmd((byte)Command.CMD_DE_SENSE);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_UNLOCK);
Thread.Sleep(1000);
var currentMode = cCmdRsp.GetLockParam().mode;
cCmdRsp.GetLockParam().mode = Mode.MODE_SECERROR;
cCmdRsp.SendLock();
Thread.Sleep(1000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_SENSE);
var recvData = cCmdRsp.recv_dat;
var SR2 = recvData.dat[1];
var S2 = recvData.dat[recvData.leng - 1];
if (recvData.dat[1] == 0x1C && (S2==0xE2 || S2==0xE4))
{
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_RESET);
Thread.Sleep(2000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_SENSE);
Thread.Sleep(1000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_CNTSTART);
Thread.Sleep(1000);
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_STORESTART);
if (cCmdRsp.recv_dat.dat[1] == 0x04 && cCmdRsp.recv_dat.dat[2] == 0x41)
{
bSuccess = true;
}
}
else
{
}
}
}
return bSuccess;
}
} }
public class CustomerAccount public class CustomerAccount
UserControl/DepositSMUCv2.xaml.cs
+7 -2
View File
@@ -120,7 +120,6 @@ namespace SafeBagDE70
notesInSession = new NotesInSession(); notesInSession = new NotesInSession();
spNotesInSession.DataContext = notesInSession; spNotesInSession.DataContext = notesInSession;
ResetButtons(); ResetButtons();
btnStart.IsEnabled = true; btnStart.IsEnabled = true;
btnLogout.IsEnabled = true; btnLogout.IsEnabled = true;
@@ -1053,7 +1052,13 @@ namespace SafeBagDE70
if (CheckPreStoreValid(previousCassetData, AppData.MaxNotes, sessions)) if (CheckPreStoreValid(previousCassetData, AppData.MaxNotes, sessions))
{ {
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_STORESTART); cCmdRsp.SendXXCmd((byte)Command.CMD_DE_STORESTART);
bSuccess = WaitUntilCountReady(10); bSuccess = WaitUntilCountReady(20);
if (!bSuccess)
{
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_STORESTART);
bSuccess = WaitUntilCountReady(20);
}
var newCasstData = AppData.GetCassetteData(); var newCasstData = AppData.GetCassetteData();
str = "AFTER STORE \r\n[CASSETTE]" + AppData.GetNotesString(newCasstData); str = "AFTER STORE \r\n[CASSETTE]" + AppData.GetNotesString(newCasstData);
UserControl/WelcomeUC.xaml.cs
+10 -3
View File
@@ -55,6 +55,7 @@ namespace SafeBagDE70
{ {
gridInfor.Visibility = Visibility.Collapsed; gridInfor.Visibility = Visibility.Collapsed;
gridMain.Visibility = Visibility.Visible; gridMain.Visibility = Visibility.Visible;
btnQRCodeLogin.IsEnabled = true;
} }
public void ShowInfor(string strMessage) public void ShowInfor(string strMessage)
{ {
@@ -122,7 +123,7 @@ namespace SafeBagDE70
{ {
QrCodePanel.Visibility = Visibility.Collapsed; QrCodePanel.Visibility = Visibility.Collapsed;
PinCodePanel.Visibility = Visibility.Visible; PinCodePanel.Visibility = Visibility.Visible;
btnQRCodeLogin.IsEnabled = true;
cCoreScannerClass.BarcodeEvent -= new _ICoreScannerEvents_BarcodeEventEventHandler(OnBarcodeEvent); cCoreScannerClass.BarcodeEvent -= new _ICoreScannerEvents_BarcodeEventEventHandler(OnBarcodeEvent);
} }
catch { catch {
@@ -134,9 +135,10 @@ namespace SafeBagDE70
{ {
PinCodePanel.Visibility = Visibility.Collapsed; PinCodePanel.Visibility = Visibility.Collapsed;
QrCodePanel.Visibility=Visibility.Visible; QrCodePanel.Visibility=Visibility.Visible;
btnQRCodeLogin.IsEnabled = false;
cCoreScannerClass.BarcodeEvent -= new _ICoreScannerEvents_BarcodeEventEventHandler(OnBarcodeEvent);
cCoreScannerClass.BarcodeEvent += new _ICoreScannerEvents_BarcodeEventEventHandler(OnBarcodeEvent); cCoreScannerClass.BarcodeEvent += new _ICoreScannerEvents_BarcodeEventEventHandler(OnBarcodeEvent);
} }
public void InitQRCodeScanner() public void InitQRCodeScanner()
{ {
@@ -222,7 +224,12 @@ namespace SafeBagDE70
} }
}); });
} }
Dispatcher.Invoke(() =>
{
btnQRCodeLogin.IsEnabled = true;
});
} }
private void VerifyQRCode(string decodedString,out string? ConsumerID) private void VerifyQRCode(string decodedString,out string? ConsumerID)
appsettings.json
+1 -1
View File
@@ -4,7 +4,7 @@
{ {
"Name": "File", "Name": "File",
"Args": { "Args": {
"path": "D:\\logs\\log_.txt", "path": "F:\\logs\\log_.txt",
"rollingInterval": "Day" "rollingInterval": "Day"
} }
} }