From f3b2f01f8b62bd2f9ca1205fb84b3bcf433ba0e3 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 16 Jan 2025 11:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B2=E5=8F=A3log=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=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 | 2 +- app/src/main/cpp/PhoneDevice.h | 2 +- app/src/main/cpp/SensorsProtocol.cpp | 4 ++-- app/src/main/cpp/SensorsProtocol.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 53d70ee6..318df2ea 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3802,7 +3802,7 @@ int CPhoneDevice::GetSerialPhoto(int devno, D_IMAGE_DEF *photo) return GetImage(devno, (IMAGE_DEF*)photo); } -void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir, char *logpath) +void CPhoneDevice::InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir,const char *logpath) { Gm_InitSerialComm((SENSOR_PARAM *)sensorParam, filedir, logpath); } diff --git a/app/src/main/cpp/PhoneDevice.h b/app/src/main/cpp/PhoneDevice.h index 63beffb7..077cda68 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, char *logpath); + virtual void InitSerialComm(D_SENSOR_PARAM *sensorParam, char *filedir,const 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 c53c5fd8..662df4ee 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -950,7 +950,7 @@ uint8_t getdevtype(int devno) return devparam[devno].ProtocolIdx; } // 初始化所有串口及所接传感器的配置 -void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir, char *log) +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log) { int i; char szbuf[128]; @@ -1687,7 +1687,7 @@ int SaveLogTofile(int commid, char *szbuf) } // 写入文件到sdcard memset(filename, 0, sizeof(filename)); - sprintf(filename, "%sCOM%dlog-%d-%d-%d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); + sprintf(filename, "%sCOM%dlog-%04d-%02d-%02d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); fp = fopen(filename, "a+"); if (NULL == fp) return -1; diff --git a/app/src/main/cpp/SensorsProtocol.h b/app/src/main/cpp/SensorsProtocol.h index 5f49b807..6d8ee84f 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, char *log); +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log); // 启动串口通讯 void GM_StartSerialComm(); // 启动使用串口拍照