更新web，8.0.4(anderson)，7.02(other)

cust_data/web/anderson/css/chunk-54008279.8314a36c.css

@@ -0,0 +1 @@
+.domainSpanCss{cursor:pointer;margin-right:10px;text-align:center;text-decoration:underline;float:right}.span1,.span2,.span3{border-radius:5px;background:#0e35ff;height:20px!important;text-align:center;color:#fff}.span4,.span5,.span6{border-radius:5px;background:#0e35ff;height:29px;text-align:center;color:#fff}.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}

cust_data/web/anderson/css/chunk-98fcd3ce.8314a36c.css

@@ -0,0 +1 @@
+.domainSpanCss{cursor:pointer;margin-right:10px;text-align:center;text-decoration:underline;float:right}.span1,.span2,.span3{border-radius:5px;background:#0e35ff;height:20px!important;text-align:center;color:#fff}.span4,.span5,.span6{border-radius:5px;background:#0e35ff;height:29px;text-align:center;color:#fff}.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}

cust_data/web/general/css/chunk-14449d4f.8314a36c.css

@@ -0,0 +1 @@
+.domainSpanCss{cursor:pointer;margin-right:10px;text-align:center;text-decoration:underline;float:right}.span1,.span2,.span3{border-radius:5px;background:#0e35ff;height:20px!important;text-align:center;color:#fff}.span4,.span5,.span6{border-radius:5px;background:#0e35ff;height:29px;text-align:center;color:#fff}.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}

cust_data/web/general/css/chunk-1886dbc9.2f9fde42.css

@@ -0,0 +1 @@
+.el-tabs__item{font-size:16px;font-weight:700;border-radius:20px;border-color:#fff}.el-tabs__item.is-active{font-weight:700;background-color:#0e35ff;color:#fff;border-radius:20px}

output/push/tools/script.sh

@@ -69,7 +69,7 @@ set_net
 
 echo +++++++ upgrade ok! +++++++
 echo reboot device now ... 
-reboot
+reboot -f
 
 
 

pro/.vscode/launch.json

@@ -16,7 +16,7 @@
             "externalConsole": false,
             "MIMode": "gdb",
             "miDebuggerPath": "/home/tronlong/T113/T113-i_v1.0/out/t113_i/tlt113-evm-emmc/longan/buildroot/host/opt/ext-toolchain/bin/arm-linux-gnueabi-gdb",
-            "miDebuggerServerAddress": "192.168.1.132:1234"
+            "miDebuggerServerAddress": "192.168.234.132:1234"
         }
     ]
 }

pro/src/appweb_handle.c

@@ -225,7 +225,7 @@ static void *web_thread(void *arg)
     printf("_____mgHandle.cnt: %d, rootdir: %s\n", mh->cnt, mh->rootDir);
 
     while(h->quit==0) {
-        mg_mgr_poll(&mgr, 50);
+        mg_mgr_poll(&mgr, 200);
     }
     mg_mgr_free(&mgr);
         
@@ -2447,9 +2447,7 @@ static void alarmProtect(void *conn)
         }
         else {
             //转换参数
-            printf("___ 1111, %d\n", nAlarmNumber);
             ack_str = alarm_info_to_json(&_alarm_ack_info,nAlarmNumber);
-            printf("___ 2222, %d\n", nAlarmNumber);
 
             //释放资源
             _AlarmAckInfo* node;

pro/src/json_handle.c

@@ -3034,36 +3034,36 @@ char* over_sensor_history_info_to_json(_OverSensorBackInfo* _over_all_sensor_bac
     }
     else if(sensor_type == SENSOR_TYPE_LIST)
     {
-    // 添加基本键值对
-    cJSON_AddNumberToObject(root, "code", 200); 
+        // 添加基本键值对
+        cJSON_AddNumberToObject(root, "code", 200); 
         cJSON_AddNumberToObject(root, "total", 3); 
-    //创建数据
-    cJSON* data_root_array = cJSON_CreateArray();
-    //循环添加数据
-    list_for_each_entry(_temp, &_over_all_sensor_back_info->list, list)
-    {
-        log_d("sensor_name:%s", _temp->sensorName);
-        sleep(1);
-        cJSON* data_filed = cJSON_CreateObject();
-        cJSON_AddNumberToObject(data_filed, "accessControlStatus",_over_all_sensor_back_info->accessControlStatus);
-        cJSON_AddNumberToObject(data_filed,"sensorAddr",_over_all_sensor_back_info->sensorAddr);
+        //创建数据
+        cJSON* data_root_array = cJSON_CreateArray();
+        //循环添加数据
+        list_for_each_entry(_temp, &_over_all_sensor_back_info->list, list)
+        {
+            log_d("sensor_name:%s", _temp->sensorName);
+            sleep(1);
+            cJSON* data_filed = cJSON_CreateObject();
+            cJSON_AddNumberToObject(data_filed, "accessControlStatus",_over_all_sensor_back_info->accessControlStatus);
+            cJSON_AddNumberToObject(data_filed,"sensorAddr",_over_all_sensor_back_info->sensorAddr);
             cJSON_AddStringToObject(data_filed,"productName",__globalDeviceManage._globalDevInfo.product_name);
             cJSON_AddStringToObject(data_filed,"productNumber",__globalDeviceManage._globalDevInfo.product_number);
-        cJSON_AddNumberToObject(data_filed, "alarmStatus",_over_all_sensor_back_info->alarmStatus);
-        cJSON_AddNumberToObject(data_filed,"sensorBaud",_over_all_sensor_back_info->sensorBaud);
-        cJSON_AddStringToObject(data_filed,"comSlogan",_over_all_sensor_back_info->comSlogan);
-        cJSON_AddNumberToObject(data_filed, "connectionStatus",_over_all_sensor_back_info->connectionStatus);        
+            cJSON_AddNumberToObject(data_filed, "alarmStatus",_over_all_sensor_back_info->alarmStatus);
+            cJSON_AddNumberToObject(data_filed,"sensorBaud",_over_all_sensor_back_info->sensorBaud);
+            cJSON_AddStringToObject(data_filed,"comSlogan",_over_all_sensor_back_info->comSlogan);
+            cJSON_AddNumberToObject(data_filed, "connectionStatus",_over_all_sensor_back_info->connectionStatus);        
             cJSON_AddStringToObject(data_filed,"sensorName",_over_all_sensor_back_info->sensorName);
-        sprintf(temp, "%d", _over_all_sensor_back_info->sensorId);
-        cJSON_AddStringToObject(data_filed,"sensorId",temp);
-        cJSON_AddNumberToObject(data_filed,"sensorType",_over_all_sensor_back_info->sensorType);
-        cJSON_AddNumberToObject(data_filed, "waterImmersionState",_over_all_sensor_back_info->waterImmersionState);
-        cJSON_AddItemToObject(data_root_array, "data", data_filed);
-    }
-    //添加汇总
-    cJSON_AddItemToObject(root, "data", data_root_array);
-    //添加结果
-    cJSON_AddStringToObject(root, "msg", "操作成功");
+            sprintf(temp, "%d", _over_all_sensor_back_info->sensorId);
+            cJSON_AddStringToObject(data_filed,"sensorId",temp);
+            cJSON_AddNumberToObject(data_filed,"sensorType",_over_all_sensor_back_info->sensorType);
+            cJSON_AddNumberToObject(data_filed, "waterImmersionState",_over_all_sensor_back_info->waterImmersionState);
+            cJSON_AddItemToObject(data_root_array, "data", data_filed);
+        }
+        //添加汇总
+        cJSON_AddItemToObject(root, "data", data_root_array);
+        //添加结果
+        cJSON_AddStringToObject(root, "msg", "操作成功");
     }
     //转换
     str = cJSON_Print(root);    
@@ -3091,7 +3091,6 @@ char* alarm_info_to_json(_AlarmAckInfo* _alarm_ack_info,int nAllNumber)
     //循环添加数据
     list_for_each_entry(_temp, &_alarm_ack_info->list, list)
     {
- #if 1
         cJSON* data_filed = cJSON_CreateObject();
 
         cJSON_AddStringToObject(data_filed,"alarmNumber",_temp->alarmNumber);
@@ -3115,7 +3114,6 @@ char* alarm_info_to_json(_AlarmAckInfo* _alarm_ack_info,int nAllNumber)
         replace_sequences(_temp->alarmContent, __globalDeviceManage.alarmTab);
         cJSON_AddStringToObject(data_filed,"alarmContent",_temp->alarmContent);
         cJSON_AddItemToObject(data_root_array, "data", data_filed);
-#endif
     }
     //数据总数
     cJSON_AddNumberToObject(root, "total", nAllNumber);     

pro/src/smtp.c

@@ -3971,7 +3971,12 @@ smtp_attachment_clear_all(struct smtp *const smtp){
 }
 
 /////////////////////////////////////////////////////
+#include <stdint.h>
+#include "common.h"
+#include "thread.h"
+#include "xlist.h"
 #include "elog.h"
+#include "sqlite_handle.h"
 
 #if 1
     #define LOGD            log_d
@@ -4096,10 +4101,6 @@ static int send_mails(smtp_sett_t *sett, char *sub, char *body)
 }
 
 
