Merge branch 'uat' into feature_unionlog

CMakeLists.txt

@@ -92,7 +92,7 @@ endif($ENV{PIPELINE_BUILD_ID})
 # stable Îȶ¨°æ±¾
 
 #Set the project version
-set(RAW_VERSION_STRING "0.2.10-beta1")
+set(RAW_VERSION_STRING "0.2.12-beta1")
 string(STRIP ${RAW_VERSION_STRING} RAW_VERSION_STRING)
 
 set(VERSION_REGEX "^.?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)")

ChangeLog.in

@@ -2,6 +2,14 @@
 
 *Last Built Day: @BUILD_DATE_STRING@*
 
+## V0.2.12
+
+* [BugFix][CardIssuer] 卡箱无卡不作为故障统计
+* [BugFix][IDCertificate] 读取身份证时去除对Error_DevMedia的特殊判断
+
+## V0.2.11
+
+* [BugFix][Vendor][Keba][HSPSCanner] 解决高拍仪偶发拍照错乱问题
 
 ## V0.2.10
 

DevAdapter/CMakeLists.txt

@@ -139,7 +139,7 @@ message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 
 # 通过conan的方式管理厂商库
 if(DEVADAPTER_USING_CONAN)
-    set(KEBA_CONAN_LIB_NAME keba/2022.0425.01@LR04.02_VendorLib/testing)
+    set(KEBA_CONAN_LIB_NAME keba/2022.0610.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2022.0224.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2022.0310.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2021.0927.01@LR04.02_VendorLib/testing)

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -812,8 +812,6 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 			Dbg("IDCerAuthenticate failed: %s", SpStrError(ecForIDCerAuthenticate));
 			dwEnd = RVCGetTickCount();
 			elapsed = dwEnd - dwStart;
-			if (eErr == Error_DevMedia)
-				break;
 			continue;
 		}
 		else
@@ -985,8 +983,6 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 		if (eErr1 == Error_Succeed)
 		{
 			Dbg("pos after eject:%d", pos);
-			/*if (pos == 2)
-			return 4;*/
 		}
 	}
 
@@ -997,26 +993,24 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 	}
 
 	//zjw@20191219 处理完相关操作再返回给前端，防止状态还未跳转又发起流程
-	if (bGetIDCert)
+	if (bGetIDCert) {
 		ctx->Answer(Error_Succeed);
-	else if (m_bCancelRead)
+	} else if (m_bCancelRead) {
 		ctx->Answer(Error_Cancel);
-	else if (elapsed >= IDCER_READ_TIMEOUT) {
+		LogWarn(Severity_Low, Error_Debug, IDCertificate_UserErrorCode_CancelOperation, "User cancel read IDCard from front.");
+	} else if (elapsed >= IDCER_READ_TIMEOUT) {
 		ctx->Answer(Error_TimeOut);
 
         if (ecForIDCerRFControl != Error_Succeed) {
-			SetErrPackage(m_errPkg, "ReadAndScan::IDCerRFControl", m_devSN, ecForIDCerRFControl, MEC_DEVAPI_IDCER_IDCerRFControl);
+			SetErrPackage(m_errPkg, "ReadAndScan::IDCerRFControl(Timeout)", m_devSN, ecForIDCerRFControl, MEC_DEVAPI_IDCER_IDCerRFControl);
 			AlarmDEC(m_errPkg);
         }
         if (ecForIDCerAuthenticate != Error_Succeed) {
-			SetErrPackage(m_errPkg, "ReadAndScan::IDCerAuthenticate", m_devSN, ecForIDCerAuthenticate, MEC_DEVAPI_IDCER_IDCerAuthenticate);
+			SetErrPackage(m_errPkg, "ReadAndScan::IDCerAuthenticate(Timeout)", m_devSN, ecForIDCerAuthenticate, MEC_DEVAPI_IDCER_IDCerAuthenticate);
 			AlarmDEC(m_errPkg);
         }
-	}
-	else if (eErr == Error_DevMedia) {
-		LogWarn(Severity_High, Error_DevMedia, IDCertificate_UserErrorCode_ErrorDevMedia, "Error DevMedia");
-        ctx->Answer(Error_DevMedia);
 	} else {
+
 		ctx->Answer(Error_Unexpect);
 
         if (ecForIDCerRFControl != Error_Succeed) {

Module/mod_IDCertificate/IDCertificate_UserErrorCode.h

@@ -18,4 +18,5 @@
 #define IDCertificate_UserErrorCode_DevOpenFailed			(IDCertificate_UserErrorCode_Start + 13) //实体打开失败
 #define IDCertificate_UserErrorCode_DevFailAddUp			(IDCertificate_UserErrorCode_Start + 14) //报错累计达到上限
 #define IDCertificate_UserErrorCode_ErrorDevMedia			(IDCertificate_UserErrorCode_Start + 15)
+#define IDCertificate_UserErrorCode_CancelOperation			(IDCertificate_UserErrorCode_Start + 16)
 #endif //_IDCERTIFICATE_USER_ERRORCODE_H

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -2702,10 +2702,16 @@ int CCardIssuerFSM::IssueCard(SpReqAnsContext<CardIssuerService_Issue_Req, CardI
 			else if (m_currentHopper == 3)
 				dwUsrErrCode = CardIssuer_UserErrorCode_NoCardRemains_Hopper3;
 		}
+
+		ErrorCodeEnum errForBusiness = Error_Unexpect;
+		if (bEmpty && m_remainsEx[m_currentHopper - 1] <= 0) {
+			errForBusiness = Error_DevNotAvailable;
+		}
+
 		if (ctx != NULL)//TODO:web需要根据userCode给出具体的提示
-			ctx->Answer(AnswerErrCode(Error_Unexpect), dwUsrErrCode);
+			ctx->Answer(AnswerErrCode(errForBusiness), dwUsrErrCode);
 		else
-			ctxEx->Answer(AnswerErrCode(Error_Unexpect), dwUsrErrCode);
+			ctxEx->Answer(AnswerErrCode(errForBusiness), dwUsrErrCode);
 
 		return 2;
 	}