11

Drivers/Business/PumpBusiness.c

@@ -143,7 +143,7 @@ static void Regist_ResultHandle()
 			Network_Success_Flag = 0;
 		}
 		// ÖØÖÃ×¢²á
-//		REGIST_Reset();
+		REGIST_Reset();
 	}
 }
 

Drivers/Modules/Tuoreniot.c

@@ -115,8 +115,8 @@ uint8_t TUORENIOT_AnalysisRegistData(uint8_t * regist_data, uint16_t regist_data
 		strcpy(regist_response.deviceId, cJSON_GetObjectItem(json, "deviceId")->valuestring);
 		strcpy(regist_response.userId, cJSON_GetObjectItem(json, "userId")->valuestring);
 		strcpy(regist_response.deviceSecret, cJSON_GetObjectItem(json, "deviceSecret")->valuestring);
-		strcpy(regist_response.remoteAddress, cJSON_GetObjectItem(json, "remoteAddress")->valuestring);
-		regist_response.remotePort = cJSON_GetObjectItem(json, "remotePort")->valueint;
+		strcpy(regist_response.address, cJSON_GetObjectItem(json, "address")->valuestring);
+		regist_response.port = cJSON_GetObjectItem(json, "port")->valueint;
 		
 		// ÅжÏÊÇ·ñ½âÎöWiFiÐÅÏ¢
 		if(regist_response.networkType == 3)
@@ -209,9 +209,9 @@ void TUORENIOT_PackAuthMessage(uint8_t * coap_message, uint16_t * coap_message_l
 	CoAP_Set_MessageID(SeqOffset);
 	// option
 	// host
-	CoAP_Set_Option_Str(3, regist_response.remoteAddress);
+	CoAP_Set_Option_Str(3, regist_response.address);
 	// port
-	CoAP_Set_Option_Short(7, regist_response.remotePort);
+	CoAP_Set_Option_Short(7, regist_response.port);
 	// path
 	CoAP_Set_Option_Str(11, "auth");
 	// content-format
@@ -288,9 +288,9 @@ void TUORENIOT_PackDataMessage(uint8_t * data, uint8_t data_length, uint8_t * co
 	CoAP_Set_MessageID(++SeqOffset);
 	// option
 	// host
-	CoAP_Set_Option_Str(3, regist_response.remoteAddress);
+	CoAP_Set_Option_Str(3, regist_response.address);
 	// port
-	CoAP_Set_Option_Short(7, regist_response.remotePort);
+	CoAP_Set_Option_Short(7, regist_response.port);
 	// path
 	CoAP_Set_Option_Str(11, "topic");
 	CoAP_Set_Option_Str(11, "sys");
@@ -432,8 +432,8 @@ void TUORENIOT_PrintfRegistResponseStruct(void)
 	Log_Printf("deviceId=%s\r\n", regist_response.deviceId);
 	Log_Printf("userId=%s\r\n", regist_response.userId);
 	Log_Printf("deviceSecret=%s\r\n", regist_response.deviceSecret);
-	Log_Printf("remoteAddress=%s\r\n", regist_response.remoteAddress);
-	Log_Printf("remotePort=%d\r\n", regist_response.remotePort);
+	Log_Printf("remoteAddress=%s\r\n", regist_response.address);
+	Log_Printf("remotePort=%d\r\n", regist_response.port);
 	Log_Printf("wifiNumber=%d\r\n", regist_response.wifiNumber);
 	Log_Printf("------print regist result end------\r\n");
 }

Drivers/Modules/Tuoreniot.h

@@ -39,8 +39,8 @@ struct TUORENIOT_RegistResponseStruct
 	char deviceId[20];
 	char userId[20];
 	char deviceSecret[50];
-	char remoteAddress[50];
-	uint16_t remotePort;
+	char address[50];
+	uint16_t port;
 	uint8_t wifiNumber;
 	struct Wifi_Struct wifi[10];
 };

Drivers/Modules/esp32/Esp32.Regist.c

@@ -305,6 +305,9 @@ static void REGIST_Process()
 							goto_failure("注册数据处理失败");
 						}
 						break;
+		case STEP_WAIT: 			// 等待
+						PCTRL_Wait(&pctrl);
+						break;
 		case STEP_SUCCESS: 			// 成功
 						PCTRL_GotoStep(&pctrl, STEP_ENTER_DEEP_SLEEP, "注册成功，模块进入深休眠");	
 						break;

Drivers/Modules/esp32/Esp32_UDP_Client5.c

@@ -319,7 +319,7 @@ static void UDPCLIENT_Process(void)
 						}
 						break;
 		case STEP_CONNECT_NETWORK:		//连接UDP网络
-						result = esp32.connect_network("UDP", regist_response.remoteAddress,regist_response.remotePort);
+						result = esp32.connect_network("UDP", regist_response.address,regist_response.port);
 						if(result == Result_Success)
 						{
 							PCTRL_GotoStep(&pctrl, STEP_JUDGE_AUTH_OR_DATA, "判断认证还是发送");