From: hcj <1224667075@qq.com>
Date: Tue, 24 Sep 2024 02:18:33 +0000 (+0800)
Subject: 修复天气json数据异常导致的死机问题(补)
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1005%2F3;p=mirrors%2FFD230.git

修复天气json数据异常导致的死机问题(补)
---

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 173362513..01ae8e1c8 100644
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -2183,35 +2183,35 @@ uint8_t parse_jsonCheck_weather(uint8_t *buf,uint8_t *check)//json 格式解析
     int temp=0;
     int iconNight=0;
 
-    cJSON *now_data= cJSON_GetObjectItem(now_cjson, "humidity");
-    if(now_data)
+    cJSON *now_data_humidity= cJSON_GetObjectItem(now_cjson, "humidity");
+    if(now_data_humidity)
     {
-        humidity=now_data->valueint;
+        humidity=now_data_humidity->valueint;
     }
-    now_data=cJSON_GetObjectItem(now_cjson, "windScale");
-    if(now_data)
+    cJSON *now_data_windScale=cJSON_GetObjectItem(now_cjson, "windScale");
+    if(now_data_windScale)
     {
-        windScale=now_data->valuestring;
+        windScale=now_data_windScale->valuestring;
     }
-    now_data=cJSON_GetObjectItem(now_cjson, "textNight");
-    if(now_data)
+    cJSON *now_data_textNight=cJSON_GetObjectItem(now_cjson, "textNight");
+    if(now_data_textNight)
     {
-        textNight=now_data->valuestring;
+        textNight=now_data_textNight->valuestring;
     }
-    now_data= cJSON_GetObjectItem(now_cjson, "uvIndex");
-    if(now_data)
+    cJSON *now_data_uvIndex= cJSON_GetObjectItem(now_cjson, "uvIndex");
+    if(now_data_uvIndex)
     {
-        uvIndex=now_data->valueint;
+        uvIndex=now_data_uvIndex->valueint;
     }
-    now_data= cJSON_GetObjectItem(now_cjson, "temp");
-    if(now_data)
+    cJSON *now_data_temp= cJSON_GetObjectItem(now_cjson, "temp");
+    if(now_data_temp)
     {
-        temp=now_data->valueint;
+        temp=now_data_temp->valueint;
     }
-    now_data= cJSON_GetObjectItem(now_cjson, "iconNight");
-    if(now_data)
+    cJSON *now_data_iconNight= cJSON_GetObjectItem(now_cjson, "iconNight");
+    if(now_data_iconNight)
     {
-        iconNight=now_data->valueint;
+        iconNight=now_data_iconNight->valueint;
     }
     set_weather_now_data(humidity,windScale,textNight,uvIndex,temp,iconNight);
 
@@ -2284,18 +2284,18 @@ uint8_t parse_jsonCheck_weather(uint8_t *buf,uint8_t *check)//json 格式解析
            iconDay=data_->valueint;
         }
         
-        cJSON_GetObjectItem(data,"fxDate");
+        data_=cJSON_GetObjectItem(data,"fxDate");
         if(data_)
         {
            fxDate=data_->valueint;
         }
         
-        cJSON_GetObjectItem(data,"textDay");
+        data_=cJSON_GetObjectItem(data,"textDay");
         if(data_)
         {
            textDay=data_->valuestring;
         }
-        cJSON_GetObjectItem(data,"tempMax");
+        data_=cJSON_GetObjectItem(data,"tempMax");
         if(data_)
         {
            tempMax=data_->valueint;