|
|
|
@ -832,7 +832,7 @@ float CPhoneDevice::QueryBattaryVoltage(int timesForAvg, bool* isCharging)
|
|
|
|
|
|
|
|
|
|
if (isCharging != NULL)
|
|
|
|
|
{
|
|
|
|
|
*isCharging = chargingBusVoltage > 10.0;
|
|
|
|
|
*isCharging = chargingBusVoltage > DEFAULT_WARNING_CHARGING_BUS_VOL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int matched = 0;
|
|
|
|
@ -1458,6 +1458,7 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
|
|
|
|
|
|
|
|
|
|
NdkCamera::CAPTURE_RESULT captureResult = mCamera->getCaptureResult();
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
if (captureResult.avgY < 25 && mPhotoInfo.autoExposure != 0)
|
|
|
|
|
{
|
|
|
|
|
// Take another photo
|
|
|
|
@ -1508,6 +1509,7 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
|
|
|
|
|
|
|
|
|
|
t.detach();
|
|
|
|
|
}
|
|
|
|
|
#endif // 0
|
|
|
|
|
|
|
|
|
|
char extimeunit[4] = { 0 };
|
|
|
|
|
unsigned int extime = (captureResult.exposureTime >= 1000000) ? ((unsigned int)(captureResult.exposureTime / 1000000)) : ((unsigned int)(captureResult.exposureTime / 1000));
|
|
|
|
|