修改网络类型切换，用宏定义控制网络切换，V2.13

zhangbo

3 天以前 ff27ffd4106d12d68f4da4259279f948e512fc69

 keil/include/src/TCPClient.c

@@ -43,7 +43,12 @@
/*******************************************************************************
 *                             Local Variable                                  *
 *******************************************************************************/
#ifdef   UDP_CONNECT 
HIDO_INT32 l_i32TCPClientID = 0;
#endif
#ifdef   TCP_CONNECT 
HIDO_INT32 l_i32TCPClientID = 1;
#endif
uint8_t gps_power_state;
static E_TCPClientState l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
static HIDO_UINT32 l_u32HeartBeatTick = 0;
@@ -700,10 +705,9 @@

    }
}
char senddata[2048];
char senddata[500];
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;
@@ -721,13 +725,8 @@
//    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);
        Socket_Send(l_i32TCPClientID, (HIDO_UINT8 *)senddata, l_u32UploadBuffLen);
        uwbsendnum++;
        l_u32UploadBuffLen = 0;
//        }
@@ -833,7 +832,7 @@
    }
    else
    {
        led4g=RED;
        led4g = RED;
        l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
    }

@@ -895,8 +894,13 @@
HIDO_INT32 TCPClient_Init(void)
{
    l_eTCPClientState = TCP_CLIENT_STATE_IDLE;
//    Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL);
#ifdef   UDP_CONNECT 
    Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_UDP, TCPClient_SocketEventProc, HIDO_NULL);

#endif    
#ifdef   TCP_CONNECT 
    Socket_Create(&l_i32TCPClientID, SOCKET_TYPE_TCP, TCPClient_SocketEventProc, HIDO_NULL);
#endif
    // 这里是固定的心跳，由4G自行发送
#if 0
    HIDO_CHAR acHeart[64];