[bugfix][T103-111]fix systime bug
Change-Id: I62783a301474530e1fff845e1947d22884a33862
diff --git a/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.cpp b/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.cpp
index 7eb09bb..c63ebee 100755
--- a/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.cpp
+++ b/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.cpp
@@ -19,6 +19,7 @@
//#include <log/log.h>
#include "lynq_systime.h"
#include<cutils/properties.h>
+#include<lynq_at_time.h>
static void lynq_response_ttyGS3(char *log_buf)
{
@@ -29,77 +30,59 @@
int lynq_at_choose_time(int argc, char *argv[])
{
- int temp = 0;
- int ret = 0;
- int enable = 0;
- char buf[20] = "";
-
-
-
- if(NULL == argv[4] || argc!=5)
- {
- lynq_response_ttyGS3("+CME ERROR: para error!!\n");
- return -1;
- }
-
- enable = atoi(argv[4]);
-
- if(!strcmp(argv[3], "ntp"))
- {
- ret = ntp_sync_time(enable);
- }
- else if(!strcmp(argv[3], "md"))
- {
- ret = modem_time_enable(enable);
- }
- else
- {
- lynq_response_ttyGS3("+CME ERROR: para error!!\n");
- }
- if(ret!=0)
+ int enable = 0;
+ int ret = 0;
+ char buf[20] = "";
+
+ if(NULL == argv[4] || argc != 5)
+ ret = PARA_ERROR;
+
+
+ if(!strcmp(argv[4], "1") || !strcmp(argv[4], "0"))
{
- lynq_response_ttyGS3("+CME ERROR: para error!!\n");
+ enable = atoi(argv[4]);
+
+ if(!strcmp(argv[3], "ntp"))
+ ret = ntp_sync_time(enable);
+ else if(!strcmp(argv[3], "md"))
+ ret = modem_time_enable(enable);
+ else
+ ret = PARA_ERROR;
}
else
- {
- sprintf(buf,"+LYNQTIME: %d\n", enable);
- lynq_response_ttyGS3(buf);
- }
-
+ ret = PARA_ERROR;
+
return ret;
}
int lynq_at_sync_time(int argc, char *argv[])
{
int ret = 0;
+ char buf[100] = "";
+
if((!strcmp(argv[3], "usr")))
{
- if(argc!=6)
+ if(argc != 6)
{
- lynq_response_ttyGS3("+CME ERROR: para error!!\n");
- return -1;
+ ret = PARA_ERROR;
+ goto out;
}
ret = user_set_time(argv[4], argv[5]);
- if(ret!=0)
- {
- lynq_response_ttyGS3("+CME ERROR: para error!\n");
- }
- else
- {
- lynq_response_ttyGS3("+LYNQTIME: ok!\n");
- }
}
else
- {
ret = lynq_at_choose_time(argc, argv);
- if(ret!=0)
- {
- lynq_response_ttyGS3("+CME ERROR: para error!\n");
- }
- }
-
+
+out:
+ if (ret != 0)
+ sprintf(buf,"+CME ERROR: error code = %d\n", ret);
+ else if((!strcmp(argv[3], "usr")))
+ sprintf(buf,"+LYNQTIME: ok!\n", ret);
+ else
+ sprintf(buf,"+LYNQTIME: %d\n", atoi(argv[4]));
+
+ lynq_response_ttyGS3(buf);
return ret;
}
#ifdef __cplusplus
diff --git a/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.h b/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.h
index ed3f148..bb30153 100755
--- a/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.h
+++ b/src/lynq/framework/lynq-atsvc/src/time/lynq_at_time.h
@@ -4,6 +4,7 @@
extern "C" {
#endif
+#define PARA_ERROR 10
int lynq_at_sync_time(int argc, char *argv[]);
#ifdef __cplusplus
diff --git a/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate.service b/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate.service
old mode 100644
new mode 100755
index 20cce5b..d644c45
--- a/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate.service
+++ b/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate.service
@@ -1,9 +1,10 @@
[Unit]
-Description=system service
+Description=lynq logrotate service
After=wmtd.service
[Service]
-Type=oneshot
+StandardOutput=kmsg+console
+Type=simple
RemainAfterExit=no
ExecStart=/usr/bin/lynq-logrotate-service
diff --git a/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate_service.c b/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate_service.c
old mode 100644
new mode 100755
index 971628e..629160e
--- a/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate_service.c
+++ b/src/lynq/framework/lynq-logrotate-service/src/lynq_logrotate_service.c
@@ -51,7 +51,8 @@
int main()
{
char muclog[1024] = {0};
-
+
+ system("systemctl stop ntpd");
lynq_fota_func();//lt add @2021.9.27 for check fota
while(1)
{