apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-05 08:37:06 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Android] fixed OcrMainActivity setting errors (#578)

Browse Source 
* [FlyCV] Add global SetProcLibCpuNumThreads method

* [Android] Support segmentation and facedet in Android

* [Android] add JNI instance check to j_runtime_option_obj

* [Model] fixed ppseg flycv resize error

* [FlyCV] fix FlyCV resize flags

* [cmake] remove un-need lite compile option

* [Android] add PaddleSegModel JNI and fix some bugs

* [Android] bind PaddleSegModel via JNI

* [Android] bind VisSegmentation via JNI

* [Android] bind YOLOv5Face and SCRFD via JNI

* [Android] fix NewJavaFaceDetectionResultFromCxx error

* [Android] remove un-need option in Java RuntimeOption

* [Android] fixed OcrMainActivity setting errors
This commit is contained in:
DefTruth
2022-11-14 12:50:15 +08:00
committed by GitHub
parent f1ebcf7a13
commit 8c6b1935c2
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java
View File

@@ -19,6 +19,7 @@ import android.provider.MediaStore;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
@@ -207,9 +208,12 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe
@Override @Override
public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) {
Log.d(TAG, "onTextureChanged: bitmap height: "
+ ARGB8888ImageBitmap.getHeight() + " width: "
+ ARGB8888ImageBitmap.getWidth());
String savedImagePath = ""; String savedImagePath = "";
synchronized (this) { synchronized (this) {
savedImagePath = Utils.getDCIMDirectory() + File.separator + "result.png"; savedImagePath = Utils.getDCIMDirectory() + File.separator + "result.jpg";
} }
shutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true); shutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true);
originShutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true); originShutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true);

18
java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java
View File

@@ -205,8 +205,8 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C
} }
public void checkAndUpdateSettings() { public void checkAndUpdateSettings() {
if (SettingsActivity.checkAndUpdateSettings(this)) { if (OcrSettingsActivity.checkAndUpdateSettings(this)) {
String realModelDir = getCacheDir() + "/" + SettingsActivity.modelDir; String realModelDir = getCacheDir() + "/" + OcrSettingsActivity.modelDir;
String detModelName = "ch_PP-OCRv2_det_infer"; String detModelName = "ch_PP-OCRv2_det_infer";
// String detModelName = "ch_ppocr_mobile_v2.0_det_infer"; // String detModelName = "ch_ppocr_mobile_v2.0_det_infer";
String clsModelName = "ch_ppocr_mobile_v2.0_cls_infer"; String clsModelName = "ch_ppocr_mobile_v2.0_cls_infer";
@@ -234,13 +234,13 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C
RuntimeOption detOption = new RuntimeOption(); RuntimeOption detOption = new RuntimeOption();
RuntimeOption clsOption = new RuntimeOption(); RuntimeOption clsOption = new RuntimeOption();
RuntimeOption recOption = new RuntimeOption(); RuntimeOption recOption = new RuntimeOption();
detOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); detOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum);
clsOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); clsOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum);
recOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); recOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum);
detOption.setLitePowerMode(SettingsActivity.cpuPowerMode); detOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode);
clsOption.setLitePowerMode(SettingsActivity.cpuPowerMode); clsOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode);
recOption.setLitePowerMode(SettingsActivity.cpuPowerMode); recOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode);
if (Boolean.parseBoolean(SettingsActivity.enableLiteFp16)) { if (Boolean.parseBoolean(OcrSettingsActivity.enableLiteFp16)) {
detOption.enableLiteFp16(); detOption.enableLiteFp16();
clsOption.enableLiteFp16(); clsOption.enableLiteFp16();
recOption.enableLiteFp16(); recOption.enableLiteFp16();

2
java/android/app/src/main/res/layout/detection_camera_page.xml
View File

@@ -15,7 +15,7 @@
<com.baidu.paddle.fastdeploy.app.ui.layout.ActionBarLayout <com.baidu.paddle.fastdeploy.app.ui.layout.ActionBarLayout
android:id="@+id/action_bar_main" android:id="@+id/action_bar_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"/>
<ImageView <ImageView
android:id="@+id/back_in_preview" android:id="@+id/back_in_preview"