增加自动拍照等待时间，防止同一时间ptz拍多张图片时，中间会关电

app/src/main/cpp/PtzController.cpp

@@ -123,7 +123,10 @@ void PtzController::PtzProc()
     time_t PTZ_preset_wait_time = 0;
     time_t close_delay_time = CAMERA_CLOSE_DELAYTIME;
     time_t start_delay_time = 0;
+    time_t auto_delay_time = 0;
+    time_t auto_wait_time = WAIT_TIME_AUTO_CLOSE;
     time_t photo_move_preset_time = 0;
+    int iwaitime = 0;
 
     while(true)
     {
@@ -197,7 +200,30 @@ void PtzController::PtzProc()
             }
             if(0 == start_delay_time)
             {
-                ;
+                if(0 == iwaitime)
+                {
+                    auto_delay_time = time(NULL);
+                    iwaitime += 1;
+                    m_sem.release();
+                    continue;
+                }
+                else
+                {
+                    if(time(NULL) - auto_delay_time < 0)
+                    {
+                        auto_delay_time = time(NULL);
+                    }
+                    if(time(NULL) - auto_delay_time >= auto_wait_time)
+                    {
+                        iwaitime = 0;
+                        XYLOG(XYLOG_SEVERITY_INFO, "摄像机自动上电延时时间超过%u秒！准备关闭摄像机！", (uint32_t)auto_wait_time);
+                    }
+                    else
+                    {
+                        m_sem.release();
+                        continue;
+                    }
+                }
             }
             else
             {
@@ -207,7 +233,7 @@ void PtzController::PtzProc()
                 }
                 if(time(NULL) - start_delay_time >= close_delay_time)
                 {
-                    XYLOG(XYLOG_SEVERITY_INFO, "摄像机空闲时间超过%u秒！关闭摄像机！", (uint32_t)close_delay_time);
+                    XYLOG(XYLOG_SEVERITY_INFO, "摄像机空闲时间超过%u秒！准备关闭摄像机！", (uint32_t)close_delay_time);
                 }
                 else
                 {
@@ -284,6 +310,10 @@ void PtzController::PtzProc()
                                 break;
                             }
                         }
+                        if(time(NULL) - PTZ_preset_start_time < 0)
+                        {/* 防止等待关机期间，其他线程发生对时，改变了系统时间，导致长时间等待摄像机到达预置点*/
+                            PTZ_preset_start_time = time(NULL);
+                        }
                         if(time(NULL) - PTZ_preset_start_time >= PTZ_preset_wait_time)
                         {
                             XYLOG(XYLOG_SEVERITY_INFO, "摄像机拍照前调用预置点%u，摄像机在%u秒内未收到调用预置点结束应答！state=%d", (uint32_t)cmd.preset, (uint32_t)PTZ_preset_wait_time, state);

app/src/main/cpp/PtzController.h

@@ -26,8 +26,10 @@ enum PROC_PTZ_STATE
 
 #define CAMERA_SELF_TEST_TIME     60    /* Camera self-test time (excluding PTZ self-test)*/
 #define MOVE_PRESET_WAIT_TIME     20    /* Waiting for the maximum time for the PTZ to move to the preset position*/
-#define CAMERA_CLOSE_DELAYTIME    120   /* Auto Power-Off Timer Setting After Manual Power-On (for Camera)*/
+#define CAMERA_CLOSE_DELAYTIME    150   /* Auto Power-Off Timer Setting After Manual Power-On (for Camera)*/
 #define PHOTO_OPEN_POWER         16000
+#define WAIT_TIME_AUTO_CLOSE       2    /* In order to automatically capture multiple preset point images at the same time and prevent the camera from self checking every time it takes a picture.*/
+
 class PtzPhotoParams
 {
 public: