#IQRV #comment 编码格式调整

Module/include/DevEntityCommBase.hpp

@@ -158,10 +158,10 @@ inline ErrorCodeEnum CDevAdptEntityBase::ExtractVendorLibName()
 		CSimpleStringA strDeviceEntityName = GetEntityName();		
 		
 #ifndef DEVOPS_ON_PRD
-		//非生产情况下，才支持测试模式
+		//闈炵敓浜ф儏鍐典笅锛屾墠鏀�寔娴嬭瘯妯″紡
 		CSystemRunInfo runInfo = { 0 };
 		ErrorCodeEnum ec = GetFunction()->GetSystemRunInfo(runInfo);
-		if (ec == Error_Succeed && runInfo.autoTest) //识别成测试模式的条件
+		if (ec == Error_Succeed && runInfo.autoTest) //璇嗗埆鎴愭祴璇曟ā寮忕殑鏉′欢
 		{
 			vendorLibInfo.strDevice = strDeviceEntityName;
 			vendorLibInfo.strVendor = "simulator";
@@ -176,10 +176,6 @@ inline ErrorCodeEnum CDevAdptEntityBase::ExtractVendorLibName()
 			}
 			CSimpleStringA strSection = CSimpleStringA("Device.") + strDeviceEntityName;
 			vendorLibInfo.strDevice = strDeviceEntityName;
-
-			CSystemRunInfo runInfo = { 0 };
-			ErrorCodeEnum ec = GetFunction()->GetSystemRunInfo(runInfo);
-
 			spRootConfig->ReadConfigValue(strSection, "Vendor", vendorLibInfo.strVendor);
 			spRootConfig->ReadConfigValue(strSection, "Version", vendorLibInfo.strVersion);
 			spRootConfig->ReadConfigValue(strSection, "Batch", vendorLibInfo.strBatch);

Module/include/DevFSMCommBase.hpp

@@ -554,7 +554,7 @@ struct AdapterInfo : public AdaptorInfo
 		strcpy(devCatInfo.szModel, rhs.szModel);
 		strcpy(devCatInfo.szVendor, rhs.szVendor);
 
-        CSimpleStringA strVersion = CSimpleStringA::Format("%d.%d.%d.%d", devCatInfo.version.wMajor, devCatInfo.version.wMinor, devCatInfo.version.wRevision, devCatInfo.version.wBuild);
+        CSimpleStringA strCatVersion = CSimpleStringA::Format("%d.%d.%d.%d", devCatInfo.version.wMajor, devCatInfo.version.wMinor, devCatInfo.version.wRevision, devCatInfo.version.wBuild);
 
 		if (strlen(devCatInfo.szType) >= MAX_DEV_TYPE_LEN) {
 			devCatInfo.szType[MAX_DEV_TYPE_LEN - 1] = '\0';
@@ -566,7 +566,7 @@ struct AdapterInfo : public AdaptorInfo
 			devCatInfo.szVendor[MAX_DEV_VENDOR_LEN - 1] = '\0';
 		}
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("GetDevCategory")("{\"szVendor\":\"%s\",\"szType\":\"%s\",\"szModel\":\"%s\",\"szVersion\":\"%s\"}", devCatInfo.szVendor, devCatInfo.szType, devCatInfo.szModel, strVersion.GetData());
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("GetDevCategory")("{\"szVendor\":\"%s\",\"szType\":\"%s\",\"szModel\":\"%s\",\"szVersion\":\"%s\"}", devCatInfo.szVendor, devCatInfo.szType, devCatInfo.szModel, strCatVersion.GetData());
 		
 		CheckCategoryInfoFormat();
 	}

Module/mod_CardIssuerStand/mod_cardissuer.cpp

@@ -151,7 +151,7 @@ void CCardIssuerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue,
 	{
 		if (_strnicmp(pszValue, "M", strlen("M")) == 0) {
 			m_fsm.SetInWhatPage(PageType_MainPage);
-			m_fsm.SetEnterMainPage();//ÉèÖýøÈëÊ×Ò³
+			m_fsm.SetEnterMainPage();//设置进入首页
 		}
 		else if (_strnicmp(pszValue, "U", strlen("U")) == 0) {
 			m_fsm.SetInWhatPage(PageType_UserDesktop);

Module/mod_DeviceControl/DeviceAdaptChecker.cpp

@@ -192,7 +192,7 @@ bool VendorLibInfoEx::Load(CSimpleStringA& adapterFilename)
             break;
         }
     }
