修改合并错误

zhangbo

6 天以前 b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5

 keil/include/src/TCPClient.c

@@ -18,6 +18,14 @@
#include "global_param.h"
#include "Uart.h"
#include "mk_4G.h"
#include "mk_trace.h"
#include "dw_app_anchor.h"
#include "PCA9555.h"
#include "WS2812.h"
#include "PCA9555.h"
#include "mk_flash.h"
#include <serial_at_cmd_app.h>
#include "DBG.h"
/*******************************************************************************
 *                                  Macro                                      *
 *******************************************************************************/
@@ -36,16 +44,22 @@
 *                             Local Variable                                  *
 *******************************************************************************/
HIDO_INT32 l_i32TCPClientID = 0;
extern uint8_t gps_power_state;
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];

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

/*******************************************************************************
 *                        Local Function Declaration                           *
 *******************************************************************************/
HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);

static HIDO_INT32 TCPClient_Heartbeat(HIDO_VOID);
void TCPHeartBeatUpload(void);
void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA);
void TCPReceiveMessageReply(void);
/*******************************************************************************
 *                             Local Function                                  *
 *******************************************************************************/
@@ -58,47 +72,138 @@
 * Author            : www.hido-studio.com
 * Modified Date:    : 2021年1月9日
 *******************************************************************************/
 Commend_Datestruct TCP_command;
