修复天气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 1733625..01ae8e1 100644 (file)
--- 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;\r
     int iconNight=0;\r
 \r
-    cJSON *now_data= cJSON_GetObjectItem(now_cjson, "humidity");\r
-    if(now_data)\r
+    cJSON *now_data_humidity= cJSON_GetObjectItem(now_cjson, "humidity");\r
+    if(now_data_humidity)\r
     {\r
-        humidity=now_data->valueint;\r
+        humidity=now_data_humidity->valueint;\r
     }\r
-    now_data=cJSON_GetObjectItem(now_cjson, "windScale");\r
-    if(now_data)\r
+    cJSON *now_data_windScale=cJSON_GetObjectItem(now_cjson, "windScale");\r
+    if(now_data_windScale)\r
     {\r
-        windScale=now_data->valuestring;\r
+        windScale=now_data_windScale->valuestring;\r
     }\r
-    now_data=cJSON_GetObjectItem(now_cjson, "textNight");\r
-    if(now_data)\r
+    cJSON *now_data_textNight=cJSON_GetObjectItem(now_cjson, "textNight");\r
+    if(now_data_textNight)\r
     {\r
-        textNight=now_data->valuestring;\r
+        textNight=now_data_textNight->valuestring;\r
     }\r
-    now_data= cJSON_GetObjectItem(now_cjson, "uvIndex");\r
-    if(now_data)\r
+    cJSON *now_data_uvIndex= cJSON_GetObjectItem(now_cjson, "uvIndex");\r
+    if(now_data_uvIndex)\r
     {\r
-        uvIndex=now_data->valueint;\r
+        uvIndex=now_data_uvIndex->valueint;\r
     }\r
-    now_data= cJSON_GetObjectItem(now_cjson, "temp");\r
-    if(now_data)\r
+    cJSON *now_data_temp= cJSON_GetObjectItem(now_cjson, "temp");\r
+    if(now_data_temp)\r
     {\r
-        temp=now_data->valueint;\r
+        temp=now_data_temp->valueint;\r
     }\r
-    now_data= cJSON_GetObjectItem(now_cjson, "iconNight");\r
-    if(now_data)\r
+    cJSON *now_data_iconNight= cJSON_GetObjectItem(now_cjson, "iconNight");\r
+    if(now_data_iconNight)\r
     {\r
-        iconNight=now_data->valueint;\r
+        iconNight=now_data_iconNight->valueint;\r
     }\r
     set_weather_now_data(humidity,windScale,textNight,uvIndex,temp,iconNight);\r
 \r
@@ -2284,18 +2284,18 @@ uint8_t parse_jsonCheck_weather(uint8_t *buf,uint8_t *check)//json 格式解析
            iconDay=data_->valueint;\r
         }\r
         \r
-        cJSON_GetObjectItem(data,"fxDate");\r
+        data_=cJSON_GetObjectItem(data,"fxDate");\r
         if(data_)\r
         {\r
            fxDate=data_->valueint;\r
         }\r
         \r
-        cJSON_GetObjectItem(data,"textDay");\r
+        data_=cJSON_GetObjectItem(data,"textDay");\r
         if(data_)\r
         {\r
            textDay=data_->valuestring;\r
         }\r
-        cJSON_GetObjectItem(data,"tempMax");\r
+        data_=cJSON_GetObjectItem(data,"tempMax");\r
         if(data_)\r
         {\r
            tempMax=data_->valueint;\r