修改GPS4G灯充电灯闪灯逻辑，修改发送逻辑，处理4G立即关闭无法发送心跳包逻辑，完成3连击单击长按按钮逻辑，初步测试成功版本

chen

2025-04-20 38c1a38c08b6dfbc4632def361ddf8398a9f2107

 keil/include/src/TCPClient.c

@@ -53,7 +53,7 @@
 *                        Local Function Declaration                           *
 *******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
void TCPHeartBeatUpload();
void UDPClient_UploadGPS(void);
void TCPReceiveMessageReply(void);
/*******************************************************************************
@@ -338,8 +338,9 @@
extern double jd,wd;
extern char GGA_Format_message[200];
void UDPClient_UploadGPS(void)
{   if(gps_open_flag||userkey_state)
   air780_led_on();
{	
//   if(gps_open_flag||userkey_state)
//   air780_led_on();
    HIDO_CHAR acHeart[200];
    HIDO_UINT32 u32HeartLen;
    ave_sp = g_spsum/g_snum;
@@ -356,20 +357,20 @@
   
   u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%x,%d,%d,0,0\r\n", \
                               GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
	
   memset(GPS_GGAmessage, 0, sizeof(GPS_GGAmessage));
      
   if(gps_open_flag&&userkey_state!=1){
//   if(userkey_state!=1){
      Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   }
   if (userkey_state){
      TCPHeartBeatUpload();//立即上传心跳包
//   }
//   if (userkey_state){
//      TCPHeartBeatUpload();//立即上传心跳包
//     Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)GGA_Final_message, u32GGaLenth);
//      memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
//      u32GGaLenth=0;
//      gga_num=0;//清0有效次数
   }
   userkey_state = 0;
   air780_led_off();
//   }
   //userkey_state = 0;
//   air780_led_off();
}
void UDPClient_UploadGPS_10pack(void)//10包发送功能
{      air780_led_on();
@@ -386,7 +387,7 @@
      gga_num=0;//清0有效次数
      air780_led_off();
}
void TCPHeartBeatUpload(void)
void TCPHeartBeatUpload()
{
    HIDO_CHAR acHeart1[200];
    HIDO_UINT32 u32HeartLen;
@@ -404,9 +405,10 @@
   //         u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.",
//                    g_com_map[DEV_ID], bat_percent2, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),userkey_state4g,g_com_map[TCP_IP_0],g_com_map[TCP_IP_1],g_com_map[TCP_IP_2],g_com_map[TCP_IP_3],g_com_map[TCP_PORT]);   

   u32HeartLen = snprintf(acHeart1, sizeof(acHeart1), "$XTB,%04x,%02u%%,%d.%d,%s,%d,0\r\n", \
   u32HeartLen = snprintf(acHeart1, sizeof(acHeart1), "$XTB,%04x,%02u%%,%d.%d,%s,%d,1\r\n", \
                               g_com_map[DEV_ID],bat_percent,g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff,Module_GetCCID(),userkey_state);
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart1, u32HeartLen);
   userkey_state=0;
}
void TCPReceiveMessageReply(void)
{
@@ -414,13 +416,13 @@
    HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$rec_message,%04x",g_com_map[DEV_ID]);
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
}
void _4GAlarmUpload(uint8_t alarm)
{
    alarm_type = alarm;
    TCPHeartBeatUpload();
    if(alarm_type == 2)
        alarm_type = 0;
}
//void _4GAlarmUpload(uint8_t alarm)
//{
//    alarm_type = alarm;
//    TCPHeartBeatUpload();
//    if(alarm_type == 2)
//        alarm_type = 0;
//}

HIDO_INT32 TCPClient_Poll(void)
{
@@ -460,7 +462,7 @@


           
           if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(1)||flag_first_TCPconnect)
           if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect)
                //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
            {
                flag_first_TCPconnect = 0;