Back GetCassete
Chỉ cho phép login qrcode 1 lần Thêm timeout cho read cassete
This commit is contained in:
+56
-12
@@ -268,16 +268,17 @@ namespace SafeBagDE70
|
||||
}
|
||||
public static byte[] GetCassetteData()
|
||||
{
|
||||
for(int i = 0; i < 2; i++)//Retry if failed
|
||||
{
|
||||
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE);
|
||||
if (cCmdRsp.recv_dat.dat[0] != 0x40)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
}
|
||||
else
|
||||
break;
|
||||
}
|
||||
//for(int i = 0; i < 2; i++)//Retry if failed
|
||||
//{
|
||||
// cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE);
|
||||
// if (cCmdRsp.recv_dat.dat[0] != 0x40)
|
||||
// {
|
||||
// Thread.Sleep(1000);
|
||||
// }
|
||||
// else
|
||||
// break;
|
||||
//}
|
||||
cCmdRsp.SendXXCmd((byte)Command.CMD_DE_READ_CASSETTE);
|
||||
var data = cCmdRsp.recv_dat.dat;
|
||||
StringBuilder str = new StringBuilder();
|
||||
var recv_dat = cCmdRsp.recv_dat;
|
||||
@@ -465,8 +466,7 @@ namespace SafeBagDE70
|
||||
break;
|
||||
}
|
||||
//
|
||||
if(bResult)
|
||||
await APIModels.UpdateDeviceCommand(command.Id, bResult?1:0);
|
||||
await APIModels.UpdateDeviceCommand(command.Id, bResult?1:2);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -692,6 +692,50 @@ namespace SafeBagDE70
|
||||
}
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user