|
|
|
@ -1773,7 +1773,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
|
|
|
|
|
vector<IDevice::OSD_INFO> osds;
|
|
|
|
|
osds.swap(mOsds);
|
|
|
|
|
|
|
|
|
|
std::thread t([localPhotoInfo, param, pThis, osds, wid_serial]() mutable
|
|
|
|
|
std::thread t([localPhotoInfo, param, pThis, path, osds, wid_serial]() mutable
|
|
|
|
|
{
|
|
|
|
|
if (localPhotoInfo.preset != 0 && localPhotoInfo.preset != 0xFF)
|
|
|
|
|
{
|
|
|
|
@ -1799,13 +1799,13 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
|
|
|
|
|
{
|
|
|
|
|
int result = std::remove(photo.photoname);
|
|
|
|
|
pThis->TakePhotoCb(1, localPhotoInfo, "", photo.phototime - 28800, objects);
|
|
|
|
|
pThis->PostProcessPhoto(localPhotoInfo, osds, photo.photoname, "", img);
|
|
|
|
|
pThis->PostProcessPhoto(localPhotoInfo, osds, path, "", img);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}else
|
|
|
|
|
{
|
|
|
|
|
XYLOG(XYLOG_SEVERITY_WARNING,"Get Serials Photo Failed");
|
|
|
|
|
pThis->TakePhotoCb(0, localPhotoInfo, photo.photoname, photo.phototime - 28800, objects);
|
|
|
|
|
pThis->TakePhotoCb(0, localPhotoInfo, path, photo.phototime - 28800, objects);
|
|
|
|
|
}
|
|
|
|
|
// pThis->TakePTZPhotoCb(3, localPhotoInfo);
|
|
|
|
|
pThis->ClosePTZSensors(localPhotoInfo.closeDelayTime);
|
|
|
|
|