From 0b8fc17c2243e6834f50b370c78c82e908001c74 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" Date: Fri, 29 Nov 2024 16:00:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BB=B6=E9=95=BF=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index 9b2eac68..f14bab24 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -2479,7 +2479,7 @@ int FindNextCameraPhotoCommand(int devidx) return 1; case 10009: /* 近距离聚焦(1 有效)*/ Gm_CtrlPtzCmd(channel, P_FOCUS_NEAR); - usleep(100000); + usleep(500000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; @@ -2487,7 +2487,7 @@ int FindNextCameraPhotoCommand(int devidx) return 1; case 10010: /* 远距离聚焦(1 有效)*/ Gm_CtrlPtzCmd(channel, P_FOCUS_FAR); - usleep(100000); + usleep(500000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; @@ -2495,7 +2495,7 @@ int FindNextCameraPhotoCommand(int devidx) return 1; case 10011: /* 远离物体(1 有效)*/ Gm_CtrlPtzCmd(channel, P_ZOOM_WIDE); - usleep(100000); + usleep(500000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; @@ -2503,7 +2503,7 @@ int FindNextCameraPhotoCommand(int devidx) return 1; case 10012: /* 接近物体(1 有效)*/ Gm_CtrlPtzCmd(channel, P_ZOOM_TELE); - usleep(100000); + usleep(500000); Gm_CtrlPtzCmd(channel, Cmd_Cancel); usleep(100000); srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo; From 56b53eb8d4e2f941d47b5ba6d9471f13c66d9541 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" Date: Fri, 29 Nov 2024 17:49:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E8=BE=A8=E7=8E=87=E5=92=8C=E8=87=AA?= =?UTF-8?q?=E6=A3=80=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 48812724..c7fa2907 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1699,9 +1699,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< time_t ts = time(NULL); if(!GetPTZSensorsStatus() && !GetCameraStatus()) { - OpenPTZSensors(120); + OpenPTZSensors(photoInfo.selfTestingTime); } - CameraPhotoCmd(ts, photoInfo.channel, 0, 6, 0); + CameraPhotoCmd(ts, photoInfo.channel, 0, photoInfo.resolution, 0); res = TakePTZPhotoCb(3, photoInfo); } else if (mPhotoInfo.usingSysCamera == 1)