From 09dae147259fd5b178afda19e3a4fa0f604ce177 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 26 Mar 2025 22:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=88=96=E8=80=85=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/DngCreator.cpp | 8 ++++---- app/src/main/cpp/SensorsProtocol.cpp | 6 +++--- app/src/main/cpp/SensorsProtocol.h | 6 +++--- app/src/main/cpp/netcamera/HangYuCtrl.cpp | 2 +- app/src/main/cpp/netcamera/YuShiCtrl.cpp | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/src/main/cpp/DngCreator.cpp b/app/src/main/cpp/DngCreator.cpp index 0c1727fb..12d31d5a 100644 --- a/app/src/main/cpp/DngCreator.cpp +++ b/app/src/main/cpp/DngCreator.cpp @@ -2509,8 +2509,8 @@ void DngCreator::writeInputStream(std::vector& outStream, uint64_t uOffset = static_cast(offset); ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, " - "rowStride=%d, pixStride=%d, offset=%" PRId64, __FUNCTION__, uWidth, - uHeight, rowStride, pixStride, offset); + "rowStride=%d, pixStride=%d, offset=%lld", __FUNCTION__, uWidth, + uHeight, rowStride, pixStride, (int64_t)offset); ByteVectorOutput out(outStream); // std::vector& out = outStream; @@ -2578,8 +2578,8 @@ void DngCreator::writeInputBuffer(std::vector& outStream, uint64_t uOffset = static_cast(offset); ALOGV("%s: nativeWriteInputStream called with: width=%u, height=%u, " - "rowStride=%d, pixStride=%d, offset=%" PRId64, __FUNCTION__, uWidth, - uHeight, rowStride, pixStride, offset); + "rowStride=%d, pixStride=%d, offset=%lld", __FUNCTION__, uWidth, + uHeight, rowStride, pixStride, (int64_t)offset); ByteVectorOutput out(outStream); // std::vector& out = outStream; diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index b81dc5e6..ba7d5582 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -445,7 +445,7 @@ uint8_t getdevtype(int devno) return devparam[devno].ProtocolIdx; } // 初始化所有串口及所接传感器的配置 -void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log) +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, const char *filedir,const char *log) { int i; char szbuf[128]; @@ -1124,7 +1124,7 @@ void SerialDataProcess(int devidx, u_char *buf, int len) } } -void DebugLog(int commid, char *szbuf, char flag) +void DebugLog(int commid, const char *szbuf, char flag) { if (NULL == szbuf) return; @@ -1152,7 +1152,7 @@ void DebugLog(int commid, char *szbuf, char flag) } } -int SaveLogTofile(int commid, char *szbuf) +int SaveLogTofile(int commid, const char *szbuf) { int status; time_t now; diff --git a/app/src/main/cpp/SensorsProtocol.h b/app/src/main/cpp/SensorsProtocol.h index 488d01c6..42e388fa 100644 --- a/app/src/main/cpp/SensorsProtocol.h +++ b/app/src/main/cpp/SensorsProtocol.h @@ -346,11 +346,11 @@ void Gm_OpenSerialPort(int devidx); // 关闭串口通讯 void Gm_CloseSerialPort(); -void DebugLog(int commid, char *szbuf, char flag); -int SaveLogTofile(int commid, char *szbuf); +void DebugLog(int commid, const char *szbuf, char flag); +int SaveLogTofile(int commid, const char *szbuf); // 功能说明:串口发送数据 返回实际发送的字节数 int GM_SerialComSend(const unsigned char * cSendBuf, size_t nSendLen, int commid); -void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, char *filedir,const char *log); +void Gm_InitSerialComm(SENSOR_PARAM *sensorParam, const char *filedir,const char *log); // 启动串口通讯 void GM_StartSerialComm(); // 启动使用串口拍照 diff --git a/app/src/main/cpp/netcamera/HangYuCtrl.cpp b/app/src/main/cpp/netcamera/HangYuCtrl.cpp index 2d1fbde4..2bd71214 100644 --- a/app/src/main/cpp/netcamera/HangYuCtrl.cpp +++ b/app/src/main/cpp/netcamera/HangYuCtrl.cpp @@ -182,5 +182,5 @@ bool HangYuCtrl::TakePhoto(std::vector& img) bool HangYuCtrl::TakeVideo(uint32_t duration, std::string path) { - + return false; } \ No newline at end of file diff --git a/app/src/main/cpp/netcamera/YuShiCtrl.cpp b/app/src/main/cpp/netcamera/YuShiCtrl.cpp index 43fc0cf9..93bd2bdb 100644 --- a/app/src/main/cpp/netcamera/YuShiCtrl.cpp +++ b/app/src/main/cpp/netcamera/YuShiCtrl.cpp @@ -158,6 +158,7 @@ bool YuShiCtrl::TakePhoto(std::vector& img) bool YuShiCtrl::TakeVideo(uint32_t duration, std::string path) { + return false; }