From ab8e2a1d30be2f0d5ca9b99e8dc52f1a0b25e8bb Mon Sep 17 00:00:00 2001
From: BlueMatthew <wakinchau@msn.com>
Date: Wed, 3 Jan 2024 17:33:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAI=E8=AF=86=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/PhoneDevice.cpp                          | 2 +-
 app/src/main/cpp/ncnn/yolov5ncnn.cpp                      | 8 ++++----
 app/src/main/cpp/ncnn/yolov5ncnn.h                        | 2 +-
 .../main/java/com/xypower/mpapp/MicroPhotoService.java    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index 5edb5c74..ee8fd3f7 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -834,7 +834,7 @@ bool CPhoneDevice::OnImageReady(cv::Mat& mat)
         double startTime = ncnn::get_current_time();
 #endif // _DEBUG
 
-        bool detected = YoloV5NcnnDetect(mat, true, objs);
+        bool detected = YoloV5NcnnDetect(mat, true, m_pRecognizationCfg->blobName8, m_pRecognizationCfg->blobName16, m_pRecognizationCfg->blobName32, objs);
 #ifdef _DEBUG
         double elasped = ncnn::get_current_time() - startTime;
         // __android_log_print(ANDROID_LOG_DEBUG, "YoloV5Ncnn", "%.2fms   detect", elasped);
diff --git a/app/src/main/cpp/ncnn/yolov5ncnn.cpp b/app/src/main/cpp/ncnn/yolov5ncnn.cpp
index ca06cb05..a3ff4e5b 100644
--- a/app/src/main/cpp/ncnn/yolov5ncnn.cpp
+++ b/app/src/main/cpp/ncnn/yolov5ncnn.cpp
@@ -414,7 +414,7 @@ bool YoloV5NcnnDetect( ncnn::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_
     return true;
 }
 
-bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OBJECT>& objects)
+bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, const std::string& blobName8, const std::string& blobName16, const std::string& blobName32, std::vector<IDevice::RECOG_OBJECT>& objects)
 {
     if (use_gpu && ncnn::get_gpu_count() == 0)
     {
@@ -480,7 +480,7 @@ bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OB
         // stride 8
         {
             ncnn::Mat out;
-            ex.extract("output", out);
+            ex.extract(blobName8.c_str(), out);
 
             ncnn::Mat anchors(6);
             anchors[0] = 10.f;
@@ -499,7 +499,7 @@ bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OB
         // stride 16
         {
             ncnn::Mat out;
-            ex.extract("781", out);
+            ex.extract(blobName16.c_str(), out);
 
             ncnn::Mat anchors(6);
             anchors[0] = 30.f;
@@ -518,7 +518,7 @@ bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OB
         // stride 32
         {
             ncnn::Mat out;
-            ex.extract("801", out);
+            ex.extract(blobName32.c_str(), out);
 
             ncnn::Mat anchors(6);
             anchors[0] = 116.f;
diff --git a/app/src/main/cpp/ncnn/yolov5ncnn.h b/app/src/main/cpp/ncnn/yolov5ncnn.h
index 7fa27d86..1a87e3ea 100644
--- a/app/src/main/cpp/ncnn/yolov5ncnn.h
+++ b/app/src/main/cpp/ncnn/yolov5ncnn.h
@@ -109,4 +109,4 @@ bool YoloV5Ncnn_Init(const std::string& paramFile, const std::string& binFile);
 
 // public native Obj[] Detect(Bitmap bitmap, boolean use_gpu);
 bool YoloV5NcnnDetect( ncnn::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OBJECT>& objects);
-bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, std::vector<IDevice::RECOG_OBJECT>& objects);
\ No newline at end of file
+bool YoloV5NcnnDetect( cv::Mat& mat, bool use_gpu, const std::string& blobName8, const std::string& blobName16, const std::string& blobName32, std::vector<IDevice::RECOG_OBJECT>& objects);
\ No newline at end of file
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index f7b3190b..8a894c4a 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -117,7 +117,7 @@ public class MicroPhotoService extends Service {
     private String mCmdid = "";
     private NotificationManager mNotificationManager;
     private final Map<String, PowerManager.WakeLock> mWakeLocks = new HashMap<>();
-    private int mHeartbeatDuration = 0; // Default 1m: 10 * 60 * 1000 from NDK
+    private int mHeartbeatDuration = 0; // MUST BE 0!!!
     private long mNextHeartbeatTime = 0;
 
     private PositionManager mPositionManager = null;