extern uint8_t gps_4g_flag,search_open_flag,gps_open_flag,gps_wait_count,gps_need_data_flag,gps_wait_count2;
uint8_t ota_flag;
extern Operation_step UWB_work_state;
Commend_Datestruct TCP_command;
uint8_t result;
char applyid[10];
uint16_t receive_id;
uint16_t g_com_position;
uint16_t g_com_num;
uint8_t testdata[100];
static HIDO_INT32 TCPClient_DataProc(HIDO_UINT8 *_u8Data, HIDO_UINT32 _u32Len)
{
    LOG_INFO(TRACE_MODULE_APP, "收到数据\r\n");  
     if(STRCMP(_u8Data, "$instruct,") == 0)
     {
      sscanf(_u8Data,"$%*[^,],%d,%d,%d,%d,%lf,%lf,%d",TCP_command.type,TCP_command.applyID,TCP_command.tagId,
        TCP_command.gunLableId,TCP_command.warnDistance,TCP_command.alarmDistance,TCP_command.frequency);
        if(g_com_map[DEV_ID]==TCP_command.tagId)
            switch(TCP_command.type)
    HIDO_CHAR *apcSplitStr[12];
    HIDO_UINT32 u32SplitCnt = 0;
    
    HIDO_UINT32 u32Len = 0;

//    HIDO_Debug("%s\r\n", l_au8CmdBuff);

    /* $config,id,gps_hz,ip,port */
    if(STRCMP(_u8Data, "$config,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));

        if(u32SplitCnt < 5)
        {
            return HIDO_ERR;
        }

        /* 设备ID检查 */
        if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            HIDO_UINT32 u32Temp = 0;
            HIDO_BOOL bChange = HIDO_FALSE;
            HIDO_UINT8 au8IP[4];

            /* GPS HZ */
            u32Temp = HIDO_UtilStrToInt(apcSplitStr[2]);
            if(u32Temp != g_com_map[GPS_HZ])
            {
                case BIND_SUCCESS:
                {            
                 g_com_map[BIND_DEV_ID]=TCP_command.gunLableId;
                 g_com_map[ALARM_DISTANCE1]=TCP_command.warnDistance;
                 g_com_map[ALARM_DISTANCE2]=TCP_command.alarmDistance;//这个距离double和uint格式不符
                 g_com_map[SEND_4G_FREQUENCY]=1000/TCP_command.frequency;
                 save_com_map_to_flash();
                }
                break;
                case UNBIND:
               // bind_resetbreak();
                case OPEN_GNSS:
                 gnss_forceopen();
                case CLOSE_VIBRATION:
                // vibration_close();
                case QUARY_INFORMATION:
                //??
                case CHANGE_POLL_FREQUENCY:
                g_com_map[SEND_4G_FREQUENCY]=TCP_command.frequency;
                break;
                g_com_map[GPS_HZ] = u32Temp;
                bChange = HIDO_TRUE;
            }
     }
         
   
    //根据指令去执行

            /* IP=192.168.1.1 */
            HIDO_UtilIPStringToByteArrary(apcSplitStr[3], au8IP);
            /* IP变化 */
            if((au8IP[0] != g_com_map[IP_0]) || (au8IP[1] != g_com_map[IP_1])
                    || (au8IP[2] != g_com_map[IP_2]) || (au8IP[3] != g_com_map[IP_3]))
            {
                bChange = HIDO_TRUE;
                g_com_map[IP_0] = au8IP[0];
                g_com_map[IP_1] = au8IP[1];
                g_com_map[IP_2] = au8IP[2];
                g_com_map[IP_3] = au8IP[3];

       //
                l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
            }

            /* 端口=0-65535 */
            if( g_com_map[PORT] != HIDO_UtilStrToInt(apcSplitStr[4]))
            {
                g_com_map[PORT] = HIDO_UtilStrToInt(apcSplitStr[4]);
                bChange = HIDO_TRUE;
            }

            if(bChange)
            {
                save_com_map_to_flash();
              g_com_map[CNT_RESTART] = 1;
            }
        }
    }
    /* $update,id,url,version */
    else if(STRCMP(_u8Data, "$update,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));

        if(u32SplitCnt < 4)
        {
            return HIDO_ERR;
        }

        /* 设备ID检查 */
        if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
//              ota_flag=1;
//              LOG_INFO(TRACE_MODULE_APP,"OTA文件地址名称:%s.\r\n",(char *)&apcSplitStr[2]);
//              uart_send(UART_ID1, (char *)&apcSplitStr[2],strlen(apcSplitStr[3]), NULL);
//            memcpy(testdata,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
//              OTA_Start((HIDO_UINT8*)apcSplitStr[2]);
            
//            g_com_map[OTA_FLAG]=1;
//            g_com_map[OTA_URL_CHANGDU]=strlen(apcSplitStr[2]) + 1;
//            memcpy(g_com_map+OTA_URL_INDEX,(HIDO_UINT8*)apcSplitStr[2],strlen(apcSplitStr[2]) + 1);
//            save_com_map_to_flash();
//            delay_us(100000);
            uint16_t tmp = 0xCCCC;
            uint8_t flag = 0;
            __disable_irq();
            result=flash_open(FLASH_ID0,NULL);
            if(!result) 
            {
            flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE);//擦除APPFLAG
            flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t*)&tmp, sizeof(tmp));
            flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE);//擦除APPFLAG
            flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
            flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP+1, (HIDO_UINT8*)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
            }
            __enable_irq();
            NVIC_SystemReset(); //软复位回到bootloader
        }
    }
    /* $getlog,id,url */
    else if(STRCMP(_u8Data, "$getlog,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));

        if(u32SplitCnt < 3)
        {
            return HIDO_ERR;
        }

        /* 设备ID检查 */
        if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
#if 0
 if(STRCMP(_u8Data, "$control,") == 0)
            Log_Upload(apcSplitStr[2]);
#endif
        }
    }    /* $control,id,bepper,time */
    else if(STRCMP(_u8Data, "$control,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
     if(u32SplitCnt < 3)
@@ -112,17 +217,222 @@
            if(strcmp(apcSplitStr[2],"beeper")==0)
            {
               
                    beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
//                    beepontime = HIDO_UtilStrToInt(apcSplitStr[3]);
                    
            }
            
                if(strcmp(apcSplitStr[2],"TTS")==0)
                {
                    PCA9555_Set_One_Value_Output(TTS_ENABLE,1);         //打开TTS电源
                    delay_ms(800);                //再短一点，会丢失语音的第一个字，不是不读，而是就像没有下发第一个字
                    
//                    TTS_Play((HIDO_UINT8 *)apcSplitStr[3], strlen(apcSplitStr[3]));             //服务器语音播报
                    
                    
                    u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
                    g_com_map[DEV_ID]);
                    
                    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
                    
                   
                }
          
        }
    }else if(STRCMP(_u8Data, "$userdata,") == 0)
    {
        if(DBG_GetMode() == DBG_MODE_CFG)
        HIDO_Debug2("%s\r\n", l_au8CmdBuff);
        
    }
