Skip to content

Commit 9acc8f9

Browse files
WinterGengWinterGeng
committed
1.detection、face、seg module add "svPreview.enableCamera();".
2.java/android add fastdepolyUi module.
1 parent 3a59510 commit 9acc8f9

File tree

50 files changed

+323
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+323
-261
lines changed

‎examples/vision/detection/paddledetection/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ protected void onResume() {
305305
// Open camera until the permissions have been granted
306306
if (!checkAllPermissions()) {
307307
svPreview.disableCamera();
308+
} else {
309+
svPreview.enableCamera();
308310
}
309311
svPreview.onResume();
310312
}

‎examples/vision/facedet/scrfd/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ protected void onResume() {
300300
// Open camera until the permissions have been granted
301301
if (!checkAllPermissions()) {
302302
svPreview.disableCamera();
303+
} else {
304+
svPreview.enableCamera();
303305
}
304306
svPreview.onResume();
305307
}

‎examples/vision/segmentation/paddleseg/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation/SegmentationMainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ protected void onResume() {
287287
// Open camera until the permissions have been granted
288288
if (!checkAllPermissions()) {
289289
svPreview.disableCamera();
290+
} else {
291+
svPreview.enableCamera();
290292
}
291293
svPreview.onResume();
292294
}

‎java/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies {
3030
implementation 'com.android.support:design:28.0.0'
3131
implementation 'org.jetbrains:annotations:15.0'
3232
// implementation project(path: ':fastdeploy')
33+
implementation project(path: ':fastdepolyUi')
3334
//noinspection GradleDependency
3435
testImplementation 'junit:junit:4.12'
3536
androidTestImplementation 'com.android.support.test:runner:1.0.2'

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationMainActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baidu.paddle.fastdeploy.app.examples.classification;
22

3-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.decodeBitmap;
4-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.getRealPathFromURI;
5-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.readTxt;
3+
import static com.baidu.ui.Utils.decodeBitmap;
4+
import static com.baidu.ui.Utils.getRealPathFromURI;
5+
import static com.baidu.ui.Utils.readTxt;
66

77
import android.Manifest;
88
import android.annotation.SuppressLint;
@@ -32,14 +32,14 @@
3232

3333
import com.baidu.paddle.fastdeploy.RuntimeOption;
3434
import com.baidu.paddle.fastdeploy.app.examples.R;
35-
import com.baidu.paddle.fastdeploy.app.ui.view.CameraSurfaceView;
36-
import com.baidu.paddle.fastdeploy.app.ui.view.ResultListView;
37-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
38-
import com.baidu.paddle.fastdeploy.app.ui.view.adapter.BaseResultAdapter;
39-
import com.baidu.paddle.fastdeploy.app.ui.view.model.BaseResultModel;
4035
import com.baidu.paddle.fastdeploy.vision.ClassifyResult;
4136
import com.baidu.paddle.fastdeploy.vision.Visualize;
4237
import com.baidu.paddle.fastdeploy.vision.classification.PaddleClasModel;
38+
import com.baidu.ui.Utils;
39+
import com.baidu.ui.view.CameraSurfaceView;
40+
import com.baidu.ui.view.ResultListView;
41+
import com.baidu.ui.view.adapter.BaseResultAdapter;
42+
import com.baidu.ui.view.model.BaseResultModel;
4343

4444
import java.math.BigDecimal;
4545
import java.util.ArrayList;
@@ -407,7 +407,7 @@ private void detail(Bitmap bitmap) {
407407
}
408408
}
409409
}
410-
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.classification_result_page_item, results);
410+
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.base_result_page_item, results);
411411
resultView.setAdapter(adapter);
412412
resultView.invalidate();
413413

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification/ClassificationSettingsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.support.v7.app.ActionBar;
1111

1212
import com.baidu.paddle.fastdeploy.app.examples.R;
13-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
14-
import com.baidu.paddle.fastdeploy.app.ui.view.AppCompatPreferenceActivity;
13+
import com.baidu.ui.Utils;
14+
import com.baidu.ui.view.AppCompatPreferenceActivity;
1515

1616
import java.util.ArrayList;
1717
import java.util.List;

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package com.baidu.paddle.fastdeploy.app.examples.detection;
22

3+
import static com.baidu.ui.Utils.decodeBitmap;
4+
import static com.baidu.ui.Utils.getRealPathFromURI;
5+
import static com.baidu.ui.Utils.readTxt;
6+
37
import android.Manifest;
48
import android.annotation.SuppressLint;
59
import android.app.Activity;
@@ -28,18 +32,14 @@
2832

