Ver código fonte

1、合并遗漏项

liyuezong 2 anos atrás
pai
commit
4efa228c28
1 arquivos alterados com 6 adições e 1 exclusões
  1. 6 1
      pro/src/json_handle.c

+ 6 - 1
pro/src/json_handle.c

@@ -978,9 +978,14 @@ cJSON* json_to_overall_status_monitor(const char* str,_Over_All_Sts_Monitor* _ov
         _over_all_sts_monitor->type = cjson_type->valuestring;
 
      cJSON *cjson_ltype = cJSON_GetObjectItem(cjson, "lType");
+    cJSON *cjson_productPhOrder = cJSON_GetObjectItem(cjson, "productPhOrder");
     if (cjson_ltype != NULL)
         _over_all_sts_monitor->lType = cjson_ltype->valuestring;
-
+    else if (cjson_productPhOrder!=NULL)
+    {
+         _over_all_sts_monitor->lType = cjson_productPhOrder->valuestring;
+    }
+    
     cJSON *cjson_productName = cJSON_GetObjectItem(cjson, "productName");
     if (cjson_productName != NULL)
         _over_all_sts_monitor->product_name = cjson_productName->valuestring;