Forráskód Böngészése

xml读取出来的数据是utf-8编码的,在C++ gbk中不需要转换,直接http发送即可;

scbc.sat2 5 éve
szülő
commit
4c8cd0aca4

+ 1 - 1
SATService/SATService/CharEncoding.cpp

@@ -570,7 +570,7 @@ string CharEncoding::EnCode_UNICODEURL(IN const CHAR* pText)
 	MultiByteToWideChar(CP_ACP, 0, pText, -1, (LPWSTR)pwchBuf, nLength);
 
 	unsigned char h, l;
-	char tempbuff[6] = {0};	
+	char tempbuff[8] = {0};	
 	for (size_t i = 0; i < wcslen(pwchBuf); i++)
 	{
 		// È¡¸ßµÍ×Ö½Ú;

+ 7 - 4
SATService/SATService/SATExecutor.cpp

@@ -352,13 +352,15 @@ bool CSATExecutor::ReportCaseItemFinish(SATParameters::STTask* pTask, SATParamet
 	_itoa_s(100*(atoi(pCase->strIndex.c_str()))/pTask->Job.vtCases.size(), szValue, 10);
 	stJobProcessReq.strProgress = szValue;
 	// 需要将utf-8转gbk;
-	stJobProcessReq.strReusltMessage = CharEncoding::UTF82ASCII(caseItem.name.c_str());
+	stJobProcessReq.strReusltMessage = caseItem.name;//CharEncoding::UTF82ASCII(caseItem.name.c_str());
 	stJobProcessReq.strJobRepeat = "0";
 	stJobProcessReq.strScreenShot = "";
 	stJobProcessReq.strStartTime = pCase->_strStartTime;
 	stJobProcessReq.strCrashNumber = "";
 	stJobProcessReq.strCaseName = pCase->strCaseName;
-	stJobProcessReq.strFailedReason = CharEncoding::UTF82ASCII(caseItem.remark.c_str());
+	//stJobProcessReq.strFailedReason = CharEncoding::UTF82ASCII(caseItem.remark.c_str());
+	//stJobProcessReq.strFailedReason = (char*)CharEncoding::UTF82UNICODE(caseItem.remark.c_str());
+	stJobProcessReq.strFailedReason = caseItem.remark;
 	for (std::vector<std::string>::iterator it = caseItem.imgs.begin(); it != caseItem.imgs.end(); it++ )
 	{
 		int npos = it->find_last_of('/');
@@ -378,7 +380,8 @@ bool CSATExecutor::ReportCaseItemFinish(SATParameters::STTask* pTask, SATParamet
 	// 实例Id;
 	//_itoa_s(pTask->nTaskId, szValue, 10);
 	stJobProcessReq.strTaskId = pTask->Job.strTaskId;
-	stJobProcessReq.strAnalysis = CharEncoding::UTF82ASCII(caseItem.data.c_str());
+	//stJobProcessReq.strAnalysis = CharEncoding::UTF82ASCII(caseItem.data.c_str());
+	stJobProcessReq.strAnalysis = caseItem.data.c_str(); 
 	// 设备名称:即DeviceSerial;
 	stJobProcessReq.strDevnceName = pTask->Job.strDeviceId;	// 命名及其不范围,一会deviceid是deviceserial,一会是id;
 	// 固定为:TOTAL
@@ -447,7 +450,7 @@ bool CSATExecutor::ReportCaseFinish(SATParameters::STTask* pTask, SATParameters:
 	_itoa_s(100*(atoi(pCase->strIndex.c_str()))/pTask->Job.vtCases.size(), szValue, 10);
 	stJobProcessReq.strProgress = szValue;
 	// 需要将utf-8转gbk;
-	stJobProcessReq.strReusltMessage = "测试用例结果:";
+	stJobProcessReq.strReusltMessage = CharEncoding::ASCII2UTF8("测试用例结果:");
 	stJobProcessReq.strJobRepeat = "";
 	stJobProcessReq.strScreenShot = "";
 	stJobProcessReq.strStartTime = pCase->_strStartTime;