-    ///**TODO(Gifur@10/19/2021): 保守写法，需考虑到文件名异常的情况 */
+    ///**TODO(Gifur@10/19/2021): 淇濆畧鍐欐硶锛岄渶鑰冭檻鍒版枃浠跺悕寮傚父鐨勬儏鍐� */
     for (int i = 0; result && i < adapterElems.GetCount(); ++i) {
         switch (i) {
         case 0:

Module/mod_DeviceControl/mod_DeviceControl.cpp

@@ -32,7 +32,7 @@
 
 #endif //RVC_OS_WIN
 
-#define DeviceControl_MouseMove  0x21400301	//鼠标移动
+#define DeviceControl_MouseMove  0x21400301	//榧犳爣绉诲姩
 
 void CDeviceControlServerSession::Handle_USB(SpReqAnsContext<DeviceControlService_USB_Req, DeviceControlService_USB_Ans>::Pointer ctx)
 {
@@ -115,9 +115,9 @@ void CDeviceControlEntity::QueryHardwareInfo(SpReqAnsContext<DeviceControlServic
 	GetFunction()->OpenConfig(Config_Root, spConfig);
 	spConfig->ReadConfigValue("Device.PinPad", "Vendor", deviceFct);
 
-    //获取操作系统版本信息
+    //鑾峰彇鎿嶄綔绯荤粺鐗堟湰淇℃伅
 #if defined(_MSC_VER)
-        //获取windows系统版本
+        //鑾峰彇windows绯荤粺鐗堟湰
     DWORD dwMajorVer, dwMinorVer, dwBuildNumber;
     BOOL bRet = FALSE;
     HMODULE hModNtdll = NULL;
@@ -153,15 +153,15 @@ void CDeviceControlEntity::QueryHardwareInfo(SpReqAnsContext<DeviceControlServic
         ctx->Ans.terminalNo = info.strTerminalID;
         ctx->Ans.termLimit = "";
         ctx->Ans.termVersion = info.InstallVersion.ToString();
-#ifdef DEVOPS_ON_ST /*DevOps流水线编译，ST环境*/
+#ifdef DEVOPS_ON_ST /*DevOps娴佹按绾跨紪璇戯紝ST鐜��*/
         ctx->Ans.reserved1 = 1;
-#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译，UAT环境*/
+#elif defined(DEVOPS_ON_UAT)/*DevOps娴佹按绾跨紪璇戯紝UAT鐜��*/
         ctx->Ans.reserved1 = 2;
-#elif defined(DEVOPS_ON_PRD)/*DevOps流水线编译，PRD环境*/
+#elif defined(DEVOPS_ON_PRD)/*DevOps娴佹按绾跨紪璇戯紝PRD鐜��*/
         ctx->Ans.reserved1 = 3;
-#elif defined(DEVOPS_ON_DEV)/*DevOps流水线编译，Dev环境*/
+#elif defined(DEVOPS_ON_DEV)/*DevOps娴佹按绾跨紪璇戯紝Dev鐜��*/
         ctx->Ans.reserved1 = 0;
-#else/*本地编译等非DevOps环境编译的版本*/
+#else/*鏈�湴缂栬瘧绛夐潪DevOps鐜��缂栬瘧鐨勭増鏈�*/
         ctx->Ans.reserved1 = 0;
 #endif	
         ctx->Ans.reserved3 = sysVer;
@@ -322,7 +322,7 @@ void CDeviceControlEntity::ReadConfigValue(SpReqAnsContext<DeviceControlService_
         CSimpleStringA section(ctx->Req.section);
         CSimpleStringA key(ctx->Req.key);
 #ifndef DEVOPS_ON_PRD
-        /** 被逼的，方便测试环境验证，并且在只读的情况下 [Gifur@2022127]*/
+        /** 琚�€肩殑锛屾柟渚挎祴璇曠幆澧冮獙璇侊紝骞朵笖鍦ㄥ彧璇荤殑鎯呭喌涓� [Gifur@2022127]*/
         if (ctx->Req.reserved1 == 1 && !ctx->Req.option) {
 #ifdef DEVOPS_ON_ST
             section.Append("_ST");
@@ -519,7 +519,7 @@ void CDeviceControlEntity::GetVendorFileList(SpReqAnsContext<DeviceControlServic
 				regerror(ret, &reg, ebuff, 256);
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("regex failed: %s", ebuff);
 				tmpResult = Error_Unexpect;
-				tmpMsg = CSimpleStringA::Format("内部错误：REGEX %s", ebuff);
+				tmpMsg = CSimpleStringA::Format("鍐呴儴閿欒�锛歊EGEX %s", ebuff);
 			} else {
 				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("pattern: %s", pattern.GetData());
 				for (int i = 0; i < subs->nelts; ++i) {
@@ -586,7 +586,7 @@ void CDeviceControlEntity::TestAdapterFileAvailable(
 	CSimpleStringA tmpMsg(true);
 
 
-	if (ctx->Req.type == 1) /*循环验证配置适配器的有效性*/ {
+	if (ctx->Req.type == 1) /*寰�幆楠岃瘉閰嶇疆閫傞厤鍣ㄧ殑鏈夋晥鎬�*/ {
 		CAdapterLoadChecker* checker = new CAdapterLoadChecker();
 		checker->Init(this);
 		CAutoArray<CAdapterLoader*>& tmp = checker->AdapterCoinfigList();
@@ -720,7 +720,7 @@ void CDeviceControlEntity::OnPreStart(CAutoArray<CSimpleStringA> strArgs, CSmart
 {
     LOG_FUNCTION();
     ErrorCodeEnum rt = m_fsm.Init(this);
-    ///**TODO(Gifur@9/28/2023): UOS 下需要监控鼠标移动状态吗？ */
+    ///**TODO(Gifur@9/28/2023): UOS 涓嬮渶瑕佺洃鎺ч紶鏍囩Щ鍔ㄧ姸鎬佸悧锛� */
 #if defined(_MSC_VER)
     CloseHandle(CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)&cursorPosUpdate, NULL, 0, NULL));
 #endif //_MSC_VER

Module/mod_IDCertificate/IDCertificate_UserErrorCode.h

@@ -3,35 +3,35 @@
 #pragma once
 
 #define IDCertificate_UserErrorCode_Start 0x20100200
-#define IDCertificate_UserErrorCode_Open_RootCfg_Failed		(IDCertificate_UserErrorCode_Start + 1)	//打开Root.ini失败 201000201
-#define IDCertificate_UserErrorCode_LogInfoAboutTerm		(IDCertificate_UserErrorCode_Start + 2)	//告警上送终端模块信息
-#define IDCertificate_UserErrorCode_KxdDeviceInfo			(IDCertificate_UserErrorCode_Start + 3) //告警上送凯欣达机型信息
-#define IDCertificate_UserErrorCode_RootInfo			    (IDCertificate_UserErrorCode_Start + 4) //root信息
-#define IDCertificate_UserErrorCode_ScanIImageFailed        (IDCertificate_UserErrorCode_Start + 5) //扫描图像失败
-#define IDCertificate_UserErrorCode_InvalidStartDate		(IDCertificate_UserErrorCode_Start + 6) //告警开始日期非法
-#define IDCertificate_UserErrorCode_InvalidEndDate		    (IDCertificate_UserErrorCode_Start + 7) //告警结束日期非法
-#define IDCertificate_UserErrorCode_InvalidBirthDate		(IDCertificate_UserErrorCode_Start + 8) //告警生日日期非法
-#define IDCertificate_UserErrorCode_StartDate				(IDCertificate_UserErrorCode_Start + 9) //上传开始日期
-#define IDCertificate_UserErrorCode_EndDate					(IDCertificate_UserErrorCode_Start + 10) //上传结束日期
-#define IDCertificate_UserErrorCode_BirthDate				(IDCertificate_UserErrorCode_Start + 11) //上传生日日期
-#define IDCertificate_UserErrorCode_NotMatch         		(IDCertificate_UserErrorCode_Start + 12) //起止日期不匹配
-#define IDCertificate_UserErrorCode_DevOpenFailed			(IDCertificate_UserErrorCode_Start + 13) //实体打开失败 2010020d
-#define IDCertificate_UserErrorCode_DllLoadFailed			(IDCertificate_UserErrorCode_Start + 14) //厂商适配器加载失败 2010020e
-#define IDCertificate_UserErrorCode_Release_Object_Failed	(IDCertificate_UserErrorCode_Start + 15) //释放设备失败
+#define IDCertificate_UserErrorCode_Open_RootCfg_Failed		(IDCertificate_UserErrorCode_Start + 1)	//鎵撳紑Root.ini澶辫触 201000201
+#define IDCertificate_UserErrorCode_LogInfoAboutTerm		(IDCertificate_UserErrorCode_Start + 2)	//鍛婅�涓婇€佺粓绔�ā鍧椾俊鎭�
+#define IDCertificate_UserErrorCode_KxdDeviceInfo			(IDCertificate_UserErrorCode_Start + 3) //鍛婅�涓婇€佸嚡娆ｈ揪鏈哄瀷淇℃伅
+#define IDCertificate_UserErrorCode_RootInfo			    (IDCertificate_UserErrorCode_Start + 4) //root淇℃伅
+#define IDCertificate_UserErrorCode_ScanIImageFailed        (IDCertificate_UserErrorCode_Start + 5) //鎵�弿鍥惧儚澶辫触
+#define IDCertificate_UserErrorCode_InvalidStartDate		(IDCertificate_UserErrorCode_Start + 6) //鍛婅�寮€濮嬫棩鏈熼潪娉�
+#define IDCertificate_UserErrorCode_InvalidEndDate		    (IDCertificate_UserErrorCode_Start + 7) //鍛婅�缁撴潫鏃ユ湡闈炴硶
+#define IDCertificate_UserErrorCode_InvalidBirthDate		(IDCertificate_UserErrorCode_Start + 8) //鍛婅�鐢熸棩鏃ユ湡闈炴硶
+#define IDCertificate_UserErrorCode_StartDate				(IDCertificate_UserErrorCode_Start + 9) //涓婁紶寮€濮嬫棩鏈�
+#define IDCertificate_UserErrorCode_EndDate					(IDCertificate_UserErrorCode_Start + 10) //涓婁紶缁撴潫鏃ユ湡
+#define IDCertificate_UserErrorCode_BirthDate				(IDCertificate_UserErrorCode_Start + 11) //涓婁紶鐢熸棩鏃ユ湡
+#define IDCertificate_UserErrorCode_NotMatch         		(IDCertificate_UserErrorCode_Start + 12) //璧锋�鏃ユ湡涓嶅尮閰�
+#define IDCertificate_UserErrorCode_DevOpenFailed			(IDCertificate_UserErrorCode_Start + 13) //瀹炰綋鎵撳紑澶辫触 2010020d
+#define IDCertificate_UserErrorCode_DllLoadFailed			(IDCertificate_UserErrorCode_Start + 14) //鍘傚晢閫傞厤鍣ㄥ姞杞藉け璐� 2010020e
+#define IDCertificate_UserErrorCode_Release_Object_Failed	(IDCertificate_UserErrorCode_Start + 15) //閲婃斁璁惧�澶辫触
 #define IDCertificate_UserErrorCode_CancelOperation			(IDCertificate_UserErrorCode_Start + 16)
-#define IDCertificate_UserErrorCode_DevOpen_Success			(IDCertificate_UserErrorCode_Start + 20) //身份证打开成功 201000214
-#define IDCertificate_UserErrorCode_FWB_NotConnected		(IDCertificate_UserErrorCode_Start + 21) //RVC.PAD机型蓝牙多合一未连接
-#define IDCertificate_UserErrorCode_Reading_Disconnected	(IDCertificate_UserErrorCode_Start + 22) //读证时蓝牙多合一断开
+#define IDCertificate_UserErrorCode_DevOpen_Success			(IDCertificate_UserErrorCode_Start + 20) //韬�唤璇佹墦寮€鎴愬姛 201000214
+#define IDCertificate_UserErrorCode_FWB_NotConnected		(IDCertificate_UserErrorCode_Start + 21) //RVC.PAD鏈哄瀷钃濈墮澶氬悎涓€鏈�繛鎺�
+#define IDCertificate_UserErrorCode_Reading_Disconnected	(IDCertificate_UserErrorCode_Start + 22) //璇昏瘉鏃惰摑鐗欏�鍚堜竴鏂�紑
 
-#define IDCertificate_UserErrorCode_ScanImg_Failed			(IDCertificate_UserErrorCode_Start + 25) //身份证图片检测失败 
-#define IDCertificate_UserErrorCode_ReadAndScan_Failed		(IDCertificate_UserErrorCode_Start + 26) //读取身份证失败 2010021a
-#define IDCertificate_UserErrorCode_ReadAndScan_Interrupt	(IDCertificate_UserErrorCode_Start + 27) //读取身份证异常退出 2010021b
-#define IDCertificate_UserErrorCode_ReadAndScan_NotHanZi	(IDCertificate_UserErrorCode_Start + 28) //读取身份证非汉字 错误码为 2010021c
-#define IDCertificate_UserErrorCode_ReadAndScan_GetIDInfo	(IDCertificate_UserErrorCode_Start + 29) //读取身份证信息 错误码为 2010021d
-#define IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild (IDCertificate_UserErrorCode_Start + 30) // 扫描图片获取失败错误码为 2010021e
-#define IDCertificate_UserErrorCode_ReadAndScan_NotOnReading	0x2010021f //实体不在读证状态
+#define IDCertificate_UserErrorCode_ScanImg_Failed			(IDCertificate_UserErrorCode_Start + 25) //韬�唤璇佸浘鐗囨�娴嬪け璐� 
+#define IDCertificate_UserErrorCode_ReadAndScan_Failed		(IDCertificate_UserErrorCode_Start + 26) //璇诲彇韬�唤璇佸け璐� 2010021a
+#define IDCertificate_UserErrorCode_ReadAndScan_Interrupt	(IDCertificate_UserErrorCode_Start + 27) //璇诲彇韬�唤璇佸紓甯搁€€鍑� 2010021b
+#define IDCertificate_UserErrorCode_ReadAndScan_NotHanZi	(IDCertificate_UserErrorCode_Start + 28) //璇诲彇韬�唤璇侀潪姹夊瓧 閿欒�鐮佷负 2010021c
+#define IDCertificate_UserErrorCode_ReadAndScan_GetIDInfo	(IDCertificate_UserErrorCode_Start + 29) //璇诲彇韬�唤璇佷俊鎭� 閿欒�鐮佷负 2010021d
+#define IDCertificate_UserErrorCode_ReadAndScan_TransImgFaild (IDCertificate_UserErrorCode_Start + 30) // 鎵�弿鍥剧墖鑾峰彇澶辫触閿欒�鐮佷负 2010021e
+#define IDCertificate_UserErrorCode_ReadAndScan_NotOnReading	0x2010021f //瀹炰綋涓嶅湪璇昏瘉鐘舵€�
 
 
-//#define IDCertificate_UserErrorCode_Real_Root_Config		(IDCertificate_UserErrorCode_Start + 31) //加载实际的root配置
+//#define IDCertificate_UserErrorCode_Real_Root_Config		(IDCertificate_UserErrorCode_Start + 31) //鍔犺浇瀹為檯鐨剅oot閰嶇疆
 
 #endif //_IDCERTIFICATE_USER_ERRORCODE_H

Module/mod_pinpad/mod_PinPad.h

@@ -181,7 +181,7 @@ public:
 			ErrorCodeEnum eGetDevInfo = m_fsm.GetDevInfo(devInfo);
 			if (eGetDevInfo == Error_Succeed)
 			{
-				//oiltmp@20240823 纪林的与业务组的初始化优化完成之后，是不是不要再拼接了？
+				//oiltmp@20240823 绾�灄鐨勪笌涓氬姟缁勭殑鍒濆�鍖栦紭鍖栧畬鎴愪箣鍚庯紝鏄�笉鏄�笉瑕佸啀鎷兼帴浜嗭紵
 				CSimpleStringA tmpAddStr("");
 				tmpAddStr = tmpAddStr + "Vendor=" + devInfo.szVendor;
 				if (devInfo.szModel[strlen(devInfo.szModel) - 1] == '#')