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