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

app/src/main/cpp/PhoneDevice.cpp

@@ -1695,9 +1695,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
         time_t ts = time(NULL);
         if(!GetPTZSensorsStatus() && !GetCameraStatus())
         {
-            OpenPTZSensors(120);
+            OpenPTZSensors(photoInfo.selfTestingTime);
         }
-        CameraPhotoCmd(ts, photoInfo.channel, 0, 6, 0);
+        CameraPhotoCmd(ts, photoInfo.channel, 0, photoInfo.resolution, 0);
         res = TakePTZPhotoCb(3, photoInfo);
     }
     else if (mPhotoInfo.usingSysCamera == 1)

app/src/main/cpp/SensorsProtocol.cpp

@@ -2413,7 +2413,7 @@ int FindNextCameraPhotoCommand(int devidx)
 			return 1;
 		case 10009:     /* 近距离聚焦(1 有效)*/
 			Gm_CtrlPtzCmd(channel, P_FOCUS_NEAR);
-			usleep(100000);
+			usleep(500000);
 			Gm_CtrlPtzCmd(channel, Cmd_Cancel);
 			usleep(100000);
 			srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
@@ -2421,7 +2421,7 @@ int FindNextCameraPhotoCommand(int devidx)
 			return 1;
 		case 10010:     /* 远距离聚焦(1 有效)*/
 			Gm_CtrlPtzCmd(channel, P_FOCUS_FAR);
-			usleep(100000);
+			usleep(500000);
 			Gm_CtrlPtzCmd(channel, Cmd_Cancel);
 			usleep(100000);
 			srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
@@ -2429,7 +2429,7 @@ int FindNextCameraPhotoCommand(int devidx)
 			return 1;
 		case 10011:     /* 远离物体(1 有效)*/
 			Gm_CtrlPtzCmd(channel, P_ZOOM_WIDE);
-			usleep(100000);
+			usleep(500000);
 			Gm_CtrlPtzCmd(channel, Cmd_Cancel);
 			usleep(100000);
 			srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;
@@ -2437,7 +2437,7 @@ int FindNextCameraPhotoCommand(int devidx)
 			return 1;
 		case 10012:     /* 接近物体(1 有效)*/
 			Gm_CtrlPtzCmd(channel, P_ZOOM_TELE);
-			usleep(100000);
+			usleep(500000);
 			Gm_CtrlPtzCmd(channel, Cmd_Cancel);
 			usleep(100000);
 			srdt.ms_dev[devidx].SerialCmdidx = srdt.iLastGetPhotoNo;