Merge remote-tracking branch 'origin/master'

Admin

2021-02-22 8aefca0bdda8ad06a9ec8b810148c97279d9b62b

 lib/src/main/cpp/rtk_platform/platform.cpp

@@ -203,6 +203,7 @@
    eventQueue = NULL;

    memset(&platformStatus, 0, sizeof(platformStatus));
    memset(&deviceInfo, 0, sizeof(deviceInfo));

    sem_init(&sem_status_changed, 0, 0);

@@ -225,19 +226,27 @@

void ConfigPlatform(const rtk_platform_cfg_t *p)
{
    DEBUG("配置RTK平台资讯 sn %s device_model %s, imei %s, phone %02X%02X%02X%02X%02X%02X%02X%02X", p->device_sn, p->device_model, p->imei, p->phone[0],
    DEBUG("配置RTK平台资讯 sn %s device_model %s, imei %s, phone %02X%02X%02X%02X%02X%02X%02X%02X, province %d city %d",
            p->device_sn, p->device_model, p->imei, p->phone[0],
          p->phone[1],
          p->phone[2],
          p->phone[3],
          p->phone[4],
          p->phone[5],
          p->phone[6],
          p->phone[7]);
          p->phone[7],
          p->province,
          p->city);

    AppTimer_delete(ReqRtkPlatformConfigTimeout);

    strcpy(exceptSocket.domain_name, p->domain_name);
    exceptSocket.port = p->port;

    if (deviceInfo.province != p->province || deviceInfo.city != p->city) {
        GetUpgrade(p->province, p->city);
    }

    deviceInfo.province = p->province;
    deviceInfo.city = p->city;
    strcpy((char *)deviceInfo.device_model, p->device_model);