From 957cadaad129f81df6441b73721f11e33313b6fe Mon Sep 17 00:00:00 2001 From: BlueMatthew Date: Tue, 19 Mar 2024 11:51:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E8=BE=93=E5=87=BA=E5=85=89=E6=95=8F?= =?UTF-8?q?=E7=94=B5=E9=98=BB=E9=87=87=E6=A0=B7=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 997d7d7d..a971fdb5 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -412,6 +412,11 @@ bool CPhoneDevice::QuerySystemProperties(std::map& pro snprintf(str, sizeof(str), "%.1f", val); it->second = str; } + else if (it->first == (PROP_LIGHT)) + { + int val = GpioControl::getLightAdc(); + it->second = std::to_string(val); + } else if (it->first == (PROP_CHARGING_CURRENT)) { it->second = std::to_string(GpioControl::getChargingCurrent()); @@ -1140,11 +1145,12 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat) NdkCamera::CAPTURE_RESULT captureResult = mCamera->getCaptureResult(); char str[128] = { 0 }; - snprintf(str, sizeof(str), "AE=%u EXPS=%ums ISO=%d AF=%u FD=%.3f AFS=%u HDR=%d", captureResult.autoExposure, + snprintf(str, sizeof(str), "AE=%u EXPS=%ums ISO=%d AF=%u LDR=%d AFS=%u HDR=%d", captureResult.autoExposure, (unsigned int)(captureResult.exposureTime / 1000000), captureResult.sensitibity, captureResult.autoFocus, - isnan(captureResult.FocusDistance) ? 0 : captureResult.FocusDistance, + // isnan(captureResult.FocusDistance) ? 0 : captureResult.FocusDistance, + GpioControl::getLightAdc(), (unsigned int)captureResult.afState, captureResult.hdrMode); // cv::putText(mat, str, cv::Point(0, mat.rows - 20), cv::FONT_HERSHEY_COMPLEX, fontScale, scalar, thickness1, cv::LINE_AA);