From 2e7e22e3a8fdd2dfbbf9b4e1dd92b96cbf96868b Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 04 九月 2024 11:06:06 +0800
Subject: [PATCH] 调4G休眠唤醒功能，还有BUG
---
keil/include/src/TCPClient.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/keil/include/src/TCPClient.c b/keil/include/src/TCPClient.c
index 4b4cae8..f13b8d0 100644
--- a/keil/include/src/TCPClient.c
+++ b/keil/include/src/TCPClient.c
@@ -273,13 +273,16 @@
l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;
- HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
+// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", ip0,ip1, ip2, ip3);
- Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
+// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, port);
// HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "123.57.87.125");
// Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 8888);
- TCPfail_flag = 1;
+
+ HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "111.198.60.6");
+ Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, 1234);
+ TCPfail_flag = 1;
}
else
{
@@ -295,8 +298,8 @@
- if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
- // if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
+ // if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
+ if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
{
flag_first_TCPconnect = 0;
l_u32HeartBeatTick = u32CurTick;
@@ -332,6 +335,11 @@
return HIDO_OK;
}
+HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
+{
+ return Socket_IsSendQueueEmpty(l_i32TCPClientID);
+}
+
/*******************************************************************************
* Function Name : TCPClient_Init
* Description : TCP客户端初始化
@@ -344,7 +352,7 @@
HIDO_INT32 TCPClient_Init(void)
{
l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
- Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL);
+ Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL);
// 这里是固定的心跳，由4G自行发送
#if 0
--
Gitblit v1.9.3