diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index ff57603..9f396fc 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/common/global.hpp b/common/global.hpp
index 0defe3f..f8b3ec6 100644
--- a/common/global.hpp
+++ b/common/global.hpp
@@ -1,67 +1,69 @@
-#ifndef GLOBAL_HPP_
-#define GLOBAL_HPP_
-#include
-#include
-#include
-#include
-#include
-#include
-#include "common_func.hpp"
-
-
-//#define SECTION_MAX_LEN 1024
-//******************** 全局变量**********************
-enum enumZigBeeTransmitStatus {
- NO_ENTER_TRANSMITTING_STATUS = 0,
- ENTER_TRANSMITTING_STATUS
-};
-
-
-//#define NR5G_MODULE
-#define Q4G_MODULE
-//#define WIFI_MODULE
-//#define NR5G_MEIGE
-
-class GlobalConfig
-{
-public :
- static int RUN_MODE; //1调试模式 0运行模式
- static int QuitFlag_G; //程序退出标志
- static int LinkStatus_G; //和服务器连接状态
- static int LinkCount;
- static int NetSignal;
- static int serverStatus;
- static int net0Status;
- static std::string NR5GTemp;
- static std::string NetStatus;
- static std::string NetType;
- static std::string Version; //软件版本号
- static std::string MacAddr_G; //设备MAC地址
- static std::string MacAddr_G2; //设备光纤MAC地址
- static std::string IpAddr_G; //设备IP
- static std::string DbName_G; //数据库名字
- static std::string Config_G; //配置文件
- static std::string ServerIP; //服务器地址
- static int ServerPort; //服务器端口
- static int threadStatus;
- static std::string UartName_G;
- static TopicList Topic_G; //发布的主题
- static ZigbeeInfo ZigbeeInfo_G; //gateway zigbee info
- static ZIGBEE Zigbee_G;
- static GPIOInfo GPIO_G;
- static enumZigBeeTransmitStatus EnterZigBeeWaveTransmittingFlag_G; // 进入ZigBee网络原始数据传输状态标志
- static int EnterZigBeeWaveTransmittingCnt_G; // 进入ZigBee网络原始数据传输状态计数器，以秒为单位进行计数
- static int day;
-
-};
-
-
-#define SAVE_COUNT 4320
-#define OneWeek 432000 //5天
-
-//按8 取整
-#define Length_(len) do{ \
- len = ((((len>>3) + ((len&0x7)>0?1:0))<<4) + 8); \
- } while (0)
-
-#endif
+#ifndef GLOBAL_HPP_
+#define GLOBAL_HPP_
+#include
+#include
+#include
+#include
+#include
+#include
+#include "common_func.hpp"
+
+
+//#define SECTION_MAX_LEN 1024
+//******************** 全局变量**********************
+enum enumZigBeeTransmitStatus {
+ NO_ENTER_TRANSMITTING_STATUS = 0,
+ ENTER_TRANSMITTING_STATUS
+};
+
+
+//#define NR5G_MODULE
+//#define Q4G_MODULE
+//#define WIFI_MODULE
+//#define NR5G_MEIGE
+
+
+class GlobalConfig
+{
+public :
+ static int RUN_MODE; //1调试模式 0运行模式
+ static int QuitFlag_G; //程序退出标志
+ static int LinkStatus_G; //和服务器连接状态
+ static int LinkCount;
+ static int NetSignal;
+ static int serverStatus;
+ static int net0Status;
+ static std::string NR5GTemp;
+ static std::string NetStatus;
+ static std::string NetType;
+ static std::string Version; //软件版本号
+ static std::string MacAddr_G; //设备MAC地址
+ static std::string MacAddr_G2; //设备光纤MAC地址
+ static std::string IpAddr_G; //设备IP
+ static std::string DbName_G; //数据库名字
+ static std::string Config_G; //配置文件
+ static std::string ServerIP; //服务器地址
+ static int ServerPort; //服务器端口
+ static int threadStatus;
+ static std::string UartName_G;
+ static TopicList Topic_G; //发布的主题
+ static ZigbeeInfo ZigbeeInfo_G; //gateway zigbee info
+ static ZIGBEE Zigbee_G;
+ static GPIOInfo GPIO_G;
+ static enumZigBeeTransmitStatus EnterZigBeeWaveTransmittingFlag_G; // 进入ZigBee网络原始数据传输状态标志
+ static int EnterZigBeeWaveTransmittingCnt_G; // 进入ZigBee网络原始数据传输状态计数器，以秒为单位进行计数
+ static int day;
+
+};
+
+
+#define SAVE_COUNT 4800*4
+#define OneWeek 604800*7
+
+
+//按8 取整
+#define Length_(len) do{ \
+ len = ((((len>>3) + ((len&0x7)>0?1:0))<<4) + 8); \
+ } while (0)
+
+#endif
diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp
index d954f5d..78d9b46 100644
--- a/jsonparse/web_cmd_parse3.cpp
+++ b/jsonparse/web_cmd_parse3.cpp
@@ -167,7 +167,7 @@ std::string JsonData::JsonCmd_Cgi_52(Param_52 ¶m) {
std::vector vecSsid;
boost::split(vecSsid, netssid, boost::is_any_of("\n"), boost::token_compress_off);
jsBody["type"] = "SCAN";
- zlog_info(zct,"netssid : %s %d", netssid.c_str(), vecSsid.size());
+ zlog_info(zct,"netssid : %s ==== %d", netssid.c_str(), vecSsid.size());
for (unsigned int i = 1; i < vecSsid.size() - 1; i++) {
std::vector data;
boost::split(data, vecSsid[i], boost::is_any_of("\t"), boost::token_compress_off);
diff --git a/wifi_5g/wpa_client.cpp b/wifi_5g/wpa_client.cpp
index e96472a..5e1b9e5 100644
--- a/wifi_5g/wpa_client.cpp
+++ b/wifi_5g/wpa_client.cpp
@@ -409,8 +409,8 @@ bool WPAClient::Request(WPAContext *context, const std::string &cmd, std::string
res = select(wpa_context_->s + 1, &rfds, NULL, NULL, &tv);
if (res < 0) return false;
if (FD_ISSET(wpa_context_->s, &rfds)) {
- char temp[1024] = {0};
- int temp_len = 1024;
+ char temp[1024 * 3] = {0};
+ int temp_len = 1024 * 3;
res = recv(wpa_context_->s, temp, temp_len, 0);
if (res < 0) return false;
if (res > 0 && temp[0] == '<') {