|
|
@ -786,12 +786,12 @@ bool CPhoneDevice::Reboot(int resetType)
|
|
|
|
GpioControl::reboot();
|
|
|
|
GpioControl::reboot();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
t.detach();
|
|
|
|
t.detach();
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
long timeout = 1000;
|
|
|
|
{
|
|
|
|
RestartApp(resetType, timeout);
|
|
|
|
long timeout = 1000;
|
|
|
|
|
|
|
|
RestartApp(resetType, timeout);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1178,6 +1178,10 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
|
|
|
|
params.zoom = mPhotoInfo.zoom;
|
|
|
|
params.zoom = mPhotoInfo.zoom;
|
|
|
|
params.zoomRatio = mPhotoInfo.zoomRatio;
|
|
|
|
params.zoomRatio = mPhotoInfo.zoomRatio;
|
|
|
|
params.requestTemplate = mPhotoInfo.requestTemplate;
|
|
|
|
params.requestTemplate = mPhotoInfo.requestTemplate;
|
|
|
|
|
|
|
|
if (params.requestTemplate <= 0 || params.requestTemplate > 5)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
params.requestTemplate = 2;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (photoInfo.ldrEnabled)
|
|
|
|
if (photoInfo.ldrEnabled)
|
|
|
|
{
|
|
|
|
{
|
|
|
|