From 16b18108a37c55b6692b1444243bec8e38b5bd83 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Fri, 27 Oct 2023 06:42:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E6=9C=8D=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E5=85=88=E9=94=80=E6=AF=81Camera=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/MicroPhoto.cpp  |  5 +++++
 app/src/main/cpp/PhoneDevice.cpp | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/cpp/MicroPhoto.cpp b/app/src/main/cpp/MicroPhoto.cpp
index 1aa058b2..7d6e36a9 100644
--- a/app/src/main/cpp/MicroPhoto.cpp
+++ b/app/src/main/cpp/MicroPhoto.cpp
@@ -239,6 +239,11 @@ Java_com_xypower_mpapp_MicroPhotoService_uninit(
         return JNI_FALSE;
     }
 
+    IDevice* dev = pTerminal->GetDevice();
+    if (dev != NULL)
+    {
+        ((CPhoneDevice *)dev)->CloseCamera();
+    }
     pTerminal->SignalExit();
     pTerminal->Shutdown();
 
diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 2273b263..fbb06a05 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -582,11 +582,13 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
 
 bool CPhoneDevice::CloseCamera()
 {
-    // if (mCamera != NULL)
+    if (mCamera != NULL)
     {
-        // mCamera->close();
-        // delete mCamera;
-        // mCamera = NULL;
+        auto camera = mCamera;
+        mCamera = NULL;
+
+        camera->close();
+        delete camera;
     }
     return true;
 }