TCPclent.c文件更新

chen

2024-09-04 a7376ba53eae30bef9e53bd88d38b37b0a050cee

 keil/include/src/TCPClient.c

@@ -43,6 +43,10 @@
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];

uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;

/*******************************************************************************
 *                        Local Function Declaration                           *
 *******************************************************************************/
@@ -177,6 +181,7 @@
    {
        if(l_eTCPClientState ==  TCP_CLIENT_STATE_CONNECTING)
        {
            TCPfail_flag = 0;
            l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
        }

@@ -192,6 +197,7 @@
    }
    case SOCKET_EVENT_CLOSED:
    {
        TCPfail_flag = 0;
        l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
        break;
    }
@@ -242,7 +248,6 @@
     u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,heart,%04x,%d,%04x,%d,%02u%%,%d,%d,%lf,%lf,%s,%d,%d,0\r\n", \
        g_com_map[DEV_ID],GetUWBBindState(),g_com_map[BIND_DEV_ID],alarm_type,bat_percent,g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],jd,wd,applyid,result,distance);
}
//      LOG_INFO(TRACE_MODULE_APP, "电量为%lf\r\n",bat_percent);//测试电量
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}

@@ -259,9 +264,7 @@
    if(alarm_type == 2)
        alarm_type = 0;
}
uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
uint16_t ip0,ip1,ip2,ip3,port;

HIDO_INT32 TCPClient_Poll(void)
{
    if (Internet_IsIPReady() == HIDO_TRUE)
@@ -274,12 +277,15 @@
                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);
                
                          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
@@ -333,6 +339,11 @@
    return HIDO_OK;
}

HIDO_BOOL TCPClient_IsSendOver(HIDO_VOID)
{
    return Socket_IsSendQueueEmpty(l_i32TCPClientID);
}

/*******************************************************************************
 * Function Name     : TCPClient_Init
 * Description       : TCP客户端初始化
@@ -345,7 +356,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