串口拍照失败处理;重新拍照前未开启电源则开电

hdrplus
陈曦 7 months ago
parent 02037ac34f
commit d1571fad00

@ -1697,9 +1697,12 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
std::this_thread::sleep_for(std::chrono::seconds(2)); std::this_thread::sleep_for(std::chrono::seconds(2));
} }
time_t ts = time(NULL); time_t ts = time(NULL);
if(!GetPTZSensorsStatus() && !GetCameraStatus())
{
OpenPTZSensors(120);
}
CameraPhotoCmd(ts, photoInfo.channel, 0, 6, 0); CameraPhotoCmd(ts, photoInfo.channel, 0, 6, 0);
TakePTZPhotoCb(3, photoInfo); res = TakePTZPhotoCb(3, photoInfo);
res = true;
} }
else if (mPhotoInfo.usingSysCamera == 1) else if (mPhotoInfo.usingSysCamera == 1)
{ {
@ -1837,7 +1840,7 @@ bool CPhoneDevice::ClosePTZSensors()
{ {
m_shouldStopWaiting.store(true); m_shouldStopWaiting.store(true);
} }
else else if(m_sensorsStatus && m_cameraStatus)
{ {
std::lock_guard<std::mutex> lock(m_cameraLocker); std::lock_guard<std::mutex> lock(m_cameraLocker);
// std::unique_lock<std::mutex> lock(m_cameraLocker); // std::unique_lock<std::mutex> lock(m_cameraLocker);

Loading…
Cancel
Save