From 7cc3de572bacd0810b78d6dc75e639353c662e55 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 19:46:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E6=91=84=E5=83=8F?= =?UTF-8?q?=E6=9C=BA=E8=A7=84=E7=BA=A6=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8E=E6=B0=B4=E5=8D=B0=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 97394a6f..1e3ce7c9 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1639,6 +1639,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< std::thread t([localPhotoInfo, path, pThis, osds, powerCtrlPtr]() mutable { // AutoEnv autoEnv(pThis->m_vm); + time_t ts = time(NULL); uint32_t waitTime = localPhotoInfo.selfTestingTime; waitTime = (waitTime!= 0) ? (waitTime * 1024) : 10240; std::this_thread::sleep_for(std::chrono::milliseconds(waitTime)); @@ -1740,7 +1741,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< if (netCaptureResult) { - time_t takingTime = time(NULL); + time_t takingTime = ts; if (localPhotoInfo.remedy != 0) { if ((takingTime - localPhotoInfo.scheduleTime) > 30) From 6940c89caf06fae11d11d1a625fcab75c39e19ee Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 19 Dec 2024 19:47:06 +0800 Subject: [PATCH 2/2] Update version to 1.1.31 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 6ee8f6cc..367e4c73 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 = 30 +def AppBuildNumber = 31 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber