1

Drivers/Modules/Tuoreniot.c

@@ -29,12 +29,16 @@ uint16_t regist_data_length;
 // 生产环境
 char * REGIST_SERVER = "iot.tuoren.com" ; //注册服务器地址
 uint16_t REGIST_PORT = 8888; //端口号
+
 #endif
 
 #if TEST_ENV
 
-char * REGIST_SERVER = "18017zi0ec26.vicp.fun" ; //注册服务器地址
-uint16_t REGIST_PORT = 58562; //端口号
+//char * REGIST_SERVER = "18017zi0ec26.vicp.fun" ; //注册服务器地址
+//uint16_t REGIST_PORT = 58562; //端口号
+
+char * REGIST_SERVER = "z18z017026.51vip.biz" ; //注册服务器地址
+uint16_t REGIST_PORT = 10029; //端口号
 
 #endif
 

Drivers/Modules/Tuoreniot.h

@@ -22,6 +22,7 @@ struct TUORENIOT_RegistRequestStruct
 	char deviceId[20];
 	char userId[20];
 	char sim[30];
+	char netMac[20];
 };
 
 struct Wifi_Struct

Drivers/Modules/esp32/Esp32.Regist.c

@@ -246,10 +246,10 @@ static void REGIST_Process()
 						}
 						break;
 		case STEP_QUERY_MAC:
-						result = esp32.query_mac_address(MAC_ADDRESS);
+						result = esp32.query_mac_address(regist_request.netMac);
 						if(result == Result_Success)
 						{
-							
+//							Log_Printf_Debug("WiFi模块的MAC地址: %s\r\n", regist_request.netMac);
 							PCTRL_GotoStep(&pctrl, STEP_SET_MODE, "设置WiFi为Station工作模式");
 						}
 						else if(result == Result_Failed)

Drivers/Modules/esp32/esp32.c

@@ -1258,12 +1258,12 @@ enum Result esp32_query_mac_address(char * MAC_address)
 				char * split = "\"";
 				
 				strtok_r((char * )AT_result(), split, &saveptr);
-				MAC_address = strtok_r(NULL, split, &saveptr);
+				char * wifi_mac_address = strtok_r(NULL, split, &saveptr);
 				//校验获取到的MAC地址长度
-				if(strlen( MAC_address) == 17)
+				if(strlen(wifi_mac_address) == 17)
 				{
 					//存储、打印WiFi模块的MAC地址
-					memcpy(MAC_ADDRESS,MAC_address,strlen(MAC_address));
+					memcpy(MAC_address,wifi_mac_address,strlen(wifi_mac_address));
 					Log_Printf_Debug("WiFi模块的MAC地址: %s\r\n", MAC_address);
 					result = success(); // 成功
 				}