From 34f0c173cb4e1980d623adf8677eea897d59f99a Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Wed, 15 Jan 2025 17:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D938=E5=87=8C=E6=99=A8?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=B2=E5=8F=A3?= =?UTF-8?q?log=E8=B7=AF=E5=BE=84=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 4 ++-- app/src/main/cpp/PhoneDevice.h | 2 +- app/src/main/cpp/SensorsProtocol.cpp | 35 ++++++++++++++++------------ app/src/main/cpp/SensorsProtocol.h | 2 +- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 2091b713..0b0f4fb8 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3800,9 +3800,9 @@ int CPhoneDevice::GetSerialPhoto(int devno, D_IMAGE_DEF *photo) return GetImage(devno, (IMAGE_DEF*)photo); } -void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir) +void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir, char *logpath) { - Gm_InitSerialComm((SENSOR_PARAM *)sensorParam, filedir); + Gm_InitSerialComm((SENSOR_PARAM *)sensorParam, filedir, logpath); } int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceTail, D_SENSOR_PARAM *sensorParam) diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index e20bf433..63beffb7 100644 --- a/app/src/main/cpp/PhoneDevice.h +++ b/app/src/main/cpp/PhoneDevice.h @@ -241,7 +241,7 @@ public: virtual bool GetCameraStatus(); virtual void CameraCtrl(unsigned short waitTime, unsigned short delayTime, unsigned char channel, int cmdidx, unsigned char presetno, const char *serfile, unsigned int baud, int addr); virtual int GetSerialPhoto(int devno, D_IMAGE_DEF *photo); - virtual void InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir); + virtual void InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir, char *logpath); bool LoadNetworkInfo(); bool GetNextScheduleItem(uint32_t tsBasedZero, uint32_t scheduleTime, vector& items); diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index a3eea8ac..c53c5fd8 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -39,6 +39,7 @@ SRDT_DEF srdt; AI_DEF weatherpntmsg[WEATHER_DATA_NUM]; AI_DEF rallypntmsg[6][RALLY_DATA_NUM]; AI_DEF slantpntmsg[6][SLANTANGLE_DATA_NUM]; +char logPath[512]; #if 0 /********************************************************************************* @@ -941,7 +942,7 @@ void Gm_InitSerialComm_Test() memset(sensorParam[3].pathname, 0, sizeof(sensorParam[3].pathname)); strcpy(sensorParam[3].pathname, "/dev/ttyS1"); //#endif - Gm_InitSerialComm(sensorParam, "/sdcard/photo/"); + Gm_InitSerialComm(sensorParam, "/sdcard/photo/",logPath); } uint8_t getdevtype(int devno) @@ -949,11 +950,14 @@ uint8_t getdevtype(int devno) return devparam[devno].ProtocolIdx; } // 初始化所有串口及所接传感器的配置 -void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir) +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir, char *log) { int i; char szbuf[128]; + memset(logPath,0, sizeof(logPath)); + strcpy(logPath, log); + for (i = 0; i < MAX_SERIAL_DEV_NUM; i++) { memset(&devparam[i], 0, sizeof(SERIAL_PARAM)); @@ -1670,7 +1674,8 @@ int SaveLogTofile(int commid, char *szbuf) gettimeofday(&tv, NULL); memset(filedir, 0, sizeof(filedir)); - strcpy(filedir, "/sdcard/log/"); + if(logPath != NULL) + strcpy(filedir, logPath); if (access(filedir, 0) == 0) ;//LOGI("文件路径已经存在！"); @@ -1682,7 +1687,7 @@ int SaveLogTofile(int commid, char *szbuf) } // 写入文件到sdcard memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d-%d-%d-COM%d.log", filedir, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday, commid + 1); + sprintf(filename, "%sCOM%dlog-%d-%d-%d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); fp = fopen(filename, "a+"); if (NULL == fp) return -1; @@ -3421,21 +3426,21 @@ void Collect_sensor_data() char logbuf[64]; time_t now; struct tm t0; - const char *path = "/sdcard/log"; // 指定目录路径 - int days = 15; // 删除15天前的log文件 +// const char *path = logPath; // 指定目录路径 +// int days = 15; // 删除15天前的log文件 sprintf(logbuf, "进入程序时间：%lld, ideletefile=%d", get_msec(), ideletefile); DebugLog(8, logbuf, 'I'); - now = time(NULL); - localtime_r(&now, &t0); - if ((0 == t0.tm_hour) && (0 == ideletefile)) - { - delete_old_files(path, days); - ideletefile++; - } - if (0 < t0.tm_hour) - ideletefile = 0; +// now = time(NULL); +// localtime_r(&now, &t0); +// if ((0 == t0.tm_hour) && (0 == ideletefile)) +// { +// delete_old_files(path, days); +// ideletefile++; +// } +// if (0 < t0.tm_hour) +// ideletefile = 0; #endif GM_StartSerialComm(); pthread_mutex_unlock(&serial_mutex); // 解锁 diff --git a/app/src/main/cpp/SensorsProtocol.h b/app/src/main/cpp/SensorsProtocol.h index 4618dcca..5f49b807 100644 --- a/app/src/main/cpp/SensorsProtocol.h +++ b/app/src/main/cpp/SensorsProtocol.h @@ -336,7 +336,7 @@ void DebugLog(int commid, char *szbuf, char flag); int SaveLogTofile(int commid, char *szbuf); // 功能说明:串口发送数据 返回实际发送的字节数 int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid); -void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir); +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir, char *log); // 启动串口通讯 void GM_StartSerialComm(); // 启动使用串口拍照