2933
import com.baidu.paddle.fastdeploy.RuntimeOption;
3034
import com.baidu.paddle.fastdeploy.app.examples.R;
31-
import com.baidu.paddle.fastdeploy.app.ui.view.CameraSurfaceView;
32-
import com.baidu.paddle.fastdeploy.app.ui.view.ResultListView;
33-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
34-
import com.baidu.paddle.fastdeploy.app.ui.view.adapter.BaseResultAdapter;
35-
import com.baidu.paddle.fastdeploy.app.ui.view.model.BaseResultModel;
3635
import com.baidu.paddle.fastdeploy.vision.DetectionResult;
3736
import com.baidu.paddle.fastdeploy.vision.Visualize;
3837
import com.baidu.paddle.fastdeploy.vision.detection.PicoDet;
39-
40-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.decodeBitmap;
41-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.getRealPathFromURI;
42-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.readTxt;
38+
import com.baidu.ui.Utils;
39+
import com.baidu.ui.view.CameraSurfaceView;
40+
import com.baidu.ui.view.ResultListView;
41+
import com.baidu.ui.view.adapter.BaseResultAdapter;
42+
import com.baidu.ui.view.model.BaseResultModel;
4343

4444
import java.math.BigDecimal;
4545
import java.util.ArrayList;
@@ -406,7 +406,7 @@ private void detail(Bitmap bitmap) {
406406
}
407407
}
408408
}
409-
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.detection_result_page_item, results);
409+
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.base_result_page_item, results);
410410
resultView.setAdapter(adapter);
411411
resultView.invalidate();
412412

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionSettingsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.support.v7.app.ActionBar;
1111

1212
import com.baidu.paddle.fastdeploy.app.examples.R;
13-
import com.baidu.paddle.fastdeploy.app.ui.view.AppCompatPreferenceActivity;
14-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
13+
import com.baidu.ui.Utils;
14+
import com.baidu.ui.view.AppCompatPreferenceActivity;
1515

1616
import java.util.ArrayList;
1717
import java.util.List;

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetMainActivity.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.baidu.paddle.fastdeploy.app.examples.facedet;
22

3+
import static com.baidu.ui.Utils.decodeBitmap;
4+
import static com.baidu.ui.Utils.getRealPathFromURI;
5+
36
import android.Manifest;
47
import android.annotation.SuppressLint;
58
import android.app.Activity;
@@ -16,7 +19,6 @@
1619
import android.support.annotation.NonNull;
1720
import android.support.v4.app.ActivityCompat;
1821
import android.support.v4.content.ContextCompat;
19-
import android.util.Log;
2022
import android.view.View;
2123
import android.view.ViewGroup;
2224
import android.view.Window;
@@ -28,17 +30,14 @@
2830

2931
import com.baidu.paddle.fastdeploy.RuntimeOption;
3032
import com.baidu.paddle.fastdeploy.app.examples.R;
31-
import com.baidu.paddle.fastdeploy.app.ui.view.CameraSurfaceView;
32-
import com.baidu.paddle.fastdeploy.app.ui.view.ResultListView;
33-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
34-
import com.baidu.paddle.fastdeploy.app.ui.view.adapter.BaseResultAdapter;
35-
import com.baidu.paddle.fastdeploy.app.ui.view.model.BaseResultModel;
3633
import com.baidu.paddle.fastdeploy.vision.FaceDetectionResult;
3734
import com.baidu.paddle.fastdeploy.vision.Visualize;
3835
import com.baidu.paddle.fastdeploy.vision.facedet.SCRFD;
39-
40-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.decodeBitmap;
41-
import static com.baidu.paddle.fastdeploy.app.ui.Utils.getRealPathFromURI;
36+
import com.baidu.ui.Utils;
37+
import com.baidu.ui.view.CameraSurfaceView;
38+
import com.baidu.ui.view.ResultListView;
39+
import com.baidu.ui.view.adapter.BaseResultAdapter;
40+
import com.baidu.ui.view.model.BaseResultModel;
4241

4342
import java.math.BigDecimal;
4443
import java.util.ArrayList;
@@ -405,7 +404,7 @@ private void detail(Bitmap bitmap) {
405404
}
406405
}
407406
}
408-
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.facedet_result_page_item, results);
407+
BaseResultAdapter adapter = new BaseResultAdapter(getBaseContext(), R.layout.base_result_page_item, results);
409408
resultView.setAdapter(adapter);
410409
resultView.invalidate();
411410

‎java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet/FaceDetSettingsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.support.v7.app.ActionBar;
1111

1212
import com.baidu.paddle.fastdeploy.app.examples.R;
13-
import com.baidu.paddle.fastdeploy.app.ui.Utils;
14-
import com.baidu.paddle.fastdeploy.app.ui.view.AppCompatPreferenceActivity;
13+
import com.baidu.ui.Utils;
14+
import com.baidu.ui.view.AppCompatPreferenceActivity;
1515

1616
import java.util.ArrayList;
1717
import java.util.List;

0 commit comments

Comments
 (0)