#endif
    else if(STRCMP(_u8Data, "$userdata,") == 0)
    {
//        if(DBG_GetMode() == DBG_MODE_CFG)
//        HIDO_Debug2("%s\r\n", l_au8CmdBuff);
    }
    else if(STRCMP(_u8Data, "$settone,") == 0)
    {
        HIDO_DataStruct stData;
        HIDO_DataStruct stId;

        if(HIDO_UtilParseFormat(_u8Data, _u32Len, "$settone,%p,%p\r\n", &stId, &stData) == 2)
        {
            ((char *)stId.m_pData)[stId.m_u32Len] = '\0';
            if(g_com_map[DEV_ID] == HIDO_UtilHexStrToInt((char *)stId.m_pData))
            {
//                TONE_Play((HIDO_UINT8 *)stData.m_pData, stData.m_u32Len);
                
                u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$Receivevoice,%X\r\n",
                g_com_map[DEV_ID]);                                                                      //TTS收到回复
                
                Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
            }
        }
    }else if(STRCMP(_u8Data, "$setpara,") == 0)
    {
        uint16_t tempindex,tempval;
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            if(u32SplitCnt < 2)
            {
                return HIDO_ERR;
            }
            tempindex = HIDO_UtilStrToInt(apcSplitStr[2]);
            tempval = HIDO_UtilStrToInt(apcSplitStr[3]);
            if(tempindex == MOTOR_ONTIME_INDEX)
            {
//              beepontime = tempval;
            }else{
            if(tempindex < COM_MAP_SIZE)
            g_com_map[tempindex] = tempval;
            save_com_map_to_flash();
            g_com_map[CNT_RESTART] = 1;
            }
        }
    }
    else if(STRCMP(_u8Data, "$readpara,") == 0)
    {
        uint16_t tempindex,templen,buffer_len,datalen;
        char send_buffer[500];
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        if(HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            if(u32SplitCnt < 2)
            {
                return HIDO_ERR;
            }
            tempindex = HIDO_UtilStrToInt(apcSplitStr[2]);
            templen = HIDO_UtilStrToInt(apcSplitStr[3]);
                  if(templen>10)
                     templen=10;
            buffer_len = sprintf(send_buffer,"$replypara,");
            datalen = sprintf(&send_buffer[buffer_len],"%x,",g_com_map[DEV_ID]);
            buffer_len += datalen;
            for(uint16_t i=tempindex;i<templen+tempindex;i++)
            {
                datalen = sprintf(&send_buffer[buffer_len],"%d,",g_com_map[i]);
                buffer_len += datalen;
            }
            send_buffer[buffer_len++] = 'e';
            send_buffer[buffer_len++] = 'n';
            send_buffer[buffer_len++] = 'd';
            send_buffer[buffer_len++] = 0x0d;
            send_buffer[buffer_len++] = 0x0a;
            Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
        }
    }
    /* $download_audio,http://39.106.210.13:8080/hfs/xxx.bin */
    else if (STRCMP(_u8Data, "$download_audio,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));

        if (u32SplitCnt < 3)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            uint16_t tmp = 0xCCCC;
            uint8_t flag = 1;

            __disable_irq();
            result = flash_open(FLASH_ID0, NULL);
            if (!result)
            {
                flash_erase(FLASH_ID0, APP_CONFIG_IAPFLAG_SECTOR_ADDR, FLASH_SECTOR_SIZE); // 擦除APPFLAG
                flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAPFLAG_MAP, (uint8_t *)&tmp, sizeof(tmp));
                flash_erase(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, FLASH_SECTOR_SIZE); // 擦除APPFLAG
                flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP, (HIDO_UINT8 *)&flag, 1);
                flash_write_nbytes(FLASH_ID0, APP_CONFIG_IAP_PARAM_MAP + 1, (HIDO_UINT8 *)apcSplitStr[2], strlen(apcSplitStr[2]) + 1);
            }
            __enable_irq();
            NVIC_SystemReset(); // 软复位回到bootloader
        }
    }
    /* $play_audio,0-9 */
    else if (STRCMP(_u8Data, "$play_audio,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));

        if (u32SplitCnt < 3)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            PCA9555_Set_One_Value_Output(TTS_ENABLE,1);//输出高电平切换为5V输入
            delay_ms(100);
            WT588E_PLAY(atoi(apcSplitStr[2]));
        }
    }
    else if (STRCMP(_u8Data, "$set_gpsuwbpara,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        uint16_t buffer_len,datalen;
        char send_buffer[20]={"ERROR\r\n"};
        if (u32SplitCnt < 6)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            HIDO_INT32 gpskaiguan,uwbkaiguan,gpspinlv,uwbpinlv,gpsbaudrate1;
            gpskaiguan= HIDO_UtilStrToInt(apcSplitStr[2]);
            g_com_map[GPSENBLE] = gpskaiguan;
            uwbkaiguan= HIDO_UtilStrToInt(apcSplitStr[3]);
            g_com_map[UWBENBLE] = uwbkaiguan;
            gpspinlv= HIDO_UtilStrToInt(apcSplitStr[4]);
            g_com_map[GPSFrequency] = gpspinlv;
            uwbpinlv= HIDO_UtilStrToInt(apcSplitStr[5]);
            g_com_map[UWBFrequency] = uwbpinlv;
            gpsbaudrate1= HIDO_UtilStrToInt(apcSplitStr[6]);
            g_com_map[GPSBAUDRATE1_INDEX] = gpsbaudrate1>>16;
            g_com_map[GPSBAUDRATE2_INDEX] = gpsbaudrate1;
            
            
            if((g_com_map[GPSENBLE]||g_com_map[GPSENBLE]==0)
             &&(g_com_map[UWBENBLE]||g_com_map[UWBENBLE]==0)
             &&(g_com_map[GPSFrequency]<65535&&g_com_map[GPSFrequency]>0)
             &&(g_com_map[UWBFrequency]==1||g_com_map[UWBFrequency]==3||g_com_map[UWBFrequency]==5||g_com_map[UWBFrequency]==10)
             &&(gpsbaudrate1==9600||gpsbaudrate1==115200)
            )
            {
            save_com_map_to_flash();
//            Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,buffer_len);
            g_com_map[CNT_RESTART] = 1;
            }
            else
            {
            Socket_Send(l_i32TCPClientID,(uint8_t*)send_buffer,10);
            }
        }
    }
    else if (STRCMP(_u8Data, "$read_gpsuwbpara,") == 0)
    {
        u32SplitCnt = HIDO_UtilStrSplit((HIDO_CHAR *)_u8Data, ',', apcSplitStr, HIDO_ARRARY_COUNT(apcSplitStr));
        uint16_t buffer_len,datalen;
        char send_buffer[200]={"ERROR\r\n"};
        if (u32SplitCnt < 1)
        {
            return HIDO_ERR;
        }
        if (HIDO_UtilHexStrToInt(apcSplitStr[1]) == g_com_map[DEV_ID])
        {
            uint16_t checksum = 0;
            send_buffer[0] = 0x55;
            send_buffer[1] = 0xAA;
            send_buffer[2] = 0x03;
            send_buffer[3] = 160+5;
            send_buffer[4] = CMD_REPLY;
            send_buffer[5] = 0;
            send_buffer[6] = 160;
            memcpy(&send_buffer[7], &g_com_map, 160);
            for(uint8_t i = 0; i<(160+5); i++)
            {
                checksum += send_buffer[2+i];
            }
            checksum = Checksum_u16(&send_buffer[2],5+160);
            memcpy(&send_buffer[7+160],&checksum,2);
            
            Socket_Send(l_i32TCPClientID,send_buffer,9+160);
        }
    }

    return HIDO_OK;
}

