Merge branch 'master' of http://192.168.100.32:3000/longsanlang/Network-Modules

Drivers/Modules/bc260y/BC260Y_UDP_Client5.c

@@ -401,19 +401,9 @@ void UDP_Client_Handle(void)
 				goto_failure("查询信号质量失败");
 			}
 			break;
-//		case STEP_CLOSE: // 关闭连接
-//			result = bc260y.close_socket(connectID);
-//			if(result == Result_Success)
-//			{
-//				goto_step(STEP_OPEN);
-//			}
-//			else if(result == Result_Failed)
-//			{
-//				goto_failure("关闭连接失败");
-//			}
-//			break;
+	
 		case STEP_QUERY_SOCKET:		 
-			 result =bc260y.query_socket_state_sync(connectID,&connectstate);
+			 result =bc260y.query_socket_state(connectID,&connectstate);
 		    if(result == Result_Success)
 			{
 				if(connectstate==2)
@@ -422,7 +412,7 @@ void UDP_Client_Handle(void)
 				}
 				else
 				{
-				 goto_step(STEP_OPEN);
+				 goto_step(STEP_CLOSE);
 				}
 			}
 			else if(result == Result_Failed)
@@ -430,6 +420,17 @@ void UDP_Client_Handle(void)
 				goto_failure("查询UDP连接失败");
 			}
 			break;
+		case STEP_CLOSE: // 关闭连接
+			result = bc260y.close_socket(connectID);
+			if(result == Result_Success)
+			{
+				goto_step(STEP_OPEN);
+			}
+			else if(result == Result_Failed)
+			{
+				goto_failure("关闭连接失败");
+			}
+			break;
 		case STEP_OPEN: // 打开客户端
 			result = bc260y.open_socket(connectID, "UDP",aliyuniot_get_host(), aliyuniot_get_port(), 1, &socket_err);
 			if(result == Result_Success)

Drivers/Modules/bc260y/Bc260y_Initialize.c

@@ -141,7 +141,7 @@ void Initialize_Handle(void)
 		   query_cgreg_times = 0; // 查询网络状态的次数
 			break;
 		case STEP_EXIT_SLEEP: // 退出休眠
-			result = bc260y.exit_sleep();
+			result = bc260y.exit_sleep_2();
 			if(result == Result_Success)
 			{
 				Log_Printf_Debug("退出休眠成功\r\n");
@@ -165,7 +165,7 @@ void Initialize_Handle(void)
 			}
 		    break;
 		case STEP_SET_SLEEP: // 设置休眠模式
-			result = bc260y.set_sleep(1);
+			result = bc260y.set_sleep(2);
 			if(result == Result_Success)
 			{
 				Log_Printf_Debug("设置休眠模式成功\r\n");

Drivers/Modules/bc260y/bc260y.c

@@ -1524,12 +1524,12 @@ enum Result bc260y_send_rai(uint8_t connectID, uint8_t * data, uint16_t data_len
 	if(getStatus() == Status_None) // 空闲状态
 	{
 		memset(AT_CMD, 0, sizeof(AT_CMD));
-		sprintf(AT_CMD + strlen(AT_CMD), "AT+QISEND=%d,%d,\"", connectID, data_length); // 拼接AT指令
+		sprintf(AT_CMD + strlen(AT_CMD), "AT+QISEND=%d,%d,", connectID, data_length); // 拼接AT指令
 		for(uint16_t i = 0; i < data_length; i++)
 		{
 			sprintf(AT_CMD + strlen(AT_CMD), "%02X", data[i]);
 		}
-		sprintf(AT_CMD + strlen(AT_CMD), "\",%d\r\n", rai); // 拼接AT指令
+		sprintf(AT_CMD + strlen(AT_CMD), ",%d\r\n", rai); // 拼接AT指令
 		result = send_at(AT_CMD, activeID);
 	}
 	else if(getStatus() != Status_Sending) // 上一次的结果没有清除，返回错误，为了保证时效性，需要重置状态。重新调用

Drivers/Modules/ec800m/Ec800m_Initialize.c

@@ -130,7 +130,7 @@ void Initialize_Handle(void)
 		Restart_flag++;
 		Log_Printf_Debug("完成准备%d\r\n",Restart_flag);
 	}
-	if(module_switch==1)networkTest_Flag=1;
+	
 	if(time_get_delay(&timer2) >= 240000)
 	{
 		Restart_flag=0;
@@ -142,6 +142,7 @@ void Initialize_Handle(void)
 		pownext_step(STEP_SET_CFUN_0);//模块不断重启，直接进入最小功能模式
 		Log_Printf_Debug("模块关闭中...%d\r\n",module_switch);
 	}
+	if(module_switch==1)networkTest_Flag=1;
 	if(set_mincfun_flag == 1)
 	{
 		return ;