From 120b13c09da6cc9460a2b7176c70d0207a0c94b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A1=93=E4=B8=80=E6=96=87?= <35919502@qq.com>
Date: Sat, 3 Feb 2018 15:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D4.4.3YouTaPhone=E6=8B=8D?=
 =?UTF-8?q?=E7=85=A7=E6=97=B6=E7=9B=B8=E6=9C=BA=E5=81=9C=E6=AD=A2=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huantansheng/easyphotos/ui/EasyPhotosActivity.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java
index 150f740d..b525576a 100644
--- a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java
+++ b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java
@@ -235,7 +235,12 @@ private void toAndroidCamera(int requestCode) {
             createCameraTempImageFile();
             if (mTempImageFile != null && mTempImageFile.exists()) {
 
-                Uri imageUri = FileProvider.getUriForFile(this, Setting.fileProviderAuthority, mTempImageFile);//通过FileProvider创建一个content类型的Uri
+                Uri imageUri = null;
+                if (Build.VERSION.SDK_INT >= 24) {
+                    imageUri = FileProvider.getUriForFile(this, Setting.fileProviderAuthority, mTempImageFile);//通过FileProvider创建一个content类型的Uri
+                } else {
+                    imageUri = Uri.fromFile(mTempImageFile);
+                }
                 cameraIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); //对目标应用临时授权该Uri所代表的文件
 
                 cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageUri);//将拍取的照片保存到指定URI
@@ -388,7 +393,7 @@ private void onCameraResult() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inJustDecodeBounds = true;
         BitmapFactory.decodeFile(mTempImageFile.getAbsolutePath(), options);
-        if (Setting.onlyStartCamera||albumModel.getAlbumItems().isEmpty()) {
+        if (Setting.onlyStartCamera || albumModel.getAlbumItems().isEmpty()) {
             MediaScannerConnectionUtils.refresh(this, mTempImageFile);// 更新媒体库
             Intent data = new Intent();
             Photo photo = new Photo(mTempImageFile.getName(), mTempImageFile.getAbsolutePath(), mTempImageFile.lastModified() / 1000, options.outWidth, options.outHeight, mTempImageFile.length(), options.outMimeType);