keil/include/src/TCPClient.c
@@ -77,6 +77,12 @@
HIDO_UINT8 *_u8Data_temp1=NULL;
HIDO_UINT32 _u32Len_temp;
extern int32_t distance;
extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
extern uint16_t g_spsum,g_snum,ave_sp;
extern uint32_t u32GGaLenth;
extern char GGA_Final_message[1024];
extern uint32_t gga_num;
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
    HIDO_CHAR *apcSplitStr[12];
@@ -113,6 +119,9 @@
                     gps_wait_count=0;
                     gps_wait_count2=0;
                     gps_need_data_flag=1;//切换状态
                     memset(GGA_Final_message, 0, sizeof(GGA_Final_message));//清空接收到的用完的数组
                     u32GGaLenth=0;
                     gga_num=0;//清0有效次数
                     }else{
                     gps_open_flag=1;
                     gps_wait_count=0;
@@ -270,11 +279,10 @@
extern uint8_t bat_percent,taglist_num;
uint8_t alarm_type;
extern double jd,wd;
extern int32_t distance;
extern uint8_t GPS_GGAmessage[150],userkey_state,gps_timeout_flag;
extern uint16_t g_spsum,g_snum,ave_sp;
void UDPClient_UploadGPS(void)
{      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;
@@ -289,13 +297,29 @@
//                               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), "%s,%04x,%02u%%,%d,%d\r\n", \
   u32HeartLen = snprintf(acHeart, sizeof(acHeart), "%s,%04x,%02u%%,%d,%d,0,0\r\n", \
                               GPS_GGAmessage,g_com_map[DEV_ID],bat_percent,userkey_state,gps_timeout_flag);
      userkey_state = 0;
    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   if(gps_open_flag||userkey_state){
      Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
   }else{
//     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();
}
void UDPClient_UploadGPS_10pack(void)//10包发送功能
{      air780_led_on();
     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有效次数
      air780_led_off();
}
void TCPHeartBeatUpload(void)
{
    HIDO_CHAR acHeart[200];