diff --git a/mace/examples/android/app/src/main/AndroidManifest.xml b/mace/examples/android/app/src/main/AndroidManifest.xml index e289b8122a26fc6e3b5bada3530d62ca653af647..99bc9271118f705d59c5aa1a8dfaadf2cb6e65ef 100644 --- a/mace/examples/android/app/src/main/AndroidManifest.xml +++ b/mace/examples/android/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ package="com.xiaomi.mace.demo"> + diff --git a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraApiLessM.java b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraApiLessM.java index 9b334c5ad0ada3ab48e77d9deb492acdfc360d1b..ddc7c38ffd119db0a35bcdd61b6608548aee41d7 100644 --- a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraApiLessM.java +++ b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraApiLessM.java @@ -104,8 +104,6 @@ public class CameraApiLessM extends CameraEngage implements Camera.AutoFocusCall private void setOutputConfig(int width, int height) { Camera.Parameters parameters = mCamera.getParameters(); parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO); - parameters.setPreviewFormat(ImageFormat.JPEG); - parameters.setPictureFormat(ImageFormat.JPEG); Camera.Size size = getOptimalSize(parameters.getSupportedPreviewSizes(), width, height); mPreviewWidth = size.width; mPreviewHeight = size.height; diff --git a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraEngage.java b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraEngage.java index af8b1b85c2110326fafa4153664ec8b43901fc6f..be75a716e9aeed2caddce69b85d36f97f6678abc 100644 --- a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraEngage.java +++ b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/camera/CameraEngage.java @@ -212,9 +212,9 @@ public abstract class CameraEngage implements SurfaceTextureListener { } boolean checkCameraPermission() { - if (ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED || + if (ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(mTextureView.getContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - ((Activity) mTextureView.getContext()).requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE}, CAMERA_PERMISSION_REQ); + ((Activity) mTextureView.getContext()).requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, CAMERA_PERMISSION_REQ); return false; } return true; diff --git a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/result/InitData.java b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/result/InitData.java index 5159f44f12caf220fe40b31ba9e9eb46203ebe43..c65483426ef7159d01462d7f39a24488d9351aaa 100644 --- a/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/result/InitData.java +++ b/mace/examples/android/app/src/main/java/com/xiaomi/mace/demo/result/InitData.java @@ -38,7 +38,11 @@ public class InitData { gpuPerfHint = 3; gpuPriorityHint = 3; device = DEVICES[0]; - kernelPath = Environment.getDownloadCacheDirectory().getAbsolutePath() + File.separator + "mace"; + kernelPath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "mace"; + File file = new File(kernelPath); + if (!file.exists()) { + file.mkdir(); + } }