xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

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

Browse Source
hdrplus
Matthew 7 months ago
parent 36d2188ce9 56b53eb8d4
commit 36750d6e85
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -1695,9 +1695,9 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
time_t ts = time(NULL); time_t ts = time(NULL);
if(!GetPTZSensorsStatus() && !GetCameraStatus()) 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); res = TakePTZPhotoCb(3, photoInfo);
} }
else if (mPhotoInfo.usingSysCamera == 1) else if (mPhotoInfo.usingSysCamera == 1)

8
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save