From c3c7b977e5616950bfaedaa02008dfc40c6ade18 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 22 二月 2021 14:55:21 +0800
Subject: [PATCH] 升级用到配置的省市ID
---
lib/src/main/cpp/rtk_platform/platform.cpp | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/src/main/cpp/rtk_platform/platform.cpp b/lib/src/main/cpp/rtk_platform/platform.cpp
index 3068568..ec41199 100644
--- a/lib/src/main/cpp/rtk_platform/platform.cpp
+++ b/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);
--
Gitblit v1.8.0