#IQRV #comment 编码转换&类型修正

DevAdapter/self/contactlesscard/VirtualDeviceClass.cpp

@@ -100,7 +100,7 @@ ErrorCodeEnum VirtualDeviceClassImpl::WarmReset()
 	ErrorCodeEnum result = Error_Succeed;
 	return (result = Bridge_WarmReset());
 }
-//δÕÒµ½ÒýÓÃ
+//未找到引用
 ErrorCodeEnum VirtualDeviceClassImpl::MifareCommand(MifareFuctionEnum eFunType, CmdInfo sendBuf, CmdInfo& recvBuf)
 {
 	ErrorCodeEnum result = Error_Unexpect;

DevAdapter/simulator/FingerPrint.1.1/FingerPrint_impl.cpp

@@ -99,7 +99,7 @@ ErrorCodeEnum FingerPrintImpl::Image2Feature(const char* imageName, LPBYTE lpbFe
 	if (err == Error_Succeed)
 	{
 		if (ans.bGenerateFile == 1) {
-			//imageName写入的文件，lpbFeature 特征码，iLength特征码长度
+			//imageName鍐欏叆鐨勬枃浠讹紝lpbFeature 鐗瑰緛鐮侊紝iLength鐗瑰緛鐮侀暱搴�
 			string imgName(imageName);
 			string imgPath = GetCurrentDirectory() + SPLIT_SLASH_STR + imgName;
 			writeFile(imgPath.c_str());
@@ -113,7 +113,7 @@ ErrorCodeEnum FingerPrintImpl::Image2Feature(const char* imageName, LPBYTE lpbFe
 			}
 			char* lastSlash = strrchr(exePath, '\\');
 			if (lastSlash != NULL) {
-				*lastSlash = '\0';  // 将最后一个反斜杠替换为字符串终止符，得到目录路径
+				*lastSlash = '\0';  // 灏嗘渶鍚庝竴涓�弽鏂滄潬鏇挎崲涓哄瓧绗︿覆缁堟�绗︼紝寰楀埌鐩�綍璺�緞
 			}
 			else {
 				LOG4VTM(INFO, "Executable path does not contain directory.");
@@ -121,7 +121,7 @@ ErrorCodeEnum FingerPrintImpl::Image2Feature(const char* imageName, LPBYTE lpbFe
 			}
 			lastSlash = strrchr(exePath, '\\');
 			if (lastSlash != NULL) {
-				*lastSlash = '\0';  // 将最后一个反斜杠替换为字符串终止符，得到目录路径
+				*lastSlash = '\0';  // 灏嗘渶鍚庝竴涓�弽鏂滄潬鏇挎崲涓哄瓧绗︿覆缁堟�绗︼紝寰楀埌鐩�綍璺�緞
 			}
 			else {
 				LOG4VTM(INFO, "Executable path does not contain directory2.");
@@ -154,7 +154,7 @@ ErrorCodeEnum FingerPrintImpl::Image2Feature(const char* imageName, LPBYTE lpbFe
 
 ErrorCodeEnum FingerPrintImpl::Image2Template(const char* imagePath1, const char* imagePath2, const char* imagePath3, LPBYTE lpbTemplate, int& iLength)
 {
-	//获取模板特征码
+	//鑾峰彇妯℃澘鐗瑰緛鐮�
 	LOG4VTM(INFO, "imagePath1 path = " << imagePath1);
 	LOG4VTM(INFO, "imagePath2 path = " << imagePath2);
 	LOG4VTM(INFO, "imagePath3 path = " << imagePath3);

DevAdapter/simulator/FingerPrint.1.1/FingerPrint_impl.h

@@ -23,21 +23,21 @@ public:
 	// Open Device
 	ErrorCodeEnum DevOpen(DWORD dwPort, DWORD dwBaudRate);
 
-	//采集指纹图片及对应特征值,imagePath保存图片名，lpbFeature保存对应特征，iLength:输入代表特征lpbFeature最大可用长度,输出为特征lpbFeature实际长度
-	//imagePath为传入的图片名，采集到的指纹图像请按此名称保存在dep目录下，lpbFeature为对应指纹图像特征
+	//閲囬泦鎸囩汗鍥剧墖鍙婂�搴旂壒寰佸€�,imagePath淇濆瓨鍥剧墖鍚嶏紝lpbFeature淇濆瓨瀵瑰簲鐗瑰緛锛宨Length:杈撳叆浠ｈ〃鐗瑰緛lpbFeature鏈€澶у彲鐢ㄩ暱搴�,杈撳嚭涓虹壒寰乴pbFeature瀹為檯闀垮害
+	//imagePath涓轰紶鍏ョ殑鍥剧墖鍚嶏紝閲囬泦鍒扮殑鎸囩汗鍥惧儚璇锋寜姝ゅ悕绉颁繚瀛樺湪dep鐩�綍涓嬶紝lpbFeature涓哄�搴旀寚绾瑰浘鍍忕壒寰�
 	//Compute features
 	ErrorCodeEnum Image2Feature(const char* imageName, LPBYTE lpbFeature, int& iLength);
 
-	//生成特征模板（注册时使用）
-	//imagePath1、imagePath2、imagePath3表示生成特征需要输入的三张图片名称,由应用传入，lpbTemplate表示输出特征模板，iLength表示模板长度
+	//鐢熸垚鐗瑰緛妯℃澘锛堟敞鍐屾椂浣跨敤锛�
+	//imagePath1銆乮magePath2銆乮magePath3琛ㄧず鐢熸垚鐗瑰緛闇€瑕佽緭鍏ョ殑涓夊紶鍥剧墖鍚嶇О,鐢卞簲鐢ㄤ紶鍏ワ紝lpbTemplate琛ㄧず杈撳嚭鐗瑰緛妯℃澘锛宨Length琛ㄧず妯℃澘闀垮害
 	ErrorCodeEnum Image2Template(const char* imagePath1, const char* imagePath2, const char* imagePath3, LPBYTE lpbTemplate, int& iLength);
 
-	//比对校验
-	//lpbTemplate和iTemplateLen分别表示输入的一组特征模板及其对应的长度，templateNum为数组长度(即模板个数)
-	//lbpFeature表示待校验的指纹特征，iFeatureLen表示其长度，level表示校验等级，默认取3
+	//姣斿�鏍￠獙
+	//lpbTemplate鍜宨TemplateLen鍒嗗埆琛ㄧず杈撳叆鐨勪竴缁勭壒寰佹ā鏉垮強鍏跺�搴旂殑闀垮害锛宼emplateNum涓烘暟缁勯暱搴�(鍗虫ā鏉夸釜鏁�)
+	//lbpFeature琛ㄧず寰呮牎楠岀殑鎸囩汗鐗瑰緛锛宨FeatureLen琛ㄧず鍏堕暱搴︼紝level琛ㄧず鏍￠獙绛夌骇锛岄粯璁ゅ彇3
 	ErrorCodeEnum Match(LPBYTE lpbTemplate[], int iTemplateLen[], int templateNum, LPBYTE lbpFeature, int& iFeatureLen, int level = 3);
 
-	//取消采集指纹
+	//鍙栨秷閲囬泦鎸囩汗
 	ErrorCodeEnum Cancel();
 };
 #endif //LIBFRAMEWORK_FINGERPRINT_IMPL_H

DevAdapter/simulator/cardissuerstand.1.1/cardissuer_httpans.h

@@ -7,11 +7,11 @@ typedef struct CardIssuerStatusAns {
 
 	int eMedia;	//state about card
 	int eRetainBin;
-	int dwRetainCount;	//回收箱容量
-	//根据实际的卡箱数量对相关字段进行赋值
-	std::vector<int> eIssuerBin;//0,1,2,... => hopper 1,2,3,... 需要对1,2,3,...三个卡箱进行对应赋值
-	std::vector<int> dwIssuerCount;	//发卡箱容量，0,1,2,... => 1,2,3,...
-	std::vector<int> eKakuTape;//eKakuTape[0],eKakuTape[1],eKakuTape[2],eKakuTape[3]分别存放平面，凹，凸（金），凸（银）的状态
+	int dwRetainCount;	//鍥炴敹绠卞�閲�
+	//鏍规嵁瀹為檯鐨勫崱绠辨暟閲忓�鐩稿叧瀛楁�杩涜�璧嬪€�
+	std::vector<int> eIssuerBin;//0,1,2,... => hopper 1,2,3,... 闇€瑕佸�1,2,3,...涓変釜鍗＄�杩涜�瀵瑰簲璧嬪€�
+	std::vector<int> dwIssuerCount;	//鍙戝崱绠卞�閲忥紝0,1,2,... => 1,2,3,...
+	std::vector<int> eKakuTape;//eKakuTape[0],eKakuTape[1],eKakuTape[2],eKakuTape[3]鍒嗗埆瀛樻斁骞抽潰锛屽嚬锛屽嚫锛堥噾锛夛紝鍑革紙閾讹級鐨勭姸鎬�
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(eMedia, eRetainBin, dwRetainCount, eIssuerBin, dwIssuerCount, eKakuTape)
 }CardIssuerStatusAns;
@@ -23,7 +23,7 @@ typedef struct GetDeviceSNAns {
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(pDevSN)
 }GetDeviceSNAns;
 
-//////MagRead中MagTracks 嵌套结构体/////////////
+//////MagRead涓璏agTracks 宓屽�缁撴瀯浣�/////////////
 struct TrackInfoJson
 {
 	int eSource;
@@ -45,7 +45,7 @@ typedef struct MagTracksAns {
 typedef struct CmdInfoAns {
 	
 	int dwSize;
-	ByteData data; //字节流数据
+	ByteData data; //瀛楄妭娴佹暟鎹�
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(dwSize, data)
 }CmdInfoAns;
@@ -107,9 +107,9 @@ typedef struct GetSlotSumAns {
 typedef struct SlotStatusAns {
 	
 	int dwSize;//sum of slots
-	//数据下标0~x 表示对应卡槽号0~x的是否有卡的状态
-	//0：卡槽为空，1:卡槽有卡；
-	std::vector<int> status;//int 数组
+	//鏁版嵁涓嬫爣0~x 琛ㄧず瀵瑰簲鍗℃Ы鍙�0~x鐨勬槸鍚︽湁鍗＄殑鐘舵€�
+	//0锛氬崱妲戒负绌猴紝1:鍗℃Ы鏈夊崱锛�
+	std::vector<int> status;//int 鏁扮粍
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(dwSize, status)
 }SlotStatusAns;

DevAdapter/simulator/cardissuerstand.1.1/cardissuer_impl.cpp

@@ -4,7 +4,7 @@
 #include <cstring>
 #include <cstdio>
 #include "log4vendor.h"
-#include <path.h>"
+#include "path.h"
 
 #ifdef _MSC_VER
 BOOL APIENTRY DllMain(HMODULE hModule,

DevAdapter/simulator/cardissuerstore.1.1/cardissuer_httpans.h

@@ -7,11 +7,11 @@ typedef struct CardIssuerStatusAns {
 
 	int eMedia;	//state about card
 	int eRetainBin;
-	int dwRetainCount;	//回收箱容量
-	//根据实际的卡箱数量对相关字段进行赋值
-	std::vector<int> eIssuerBin;//0,1,2,... => hopper 1,2,3,... 需要对1,2,3,...三个卡箱进行对应赋值
-	std::vector<int> dwIssuerCount;	//发卡箱容量，0,1,2,... => 1,2,3,...
-	std::vector<int> eKakuTape;//eKakuTape[0],eKakuTape[1],eKakuTape[2],eKakuTape[3]分别存放平面，凹，凸（金），凸（银）的状态
+	int dwRetainCount;	//鍥炴敹绠卞�閲�
+	//鏍规嵁瀹為檯鐨勫崱绠辨暟閲忓�鐩稿叧瀛楁�杩涜�璧嬪€�
+	std::vector<int> eIssuerBin;//0,1,2,... => hopper 1,2,3,... 闇€瑕佸�1,2,3,...涓変釜鍗＄�杩涜�瀵瑰簲璧嬪€�
+	std::vector<int> dwIssuerCount;	//鍙戝崱绠卞�閲忥紝0,1,2,... => 1,2,3,...
+	std::vector<int> eKakuTape;//eKakuTape[0],eKakuTape[1],eKakuTape[2],eKakuTape[3]鍒嗗埆瀛樻斁骞抽潰锛屽嚬锛屽嚫锛堥噾锛夛紝鍑革紙閾讹級鐨勭姸鎬�
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(eMedia, eRetainBin, dwRetainCount, eIssuerBin, dwIssuerCount, eKakuTape)
 }CardIssuerStatusAns;
@@ -23,7 +23,7 @@ typedef struct GetDeviceSNAns {
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(pDevSN)
 }GetDeviceSNAns;
 
-//////MagRead中MagTracks 嵌套结构体/////////////
+//////MagRead涓璏agTracks 宓屽�缁撴瀯浣�/////////////
 struct TrackInfoJson
 {
 	int eSource;
@@ -45,7 +45,7 @@ typedef struct MagTracksAns {
 typedef struct CmdInfoAns {
 	
 	int dwSize;
-	ByteData data; //字节流数据
+	ByteData data; //瀛楄妭娴佹暟鎹�
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(dwSize, data)
 }CmdInfoAns;
@@ -107,9 +107,9 @@ typedef struct GetSlotSumAns {
 typedef struct SlotStatusAns {
 	
 	int dwSize;//sum of slots
-	//数据下标0~x 表示对应卡槽号0~x的是否有卡的状态
-	//0：卡槽为空，1:卡槽有卡；
-	std::vector<int> status;//int 数组
+	//鏁版嵁涓嬫爣0~x 琛ㄧず瀵瑰簲鍗℃Ы鍙�0~x鐨勬槸鍚︽湁鍗＄殑鐘舵€�
+	//0锛氬崱妲戒负绌猴紝1:鍗℃Ы鏈夊崱锛�
+	std::vector<int> status;//int 鏁扮粍
 
 	JSONCONVERT2OBJECT_MEMEBER_REGISTER(dwSize, status)
 }SlotStatusAns;

DevAdapter/simulator/contactlesscard.1.1/contactless_impl.cpp

@@ -30,10 +30,10 @@ ErrorCodeEnum ContactlessCardImpl::GetDevCategory(DevCategoryInfo &devCategory)
     strcpy(devCategory.szModel, ans.szModel.c_str());
     strcpy(devCategory.szVendor, ans.szVendor.c_str());
     devCategory.eState = (DevStateEnum)ans.eState;
-    devCategory.version.wMajor = ans.version.wMajor;
-    devCategory.version.wMinor = ans.version.wMinor;
-    devCategory.version.wRevision = ans.version.wRevision;
-    devCategory.version.wBuild = ans.version.wBuild;
+    devCategory.version.wMajor = (WORD)ans.version.wMajor;
+    devCategory.version.wMinor = (WORD)ans.version.wMinor;
+    devCategory.version.wRevision = (WORD)ans.version.wRevision;
+    devCategory.version.wBuild = (WORD)ans.version.wBuild;
 
     return err;
 }

DevAdapter/simulator/deps/libSimulaRestful/JsonConvertHelper.hpp

@@ -25,7 +25,7 @@ static int StrBuf2HexBuf(const char* strBuf, PBYTE* hexBuf)
     for (int i = 0; i < len;) {
         int tmpVal;
         sscanf(strBuf + i, "%2X", &tmpVal);
-        buf[j] = tmpVal;
+        buf[j] = (BYTE)tmpVal;
         i += 2;
         j++;
     }
@@ -317,7 +317,7 @@ static bool Json2Object(std::vector<T>& aimObj, const Json::Value& jsonTypeValue
     } else {
         aimObj.clear();
         bool result(true);
-        for (int i = 0; i < jsonTypeValue.size(); ++i) {
+        for (std::size_t i = 0; i < jsonTypeValue.size(); ++i) {
             T item;
             if (!Json2Object(item, jsonTypeValue[i])) {
                 result = false;
@@ -399,7 +399,7 @@ template <typename T>
 static bool Object2Json(Json::Value& jsonTypeOutValue, const std::string& key, const std::vector<T>& objValue)
 {
     bool result(true);
-    for (int i = 0; i < objValue.size(); ++i) {
+    for (std::size_t i = 0; i < objValue.size(); ++i) {
         Json::Value item;
         if (!Object2Json(item, "", objValue[i])) {
             result = false;

DevAdapter/simulator/gpio.1.1/gpio_impl.cpp

@@ -29,10 +29,10 @@ ErrorCodeEnum GPIOClassImpl::GetDevCategory(DevCategoryInfo &devCategory)
     strcpy(devCategory.szModel, ans.szModel.c_str());
     strcpy(devCategory.szVendor, ans.szVendor.c_str());
     devCategory.eState = (DevStateEnum)ans.eState;
-    devCategory.version.wMajor = ans.version.wMajor;
-    devCategory.version.wMinor = ans.version.wMinor;
-    devCategory.version.wRevision = ans.version.wRevision;
-    devCategory.version.wBuild = ans.version.wBuild;
+    devCategory.version.wMajor = (WORD)ans.version.wMajor;
+    devCategory.version.wMinor = (WORD)ans.version.wMinor;
+    devCategory.version.wRevision = (WORD)ans.version.wRevision;
+    devCategory.version.wBuild = (WORD)ans.version.wBuild;
 
     return err;
 }

DevAdapter/simulator/gpio.1.1/gpio_impl.h

@@ -47,34 +47,34 @@ public:
 #ifndef _MSC_VER
 
     /// <summary>
-    /// 打开指定模块的提示灯
+    /// 鎵撳紑鎸囧畾妯″潡鐨勬彁绀虹伅
     /// </summary>
     /// <param name="dwReq">
-    /// 硬件灯模块序号，见上方定义GPIO_DEV_SN_*，或参考规格说明文档，只会传送模式为”驱动“的序号之一
-    /// 只会设置灯，如果是其他值则返回 Error_NotSupport
+    /// 纭�欢鐏�ā鍧楀簭鍙凤紝瑙佷笂鏂瑰畾涔塆PIO_DEV_SN_*锛屾垨鍙傝€冭�鏍艰�鏄庢枃妗ｏ紝鍙�細浼犻€佹ā寮忎负鈥濋┍鍔ㄢ€滅殑搴忓彿涔嬩竴
+    /// 鍙�細璁剧疆鐏�紝濡傛灉鏄�叾浠栧€煎垯杩斿洖 Error_NotSupport
     /// </param>
     /// <param name="dwMode">
-    /// 入参，指定灯的属性如常亮还是闪烁，是普通灯颜色还是故障灯颜色
-    /// 不同属性可以通过与的方式合并传入，如灯颜色和亮灯模式，同一属性只会传入其中一个值，比如灯常亮和闪烁只会传入其中之一
-    /// 具体值表示的内容参考上方定义的内容 GPIO_DEV_LIGHT_MODE_*
+    /// 鍏ュ弬锛屾寚瀹氱伅鐨勫睘鎬у�甯镐寒杩樻槸闂�儊锛屾槸鏅�€氱伅棰滆壊杩樻槸鏁呴殰鐏��鑹�
+    /// 涓嶅悓灞炴€у彲浠ラ€氳繃涓庣殑鏂瑰紡鍚堝苟浼犲叆锛屽�鐏��鑹插拰浜�伅妯″紡锛屽悓涓€灞炴€у彧浼氫紶鍏ュ叾涓�竴涓�€硷紝姣斿�鐏�父浜�拰闂�儊鍙�細浼犲叆鍏朵腑涔嬩竴
+    /// 鍏蜂綋鍊艰〃绀虹殑鍐呭�鍙傝€冧笂鏂瑰畾涔夌殑鍐呭� GPIO_DEV_LIGHT_MODE_*
     /// </param>
     /// <returns>
-    ///  参数有误或设置失败返回对应的报错
+    ///  鍙傛暟鏈夎�鎴栬�缃�け璐ヨ繑鍥炲�搴旂殑鎶ラ敊
     /// </returns>
     virtual ErrorCodeEnum SetStatus(DWORD dwReq, DWORD dwMode);
 
     /// <summary>
-    /// 获取探测器的状态
+    /// 鑾峰彇鎺㈡祴鍣ㄧ殑鐘舵€�
     /// </summary>
     /// <param name="dwReq">
-    /// 感应模块序号，见上方定义GPIO_DEV_SN_*，或参考规格说明文档，只会传送模式为”接收“的序号
-    /// 这个可能是与的关系，即有可能会一个调用同时获取多个模块的状态
+    /// 鎰熷簲妯″潡搴忓彿锛岃�涓婃柟瀹氫箟GPIO_DEV_SN_*锛屾垨鍙傝€冭�鏍艰�鏄庢枃妗ｏ紝鍙�細浼犻€佹ā寮忎负鈥濇帴鏀垛€滅殑搴忓彿
+    /// 杩欎釜鍙�兘鏄�笌鐨勫叧绯伙紝鍗虫湁鍙�兘浼氫竴涓�皟鐢ㄥ悓鏃惰幏鍙栧�涓�ā鍧楃殑鐘舵€�
     /// </param>
     /// <param name="dwMode">
-    /// 对应模块（有震动、开门、摘机、有人靠近）对应的位，如果是高电平置为1，如果低电平则置为0
+    /// 瀵瑰簲妯″潡锛堟湁闇囧姩銆佸紑闂ㄣ€佹憳鏈恒€佹湁浜洪潬杩戯級瀵瑰簲鐨勪綅锛屽�鏋滄槸楂樼數骞崇疆涓�1锛屽�鏋滀綆鐢靛钩鍒欑疆涓�0
     /// </param>
     /// <returns>
-    /// 无法获取状态则返回报错
+    /// 鏃犳硶鑾峰彇鐘舵€佸垯杩斿洖鎶ラ敊
     /// </returns>
     virtual ErrorCodeEnum DetectStatus(DWORD dwReq, DWORD& dwMode);
 

DevAdapter/simulator/idcer.1.1/idcer_httpans.h

@@ -15,37 +15,37 @@ typedef struct IDCerDevAns
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }sex;
-    struct Nation {//民族（二代证专用）
+    struct Nation {//姘戞棌锛堜簩浠ｈ瘉涓撶敤锛�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }nation;
-    struct Birthday {//出生日期，原始格式:19861007
+    struct Birthday {//鍑虹敓鏃ユ湡锛屽師濮嬫牸寮�:19861007
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }birthday;
-    struct Address {//住址（二代证专用）
+    struct Address {//浣忓潃锛堜簩浠ｈ瘉涓撶敤锛�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }address;
-    struct Idno {//证件号码，二代证指身份证号，外国人指永久居留证号
-        std::string data; //拓展至64字节
+    struct Idno {//璇佷欢鍙风爜锛屼簩浠ｈ瘉鎸囪韩浠借瘉鍙凤紝澶栧浗浜烘寚姘镐箙灞呯暀璇佸彿
+        std::string data; //鎷撳睍鑷�64瀛楄妭
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }idno;
-    struct Department {//二代证指签发机关，外国人指当次申请受理机关代码
+    struct Department {//浜屼唬璇佹寚绛惧彂鏈哄叧锛屽�鍥戒汉鎸囧綋娆＄敵璇峰彈鐞嗘満鍏充唬鐮�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }department;
-    struct StartDate {//有效期起始日（签发日）原始格式：20200809
+    struct StartDate {//鏈夋晥鏈熻捣濮嬫棩锛堢�鍙戞棩锛夊師濮嬫牸寮忥細20200809
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }startDate;
-    struct EndDate {//有效期截止日（终止日）原始格式：20200809
+    struct EndDate {//鏈夋晥鏈熸埅姝㈡棩锛堢粓姝㈡棩锛夊師濮嬫牸寮忥細20200809
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
@@ -55,62 +55,62 @@ typedef struct IDCerDevAns
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }photoPath;
-    struct NewAddress {//最新地址，二代证专用
+    struct NewAddress {//鏈€鏂板湴鍧€锛屼簩浠ｈ瘉涓撶敤
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }newAddress;
-    struct EnglishName {//英文姓名，外国人专用
+    struct EnglishName {//鑻辨枃濮撳悕锛屽�鍥戒汉涓撶敤
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }englishName;
-    struct Nationality {//国籍或地区代码，外国人专用
+    struct Nationality {//鍥界睄鎴栧湴鍖轰唬鐮侊紝澶栧浗浜轰笓鐢�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }nationality;
-    struct IdVersion {//证件版本号，外国人专用
+    struct IdVersion {//璇佷欢鐗堟湰鍙凤紝澶栧浗浜轰笓鐢�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }idVersion;
-    struct IdType {//证件类型标识，外国人取值'I'，二代证为空
+    struct IdType {//璇佷欢绫诲瀷鏍囪瘑锛屽�鍥戒汉鍙栧€�'I'锛屼簩浠ｈ瘉涓虹┖
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }idType;
-    struct Reserved {//保留字段，外国人专用
+    struct Reserved {//淇濈暀瀛楁�锛屽�鍥戒汉涓撶敤
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }reserved;
-    struct TXZCode {//通行证号码（港澳台居住证）
+    struct TXZCode {//閫氳�璇佸彿鐮侊紙娓�境鍙板眳浣忚瘉锛�
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }txzCode;
-    struct IssuedSN {//签发次数（港澳台居住证）
+    struct IssuedSN {//绛惧彂娆℃暟锛堟腐婢冲彴灞呬綇璇侊級
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }issuedSN;
-    struct Reserved2 {//备用2（港澳台居住证）
+    struct Reserved2 {//澶囩敤2锛堟腐婢冲彴灞呬綇璇侊級
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }reserved2;
-    struct Reserved3 {//备用3（港澳台居住证）
+    struct Reserved3 {//澶囩敤3锛堟腐婢冲彴灞呬綇璇侊級
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }reserved3;
-    struct Reserved4 {//备用4（港澳台居住证）
+    struct Reserved4 {//澶囩敤4锛堟腐婢冲彴灞呬綇璇侊級
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)
     }reserved4;
-    struct Reserved5 {//备用5（港澳台居住证）
+    struct Reserved5 {//澶囩敤5锛堟腐婢冲彴灞呬綇璇侊級
         std::string data;
         int dwSize;
         JSONCONVERT2OBJECT_MEMEBER_REGISTER(data, dwSize)

DevAdapter/simulator/idcer.1.1/idcer_impl.h

@@ -31,7 +31,7 @@ public:
     ErrorCodeEnum ScanIDAndSaveImage();
     ErrorCodeEnum QueryCardPos(int &pos);
 
-    ///////身份证数据格式转换函数////////
+    ///////韬�唤璇佹暟鎹�牸寮忚浆鎹㈠嚱鏁�////////
     ErrorCodeEnum ex2HttpFunction(IDCerInfoEx2& idCerInfoEx2);
 };
 

DevAdapter/simulator/include/DeviceSimulator.h

@@ -194,7 +194,7 @@ private:
 		{
 			return;
 		}
-		int i, start_pos, end_pos;
+		std::size_t i, start_pos, end_pos;
 		for (i = 0; i < str.size(); ++i) {
 			if (!IsSpace(str[i])) {
 				break;

Other/libCMBPrint/Card-v4.cpp

@@ -15,6 +15,7 @@ CARD* g_pCard = NULL;
 
 char *CARD::SIGNCARD_ISOcode( SIGN_CARD_DATA *dat) //hz, 97.01.30
 {
+	//TODO: 成员变量中有这个变量，很奇怪在这里  [Gifur@202572]
 	static char trackData[300];
 	SIGN_CARD_TRACK2  defTrack2 =
 	{

Tool/GuardianBase/GuardianBase.cpp

@@ -244,6 +244,7 @@ void ReceiveDataOfOneWay(int socket)
 		iResult = recv(socket, recvbuf, recvbuflen, 0);
 		if (iResult > 0)
 		{
+			//TODO: delete  [Gifur@202572]
 			//printf("Bytes received: %d\n%s\n", iResult,recvbuf);
 			switch (recvbuf[0])
 			{