From 5000fdecefe7ec12836412badc1cef3b8204e2ab Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 13 Feb 2025 11:05:43 +0800 Subject: [PATCH 1/5] Update version to 1.3.7 Based Core Version to 1.4.4 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 63b09fe9..99d79ed9 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 = 3 -def AppBuildNumber = 6 +def AppBuildNumber = 7 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 772690d57e7c119f1d0903539e814d9f376ef4c8 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 13 Feb 2025 11:29:15 +0800 Subject: [PATCH 2/5] Update version to 1.3.8 Based Core Version to 1.4.5 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 99d79ed9..ce2664be 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 = 3 -def AppBuildNumber = 7 +def AppBuildNumber = 8 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 5bfd1f58ead8893580f9609740bb215d5bef6d42 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 13 Feb 2025 12:50:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= 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 19c07fbe..5cd1c5d7 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -4537,8 +4537,8 @@ void CPhoneDevice::SetStaticIp() } SetStaticIp(m_network->iface, ipStr, m_network->netmask, m_network->gateway); - XYLOG(XYLOG_SEVERITY_INFO, "Set Static IP on %s: %s", m_network->iface.c_str(), - m_network->ip.c_str()); + XYLOG(XYLOG_SEVERITY_INFO, "Set Static IP on %s: %s(%s)", m_network->iface.c_str(), + m_network->ip.c_str(), ipStr.c_str()); } else { From c08b8a03b1eabb746036581ec4fcc7a39394576b Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 13 Feb 2025 13:25:06 +0800 Subject: [PATCH 4/5] Update version to 1.3.9 Based Core Version to 1.4.6 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ce2664be..7c8b3064 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 = 3 -def AppBuildNumber = 8 +def AppBuildNumber = 9 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From f2db51607130a028bef5c82e6a5c8ece6abc5c62 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 14 Feb 2025 08:26:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A5=E6=8B=8D=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=A4=84=E7=90=86=E4=BF=9D=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 补拍应该不会存在拍照计划时间为0的情况，这儿这样处理，是为了外部特殊处理，故意把拍照计划时间置为0 --- app/src/main/cpp/PhoneDevice.cpp | 54 +++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 5cd1c5d7..76cf8a5c 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1618,9 +1618,14 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c } if (localPhotoInfo.remedy != 0) { - if ((takingTime - localPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = localPhotoInfo.scheduleTime; + if (scheduleTime == 0) { - takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2; + scheduleTime = localPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) + { + takingTime = scheduleTime + localPhotoInfo.channel * 2; } } @@ -1857,9 +1862,14 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< time_t takingTime = ts; if (localPhotoInfo.remedy != 0) { - if ((takingTime - localPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = localPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = localPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = localPhotoInfo.scheduleTime + localPhotoInfo.channel * 2; + takingTime = scheduleTime + localPhotoInfo.channel * 2; } } IMAGE_DEF photo = { 0 }; @@ -2164,9 +2174,14 @@ bool CPhoneDevice::onOneCapture(std::shared_ptr characteristics time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -2295,9 +2310,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) + { + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -2667,9 +2687,14 @@ bool CPhoneDevice::onBurstCapture(std::shared_ptr characteristi time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime; @@ -3006,9 +3031,14 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat) time_t takingTime = time(NULL); if (mPhotoInfo.remedy != 0) { - if ((takingTime - mPhotoInfo.scheduleTime) > 30) + time_t scheduleTime = mPhotoInfo.scheduleTime; + if (scheduleTime == 0) + { + scheduleTime = mPhotoInfo.requestTime; + } + if ((takingTime - scheduleTime) > 30) { - takingTime = mPhotoInfo.scheduleTime + mPhotoInfo.channel * 2; + takingTime = scheduleTime + mPhotoInfo.channel * 2; } } mPhotoInfo.photoTime = takingTime;