#IQBX #comment 指纹仪编译通过

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -344,7 +344,7 @@ int CFingerPrintFSM::Initial()
 	{
 		SetErrPackage("Initial::OpenConfig", m_csDevSN, errDev, FingerPrint_UserErrorCode_OPEN_ROOT_FAILED_ONINIT);
 		AlarmDEC();
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2402")("指纹仪实体初始化时，打开root.ini文件失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2402")("鎸囩汗浠�疄浣撳垵濮嬪寲鏃讹紝鎵撳紑root.ini鏂囦欢澶辫触");
 		return 2;
 	}
 
@@ -353,7 +353,7 @@ int CFingerPrintFSM::Initial()
 	if (m_csMachineType.Compare("RVC.PAD", true) == 0 && m_fwbSN.IsNullOrEmpty())
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RVC.PAD without FWB");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹仪设备打开成功");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗浠��澶囨墦寮€鎴愬姛");
 		return 0;
 	}
 
@@ -361,7 +361,7 @@ int CFingerPrintFSM::Initial()
 	int initCount = 0;
 	ErrorCodeEnum err;
 	auto pEntity = GET_DEV_ENTITY_BASE_POINTER();
-	//判断是否是蓝牙多合一
+	//鍒ゆ柇鏄�惁鏄�摑鐗欏�鍚堜竴
 	CSimpleStringA tmpVendor(""), tmpDLLVersion("");
 	bool isFWB = false;
 	CSimpleStringA tmpDevSN = m_fwbSN;
@@ -410,7 +410,7 @@ int CFingerPrintFSM::Initial()
 					//TODO: Support new or old edition machine.
 				}
 				else if (!m_csMachineType.Compare("RVC.PAD", true)) {
-					if (isFWB) {//蓝牙多合一
+					if (isFWB) {//钃濈墮澶氬悎涓€
 						GetEntityBase()->GetFunction()->GetSysVar("FWBVendor", strVendor);
 						strVersion = "8";
 					}
@@ -423,11 +423,11 @@ int CFingerPrintFSM::Initial()
 				}
 				else if (!m_csMachineType.Compare("RVC.Desk2S", true)) {
 					strVersion = "4";
-					if (m_machineVersion.Compare("1.0", true)) {//低柜一体机(贵宾理财2.0&非贵宾理财2.1)
+					if (m_machineVersion.Compare("1.0", true)) {//浣庢煖涓€浣撴満(璐靛�鐞嗚储2.0&闈炶吹瀹剧悊璐�2.1)
 						strBatch = "20";
 					}
 				}
-				else if (!m_csMachineType.Compare("RVC.Desk1S", true) && !m_machineVersion.Compare("1.0", true)) {//低柜一体机(厅堂自助)
+				else if (!m_csMachineType.Compare("RVC.Desk1S", true) && !m_machineVersion.Compare("1.0", true)) {//浣庢煖涓€浣撴満(鍘呭爞鑷�姪)
 					strVersion = "4";
 					strBatch = "20";
 				}
@@ -451,29 +451,29 @@ int CFingerPrintFSM::Initial()
 	m_bOpened = false;
 	if (pEntity->vendorLibInfo.IsNotConfig()) {
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Not config, Allow this condition happend.");
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("没有配置，将其视为指纹仪设备打开成功");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("娌℃湁閰嶇疆锛屽皢鍏惰�涓烘寚绾逛华璁惧�鎵撳紑鎴愬姛");
 		return 0;
 	}
 	pEntity->InitializeVendorLogSwitch();
 	err = m_hDevHelper.LoadUp(m_adapterInfo.adapterFilePath);
 	if (!IS_SUCCEED(err))
 	{
-		if (err != Error_NotExist) { //文件存在，只是因为其他原因导致加载失败的
+		if (err != Error_NotExist) { //鏂囦欢瀛樺湪锛屽彧鏄�洜涓哄叾浠栧師鍥犲�鑷村姞杞藉け璐ョ殑
 			LogWarn(Severity_High, Error_NotInit, FingerPrint_UserErrorCode_LOAD_ADAPTER_FAILED,
 				CSimpleStringA::Format("Load library file: %s failed, GLE=%d", (LPCTSTR)m_adapterInfo.adapterFileName, GetLastError()));
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2405")("加载厂商适配器失败");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2405")("鍔犺浇鍘傚晢閫傞厤鍣ㄥけ璐�");
 			return 2;
 		}
 		else {
-			if (!triedFlag) {//是在root.ini进行配置的，而不是程序推断的
+			if (!triedFlag) {//鏄�湪root.ini杩涜�閰嶇疆鐨勶紝鑰屼笉鏄�▼搴忔帹鏂�殑
 				LogWarn(Severity_High, Error_DevLoadFileFailed, FingerPrint_UserErrorCode_VENDOR_ADAPTER_NOT_EXIST,
 					CSimpleStringA::Format("library file: %s is not existed!", (LPCTSTR)m_adapterInfo.adapterFileName));
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2404")("厂商适配器不存在dep中");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Open_ID).setResultCode("RTA2404")("鍘傚晢閫傞厤鍣ㄤ笉瀛樺湪dep涓�");
 				return 2;
 			}
-			else {//程序推断出来的适配器名称，但本地不存在该文件，放弃吧
+			else {//绋嬪簭鎺ㄦ柇鍑烘潵鐨勯€傞厤鍣ㄥ悕绉帮紝浣嗘湰鍦颁笉瀛樺湪璇ユ枃浠讹紝鏀惧純鍚�
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Config programme,  Allow this condition happend.");
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("动态配置，没有该文件，放弃之");
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER)("鍔ㄦ€侀厤缃�紝娌℃湁璇ユ枃浠讹紝鏀惧純涔�");
 				return 0;
 			}
 		}
@@ -516,7 +516,7 @@ int CFingerPrintFSM::Initial()
 	m_adapterInfo.FulfillCategoryInfo(m_devCatInfo);
 	m_bOpened = true;
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("FingerPrint entity open success.");
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹仪设备打开成功");
+	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗浠��澶囨墦寮€鎴愬姛");
 	return 0;
 }
 
@@ -563,31 +563,31 @@ void CFingerPrintFSM::SelfTest(EntityTestEnum eTestType, CSmartPointer<ITransact
 #pragma endregion
 
 #pragma region collect finger for register and match interface
-//有用接口
+//鏈夌敤鎺ュ彛
 int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFingerPrint_Req, FingerPrintService_GetFingerPrint_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
 	ctx->Ans.reserved1.Init(10);
 	if(!m_bOpened) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetFingerPrint return failed for device isn't init suc.");
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("指纹扫描失败,设备还未初始化成功");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("鎸囩汗鎵�弿澶辫触,璁惧�杩樻湭鍒濆�鍖栨垚鍔�");
 		ctx->Answer(Error_NotInit);  //maybe no vendor adapter
 		return 0;
 	}
 
 	if (m_bCancelRegister) //no cancel button anymore while register
-	{   //修复当扫描前已取消，需要把参数复制，否则授权实体会lost
+	{   //淇��褰撴壂鎻忓墠宸插彇娑堬紝闇€瑕佹妸鍙傛暟澶嶅埗锛屽惁鍒欐巿鏉冨疄浣撲細lost
 		m_bCancelRegister = false;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹扫描失败,在扫描前,扫描已取消");
-		//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2412")("指纹扫描失败,扫描已取消");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗鎵�弿澶辫触,鍦ㄦ壂鎻忓墠,鎵�弿宸插彇娑�");
+		//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2412")("鎸囩汗鎵�弿澶辫触,鎵�弿宸插彇娑�");
 		ctx->Ans.reserved1[0] = 3;
 		ctx->Answer(Error_Cancel);
 		return 0;
 
 		//ctx->Answer(Error_Cancel);
 		//m_bCancelRegister = false;
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹扫描失败,在扫描前,扫描已取消");
-		////DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("指纹扫描失败,在扫描前,扫描已取消");
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗鎵�弿澶辫触,鍦ㄦ壂鎻忓墠,鎵�弿宸插彇娑�");
+		////DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("鎸囩汗鎵�弿澶辫触,鍦ㄦ壂鎻忓墠,鎵�弿宸插彇娑�");
 		//return 0;
 	}
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("ctx->Req.times = %d", ctx->Req.times);
@@ -595,7 +595,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 	if (ctx->Req.times <= 0 || ctx->Req.times > 10)
 	{
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetFingerPrint, inParam is invalid:%d", ctx->Req.times);
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("指纹扫描失败,参数不对");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("鎸囩汗鎵�弿澶辫触,鍙傛暟涓嶅�");
 		ctx->Answer(Error_Param);
 		return 0;
 	}
@@ -618,7 +618,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 		
 		SetErrPackage("GetFingerPrint::GetPath", m_csDevSN, eErr, FingerPrint_UserErrorCode_GET_DEP_PATH_FAILED_REGISTER);
 		AlarmDEC();
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("指纹扫描失败,获取dep路径失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2410")("鎸囩汗鎵�弿澶辫触,鑾峰彇dep璺�緞澶辫触");
 		ctx->Answer(Error_Param);
 		return 0;
 	}
@@ -731,13 +731,13 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 
 	if (bGetFingerPrintSuc){
 		ctx->Ans.reserved1[0] = 1;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID)("指纹仪扫描成功");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID)("鎸囩汗浠�壂鎻忔垚鍔�");
 		ctx->Answer(Error_Succeed);
 	}
 	else if(m_bCancelRegister){
 		m_bCancelRegister = false;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹扫描失败,扫描已取消");
-		//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2412")("指纹扫描失败,扫描已取消");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗鎵�弿澶辫触,鎵�弿宸插彇娑�");
+		//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2412")("鎸囩汗鎵�弿澶辫触,鎵�弿宸插彇娑�");
 		ctx->Ans.reserved1[0] = 3;
 		ctx->Answer(Error_Succeed);
 	}
@@ -749,7 +749,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 		}else {
 			LogWarn(Severity_Middle, Error_Unexpect, FingerPrint_UserErrorCode_Match_Timeout, "match timeout");
 		}
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2411")("指纹扫描失败,扫描超时");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2411")("鎸囩汗鎵�弿澶辫触,鎵�弿瓒呮椂");
 		ctx->Answer(Error_Succeed);
 	}
 	//else if(m_bCancelRegister){
