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

app/src/main/cpp/PhoneDevice.cpp

@@ -1700,7 +1700,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
                       {
          if (localPhotoInfo.preset != 0 && localPhotoInfo.preset != 0xFF)
          {
-            CameraPhotoCmd(time(NULL), localPhotoInfo.channel, MOVE_PRESETNO, 0, localPhotoInfo.preset);
+            //CameraPhotoCmd(time(NULL), localPhotoInfo.channel, MOVE_PRESETNO, 0, localPhotoInfo.preset);
             std::this_thread::sleep_for(std::chrono::seconds(3));
         }
         time_t ts = time(NULL);
@@ -1709,7 +1709,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
             XYLOG(XYLOG_SEVERITY_INFO, "Camera is SeltTesting, selfTestingtime = %d", localPhotoInfo.selfTestingTime);
             pThis->OpenPTZSensors(localPhotoInfo.selfTestingTime);
         }
-        CameraPhotoCmd(ts, localPhotoInfo.channel, 0, localPhotoInfo.resolution, 0);
+        //CameraPhotoCmd(ts, localPhotoInfo.channel, 0, localPhotoInfo.resolution, 0);
         XYLOG(XYLOG_SEVERITY_INFO, "Taking photo over");
         pThis->TakePTZPhotoCb(3, localPhotoInfo);
                       });