diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 5cd1c5d7..76cf8a5c 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1618,9 +1618,14 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c } if (localPhotoInfo.remedy != 0) { - if ((takingTime - localPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = localPhotoInfo.scheduleTime; + if (scheduleTime == 0) { - takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2; + scheduleTime = localPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) + { + takingTime = scheduleTime + localPhotoInfo.channel * 2; } } @@ -1857,9 +1862,14 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< time_t takingTime = ts; if (localPhotoInfo.remedy != 0) { - if ((takingTime - localPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = localPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = localPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2; + takingTime = scheduleTime + localPhotoInfo.channel * 2; } } IMAGE_DEF photo = { 0 }; @@ -2164,9 +2174,14 @@ bool CPhoneDevice::onOneCapture(std::shared_ptr characteristics time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -2295,9 +2310,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) + { + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -2667,9 +2687,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -3006,9 +3031,14 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat) time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index 2bae3995..a54939f8 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -1687,7 +1687,7 @@ int SaveLogTofile(int commid, char *szbuf) } // 写入文件到sdcard memset(filename, 0, sizeof(filename)); - sprintf(filename, "%sCOM%dlog-%04d-%02d-%02d.log", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); + sprintf(filename, "%sCOM%dlog-%04d-%02d-%02d.txt", filedir, commid + 1, t0.tm_year + 1900, t0.tm_mon + 1, t0.tm_mday); fp = fopen(filename, "a+"); if (NULL == fp) return -1;