@@ -774,7 +774,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 				}
 				ctx->Answer(Error_Succeed, FingerPrint_UserErrorCode_NO_IMAGE_IN_DEP_MATCH);
 			}
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2416")("指纹扫描失败,采集接口调用成功，但未在dep中找到图片文件");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2416")("鎸囩汗鎵�弿澶辫触,閲囬泦鎺ュ彛璋冪敤鎴愬姛锛屼絾鏈�湪dep涓�壘鍒板浘鐗囨枃浠�");
 		}else if(bFeatureIsNull){
 			ctx->Ans.reserved1[0] = 4;
 			if(bIsRegister){
@@ -789,7 +789,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 				}
 				ctx->Answer(Error_Succeed, FingerPrint_UserErrorCode_GETFEATURE_FAILED_MATCH);
 			}
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2413")("指纹扫描失败,采集接口调用成功，但返回的特征值为空");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2413")("鎸囩汗鎵�弿澶辫触,閲囬泦鎺ュ彛璋冪敤鎴愬姛锛屼絾杩斿洖鐨勭壒寰佸€间负绌�");
 		}else if(bLenIsNotRight){
 			ctx->Ans.reserved1[0] = 5;
 			if(bIsRegister){
@@ -804,10 +804,10 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 				}
 				ctx->Answer(Error_Succeed, FingerPrint_UserErrorCode_FEATURELEN_ISNOTRIGHT_MATCH);
 			}
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2414")("指纹扫描失败,返回的指纹特征长度错误");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2414")("鎸囩汗鎵�弿澶辫触,杩斿洖鐨勬寚绾圭壒寰侀暱搴﹂敊璇�");
 		}else if(bExit){
 			LogWarn(Severity_Middle, Error_Hardware, FingerPrint_UserErrorCode_REGISTER_FAILED, "Exit to homepage when register.");
-			//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2415")("指纹扫描失败,手动Exit退出业务");
+			//DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode(FingerPrint_Scan_ID).setResultCode("RTA2415")("鎸囩汗鎵�弿澶辫触,鎵嬪姩Exit閫€鍑轰笟鍔�");
 			ctx->Ans.reserved1[0] = 6;
 			ctx->Answer(Error_Succeed);
 		}
@@ -820,7 +820,7 @@ int CFingerPrintFSM::GetFingerPrint(SpReqAnsContext<FingerPrintService_GetFinger
 #pragma endregion
 
 #pragma region generate template
-//有用接口
+//鏈夌敤鎺ュ彛
 int CFingerPrintFSM::GenerateTemplate(SpReqAnsContext<FingerPrintService_GenerateTemplate_Req, FingerPrintService_GenerateTemplate_Ans>::Pointer ctx)
 {
 	LOG_FUNCTION();
@@ -830,7 +830,7 @@ int CFingerPrintFSM::GenerateTemplate(SpReqAnsContext<FingerPrintService_Generat
 		ctx->Answer(Error_NotInit);  //maybe no vendor adapter
 		return 0;
 	}
-	//可以去掉？？？
+	//鍙�互鍘绘帀锛燂紵锛�
 	if (m_bCancelRegister) //no cancel button anymore while register
 	{
 		ctx->Answer(Error_Cancel);
@@ -904,13 +904,13 @@ int CFingerPrintFSM::GenerateTemplate(SpReqAnsContext<FingerPrintService_Generat
 	DeleteBmp(BmpImage);
 	if (errCode == Error_Succeed) {
 		//DbgInfo("Image2Template success.");
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(FingerPrint_Generate_Template_ID)("指纹仪模板生成成功");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode(FingerPrint_Generate_Template_ID)("鎸囩汗浠�ā鏉跨敓鎴愭垚鍔�");
 		ctx->Answer(Error_Succeed);
 	}
 	else {
 		SetErrPackage("generate template failed", m_csDevSN, Error_Unexpect, FingerPrint_UserErrorCode_GETTEMPLATE_FAILED);
 		AlarmDEC();
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("指纹仪模板生成失败");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)("鎸囩汗浠�ā鏉跨敓鎴愬け璐�");
 		ctx->Answer(errCode, FingerPrint_UserErrorCode_GETTEMPLATE_FAILED);
 	}