修正设备查询接口;

SATHelper/SATHelper/DlgService.cpp

@@ -143,6 +143,11 @@ void CDlgService::FillData2Ctrl()
 void CDlgService::OnBnClickedModifyRunnerName()
 {
 	// TODO: 在此添加控件通知处理程序代码
+	CString strActuator;
+	GetDlgItemText(IDC_EDIT_RUNNER_NAME, strActuator);
+
+	Global::g_Config.strActuator = strActuator.GetString();
+	WritePrivateProfileString(_T("SATService"), _T("Actuator"), strActuator, Global::g_szConfig);
 	CSATClient::GetInstance()->TCPLogin(Global::g_Config.strSATUserName, Global::g_Config.strSATPassword, Global::g_Config.strActuator);
 }
 
@@ -171,6 +176,24 @@ void CDlgService::OnTimer(UINT_PTR nIDEvent)
 		CSATClient::GetInstance()->TCPQueryDevices(FALSE);
 		Sleep(500);
 
+		int nIndex = 0;
+		m_listDevices.DeleteAllItems();
+		for ( std::vector<SATProtocol::Device>::iterator it = SATData::devices.begin(); it != SATData::devices.end(); it++ )
+		{
+			m_listDevices.InsertItem(nIndex, "1");
+			if ( it->nType == 0 )
+				m_listDevices.SetItemText(nIndex, 1, "虚拟");
+			else if ( it->nType == 1 )
+				m_listDevices.SetItemText(nIndex, 1, "USB");
+			else if ( it->nType == 2 )
+				m_listDevices.SetItemText(nIndex, 1, "网络");
+			m_listDevices.SetItemText(nIndex, 2, it->szName);
+
+			if ( it->nStatus == 0 )
+				m_listDevices.SetItemText(nIndex, 3, "空闲");
+			else
+				m_listDevices.SetItemText(nIndex, 3, "繁忙");
+		}
 	}
 
 	CDialogEx::OnTimer(nIDEvent);

SATHelper/SATHelper/SATClient.cpp

@@ -283,7 +283,11 @@ void CSATClient::TaskProcess(SATProtocol::Package* pak)
 				SATData::devices.clear();
 				for (size_t i = 0; i < resp->nSize; i++)
 				{
-					SATData::devices.push_back(resp->szDevs[i]);
+					SATProtocol::Device dev;
+					dev.nType = resp->ssDevs[i].nType;
+					dev.nStatus = resp->ssDevs[i].nStatus;
+					memcpy(dev.szName, resp->ssDevs[i].szName, MAX_PATH);
+					SATData::devices.push_back(dev);
 				}
 			}
 				break;

SATHelper/SATHelper/SATData.cpp

@@ -6,5 +6,5 @@ namespace SATData {
 	SATProtocol::LoginResp login_resp;
 	SATProtocol::LoginResp logout_resp;
 	SATProtocol::DeviceResp device_resp;
-	std::vector<std::string> devices;
+	std::vector<SATProtocol::Device> devices;
 };

SATHelper/SATHelper/SATData.h

@@ -13,7 +13,7 @@ namespace SATData {
 	extern SATProtocol::LoginResp logout_resp;
 	// ²éѯÉ豸·µ»Ø;
 	extern SATProtocol::DeviceResp device_resp;
-	extern std::vector<std::string> devices;
+	extern std::vector<SATProtocol::Device> devices;
 };
 
 #endif // __SAT_DATA__