From c19dcce77cc51c1edf3df45344cc582720c81dce Mon Sep 17 00:00:00 2001 From: DefTruth <31974251+DefTruth@users.noreply.github.com> Date: Thu, 17 Nov 2022 23:46:59 +0800 Subject: [PATCH] [Bug Fix] fix realtime camera mode and shutter (#625) * [Bug Fix] fix android app detail page errors * [Android] fix realtime camera mode and shutter --- .../examples/classification/ClassificationMainActivity.java | 5 ++++- .../app/examples/detection/DetectionMainActivity.java | 5 ++++- .../fastdeploy/app/examples/facedet/FaceDetMainActivity.java | 4 ++++ .../paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java | 4 ++++ .../app/examples/segmentation/SegmentationMainActivity.java | 4 ++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationMainActivity.java index 07a462d67..7e7fce004 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationMainActivity.java @@ -254,9 +254,13 @@ public class ClassificationMainActivity extends Activity implements View.OnClick isRealtimeStatusRunning = true; realtimeToggleButton.setImageResource(R.drawable.realtime_start_btn); tvStatus.setVisibility(View.GONE); + isShutterBitmapCopied = false; svPreview.setOnTextureChangedListener(new CameraSurfaceView.OnTextureChangedListener() { @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + if (TYPE == BTN_SHUTTER) { + copyBitmapFromCamera(ARGB8888ImageBitmap); + } return false; } }); @@ -394,7 +398,6 @@ public class ClassificationMainActivity extends Activity implements View.OnClick if (initialized) { for (int i = 0; i < labelId.length; i++) { if (scores[i] > resultNum) { - Log.d(TAG, "[fastdeploy] detail: scores[i]: " + scores[i]); int idx = labelId[i]; String text = labelText.get(idx); text = text.substring(text.indexOf(" ")); diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java index 5a19004ba..dbb76df83 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java @@ -253,9 +253,13 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe isRealtimeStatusRunning = true; realtimeToggleButton.setImageResource(R.drawable.realtime_start_btn); tvStatus.setVisibility(View.GONE); + isShutterBitmapCopied = false; svPreview.setOnTextureChangedListener(new CameraSurfaceView.OnTextureChangedListener() { @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + if (TYPE == BTN_SHUTTER) { + copyBitmapFromCamera(ARGB8888ImageBitmap); + } return false; } }); @@ -394,7 +398,6 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe if (initialized) { for (int i = 0; i < labelId.length; i++) { if (scores[i] > resultNum) { - Log.d(TAG, "[fastdeploy] detail: scores[i]: " + scores[i]); int idx = labelId[i]; String text = labelText.get(idx); results.add(new BaseResultModel(idx, text, scores[i])); diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java index e2883baa3..eaf3d3348 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java @@ -247,10 +247,14 @@ public class FaceDetMainActivity extends Activity implements View.OnClickListene isRealtimeStatusRunning = true; realtimeToggleButton.setImageResource(R.drawable.realtime_start_btn); tvStatus.setVisibility(View.GONE); + isShutterBitmapCopied = false; // Camera is still working but detecting loop is on pause. svPreview.setOnTextureChangedListener(new CameraSurfaceView.OnTextureChangedListener() { @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + if (TYPE == BTN_SHUTTER) { + copyBitmapFromCamera(ARGB8888ImageBitmap); + } return false; } }); diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java index c515abf77..c4b69c520 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java @@ -254,9 +254,13 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C isRealtimeStatusRunning = true; realtimeToggleButton.setImageResource(R.drawable.realtime_start_btn); tvStatus.setVisibility(View.GONE); + isShutterBitmapCopied = false; svPreview.setOnTextureChangedListener(new CameraSurfaceView.OnTextureChangedListener() { @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + if (TYPE == BTN_SHUTTER) { + copyBitmapFromCamera(ARGB8888ImageBitmap); + } return false; } }); 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 07b9bc7a8..f1809d810 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 @@ -237,10 +237,14 @@ public class SegmentationMainActivity extends Activity implements View.OnClickLi isRealtimeStatusRunning = true; realtimeToggleButton.setImageResource(R.drawable.realtime_start_btn); tvStatus.setVisibility(View.GONE); + isShutterBitmapCopied = false; // Camera is still working but detecting loop is on pause. svPreview.setOnTextureChangedListener(new CameraSurfaceView.OnTextureChangedListener() { @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + if (TYPE == BTN_SHUTTER) { + copyBitmapFromCamera(ARGB8888ImageBitmap); + } return false; } });