Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/json_handle.c

@@ -1379,7 +1379,7 @@ char* over_product_list_info_to_json(GlobalDeviceManager *dm, _OverBackStsInfo*
 
                         if(dl.slave[i].addr==0) {
                             cJSON_AddStringToObject(data_filed, "productVersion", VERSION);
-                            cJSON_AddStringToObject(data_filed, "productTypeName", dm->_globalDevInfo.product.pnumber);
+                            cJSON_AddStringToObject(data_filed, "productTypeName", _over_back_sts_info->product_type);
 
                             cJSON_AddStringToObject(data_filed, "systemTime", _over_back_sts_info->product_sysTime);
 
@@ -1938,7 +1938,7 @@ char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_bac
 
     cJSON_AddStringToObject(data_filed,"productName",temp);
     //cJSON_AddStringToObject(data_filed,"productNumber",_over_all_pwr_back_info_L1->product_number);
-    cJSON_AddStringToObject(data_filed,"productNumber","SmartPDU");
+    cJSON_AddStringToObject(data_filed,"productNumber","Smart PDU");
     sprintf(temp,"%d",_over_all_pwr_back_info_L1->product_id);
     cJSON_AddStringToObject(data_filed,"productId",temp);
      cJSON_AddStringToObject(data_filed,"productPhOrder","L1");
@@ -1983,7 +1983,7 @@ char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_bac
     }
     cJSON_AddStringToObject(data_filed1,"productName",temp);
    // cJSON_AddStringToObject(data_filed1,"productNumber",_over_all_pwr_back_info_L2->product_number);
-    cJSON_AddStringToObject(data_filed1,"productNumber","SmartPDU");
+    cJSON_AddStringToObject(data_filed1,"productNumber","Smart PDU");
     sprintf(temp,"%d",_over_all_pwr_back_info_L2->product_id);
     cJSON_AddStringToObject(data_filed1,"productId",temp);
      cJSON_AddStringToObject(data_filed1,"productPhOrder","L2");
@@ -2028,7 +2028,7 @@ char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_bac
     }
     cJSON_AddStringToObject(data_filed2,"productName",temp);
     //cJSON_AddStringToObject(data_filed2,"productNumber",_over_all_pwr_back_info_L3->product_number);
-    cJSON_AddStringToObject(data_filed2,"productNumber","SmartPDU");
+    cJSON_AddStringToObject(data_filed2,"productNumber","Smart PDU");
     sprintf(temp,"%d",_over_all_pwr_back_info_L3->product_id);
     cJSON_AddStringToObject(data_filed2,"productId",temp);
      cJSON_AddStringToObject(data_filed2,"productPhOrder","L3");
@@ -2106,7 +2106,7 @@ char* over_all_pwr_monitor_to_json(int phaseType,_OverAllPwrAckInfo* _over_all_p
    
     cJSON_AddStringToObject(data_filed,"productName",_over_all_pwr_back_info->product_name);
     //cJSON_AddStringToObject(data_filed,"productNumber",_over_all_pwr_back_info->product_number);
-    cJSON_AddStringToObject(data_filed,"productNumber","SmartPDU");
+    cJSON_AddStringToObject(data_filed,"productNumber","Smart PDU");
     sprintf(temp,"%d",_over_all_pwr_back_info->product_id);
     cJSON_AddStringToObject(data_filed,"productId",temp);
 
@@ -4024,7 +4024,7 @@ char* ws_over_status_ack_to_json(int type,_OverAllPwrAckInfo* _over_all_pwr_back
     }
     cJSON_AddStringToObject(data_filed,"productName",temp);
    // cJSON_AddStringToObject(data_filed,"productNumber",_over_all_pwr_back_info->product_number);
-    cJSON_AddStringToObject(data_filed,"productNumber","SmartPDU");
+    cJSON_AddStringToObject(data_filed,"productNumber","Smart PDU");
     sprintf(temp,"%d",_over_all_pwr_back_info->product_id);
     cJSON_AddStringToObject(data_filed,"productId",temp);
     sprintf(temp,"%0.3f",_over_all_pwr_back_info->voltage);

pro/src/paras.c

@@ -289,7 +289,7 @@ static int proc_prod(dictionary *dic, int op, ProductInfo_t *prod)
             return -1;
         }
     }
-    
+    */
     token = "product:name";
     if(op==PARAS_READ) {
         p = (char*)iniparser_getstring(dic, token, NULL);
@@ -307,7 +307,7 @@ static int proc_prod(dictionary *dic, int op, ProductInfo_t *prod)
             return -1;
         }
     }
-    */
+ 
     token = "product:type";
     if(op==PARAS_READ) {
         r = iniparser_getint(dic, token, -1);

pro/src/sys.c

@@ -1426,9 +1426,11 @@ int sys_get_prod(GlobalDeviceInfo *info)
     p = str_get(fbuf.buf, tok, info->product.pnumber, sizeof( info->product.pnumber));
     if(p) LOGD("___%s:%s\n", tok, p);
 
+#if 0
     tok = "device_name";
     p = str_get(fbuf.buf, tok, info->product.name, sizeof( info->product.name));
     if(p) LOGD("___%s:%s\n", tok, p);
+#endif
 
     tok = "device_no";
     p = str_get(fbuf.buf, tok, info->product.number, sizeof(info->product.number));