网络定时拍照电源关闭不延时

app/src/main/cpp/PhoneDevice.cpp

@@ -1681,11 +1681,17 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
     }
     else if (photoInfo.cameraType == CAM_TYPE_NET)
     {
-        powerCtrlPtr = std::shared_ptr<PowerControl>(new NetCameraPowerCtrl(mPhotoInfo.closeDelayTime));
+        if(mPhotoInfo.scheduleTime == 0)
+            powerCtrlPtr = std::shared_ptr<PowerControl>(new NetCameraPowerCtrl(mPhotoInfo.closeDelayTime));
+        else
+            powerCtrlPtr = std::shared_ptr<PowerControl>(new NetCameraPowerCtrl(2));
     }
     else if (photoInfo.cameraType == CAM_TYPE_PLZ)
     {
-        powerCtrlPtr = std::shared_ptr<PowerControl>(new PlzCameraPowerCtrl(mPhotoInfo.closeDelayTime));
+        if(mPhotoInfo.scheduleTime == 0)
+            powerCtrlPtr = std::shared_ptr<PowerControl>(new PlzCameraPowerCtrl(mPhotoInfo.closeDelayTime));
+        else
+            powerCtrlPtr = std::shared_ptr<PowerControl>(new PlzCameraPowerCtrl(2));
     }
 
     res = true;
@@ -1813,11 +1819,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
 
                           if(localPhotoInfo.scheduleTime == 0) {
                               pThis->ClosePTZSensors(localPhotoInfo.closeDelayTime);
-                              GpioControl::setCam3V3Enable(false, localPhotoInfo.closeDelayTime);
                           }
                           else {
                               pThis->ClosePTZSensors(2);
-                              GpioControl::setCam3V3Enable(false, 2);
                           }
 
 
@@ -1867,9 +1871,6 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
 
         std::thread t([localPhotoInfo, param, pThis, path, osds, wid_serial, powerCtrlPtr]() mutable
         {
-            time_t ts = time(NULL);
-            pThis->OpenPTZSensors(localPhotoInfo.selfTestingTime);
-
             if (localPhotoInfo.preset != 0 && localPhotoInfo.preset != 0xFF)
             {
               XYLOG(XYLOG_SEVERITY_INFO,"Recv CameraCtrl Command, action= MOVE_PRESETNO, preset = %u", localPhotoInfo.preset);