scbc.sat2 5 rokov pred
rodič
commit
53d748d644

+ 20 - 11
SATHelper/SATHelper/DlgService.cpp

@@ -31,6 +31,8 @@ void CDlgService::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, BTN_ADD_ANDROID, m_btnAddAndroid);
 	DDX_Control(pDX, BTN_MI_INIT, m_btnMIInit);
 	DDX_Control(pDX, BTN_SCBC_INIT, m_btnSCBCInit);
+	DDX_Control(pDX, TX_TASKID, m_ctrlTaskId);
+	DDX_Control(pDX, LABLE_TASK_STATUS, m_lbTaskStatus);
 }
 
 
@@ -110,18 +112,25 @@ BOOL CDlgService::OnInitDialog()
 				p->m_listTask.DeleteAllItems();
 				TCHAR szValue[MAX_PATH] = { 0 };
 				for (int i = 0; i < SATData::task_resp.nSize; i++) {
+					// 任务编号;
+					p->m_ctrlTaskId.SetWindowText(SATData::task_resp.ssTasks[i].szTaskNo);
+					// 任务状态;
+					p->m_lbTaskStatus.SetWindowText(SATData::task_resp.ssTasks[i].szStatus);
+					// 脚本数量;
+					if (SATData::task_resp.ssTasks[i].nCaseSize) {
+						// 遍历出所有用例;
+						TCHAR szIndex[8] = {0};
+						for ( int k = 0; k < SATData::task_resp.ssTasks[i].nCaseSize; k++ )
+						{
+							_itoa_s(k, szIndex, 10);
+							SATPROTO::CaseInfo& caseInfo = SATData::task_resp.ssTasks[i].ssCases[k];
+							p->m_listTask.InsertItem(nIndex, szIndex);
+							p->m_listTask.SetItemText(nIndex, 1, caseInfo.szCaseName);
+							p->m_listTask.SetItemText(nIndex, 2, caseInfo.szStatus);
+							p->m_listTask.SetItemText(nIndex, 3, caseInfo.szCaseLogPath);
+						}
+					}
 
-					// 任务No;
-					_itoa_s(SATData::task_resp.ssTasks[i].nTaskId, szValue, 10);
-					p->m_listTask.InsertItem(nIndex, szValue);
-					p->m_listTask.SetItemText(nIndex, 1, SATData::task_resp.ssTasks[i].szTaskNo);
-					p->m_listTask.SetItemText(nIndex, 2, SATData::task_resp.ssTasks[i].szTaskName);
-					if (SATData::task_resp.ssTasks[i].nStatus == 0)
-						p->m_listTask.SetItemText(nIndex, 3, "未执行");
-					else if (SATData::task_resp.ssTasks[i].nStatus == 1)
-						p->m_listTask.SetItemText(nIndex, 3, "执行中");
-					else if (SATData::task_resp.ssTasks[i].nStatus == 2)
-						p->m_listTask.SetItemText(nIndex, 3, "完成");
 					nIndex++;
 				}
 			}

+ 2 - 0
SATHelper/SATHelper/DlgService.h

@@ -46,4 +46,6 @@ public:
 	afx_msg void OnBnClickedMiInit();
 	afx_msg void OnBnClickedScbcInit();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	CEdit m_ctrlTaskId;
+	CStatic m_lbTaskStatus;
 };