From 9170d2bec01f0811861de18dca35271a70879603 Mon Sep 17 00:00:00 2001
From: "XI.CHEN" <2311041011@qq.com>
Date: Mon, 7 Apr 2025 15:29:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=9C=89=E8=AF=AF=E6=97=B6=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/PhoneDevice.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 0e16a3f3..c01d3262 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -1728,6 +1728,19 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
         if (netCaptureResult && !img.empty())
         {
             XYLOG(XYLOG_SEVERITY_INFO, "NetCapture Succeeded PHOTOID=%u Img Size=%u", localPhotoInfo.photoId, (uint32_t)img.size());
+            if(img.size() <= 1000)
+            {
+                std::string hexStr;
+                const size_t maxBytes = 128;
+                for (size_t i = 0; i < std::min(img.size(), maxBytes); ++i)
+                {
+                    char buf[3];
+                    snprintf(buf, sizeof(buf), "%02X", img[i]);
+                    hexStr += buf;
+                    hexStr += " ";
+                }
+                XYLOG(XYLOG_SEVERITY_DEBUG,"Img Size<1000, img=%s", hexStr.c_str());
+            }
             break;
         }
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));

From dada0e876fc4aba113daa931ae8db2edbef30464 Mon Sep 17 00:00:00 2001
From: jxjajs <jgswsh@163.com>
Date: Mon, 7 Apr 2025 18:11:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=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/PtzController.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/cpp/PtzController.cpp b/app/src/main/cpp/PtzController.cpp
index d34aa0b6..0b16984e 100644
--- a/app/src/main/cpp/PtzController.cpp
+++ b/app/src/main/cpp/PtzController.cpp
@@ -260,7 +260,8 @@ void PtzController::PtzProc()
                 }
                 if(cmd.photoParams->mPhotoInfo.scheduleTime == 0)
                 {
-                    XYLOG(XYLOG_SEVERITY_INFO, "3、收到手动拍照指令，state=%d！%s", state);
+                    start_delay_time = time(NULL);
+                    XYLOG(XYLOG_SEVERITY_INFO, "3、收到手动拍照指令，state=%d！", state);
                 }
                 else
                     XYLOG(XYLOG_SEVERITY_INFO, "2、收到自动拍照指令，state=%d！", state);
@@ -332,6 +333,7 @@ void PtzController::PtzProc()
                 {
                     XYLOG(XYLOG_SEVERITY_INFO, "收到手动开机指令，摄像机处于state=%d！", state);
                 }
+                start_delay_time = time(NULL);
                 XYLOG(XYLOG_SEVERITY_INFO, "收到手动打开摄像机指令，刷新关机计时初始值，state=%d", state);
                 break;
             case CLOSE_TOTAL:
@@ -360,6 +362,7 @@ void PtzController::PtzProc()
                 break;
             default:
             {
+                start_delay_time = time(NULL);
                 XYLOG(XYLOG_SEVERITY_INFO, "收到手动控制摄像机指令，刷新关机计时初始值，state=%d", state);
                 if(cmd.ts <= photo_move_preset_time)
                 {