@@ -143,6 +453,7 @@
    {
        if(l_eTCPClientState ==  TCP_CLIENT_STATE_CONNECTING)
        {
            TCPfail_flag = 0;
            l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
        }

@@ -158,6 +469,7 @@
    }
    case SOCKET_EVENT_CLOSED:
    {
        TCPfail_flag = 0;
        l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
        break;
    }
@@ -192,8 +504,135 @@
 * Author            : www.hido-studio.com
 * Modified Date:    : 2021?1?9?
 *******************************************************************************/
uint8_t TCPfail_flag = 0,flag_first_TCPconnect=1;
uint32_t TCPfailetimer;
extern uint8_t bat_percent,taglist_num;
uint8_t alarm_type;
extern double jd,wd;
extern int32_t distance;
extern  uint8_t userkey_state;
uint8_t gps_timeout_flag;
extern uint8_t GPS_GGAmessage[150];
uint16_t g_spsum,g_snum,ave_sp;
extern uint8_t GPS_ParseGGA_data[256];
extern uint8_t GPS_ParseGGA_changdu;
uint8_t uwbsendnum,gpssendnum;

extern uint8_t exercise_state;
extern uint32_t step_count;    
extern uint16_t gaodu;void UDPClient_UploadGPS(HIDO_CHAR *_pcGGA)
{
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        

#ifdef JIBU_XIUMIAN				
        HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
//                _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,0,0,0);
                _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,(uint8_t)(step_count),exercise_state);
#else
        HIDO_UINT32 u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "%s,%X,%02x,%x,%d,%d,%d%\r\n",
                _pcGGA, g_com_map[DEV_ID], bat_percent,ave_sp,gaodu,0,0);

