From 2f176a0a3393aa2a99a6f46c4ba89acfb8da37bc Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Wed, 25 Dec 2024 17:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=AE=9A=E6=97=B6=E6=8B=8D?= =?UTF-8?q?=E7=85=A7=E7=94=B5=E6=BA=90=E5=85=B3=E9=97=AD=E4=B8=8D=E5=BB=B6?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 1c1bbf01..6996daac 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1681,11 +1681,17 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< } else if (photoInfo.cameraType == CAM_TYPE_NET) { - powerCtrlPtr = std::shared_ptr(new NetCameraPowerCtrl(mPhotoInfo.closeDelayTime)); + if(mPhotoInfo.scheduleTime == 0) + powerCtrlPtr = std::shared_ptr(new NetCameraPowerCtrl(mPhotoInfo.closeDelayTime)); + else + powerCtrlPtr = std::shared_ptr(new NetCameraPowerCtrl(2)); } else if (photoInfo.cameraType == CAM_TYPE_PLZ) { - powerCtrlPtr = std::shared_ptr(new PlzCameraPowerCtrl(mPhotoInfo.closeDelayTime)); + if(mPhotoInfo.scheduleTime == 0) + powerCtrlPtr = std::shared_ptr(new PlzCameraPowerCtrl(mPhotoInfo.closeDelayTime)); + else + powerCtrlPtr = std::shared_ptr(new PlzCameraPowerCtrl(2)); } res = true; @@ -1813,11 +1819,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< if(localPhotoInfo.scheduleTime == 0) { pThis->ClosePTZSensors(localPhotoInfo.closeDelayTime); - GpioControl::setCam3V3Enable(false, localPhotoInfo.closeDelayTime); } else { pThis->ClosePTZSensors(2); - GpioControl::setCam3V3Enable(false, 2); } @@ -1867,9 +1871,6 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< std::thread t([localPhotoInfo, param, pThis, path, osds, wid_serial, powerCtrlPtr]() mutable { - time_t ts = time(NULL); - pThis->OpenPTZSensors(localPhotoInfo.selfTestingTime); - if (localPhotoInfo.preset != 0 && localPhotoInfo.preset != 0xFF) { XYLOG(XYLOG_SEVERITY_INFO,"Recv CameraCtrl Command, action= MOVE_PRESETNO, preset = %u", localPhotoInfo.preset);