Browse Source

add position send to json count.

zhengwei 8 years ago
parent
commit
4bce6d289a
3 changed files with 12 additions and 4 deletions
  1. 3 0
      YAServerDlg.cpp
  2. 6 1
      debug_server/debug_server_socket.cpp
  3. 3 3
      system_basic_info/SystemAnalysis.h

+ 3 - 0
YAServerDlg.cpp

@@ -3695,18 +3695,21 @@ std::string CYAServerDlg::get_json_position()
 			//x,y×ø±ê
 			switch(it->second->m_nOutputPosState){
 			case 0:
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_225);
 				pos_card[JSON_KEY_CORDINATE_X] = CFunctions::round(it->second->x, 2);
 				pos_cards.append(pos_card[JSON_KEY_CORDINATE_X]);
 				pos_card[JSON_KEY_CORDINATE_Y] = CFunctions::round(it->second->y, 2);
 				pos_cards.append(pos_card[JSON_KEY_CORDINATE_Y]);
 				break;
 			case 1:
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_226);
 				pos_card[JSON_KEY_CORDINATE_X] = CFunctions::round(it->second->left_x, 2);
 				pos_cards.append(pos_card[JSON_KEY_CORDINATE_X]);
 				pos_card[JSON_KEY_CORDINATE_Y] = CFunctions::round(it->second->left_y, 2);
 				pos_cards.append(pos_card[JSON_KEY_CORDINATE_Y]);
 				break;
 			case 2:
+				LOCATION_SYSTEM_BRANCH(LOCATION_SYSTEM_BRANCH_227);
 				pos_card[JSON_KEY_CORDINATE_X] = CFunctions::round(it->second->right_x, 2);
 				pos_cards.append(pos_card[JSON_KEY_CORDINATE_X]);
 				pos_card[JSON_KEY_CORDINATE_Y] = CFunctions::round(it->second->right_y, 2);

+ 6 - 1
debug_server/debug_server_socket.cpp

@@ -14,8 +14,9 @@ using namespace std;
 #pragma warning(disable: 4996)
 #pragma comment(lib, "ws2_32.lib")
 
+#define CLIENT_SOCKET_NUM_MAX    20
 int g_iTotalConn = 0;
-SOCKET g_CliSocketArr[FD_SETSIZE];
+SOCKET g_CliSocketArr[CLIENT_SOCKET_NUM_MAX + 1];
 DWORD WINAPI WorkerThread(LPVOID lpParam);
 DWORD WINAPI AcceptThread(LPVOID lpParam);
 int parserMsg(SOCKET s, char *msg);
@@ -68,6 +69,10 @@ DWORD WINAPI AcceptThread(LPVOID lpParam)
         sClient = accept(sListen, (sockaddr*)&client, &iAddrSize); 
         printf("Accepted client:%s:%d/n", inet_ntoa(client.sin_addr), ntohs(client.sin_port));
         // Add socket to g_CliSocketArr
+        if(g_iTotalConn > CLIENT_SOCKET_NUM_MAX - 1)
+        {
+            continue;
+        }
         g_CliSocketArr[g_iTotalConn++] = sClient;
     }
 }

+ 3 - 3
system_basic_info/SystemAnalysis.h

@@ -230,9 +230,9 @@ typedef enum StationSyncBasicBranch
 	LOCATION_SYSTEM_BRANCH_222,       //used
 	LOCATION_SYSTEM_BRANCH_223,       //used
 	LOCATION_SYSTEM_BRANCH_224,       //used
-	LOCATION_SYSTEM_BRANCH_225,
-	LOCATION_SYSTEM_BRANCH_226,
-	LOCATION_SYSTEM_BRANCH_227,
+	LOCATION_SYSTEM_BRANCH_225,       //used
+	LOCATION_SYSTEM_BRANCH_226,       //used
+	LOCATION_SYSTEM_BRANCH_227,       //used
 	LOCATION_SYSTEM_BRANCH_228,
 	LOCATION_SYSTEM_BRANCH_229,
 	LOCATION_SYSTEM_BRANCH_230,