#endif
       
//        if((l_u32UploadBuffLen + u32Len) < sizeof(l_acUploadBuff))
//        {
//            memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
//            l_u32UploadBuffLen += u32Len;
//        }
        //memcpy(l_acUploadBuff + l_u32UploadBuffLen, l_au8CmdBuff, u32Len);
        //l_u32UploadBuffLen += u32Len;
       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
//        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
        {
//            l_u32UdpsendTick = HIDO_TimerGetTick();
            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
            gpssendnum++;
//            l_u32UploadBuffLen = 0;
        }


    }
}
char senddata[2048];
void HexToAsciiSendUDP(uint8_t* data,uint8_t len)
{
    static HIDO_CHAR l_acUploadBuff[2048];
    static HIDO_UINT32 l_u32UploadBuffLen = 0;
    static HIDO_UINT32 l_u32UdpsendTick = 0;
   uint8_t i,temp;
	
   for(i=0;i<len;i++)
   {
      temp = *data++;
      sprintf(&senddata[2*i],"%x",temp>>4);
      sprintf(&senddata[2*i+1],"%x",temp&0xf);
   }
    senddata[2*len] = 0x0d;
    senddata[2*len+1] = 0x0a;
//    if(DBG_GetMode() == DBG_MODE_CFG)
//    Uart_Send(0, (HIDO_UINT8 *) senddata, 2*len+2);
//    UDPClient_Uploadhex(senddata,2*len+2);
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        memcpy(l_acUploadBuff + l_u32UploadBuffLen, senddata, 2*len+2);
        l_u32UploadBuffLen += 2*len+2;
       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
//        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
//        {
//            l_u32UdpsendTick = HIDO_TimerGetTick();
            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
            uwbsendnum++;
            l_u32UploadBuffLen = 0;
//        }


    }
}
void TCPHeartBeatUpload(void)
{
    HIDO_UINT32 u32Len = 0;
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
			
        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
        {   u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,3:%d.%d.%d.%d:%d.,1",
                                       g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
            userkey_state,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]);
        } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
        {
            u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,2%s %s,1",
                                       g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
            userkey_state,(char *)&g_com_map[NTRIP_HOST_INDEX],(char *)&g_com_map[NTRIP_USERNANME_INDEX]);
        } else if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NONE)
        {
            u32Len = HIDO_UtilSnprintf((HIDO_CHAR *)l_au8CmdBuff, sizeof(l_au8CmdBuff), "$XTB,%X,%02u%%,%d.%d,%s,%d,1.,1",
                                       g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID(),\
            userkey_state,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]);
        }
            userkey_state=0;
        Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_au8CmdBuff, u32Len);
    }
//   u32HeartLen = HIDO_UtilSnprintf((HIDO_CHAR *)acHeart, sizeof(acHeart), "$XTB,%X,%02u%%,%d.%d,%s",
//                    g_com_map[DEV_ID], bat_percent, g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff, Module_GetCCID()); 
//    Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen);
    
    
}
void TCPReceiveMessageReply(void)
{
    HIDO_CHAR acHeart[200];
    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;
}
extern uint32_t uwbled,rtkled,led4g,powerled;
extern uint8_t heartbeasend_flag;
HIDO_INT32 TCPClient_Poll(void)
{
    if (Internet_IsIPReady() == HIDO_TRUE)
@@ -201,18 +640,22 @@
        HIDO_UINT32 u32CurTick = HIDO_TimerGetTick();
        if (TCP_CLIENT_STATE_IDLE == l_eTCPClientState)
        {
            led4g=RED;
            if (!TCPfail_flag)
            {
                l_eTCPClientState = TCP_CLIENT_STATE_CONNECTING;

//                HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[TCP_IP_0],
//                                  g_com_map[TCP_IP_1], g_com_map[TCP_IP_2], g_com_map[TCP_IP_3]);

//                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[TCP_PORT]);
               HIDO_UtilSnprintf((HIDO_CHAR *) l_au8CmdBuff, sizeof(l_au8CmdBuff), "%u.%u.%u.%u", g_com_map[IP_0], g_com_map[IP_1], g_com_map[IP_2], g_com_map[IP_3]);

                Socket_Connect(l_i32TCPClientID, (HIDO_CHAR *) l_au8CmdBuff, g_com_map[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;
//                          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
            {
@@ -225,20 +668,25 @@
        }
        else if (TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
        {

            if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(15)||flag_first_TCPconnect)
            {                
           led4g=GREEN;
           if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(60)||flag_first_TCPconnect||heartbeasend_flag)
                //if ((u32CurTick - l_u32HeartBeatTick) >= HIDO_TIMER_TICK_S(g_com_map[SEND_4G_SECOND])||flag_first_TCPconnect)
            {
                heartbeasend_flag=0;
                flag_first_TCPconnect = 0;
                l_u32HeartBeatTick = u32CurTick;
                // 这里是自定义心跳
                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);
                TCPHeartBeatUpload();
                        //UDPClient_UploadGPS();//先不弄心跳
//                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);
            }
        }
    }
    else
    {
        led4g=RED;
        l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
    }

@@ -260,6 +708,33 @@

    return HIDO_OK;
}
HIDO_INT32 TCPClient_Uploadhex(uint8_t *_pcGGA,uint16_t u32Len)
{
    static HIDO_CHAR l_acUploadBuff[1024];
    static HIDO_UINT32 l_u32UploadBuffLen = 0;
    static HIDO_UINT32 l_u32UdpsendTick = 0;
    
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        memcpy(l_acUploadBuff + l_u32UploadBuffLen, _pcGGA, u32Len);
        l_u32UploadBuffLen += u32Len;
       // if((l_u32UploadBuffLen + u32Len )> sizeof(l_acUploadBuff))
        if((HIDO_TimerGetTick() - l_u32UdpsendTick) >= 200)
        {
            l_u32UdpsendTick = HIDO_TimerGetTick();
            Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)l_acUploadBuff, l_u32UploadBuffLen);
            l_u32UploadBuffLen = 0;
        }


    }

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

