修改合并产生错误

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