mirror of
https://github.com/PaddlePaddle/FastDeploy.git
synced 2025-10-06 00:57:33 +08:00
[Bug Fix] add enableCamera method to fix app crash (#696)
* [Android] Add CxxBuffer to native PaddleSegModel * [Android] Add PaddleSeg android app example * [Android] Add SCRFD android app example * [Doc] fix typos * [Android] revert camera setting changes * [Bug Fix] fixed ppdet postprocess empty result error * [Android] add enableCamera method to fix app crash
This commit is contained in:
@@ -69,7 +69,7 @@ endif()
|
|||||||
if(WIN32 OR APPLE OR IOS)
|
if(WIN32 OR APPLE OR IOS)
|
||||||
message(FATAL_ERROR "Doesn't support windows/mac/ios platform with backend Paddle Lite now.")
|
message(FATAL_ERROR "Doesn't support windows/mac/ios platform with backend Paddle Lite now.")
|
||||||
elseif(ANDROID AND WITH_LITE_STATIC)
|
elseif(ANDROID AND WITH_LITE_STATIC)
|
||||||
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_full_bundled..a")
|
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_full_bundled.a")
|
||||||
set(PADDLELITE_REMOVE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_light_bundled.a")
|
set(PADDLELITE_REMOVE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_light_bundled.a")
|
||||||
else()
|
else()
|
||||||
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_full_api_shared.so")
|
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_full_api_shared.so")
|
||||||
|
@@ -306,6 +306,8 @@ public class ClassificationMainActivity extends Activity implements View.OnClick
|
|||||||
// Open camera until the permissions have been granted
|
// Open camera until the permissions have been granted
|
||||||
if (!checkAllPermissions()) {
|
if (!checkAllPermissions()) {
|
||||||
svPreview.disableCamera();
|
svPreview.disableCamera();
|
||||||
|
} else {
|
||||||
|
svPreview.enableCamera();
|
||||||
}
|
}
|
||||||
svPreview.onResume();
|
svPreview.onResume();
|
||||||
}
|
}
|
||||||
|
@@ -305,6 +305,8 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe
|
|||||||
// Open camera until the permissions have been granted
|
// Open camera until the permissions have been granted
|
||||||
if (!checkAllPermissions()) {
|
if (!checkAllPermissions()) {
|
||||||
svPreview.disableCamera();
|
svPreview.disableCamera();
|
||||||
|
} else {
|
||||||
|
svPreview.enableCamera();
|
||||||
}
|
}
|
||||||
svPreview.onResume();
|
svPreview.onResume();
|
||||||
}
|
}
|
||||||
|
@@ -300,6 +300,8 @@ public class FaceDetMainActivity extends Activity implements View.OnClickListene
|
|||||||
// Open camera until the permissions have been granted
|
// Open camera until the permissions have been granted
|
||||||
if (!checkAllPermissions()) {
|
if (!checkAllPermissions()) {
|
||||||
svPreview.disableCamera();
|
svPreview.disableCamera();
|
||||||
|
} else {
|
||||||
|
svPreview.enableCamera();
|
||||||
}
|
}
|
||||||
svPreview.onResume();
|
svPreview.onResume();
|
||||||
}
|
}
|
||||||
|
@@ -306,6 +306,8 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C
|
|||||||
// Open camera until the permissions have been granted
|
// Open camera until the permissions have been granted
|
||||||
if (!checkAllPermissions()) {
|
if (!checkAllPermissions()) {
|
||||||
svPreview.disableCamera();
|
svPreview.disableCamera();
|
||||||
|
} else {
|
||||||
|
svPreview.enableCamera();
|
||||||
}
|
}
|
||||||
svPreview.onResume();
|
svPreview.onResume();
|
||||||
}
|
}
|
||||||
|
@@ -287,6 +287,8 @@ public class SegmentationMainActivity extends Activity implements View.OnClickLi
|
|||||||
// Open camera until the permissions have been granted
|
// Open camera until the permissions have been granted
|
||||||
if (!checkAllPermissions()) {
|
if (!checkAllPermissions()) {
|
||||||
svPreview.disableCamera();
|
svPreview.disableCamera();
|
||||||
|
} else {
|
||||||
|
svPreview.enableCamera();
|
||||||
}
|
}
|
||||||
svPreview.onResume();
|
svPreview.onResume();
|
||||||
}
|
}
|
||||||
|
@@ -278,6 +278,10 @@ public class CameraSurfaceView extends GLSurfaceView implements Renderer,
|
|||||||
disableCamera = true;
|
disableCamera = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void enableCamera() {
|
||||||
|
disableCamera = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void switchCamera() {
|
public void switchCamera() {
|
||||||
releaseCamera();
|
releaseCamera();
|
||||||
selectedCameraId = (selectedCameraId + 1) % numberOfCameras;
|
selectedCameraId = (selectedCameraId + 1) % numberOfCameras;
|
||||||
|
Reference in New Issue
Block a user