V1.28 针对东营高精度方案，专网匹配，去掉了4G入网 APN和查询IP的代码。

yincheng.zhong

18 小时以前 75544b683feca0b57fb7d5fa00cbc376dc6e62a5

 keil/include/main/main.c

@@ -570,7 +570,7 @@
//      }
    g_com_map[MODBUS_MODE] = 0;
      log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
    g_com_map[VERSION] = (1<<8)|27;
    g_com_map[VERSION] = (1<<8)|28;
          
        
    LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -581,6 +581,11 @@
    LOG_INFO(TRACE_MODULE_APP,"设备UWB工作间隔: %x .\r\n",g_com_map[UWBFrequency]);
    LOG_INFO(TRACE_MODULE_APP,"设备GPS工作间隔: %x .\r\n",g_com_map[GPSFrequency]);
    LOG_INFO(TRACE_MODULE_APP,"当前GPS工作波特率: %d .\r\n",gpsbaudrate1);
    #ifdef _4G_115200
    LOG_INFO(TRACE_MODULE_APP,"当前4G波特率: 115200.\r\n");
    #else
    LOG_INFO(TRACE_MODULE_APP,"当前4G波特率: 9600.\r\n");
    #endif
//    LOG_INFO(TRACE_MODULE_APP,"充电是否开机标志位: %d .\r\n",g_com_map[URT_BQ]);
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
@@ -673,8 +678,8 @@
                            HIDO_TimerPoll();
                            HIDO_ATLitePoll();
                            TCPClient_Poll();
//                            if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//                            {TCPClient_Poll_1();}
                            if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
                            {TCPClient_Poll_1();}
                            if(flag_secondtask)
                            {
                                flag_secondtask = 0;
@@ -960,10 +965,10 @@
//       NTRIPClient_Init();
//       NTRIPApp_Init();
//    }
//    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//    {
//        TCPClient_Init_1();
//    }
    if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
    {
        TCPClient_Init_1();
    }
//    HTTPClient_Init();
    wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
    LED_output_init();//配置彩色灯引脚
@@ -1021,10 +1026,10 @@
        HIDO_ATLitePoll();
        TCPClient_Poll();
        wdt_ping(WDT_ID0);//喂狗
//        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
//        {
//            TCPClient_Poll_1();
//        }
        if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
        {
            TCPClient_Poll_1();
        }
        if(flag_secondtask)
        {
            flag_secondtask = 0;