From 1609ce1bab83a65521ca7845d58ad423aa6bbec5 Mon Sep 17 00:00:00 2001
From: DefTruth <31974251+DefTruth@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:12:16 +0800
Subject: [PATCH] [Bug Fix] fix AllocateFaceDetectionResultFromJava error
 (#628)

* [Bug Fix] fix android app detail page errors

* [Android] fix realtime camera mode and shutter

* [Bug Fix] fix AllocateSegmentationResultFromJava error
---
 java/android/app/src/main/AndroidManifest.xml    |  4 ++--
 .../segmentation/SegmentationMainActivity.java   | 16 +---------------
 .../cpp/fastdeploy_jni/vision/results_jni.cc     |  4 +++-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/android/app/src/main/AndroidManifest.xml b/java/android/app/src/main/AndroidManifest.xml
index 95511824f..0f963ffe4 100644
--- a/java/android/app/src/main/AndroidManifest.xml
+++ b/java/android/app/src/main/AndroidManifest.xml
@@ -15,14 +15,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".detection.DetectionMainActivity">
+        <activity android:name=".facedet.FaceDetMainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name=".detection.DetectionSettingsActivity"
+            android:name=".facedet.FaceDetSettingsActivity"
             android:label="Settings">
         </activity>
     </application>
diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
index f1809d810..c1d9c72b6 100644
--- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
+++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
@@ -352,30 +352,16 @@ public class SegmentationMainActivity extends Activity implements View.OnClickLi
 
             @Override
             public void onStartTrackingTouch(SeekBar seekBar) {
-
             }
 
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {
-//                runOnUiThread(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        if (TYPE == ALBUM_SELECT) {
-//                            SystemClock.sleep(TIME_SLEEP_INTERVAL * 10); // 500ms
-//                            detail(picBitmap);
-//                        } else {
-//                            SystemClock.sleep(TIME_SLEEP_INTERVAL * 10); // 500ms
-//                            svPreview.onPause();
-//                            detail(shutterBitmap);
-//                        }
-//                    }
-//                });
             }
         });
     }
 
     private void detail(Bitmap bitmap) {
-        predictor.predict(bitmap, true, 0.6f);
+        predictor.predict(bitmap, true, 0.4f);
         resultImage.setImageBitmap(bitmap);
         resultNum = 1.0f;
     }
diff --git a/java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/results_jni.cc b/java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/results_jni.cc
index e81773145..9ae6054aa 100644
--- a/java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/results_jni.cc
+++ b/java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/results_jni.cc
@@ -982,7 +982,9 @@ bool AllocateFaceDetectionResultFromJava(
   if (j_landmarks_per_face > 0) {
     jobjectArray j_face_det_landmarks_float_arr = reinterpret_cast<jobjectArray>(
         env->GetObjectField(j_face_det_result_obj, j_face_det_landmarks_id_cc));
-    for (int i = 0; i < len; ++i) {
+    const int landmarks_len = env->GetArrayLength(j_face_det_landmarks_float_arr);
+
+    for (int i = 0; i < landmarks_len; ++i) {
       auto j_landmark = reinterpret_cast<jfloatArray>(
           env->GetObjectArrayElement(j_face_det_landmarks_float_arr, i));
       if (env->GetArrayLength(j_landmark) == 2) {