From ab9ba337dca3f5b941dc5d45a431111b7cd452f5 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 09:24:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BA=91=E5=8F=B0=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 65 ++------------------------------ 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index ac43c561..a50cf7fc 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3692,68 +3692,11 @@ void CPhoneDevice::CameraCtrl(unsigned char waitTime, unsigned char delayTime, u CPhoneDevice *pThis = this; std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfile, baud, addr]() mutable { - switch (cmdidx) { - case 2: { -// if(GetCameraStatus()) - - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(time(NULL), channel, MOVE_PRESETNO, 0, preset, serfile, baud, - addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 3: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, MOVE_UP, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 4: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, MOVE_DOWN, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 5: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, MOVE_LEFT, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 6: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, MOVE_RIGHT, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 7: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, ZOOM_WIDE, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 8: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(0, channel, ZOOM_TELE, 0, 0, serfile, baud, addr); - pThis->ClosePTZSensors(delayTime); - break; - } - case 9: { -// if(GetCameraStatus()) - pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(time(NULL), channel, SAVE_PRESETNO, 0, preset, serfile, baud, - addr); - pThis->ClosePTZSensors(delayTime); - break; - } - } + pThis->OpenPTZSensors(waitTime); + CameraPhotoCmd(time(NULL), channel, cmdidx, 0, preset, serfile, baud, + addr); + pThis->ClosePTZSensors(delayTime); }); ctrlThread.detach(); } From b2d2100dfc8049e86f0119b9dea09891a557567a Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 09:47:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=8F=B0?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=98=BB=E5=A1=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index a50cf7fc..45d9cc6a 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1920,7 +1920,6 @@ bool CPhoneDevice::OpenPTZSensors(uint32_t sec) std::lock_guard lock(m_cameraLocker); if(time_now < localDelayTime-1000) { - std::lock_guard lock(m_cameraLocker); m_sensorsStatus = true; m_cameraStatus = true; OpenSensors(MAIN_POWER_OPEN); From d6392eb1d3c48e7b02311778eaf83487d0f442c4 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 10:02:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=91=E5=8F=B0?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=BC=A0=E5=85=A5=E6=96=87=E4=BB=B6=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 45d9cc6a..f08a162e 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3689,11 +3689,12 @@ void CPhoneDevice::CameraCtrl(unsigned char waitTime, unsigned char delayTime, u { if(!(m_sensorsStatus && !m_cameraStatus)) { CPhoneDevice *pThis = this; - std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfile, baud, + string serfileStr(serfile); + std::thread ctrlThread([pThis, waitTime, delayTime, cmdidx, channel, preset, serfileStr, baud, addr]() mutable { pThis->OpenPTZSensors(waitTime); - CameraPhotoCmd(time(NULL), channel, cmdidx, 0, preset, serfile, baud, + CameraPhotoCmd(time(NULL), channel, cmdidx, 0, preset, serfileStr.c_str(), baud, addr); pThis->ClosePTZSensors(delayTime); }); From bf3cb6416fc2100b44151b14170a38f935268cb0 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 10:05:37 +0800 Subject: [PATCH 4/4] Update version to 1.1.26 Based Core Version to 1.2.20 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a101fd0b..37ec9dc8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 1 -def AppBuildNumber = 25 +def AppBuildNumber = 26 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber