From eb65e917489a74f33f2eb46fe2cfbd95cdc18a8f Mon Sep 17 00:00:00 2001
From: Winter <1558270516@qq.com>
Date: Wed, 30 Nov 2022 10:41:01 +0800
Subject: [PATCH] [Android] add enableCamera method app examples (#751)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove redundant code for segmentation.

* Classification Documentation and example improvement.

* Ocr Documentation and example improvement.

* 1.detection、face、seg module add "svPreview.enableCamera();".
2.java/android add fastdepolyUi module.

* examples/vision/ to add OCRv3.

* Modify UI directory name.

* Refresh examples\vision,change OCR README.md

* Update ui module

* Update ui module

* [Android] add enableCamera method.

Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com>
---
 .../app/examples/detection/DetectionMainActivity.java         | 2 ++
 .../paddle/fastdeploy/app/ui/view/CameraSurfaceView.java      | 4 ++++
 .../fastdeploy/app/examples/facedet/FaceDetMainActivity.java  | 2 ++
 .../paddle/fastdeploy/app/ui/view/CameraSurfaceView.java      | 4 ++++
 .../app/examples/segmentation/SegmentationMainActivity.java   | 2 ++
 .../paddle/fastdeploy/app/ui/view/CameraSurfaceView.java      | 4 ++++
 6 files changed, 18 insertions(+)

diff --git a/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java b/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java
index dbb76df83..127711767 100644
--- a/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java
+++ b/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java
@@ -305,6 +305,8 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe
         // Open camera until the permissions have been granted
         if (!checkAllPermissions()) {
             svPreview.disableCamera();
+        } else {
+            svPreview.enableCamera();
         }
         svPreview.onResume();
     }
diff --git a/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java b/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
index 94a5fdbd0..14217181d 100644
--- a/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
+++ b/examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
@@ -278,6 +278,10 @@ public class CameraSurfaceView extends GLSurfaceView implements Renderer,
         disableCamera = true;
     }
 
+    public void enableCamera() {
+        disableCamera = false;
+    }
+
     public void switchCamera() {
         releaseCamera();
         selectedCameraId = (selectedCameraId + 1) % numberOfCameras;
diff --git a/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java b/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java
index 169c09cd0..8397531c8 100644
--- a/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java
+++ b/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java
@@ -300,6 +300,8 @@ public class FaceDetMainActivity extends Activity implements View.OnClickListene
         // Open camera until the permissions have been granted
         if (!checkAllPermissions()) {
             svPreview.disableCamera();
+        } else {
+            svPreview.enableCamera();
         }
         svPreview.onResume();
     }
diff --git a/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java b/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
index 94a5fdbd0..14217181d 100644
--- a/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
+++ b/examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
@@ -278,6 +278,10 @@ public class CameraSurfaceView extends GLSurfaceView implements Renderer,
         disableCamera = true;
     }
 
+    public void enableCamera() {
+        disableCamera = false;
+    }
+
     public void switchCamera() {
         releaseCamera();
         selectedCameraId = (selectedCameraId + 1) % numberOfCameras;
diff --git a/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java b/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
index 08ecda611..88b3c3a5b 100644
--- a/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
+++ b/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java
@@ -287,6 +287,8 @@ public class SegmentationMainActivity extends Activity implements View.OnClickLi
         // Open camera until the permissions have been granted
         if (!checkAllPermissions()) {
             svPreview.disableCamera();
+        } else {
+            svPreview.enableCamera();
         }
         svPreview.onResume();
     }
diff --git a/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java b/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
index 94a5fdbd0..14217181d 100644
--- a/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
+++ b/examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/ui/view/CameraSurfaceView.java
@@ -278,6 +278,10 @@ public class CameraSurfaceView extends GLSurfaceView implements Renderer,
         disableCamera = true;
     }
 
+    public void enableCamera() {
+        disableCamera = false;
+    }
+
     public void switchCamera() {
         releaseCamera();
         selectedCameraId = (selectedCameraId + 1) % numberOfCameras;