/*******************************************************************************
 * Function Name     : TCPClient_Init
@@ -273,7 +748,7 @@
HIDO_INT32 TCPClient_Init(void)
{
    l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
    Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL);
    Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL);

    // 这里是固定的心跳，由4G自行发送
#if 0
@@ -281,21 +756,80 @@
    HIDO_UINT32 u32HeartLen = snprintf(acHeart, sizeof(acHeart), "$message heart2,%04x\r\n", g_com_map[DEV_ID]);
    Socket_HeartbeatConfig(l_i32TCPClientID, (HIDO_UINT8 *)acHeart, u32HeartLen, 180);
#endif
    

    return HIDO_OK;
}
#ifdef _GPS_115200
char str[19]= {"AT+IPR=115200;&W\r\n"};
void AIR780E_Reset(void)
{
    gps_air780_power_change(gps_power_state,0);//开启gps，4G
    delay_us(1500000);
    gps_air780_power_change(gps_power_state,1);//开启gps，4G
      PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
    delay_ms(3000);
//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
//    uart_send(UART_ID0, str,17, NULL);
//    Uart_ReConfigBaudRate(UART_ID_4G,9600);
} 
void AIR780E_Reset_usart(void)
{
   PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
    delay_ms(3000);
    Uart_ReConfigBaudRate(UART_ID_4G,9600);
    uart_send(UART_ID0, str,19, NULL);
    Uart_ReConfigBaudRate(UART_ID_4G,115200);
    delay_ms(200);
    rtkled=GREEN;
    uwbled=GREEN;
    led4g=GREEN;
    powerled=GREEN;
    Set4LEDColor(uwbled,rtkled,led4g,powerled);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
    NVIC_SystemReset();
}
#else
char str[17]= {"AT+IPR=9600;&W\r\n"};
void AIR780E_Reset(void)
{
      PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
    delay_ms(3000);
//    Uart_ReConfigBaudRate(UART_ID_4G,115200);
//    uart_send(UART_ID0, str,17, NULL);
//    Uart_ReConfigBaudRate(UART_ID_4G,9600);
}
void AIR780E_Reset_usart(void)
{
   PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭4G
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);//打开4G
    delay_ms(3000);
    Uart_ReConfigBaudRate(UART_ID_4G,115200);
    uart_send(UART_ID0, str,17, NULL);
    Uart_ReConfigBaudRate(UART_ID_4G,9600);
    delay_ms(200);
    rtkled=GREEN;
    uwbled=GREEN;
    led4g=GREEN;
    powerled=GREEN;
    Set4LEDColor(uwbled,rtkled,led4g,powerled);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);
    delay_ms(1500);
    PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
    NVIC_SystemReset();
}
#endif
uint8_t IfTCPConnected(void)
{
    if(TCP_CLIENT_STATE_CONNECTED == l_eTCPClientState)
    {
        return 1;
    }else{
    } else {
        return 0;
    }
}