commit febcbfa0cb1d04dcd085b9e5a152cec003ebc406
author rita <rita@exm.com> Thu Apr 28 16:30:25 2022 +0800
committer you.chen <you.chen@mobiletek.cn> Fri May 06 15:33:50 2022 +0800
tree b393418b560b913e0b05b40d40067d4ded49d7fc
parent 1e37620d6b30d94e4d5d64bc1e2bba506765ad01

[Feature]merge code from svn

Change-Id: Iabce86599e7d0249b405f443242aec87ceeadb8d

framework/lynq-ril-service/src/common.cpp

diff --git a/framework/lynq-ril-service/src/common.cpp b/framework/lynq-ril-service/src/common.cpp
index 7c5205d..16195e5 100755
--- a/framework/lynq-ril-service/src/common.cpp
+++ b/framework/lynq-ril-service/src/common.cpp
@@ -37,6 +37,8 @@
 #include "utils.h"
 #include "data.h"
 #include "cc.h"
+#include "include/lynq_systime.h"
+#include <include/lynq_uci.h>
 
 static pthread_mutex_t s_DataMutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t s_DataCond = PTHREAD_COND_INITIALIZER;
@@ -837,10 +839,14 @@
     time_t t1, t2;
     struct tm * ptm;
     char buf[255];
+    char date_buf[32] = "";
     int dShiftSec;
 
     dShiftSec = dGMTval * 15 * 60;
     t1 = mktime(src);
+    strftime(date_buf, sizeof(date_buf), "%Z", src);
+    if (strcmp(date_buf, "CST") == 0)
+                t1 = t1 + 8 * 60 * 60;
     t2 = (time_t)(t1 + dShiftSec);
     ptm = gmtime(&t2);
 
@@ -853,6 +859,7 @@
     struct tm tm;
     time_t t;
     int dGMTval;
+    char modem_sync_enable[24] = "";
 
     if (data == NULL || datalen <= 0)
         return;
@@ -868,6 +875,11 @@
     adjustGMT2LocalTime(&tm, dGMTval);
 
     t = mktime(&tm);
+
+    lynq_get_value("lynq_uci", "lynq_sync_time", "lynq_modem_sync_time_enable" , modem_sync_enable);
+    if(!atoi(modem_sync_enable))
+        return ;
+
     stime(&t);
 
     return;