diff --git a/deploy/android_demo/app/src/main/assets/images/5.jpg b/deploy/android_demo/app/src/main/assets/images/0.jpg similarity index 100% rename from deploy/android_demo/app/src/main/assets/images/5.jpg rename to deploy/android_demo/app/src/main/assets/images/0.jpg diff --git a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java index c25c6fceb..38c982947 100644 --- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java +++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java @@ -131,7 +131,7 @@ public class MiniActivity extends AppCompatActivity { */ private boolean onRunModel() { try { - String assetImagePath = "images/5.jpg"; + String assetImagePath = "images/0.jpg"; InputStream imageStream = getAssets().open(assetImagePath); Bitmap image = BitmapFactory.decodeStream(imageStream); // Input is Bitmap diff --git a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java index b3653ccc2..c26fe6ea4 100644 --- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java +++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java @@ -17,7 +17,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha CheckBoxPreference cbEnableCustomSettings = null; EditTextPreference etModelPath = null; EditTextPreference etLabelPath = null; - EditTextPreference etImagePath = null; + ListPreference etImagePath = null; ListPreference lpCPUThreadNum = null; ListPreference lpCPUPowerMode = null; ListPreference lpInputColorFormat = null; @@ -84,7 +84,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha etModelPath = (EditTextPreference) findPreference(getString(R.string.MODEL_PATH_KEY)); etModelPath.setTitle("Model Path (SDCard: " + Utils.getSDCardDirectory() + ")"); etLabelPath = (EditTextPreference) findPreference(getString(R.string.LABEL_PATH_KEY)); - etImagePath = (EditTextPreference) findPreference(getString(R.string.IMAGE_PATH_KEY)); + etImagePath = (ListPreference) findPreference(getString(R.string.IMAGE_PATH_KEY)); lpCPUThreadNum = (ListPreference) findPreference(getString(R.string.CPU_THREAD_NUM_KEY)); lpCPUPowerMode = @@ -119,7 +119,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha editor.putString(getString(R.string.INPUT_STD_KEY), preInstalledInputStds.get(modelIdx)); editor.putString(getString(R.string.SCORE_THRESHOLD_KEY), preInstalledScoreThresholds.get(modelIdx)); - editor.commit(); + editor.apply(); } lpChoosePreInstalledModel.setSummary(modelPath); } @@ -159,7 +159,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha etLabelPath.setSummary(labelPath); etLabelPath.setText(labelPath); etImagePath.setSummary(imagePath); - etImagePath.setText(imagePath); + etImagePath.setValue(imagePath); lpCPUThreadNum.setValue(cpuThreadNum); lpCPUThreadNum.setSummary(cpuThreadNum); lpCPUPowerMode.setValue(cpuPowerMode); diff --git a/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml b/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml index fe74758ae..049bd7eca 100644 --- a/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml +++ b/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml @@ -1,16 +1,5 @@