更新web为统一版本

pro/src/app.c

@@ -154,19 +154,31 @@ int board_upgrade_status_set(int addr, int status)
 }
 int board_list_get(board_list_t *list)
 {
-    int max=0;
+    int r,max=0,addr,cnt=0;
     board_list_t *l=&brd_list;
     GlobalDeviceManager *dm=&__globalDeviceManage;
+    Modbus_Manger *mm=&dm->_globalRelaySampManger;
     GlobalPowerManger *tmp,*hd=&dm->_globalPowerManger;
+    switch_info_t swinfo;
 
     memset(l, 0, sizeof(board_list_t));
     max = sizeof(l->info)/sizeof(l->info[0]);
     list_for_each_entry(tmp,&hd->list,list) {
         if(tmp->product_saddr>0) {
-            l->info[l->cnt++].addr=tmp->product_saddr;
-            g_switch_get_board_info(&l->info[l->cnt]);
-            l->cnt++;
-            if(l->cnt>=max) break;
+            board_info_t *info=&l->info[l->cnt];
+            addr = tmp->product_saddr;
+            r = g_switch_get_board_info(mm, addr, &swinfo);
+            if(r==0) {
+                info->addr = addr;
+                info->brd_id = swinfo.id[0];
+                info->channels = swinfo.channels;
+                strcpy(info->date, swinfo.date);
+                strcpy(info->ver, swinfo.ver);
+                sprintf(info->name, "PowerBoard %d", l->cnt+1);
+
+                l->cnt++;
+                if(l->cnt>=max) break;
+            }
         }
     }
     if(list) *list = *l;

pro/src/json_handle.c

@@ -1379,6 +1379,8 @@ 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, "systemTime", _over_back_sts_info->product_sysTime);
 
                             get_bldtime(temp, sizeof(temp));

pro/src/switch_ctrl.c

@@ -3241,13 +3241,7 @@ int g_switch_get_t_ac_breaker_info(void* manger,int saddr,GlobalBreakerManager*
 
 
 ////////////////////upgrade///////////////////////////////////
-typedef struct {
-    uint32_t id[3];
-    uint32_t channels;
-    char ver[8];
-    char date[20];
-}information_t;
-int g_switch_get_upgrade(void* manger int addr)
+int g_switch_get_upgrade(void* manger, int addr)
 {
     int timeout=0;
     g_modbus_get_timeout(manger, &timeout);
@@ -3256,11 +3250,11 @@ int g_switch_get_upgrade(void* manger int addr)
     g_modbus_set_timeout(manger, timeout);
     return 0;
 }
-int g_switch_set_upgrade(void* manger int addr)
+int g_switch_set_upgrade(void* manger, int addr)
 {
     return 0;
 }
-int g_switch_get_board_info(board_info_t *info)
+int g_switch_get_board_info(void* manger, int addr, switch_info_t *info)
 {
     return 0;
 }

pro/src/switch_ctrl.h

@@ -208,9 +208,14 @@ int g_switch_get_t_ac_breaker_info(void* manger,int saddr,GlobalBreakerManager*
 //重新加载端口
 int ResetChmData(int nCtrlType);
 
-
-
-int g_switch_get_upgrade(void)
-int g_switch_set_upgrade(void)
-int g_switch_get_board_info(board_info_t *info);
+//upgrade interface
+typedef struct {
+    uint32_t id[3];
+    uint32_t channels;
+    char ver[8];
+    char date[20];
+}switch_info_t;
+int g_switch_get_upgrade(void* manger, int addr);
+int g_switch_set_upgrade(void* manger, int addr);
+int g_switch_get_board_info(void* manger, int addr, switch_info_t *info);
 #endif

pub

@@ -154,12 +154,10 @@ function do_copy()
     rm -rf $curdir/output/t113i/root/run/web
     if [ $flag -eq 0 ]; then
         if [ "$1" = "PRJ_IP_AC_I3_O3" ];then
-            cp -rf $custdir/web/general   $curdir/output/t113s/root/mnt/UDISK/web
-        else
-            cp -rf $custdir/web/general   $curdir/output/t113i/root/run/web
+            cp -rf $custdir/web/unique   $curdir/output/t113s/root/mnt/UDISK/webb
         fi
     else
-        cp -rf $custdir/web/anderson  $curdir/output/t113i/root/run/web
+        cp -rf $custdir/web/unique  $curdir/output/t113i/root/run/web
     fi
 
     prj_enable $1