1111

WXK

2025-02-14 b3b682c88a4468f47104f94eebfdbadbfaf10e6e

 keil/include/src/TCPClient.c

@@ -38,7 +38,7 @@
 *                             Local Variable                                  *
 *******************************************************************************/
HIDO_INT32 l_i32TCPClientID = 0;
extern uint8_t gps_power_state,gps_timeout_flag;
extern uint8_t gps_power_state;
static E_TCPClientState l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
static HIDO_UINT32 l_u32HeartBeatTick = 0;
static HIDO_UINT8 l_au8CmdBuff[1024];
@@ -248,10 +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);
//    }
	
   u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message,GPS,%04x,%d,%lf,%lf\r\n", \
                               g_com_map[DEV_ID],gps_timeout_flag,jd,wd);

    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}

@@ -264,7 +260,7 @@
void _4GAlarmUpload(uint8_t alarm)
{
    alarm_type = alarm;
    //TCPHeartBeatUpload();
    TCPHeartBeatUpload();
    if(alarm_type == 2)
        alarm_type = 0;
}
@@ -281,7 +277,7 @@
                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);

@@ -306,13 +302,14 @@



      //      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(15)||flag_first_TCPconnect)
                if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
            {
                flag_first_TCPconnect = 0;
                l_u32HeartBeatTick = u32CurTick;
                // 这里是自定义心跳
                //TCPHeartBeatUpload();
                TCPHeartBeatUpload();
//                HIDO_CHAR acHeart[128];
//                HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart,%04x,00001,1,50,50,50,,,,\r\n", g_com_map[DEV_ID]);
//                Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);