From 52016d2fb8621b24fa0e12b9b3b47fe5930c112b Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Mon, 2 Dec 2024 20:11:58 +0800
Subject: [PATCH] 4G Version 5.1

---
 common/global.hpp          | 2 +-
 main.cpp                   | 2 +-
 threadfunc/thread_func.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/global.hpp b/common/global.hpp
index ac03d9a..2ff7763 100644
--- a/common/global.hpp
+++ b/common/global.hpp
@@ -18,7 +18,7 @@ enum enumZigBeeTransmitStatus {
 
 
 //#define NR5G_MODULE
-//#define Q4G_MODULE
+#define Q4G_MODULE
 //#define WIFI_MODULE
 //#define NR5G_MEIGE
 
diff --git a/main.cpp b/main.cpp
index c7b2909..61bf74f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
 #ifdef Q4G_MODULE
     boost::thread startCSQ(GetCSQ);
     startCSQ.detach();
-    print_info("4G_MODULE \n");
+    zlog_info(zbt, "4G_MODULE");  
 
 #endif
 #ifdef WIFI_MODULE
diff --git a/threadfunc/thread_func.cpp b/threadfunc/thread_func.cpp
index 8854ff9..41c0b70 100644
--- a/threadfunc/thread_func.cpp
+++ b/threadfunc/thread_func.cpp
@@ -126,7 +126,7 @@ open4G:
         if (ret <= 0) {
             timeoutflag++;
             if (timeoutflag > 5) {
-                zlog_info("timeoutflag = %d\n", timeoutflag);
+                zlog_info(zbt,"timeoutflag = %d\n", timeoutflag);
                 timeoutflag = 0;
                 const char *str2 = "+QENG: ";
                 char csq[128] = {0};
@@ -135,7 +135,7 @@ open4G:
                     strncpy(csq, pdata + 7, sizeof(csq));
 
                     GlobalConfig::NetStatus = GetOneContent(csq, 1, ",");
-                    string signal = GetOneContent(csq, 13, ",");
+                    std::string signal = GetOneContent(csq, 13, ",");
                     GlobalConfig::NetSignal = atoi(signal.c_str());
                     GlobalConfig::NetType = GetOneContent(csq, 2, ",");
                     zlog_info(zct, "NetStatus = %s,NetSignal = %d", GlobalConfig::NetStatus.c_str(), GlobalConfig::NetSignal);