|
|
@@ -51,8 +51,6 @@ import java.util.List;
|
|
|
import java.util.concurrent.Semaphore;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
-import static android.os.Environment.DIRECTORY_PICTURES;
|
|
|
-
|
|
|
public class CameraActivity extends BaseCameraActivity {
|
|
|
protected int mLeft;
|
|
|
protected int mTop;
|
|
|
@@ -77,7 +75,7 @@ public class CameraActivity extends BaseCameraActivity {
|
|
|
private Size imageDimension;
|
|
|
private ImageReader imageReader;
|
|
|
|
|
|
- private File file = new File(Environment.getExternalStoragePublicDirectory(DIRECTORY_PICTURES) + "/" + System.currentTimeMillis() + ".jpg");
|
|
|
+ private File directoryFile = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/");
|
|
|
|
|
|
private Handler mBackgroundHandler;
|
|
|
private HandlerThread mBackgroundThread;
|
|
|
@@ -433,7 +431,7 @@ public class CameraActivity extends BaseCameraActivity {
|
|
|
@Override
|
|
|
public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request, TotalCaptureResult result) {
|
|
|
super.onCaptureCompleted(session, request, result);
|
|
|
- //Toast.makeText(CameraActivity.this, "Saved:" + file, Toast.LENGTH_SHORT).show();
|
|
|
+ //Toast.makeText(CameraActivity.this, "Saved:" + directoryFile, Toast.LENGTH_SHORT).show();
|
|
|
createCameraPreview();
|
|
|
}
|
|
|
|
|
|
@@ -517,11 +515,17 @@ public class CameraActivity extends BaseCameraActivity {
|
|
|
byte[] jpegData = ImageUtil.imageToByteArray(image);
|
|
|
|
|
|
// 写入到文件
|
|
|
- //FileManager.writeFrame(file.getAbsolutePath(), jpegData);
|
|
|
+ //FileManager.writeFrame(directoryFile.getAbsolutePath(), jpegData);
|
|
|
image.close();
|
|
|
|
|
|
// 得到裁剪后的图片数据
|
|
|
int[] rectData = new int[]{mLeft, mTop, mRight, mBottom};
|
|
|
+
|
|
|
+ if (!directoryFile.exists()) {
|
|
|
+ directoryFile.mkdirs();
|
|
|
+ }
|
|
|
+
|
|
|
+ File file = new File(directoryFile, System.currentTimeMillis() + ".jpg");
|
|
|
onCropFinish(jpegData, rectData, file);
|
|
|
}
|
|
|
|
|
|
@@ -546,7 +550,7 @@ public class CameraActivity extends BaseCameraActivity {
|
|
|
private void save(byte[] bytes) throws IOException {
|
|
|
OutputStream output = null;
|
|
|
try {
|
|
|
- output = new FileOutputStream(file);
|
|
|
+ output = new FileOutputStream(directoryFile);
|
|
|
output.write(bytes);
|
|
|
} finally {
|
|
|
if (null != output) {
|