Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

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));

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)
                 {