-#include "thread.h"
-#include "xlist.h"
-#include "sqlite_handle.h"
-
 typedef struct {
     char sub[128];
     char body[2048];

pro/src/smtp.h

@@ -1,10 +1,5 @@
-#ifndef __SMTP_H__
-#define __SMTP_H__
-
-#include <stdint.h>
-#include "common.h"
-
-
+#ifndef __SMTP_Hx__
+#define __SMTP_Hx__
 
 int smtp_init(void);
 int smtp_deinit(void);

pro/src/sqlite_handle.c

@@ -441,7 +441,6 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* globalDeviceManger,_Ov
             continue;
             /* code */
         }
-        
 
         if (_globalPowerMangerTemp->product_ch_type==TREE_AC_TYPE||globalDeviceManger->_globalDevInfo.product_pwr_type == SmartPDU_Tree_AC_One_B)
         {
@@ -509,8 +508,8 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* globalDeviceManger,_Ov
             #ifdef USE_NETSWITCH
                 idx = _overChnPwrBackInfoTemp->productChId-1;
                 port_info_t *info=&swInfo.port[idx];
-                _overChnPwrBackInfoTemp->mac_addr = info->mac?info->mac:"";
-                _overChnPwrBackInfoTemp->ip_addr = info->ip?info->ip:"";
+                _overChnPwrBackInfoTemp->mac_addr = info->mac[0]?info->mac:"";
+                _overChnPwrBackInfoTemp->ip_addr = info->ip[0]?info->ip:"";
             #endif
 
                 list_add_tail(&_overChnPwrBackInfoTemp->list, &__overChnPwrAckInfo->list);
@@ -542,8 +541,9 @@ int dev_search_latest_power_All_info(GlobalDeviceManager* globalDeviceManger,_Ov
 
         #ifdef USE_NETSWITCH
             idx = _overChnPwrBackInfoTemp->productChId-1;
-            _overChnPwrBackInfoTemp->mac_addr = swInfo.port[idx].mac;
-            _overChnPwrBackInfoTemp->ip_addr = swInfo.port[idx].ip;
+            port_info_t *info=&swInfo.port[idx];
+            _overChnPwrBackInfoTemp->mac_addr = info->mac[0]?info->mac:"";
+            _overChnPwrBackInfoTemp->ip_addr = info->ip[0]?info->ip:"";
         #endif
 
             list_add_tail(&_overChnPwrBackInfoTemp->list, &__overChnPwrAckInfo->list);
@@ -2439,7 +2439,6 @@ int dev_serarch_all_alarm(sqlite3* db,
         return -1 ;
     }
     
-    printf("___ nrow: %d\n", nrow);
     for (size_t i = 1; i <= nrow; i++)
     {
         _AlarmAckInfo* _alarmTemp = (_AlarmAckInfo*)malloc(sizeof( _AlarmAckInfo));