|
|
@@ -508,24 +508,10 @@ int CIDCertFSM::ReadInfo(SpReqAnsContext<IDCert_Read_Req, IDCert_Read_Ans>::Poin
|
|
|
Dbg("x to X");
|
|
|
ctx->Ans.idcode[ctx->Ans.idcode.GetLength() - 1] = 'X';
|
|
|
}
|
|
|
- //ctx->Ans.idcode = "370285198804025014";
|
|
|
ctx->Ans.department = idInfo.department.data;
|
|
|
ctx->Ans.startdate = idInfo.startDate.data;
|
|
|
ctx->Ans.enddate = idInfo.endDate.data;
|
|
|
|
|
|
- //ctx->Ans.startdate = "2015.08.06";
|
|
|
- //ctx->Ans.enddate = "2035.08.06";
|
|
|
-
|
|
|
- //oiltest
|
|
|
- /*Dbg("Name:%s,Sex:%s,Nation:%s,Birthday:%s,StartDate:%s,EndDate:%s,IDNo:%s****%s,Address:%s,"
|
|
|
- ,idInfo.name.data
|
|
|
- ,idInfo.sex.data
|
|
|
- ,idInfo.nation.data
|
|
|
- ,idInfo.birthday.data
|
|
|
- ,idInfo.startDate.data
|
|
|
- ,idInfo.endDate.data
|
|
|
- ,(const char*)ctx->Ans.idcode.SubString(0, 4), (const char*)ctx->Ans.idcode.SubString(ctx->Ans.idcode.GetLength() - 1, 1)
|
|
|
- ,idInfo.address.data);*/
|
|
|
Dbg("Sex:%s,Nation:%s,EndDate:%s,IDNo:%s****%s,"
|
|
|
,idInfo.sex.data
|
|
|
,idInfo.nation.data
|
|
|
@@ -559,14 +545,7 @@ int CIDCertFSM::ReadInfo(SpReqAnsContext<IDCert_Read_Req, IDCert_Read_Ans>::Poin
|
|
|
ctx->Answer(Error_TimeOut);
|
|
|
else
|
|
|
ctx->Answer(Error_Unexpect, AlarmDECToBusiness());
|
|
|
- //if (!bGetIDCert)
|
|
|
- //LogWarn(Severity_Low,Error_DevCommFailed,LOG_WARN_IDCERTIFICATE_ACTION,"IDCertificate read failed.");
|
|
|
Dbg("after send ack");
|
|
|
- //if (!bOpenRF)
|
|
|
- //{
|
|
|
- // LOG_TRACE("rf failed.");
|
|
|
- // return 1;
|
|
|
- //}
|
|
|
if(bOpenRF) {
|
|
|
hr = m_hDevHelper->IDCerRFControl(false);
|
|
|
if (hr != Error_Succeed)
|