添加logo处理

pro/src/appweb_handle.c

@@ -19,6 +19,14 @@
 typedef void (*http_fn_t)(void *arg);
 
 
+
+static void file_to_base64(void)
+{
+    //mg_base64_encode();
+}
+
+
+
 #ifdef USE_WEBAPP
 #include "http.h"
 #else
@@ -3401,7 +3409,7 @@ static void equipmentMintenance(void *conn)
     }
     else if(strcmp(_Over_equipment_mintenance.type,"listShfwQuery")==0)
     {
-
+        ack_str = vendor_info_to_json();
     }
     else if(strcmp(_Over_equipment_mintenance.type,"sBRestart")==0) {  //restart
         if(strcmp(_Over_equipment_mintenance.product_name,__globalDeviceManage._global_device_info->product_name)) {
@@ -3419,6 +3427,11 @@ static void equipmentMintenance(void *conn)
             //send to other device
         }
     }
+    else {
+        //char *save_logo="productNumber=Vq1&productVersion=undefined&uploadType=shfw&type=importData&token=b6cdd10e-e1a7-4bd9-8283-c6d6ecbae28c";
+
+
+    }
     
     cJSON_Delete(cjson);
     http_reply(conn, 200, ack_str);

pro/src/json_handle.c

@@ -1157,6 +1157,38 @@ char* over_product_list_info_to_json(GlobalDeviceManager *dm, _OverBackStsInfo*
     return str;
 }
 
+
+char* vendor_info_to_json(void)
+{
+    char* str = NULL;
+    
+    cJSON* root = cJSON_CreateObject(); 
+    cJSON_AddNumberToObject(root, "code", 200);       
+    
+    cJSON* data_field = cJSON_CreateObject();   
+    cJSON_AddNumberToObject(data_field, "productName", nLanguageID);
+
+    cJSON_AddStringToObject(data_field,"productId",strIPInfo); 
+    cJSON_AddStringToObject(data_field,"productNumber",strIPInfo); 
+
+    cJSON_AddStringToObject(data_field,"logo","");          //base64
+    cJSON_AddStringToObject(data_field,"sensorAddr","");
+    cJSON_AddStringToObject(data_field,"website","");
+    cJSON_AddStringToObject(data_field,"serviceTel","");
+    cJSON_AddStringToObject(data_field,"mailbox","");
+    cJSON_AddStringToObject(data_field,"qrCode","");        //base64
+
+    cJSON_AddItemToObject(root,"data",data_field);
+    cJSON_AddStringToObject(root, "msg", "操作成功");    
+    
+    str = cJSON_Print(root);
+    cJSON_Delete(root);
+
+    return str;
+}
+
+
+
 /// @brief 获取设备电源总体请求信息
 /// @param str 
 /// @param _over_all_sts_ 

pro/src/json_handle.h

@@ -483,6 +483,7 @@ char* over_channel_power_history_to_json(GlobalPowerInfo* _globalPowerInfo,Globa
 cJSON* json_to_overall_pwr_status_monitor(const char* str,_OverAllPwrRequest* _over_all_pwr_request);
 cJSON* json_to_over_equipment_mintenance(const char* str,_Equipment_Mintenance* _over_equipment_mintenance);
 char* over_product_list_info_to_json(GlobalDeviceManager *dm, _OverBackStsInfo* _over_back_sts_info,bool curFlag);
+char* vendor_info_to_json(void);
 char* over_all_pwr_monitor_to_json(int phaseType,_OverAllPwrAckInfo* _over_all_pwr_back_info);
 char* over_all_pwr_monitor_Tree_AC_to_json(_OverAllPwrAckInfo* _over_all_pwr_back_info_L1,_OverAllPwrAckInfo* _over_all_pwr_back_info_L2,_OverAllPwrAckInfo* _over_all_pwr_back_info_L3);
 char* over_all_total_info_to_json(_OverAllPwrAckInfo* _over_all_pwr_back_info, int total_type);