统一命名空间：大写化；

SATHelper/SATHelper/DlgService.cpp

@@ -94,9 +94,9 @@ void CDlgService::InitCtrl()
 	m_listDevices.InsertColumn(0, "No");
 	m_listDevices.SetColumnWidth(0, 25);
 	m_listDevices.InsertColumn(1, "类型");
-	m_listDevices.SetColumnWidth(1, 55);
+	m_listDevices.SetColumnWidth(1, 45);
 	m_listDevices.InsertColumn(2, "名称");
-	m_listDevices.SetColumnWidth(2, 120);
+	m_listDevices.SetColumnWidth(2, 130);
 	m_listDevices.InsertColumn(3, "状态");
 	m_listDevices.SetColumnWidth(3, 55);
 	m_listDevices.SetExtendedStyle(m_listDevices.GetExtendedStyle() | LVS_EX_GRIDLINES | LVS_EX_FULLROWSELECT);
@@ -180,7 +180,7 @@ void CDlgService::OnTimer(UINT_PTR nIDEvent)
 
 		int nIndex = 0;
 		m_listDevices.DeleteAllItems();
-		for ( std::vector<SATProtocol::Device>::iterator it = SATData::devices.begin(); it != SATData::devices.end(); it++ )
+		for ( std::vector<SATPROTO::Device>::iterator it = SATData::devices.begin(); it != SATData::devices.end(); it++ )
 		{
 			m_listDevices.InsertItem(nIndex, "1");
 			if ( it->nType == 0 )

SATHelper/SATHelper/SATClient.cpp

@@ -7,8 +7,8 @@ const int SOCK_TCP = SOCK_STREAM - 1;
 const int SOCK_UDP = SOCK_DGRAM - 1;
 const int AF_IPV4 = 0;
 const int AF_IPV6 = 1;
-#define PAK_LEN sizeof(SATProtocol::DataHeader)
-#define HEADER_LEN sizeof(SATProtocol::DataHeader)
+#define PAK_LEN sizeof(SATPROTO::DataHeader)
+#define HEADER_LEN sizeof(SATPROTO::DataHeader)
 // 쏵똑係;
 CDlgProBar* g_pDlgProBar = NULL;
 
@@ -103,7 +103,7 @@ bool CSATClient::OnSend(const byte* pData, int nLen, BOOL bShowGif)
 bool CSATClient::OnReceive(const byte* pData, int nLen)
 {
 	// 鬼黨관庫;
-	SATProtocol::DataHeader* phead = NULL;
+	SATPROTO::DataHeader* phead = NULL;
 	if (lastData.size() == 0)
 	{
 		// 꼇璃관庫;
@@ -115,13 +115,13 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 		else
 		{
 			// 관庫념璃;
-			phead = (SATProtocol::DataHeader*)pData;
+			phead = (SATPROTO::DataHeader*)pData;
 
 			// 供憐돨관;
 			if (phead->len == nLen)
 			{
 				OutputDebugString("A：供憐돨관;\n");
-				TaskProcess((SATProtocol::Package*)pData);
+				TaskProcess((SATPROTO::Package*)pData);
 			}
 			// 鬼관;
 			else if (phead->len > nLen)
@@ -134,7 +134,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			{
 				OutputDebugString("A：낚관;\n");
 				lastData.append((char*)pData + phead->len, nLen - phead->len);
-				TaskProcess((SATProtocol::Package*)pData);
+				TaskProcess((SATPROTO::Package*)pData);
 			}
 		}
 	}
@@ -143,14 +143,14 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 		int lastlen = nLen;
 		if (lastData.size() >= PAK_LEN)
 		{
-			phead = (SATProtocol::DataHeader*)lastData.data();
+			phead = (SATPROTO::DataHeader*)lastData.data();
 			if (phead->len <= lastData.size() + nLen)
 			{
 				if (phead->len <= lastData.size())
 				{
 					OutputDebugString("C：낚관;\n");
 					// 供憐관;
-					TaskProcess((SATProtocol::Package*)lastData.substr(0, phead->len).data());
+					TaskProcess((SATPROTO::Package*)lastData.substr(0, phead->len).data());
 
 					lastData = lastData.substr(phead->len);
 					lastData.append((char*)pData, nLen);
@@ -161,7 +161,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 					lastlen = lastData.size() + nLen - phead->len;
 					lastData.append((char*)pData, nLen - lastlen);
 					// 供憐관;
-					TaskProcess((SATProtocol::Package*)lastData.data());
+					TaskProcess((SATPROTO::Package*)lastData.data());
 					// 假岱관;
 					lastData.clear();
 					if (lastlen)
@@ -188,14 +188,14 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 			{
 				// 틈냥供憐관庫;
 				lastData.append((char*)pData, diflen);
-				phead = (SATProtocol::DataHeader*)lastData.data();
+				phead = (SATPROTO::DataHeader*)lastData.data();
 
 				// 供憐관;
 				if (phead->len == PAK_LEN + nLen - diflen)
 				{
 					OutputDebugString("B：供憐관;\n");
 					lastData.append((char*)pData + diflen, nLen - diflen);
-					TaskProcess((SATProtocol::Package*)lastData.data());
+					TaskProcess((SATPROTO::Package*)lastData.data());
 					lastData.clear();
 				}
 				// 鬼관;
@@ -210,7 +210,7 @@ bool CSATClient::OnReceive(const byte* pData, int nLen)
 					OutputDebugString("B：낚관;\n");
 					// 莉供냥관;
 					lastData.append((char*)pData + diflen, phead->len - PAK_LEN);
-					TaskProcess((SATProtocol::Package*)lastData.data());
+					TaskProcess((SATPROTO::Package*)lastData.data());
 					lastData.clear();
 					int last = nLen - diflen - phead->len + PAK_LEN;
 					if (last)
@@ -235,9 +235,9 @@ bool CSATClient::OnConnect()
 	return false;
 }
 
-void CSATClient::TaskProcess(SATProtocol::Package* pak)
+void CSATClient::TaskProcess(SATPROTO::Package* pak)
 {
-	SATProtocol::DataHeader* pHeader = &pak->header;
+	SATPROTO::DataHeader* pHeader = &pak->header;
 	if (pHeader->protocol == 0xAA) {
 #ifdef _DEBUG
 		// 儺낀속潼움鞫刻珂쇌;
@@ -251,11 +251,11 @@ void CSATClient::TaskProcess(SATProtocol::Package* pak)
 
 		switch (pHeader->cmd)
 		{
-			case SATProtocol::CMD_LOGIN:
-			case SATProtocol::CMD_LOGOUT:
+			case SATPROTO::CMD_LOGIN:
+			case SATPROTO::CMD_LOGOUT:
 			{
-				SATProtocol::LoginResp* resp = (SATProtocol::LoginResp*)pak->buf;
-				if (pHeader->cmd == SATProtocol::CMD_LOGIN)
+				SATPROTO::LoginResp* resp = (SATPROTO::LoginResp*)pak->buf;
+				if (pHeader->cmd == SATPROTO::CMD_LOGIN)
 				{
 					SATData::logout_resp.bStatus = false;
 					SATData::login_resp.bStatus = resp->bStatus;
@@ -269,21 +269,21 @@ void CSATClient::TaskProcess(SATProtocol::Package* pak)
 				}
 			}
 				break;
-			case SATProtocol::CMD_ADD_DEVICE:
-			case SATProtocol::CMD_DEL_DEVICE:
+			case SATPROTO::CMD_ADD_DEVICE:
+			case SATPROTO::CMD_DEL_DEVICE:
 			{
 				// 轟伎뇹잿럿쀼令;
 			}
 				break;
-			case SATProtocol::CMD_QUERY_DEVICES:
+			case SATPROTO::CMD_QUERY_DEVICES:
 			{
-				SATProtocol::DeviceResp* resp = (SATProtocol::DeviceResp*)pak->buf;
+				SATPROTO::DeviceResp* resp = (SATPROTO::DeviceResp*)pak->buf;
 				//SATData::device_resp.nSize = resp->nSize;
 				//memcpy(SATData::device_resp.szDevs, resp->szDevs, 30*MAX_PATH);
 				SATData::devices.clear();
 				for (size_t i = 0; i < resp->nSize; i++)
 				{
-					SATProtocol::Device dev;
+					SATPROTO::Device dev;
 					dev.nType = resp->ssDevs[i].nType;
 					dev.nStatus = resp->ssDevs[i].nStatus;
 					memcpy(dev.szName, resp->ssDevs[i].szName, MAX_PATH);
@@ -357,16 +357,16 @@ void CSATClient::GetAddress(const SockAddrIn& addrIn, CString& rString) const
 bool CSATClient::TCPLogin(std::string strUserName, std::string strPassword, std::string strActuator, BOOL bLogin, BOOL bShowGif )
 {
 	SATData::login_resp = {0};
-	int len = HEADER_LEN + sizeof(SATProtocol::UserInfo);
+	int len = HEADER_LEN + sizeof(SATPROTO::UserInfo);
 	byte* pbuff = new byte[len];
 	memset(pbuff, 0, len);
-	SATProtocol::Package* pData = (SATProtocol::Package*)pbuff;
+	SATPROTO::Package* pData = (SATPROTO::Package*)pbuff;
 
 	pData->header.protocol = 0xAA;
 	pData->header.len = len;
-	pData->header.cmd = bLogin ? SATProtocol::CMD_LOGIN : SATProtocol::CMD_LOGOUT;
+	pData->header.cmd = bLogin ? SATPROTO::CMD_LOGIN : SATPROTO::CMD_LOGOUT;
 
-	SATProtocol::UserInfo* pUserInfo = (SATProtocol::UserInfo*)pData->buf;
+	SATPROTO::UserInfo* pUserInfo = (SATPROTO::UserInfo*)pData->buf;
 	memcpy(pUserInfo->szUserName, strUserName.c_str(), strUserName.size());
 	memcpy(pUserInfo->szPassword, strPassword.c_str(), strPassword.size());
 	memcpy(pUserInfo->szActuatorName, strActuator.c_str(), strActuator.size());
@@ -387,11 +387,11 @@ bool CSATClient::TCPAddDevice(std::string strDevice, bool bDel, BOOL bShowGif)
 	int len = HEADER_LEN + MAX_PATH;
 	byte* pbuff = new byte[len];
 	memset(pbuff, 0, len);
-	SATProtocol::Package* pData = (SATProtocol::Package*)pbuff;
+	SATPROTO::Package* pData = (SATPROTO::Package*)pbuff;
 
 	pData->header.protocol = 0xAA;
 	pData->header.len = len;
-	pData->header.cmd = bDel ? SATProtocol::CMD_DEL_DEVICE : SATProtocol::CMD_ADD_DEVICE;
+	pData->header.cmd = bDel ? SATPROTO::CMD_DEL_DEVICE : SATPROTO::CMD_ADD_DEVICE;
 
 	// 립令;
 	memcpy(pData->buf, strDevice.c_str(), strDevice.size());
@@ -412,11 +412,11 @@ bool CSATClient::TCPQueryDevices(BOOL bShowGif)
 	int len = HEADER_LEN;
 	byte* pbuff = new byte[len];
 	memset(pbuff, 0, len);
-	SATProtocol::Package* pData = (SATProtocol::Package*)pbuff;
+	SATPROTO::Package* pData = (SATPROTO::Package*)pbuff;
 
 	pData->header.protocol = 0xAA;
 	pData->header.len = len;
-	pData->header.cmd = SATProtocol::CMD_QUERY_DEVICES;
+	pData->header.cmd = SATPROTO::CMD_QUERY_DEVICES;
 
 	bool bret = OnSend(pbuff, len, bShowGif);
 	delete[]pbuff;

SATHelper/SATHelper/SATClient.h

@@ -44,7 +44,7 @@ private:
 	bool OnReceive(const byte* pData, int nLen);
 	bool OnClose();
 	bool OnConnect();
-	void TaskProcess(SATProtocol::Package *pak);
+	void TaskProcess(SATPROTO::Package *pak);
 
 public:
 	// Æô¶¯TCP¿Í»§¶ËÁ¬½ÓʵÀý;

SATHelper/SATHelper/SATData.cpp

@@ -2,9 +2,9 @@
 #include "SATData.h"
 
 namespace SATData {
-	SATProtocol::UserInfo login;
-	SATProtocol::LoginResp login_resp;
-	SATProtocol::LoginResp logout_resp;
-	SATProtocol::DeviceResp device_resp;
-	std::vector<SATProtocol::Device> devices;
+	SATPROTO::UserInfo login;
+	SATPROTO::LoginResp login_resp;
+	SATPROTO::LoginResp logout_resp;
+	SATPROTO::DeviceResp device_resp;
+	std::vector<SATPROTO::Device> devices;
 };

SATHelper/SATHelper/SATData.h

@@ -6,14 +6,14 @@
 #include "SATProtocol.h"
 namespace SATData {
 	// 되쩌꽝鑒;
-	extern SATProtocol::UserInfo login;
+	extern SATPROTO::UserInfo login;
 	// 되쩌럿쀼;
-	extern SATProtocol::LoginResp login_resp;
+	extern SATPROTO::LoginResp login_resp;
 	// 되놔럿쀼;
-	extern SATProtocol::LoginResp logout_resp;
+	extern SATPROTO::LoginResp logout_resp;
 	// 꿴璂�구럿쀼;
-	extern SATProtocol::DeviceResp device_resp;
-	extern std::vector<SATProtocol::Device> devices;
+	extern SATPROTO::DeviceResp device_resp;
+	extern std::vector<SATPROTO::Device> devices;
 };
 
 #endif // __SAT_DATA__