From 522d0b96e3f9d5a47dab199552789e6dd3d33961 Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Mon, 24 Feb 2025 20:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=8D=E7=85=A7=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 8 ++++++++ app/src/main/cpp/camera2/ndkcamera.cpp | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 23382e84..abf97344 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -1334,6 +1334,14 @@ void CPhoneDevice::handleTimerImpl(CPhoneDevice::TIMER_CONTEXT* context) void CPhoneDevice::handleRebootTimer(union sigval v) { +#ifdef OUTPUT_DBG_INFO + const char *path = "/sdcard/com.xypower.mpapp/tmp/closeThreadReboot.txt"; + FILE* file = fopen(path, "w"); + if (file) { + fprintf(file, "Restarting app due to: Camera Can't Close\n"); + fclose(file); + } +#endif CPhoneDevice* pDevice = (CPhoneDevice*)(v.sival_ptr); // Reboot APP XYLOG(XYLOG_SEVERITY_ERROR, "Camera Close Thread is DEAD, will RESTART app"); diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index d57254db..b52afcc0 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -1078,10 +1078,10 @@ void NdkCamera::close() image = NULL; } AImageReader_setImageListener(mImageReader, NULL); - XYLOG(XYLOG_SEVERITY_DEBUG, "clear mImageReader Listener"); + //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::AImageReader_delete %s", mCameraId.c_str()); AImageReader_delete(mImageReader); - XYLOG(XYLOG_SEVERITY_DEBUG, "delete mImageReader"); + //XYLOG(XYLOG_SEVERITY_DEBUG, "CameraStatus::End AImageReader_delete %s", mCameraId.c_str()); mImageReader = 0; } @@ -1333,7 +1333,6 @@ void NdkCamera::onImageAvailable(AImageReader* reader) m_photoTaken = true; m_locker.lock(); - XYLOG(XYLOG_SEVERITY_DEBUG,"push image"); mCaptureFrames.push_back(std::shared_ptr(image, Auto_AImage_delete)); m_locker.unlock();