解决EasyPhoto异常并重新命名

Author: Vicent9920

README.md

@@ -67,7 +67,7 @@ EasyAndroid.init(application)
 - [EasyPermissions](#easypermissions): 动态权限申请组件
 - [EasyExecutor](#easyexecutor): 线程池封装组件
 - [EasyBundle](#easybundle): Bundle数据存取组件
-- [EasyPhoto](#easyphoto): 从拍照、图库进行图片选择组件。
+- [EasyMedia](#EasyMedia): 从拍照、图库进行图片选择组件。
 - [EasyImageGetter](#easyimagegetter): TextView加载html标签时，提供`img`标签的图片加载功能
 - [MVP](#mvp): 简单MVP架构
 
@@ -144,11 +144,11 @@ EasyImageGetter.create()
 
 ```
 
-### [EasyPhoto](./docs/EasyPhoto.md)
+### [EasyMedia](./docs/EasyPhoto.md)
 
 > [点我查看完整使用文档](./docs/EasyPhoto.md)
 
-> [点击下载组件源码文件进行使用](https://raw.githubusercontent.com/yjfnypeu/EasyAndroid/master/utils/src/main/java/com/haoge/easyandroid/easy/EasyPhoto.kt)
+> [点击下载组件源码文件进行使用](https://raw.githubusercontent.com/yjfnypeu/EasyAndroid/master/utils/src/main/java/com/haoge/easyandroid/easy/EasyMedia.kt)
 
 > 从图库或者使用相机拍照获取图片的组件。
 
@@ -161,7 +161,7 @@ EasyImageGetter.create()
 用户实例：
 
 ```
-val photo = EasyPhoto()// 创建EasyPhoto实例
+val photo = EasyMedia()// 创建EasyMedia实例
     // 是否需要进行裁剪
     .setCrop(true|false)
     // 指定创建的图片地址。

app/src/main/java/com/haoge/sample/easyandroid/activities/EasyPhotoActivity.kt

@@ -1,7 +1,6 @@
 package com.haoge.sample.easyandroid.activities
 
 import android.Manifest
-import android.content.Intent
 import android.os.Bundle
 import android.os.Environment
 import android.widget.ImageView
@@ -10,7 +9,7 @@ import butterknife.OnClick
 import com.bumptech.glide.Glide
 import com.haoge.easyandroid.easy.EasyLog
 import com.haoge.easyandroid.easy.EasyPermissions
-import com.haoge.easyandroid.easy.EasyPhoto
+import com.haoge.easyandroid.easy.EasyMedia
 import com.haoge.easyandroid.easy.EasyToast
 import com.haoge.sample.easyandroid.BaseActivity
 import com.haoge.sample.easyandroid.R
@@ -26,7 +25,7 @@ class EasyPhotoActivity : BaseActivity() {
 
     private val switcher by lazy { findViewById<TextView>(R.id.indicate_img_path) }
     private var indicatePath:String? = null
-    private val photo = EasyPhoto().setCallback {
+    private val photo = EasyMedia().setCallback {
         showImg(it)
     }
 

utils/src/main/java/com/haoge/easyandroid/easy/EasyMedia.kt

@@ -84,6 +84,7 @@ class EasyMedia {
      * 支持图片、音频、视频
      */
     fun selectFile(activity: Activity) {
+        isCrop = false
         val intent = Intent(Intent.ACTION_PICK, null).apply {
             setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "*/*")
             setDataAndType(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, "*/*")
@@ -100,6 +101,7 @@ class EasyMedia {
      * 选择视频
      */
     fun selectVideo(activity: Activity) {
+        isCrop = false
         val intent = Intent(Intent.ACTION_PICK, null).apply {
             setDataAndType(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/*")
         }
@@ -114,6 +116,7 @@ class EasyMedia {
      * 选择音频
      */
     fun selectAudio(activity: Activity) {
+        isCrop = false
         val intent = Intent(Intent.ACTION_PICK, null).apply {
             setDataAndType(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, "audio/*")
         }
@@ -256,6 +259,7 @@ class EasyMedia {
      * 音频录制
      */
     fun takeAudio(activity: Activity) {
+        isCrop = false
         val imgFile = mFilePath ?: File(generateFilePath(activity, 1))
         val imgUri = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             Uri.fromFile(imgFile)
@@ -272,9 +276,9 @@ class EasyMedia {
 //            putExtra(MediaStore.EXTRA_DURATION_LIMIT, 10000)
         }
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            takeFileInternal(imgFile, intent, activity)
+            takeFileInternal(imgFile, intent, activity,1)
         } else {
-            mainHandler.post { takeFileInternal(imgFile, intent, activity) }
+            mainHandler.post { takeFileInternal(imgFile, intent, activity,1) }
         }
 
     }
@@ -283,6 +287,7 @@ class EasyMedia {
      * 视频录制
      */
     fun takeVideo(activity: Activity) {
+        isCrop = false
         val imgFile = mFilePath ?: File(generateFilePath(activity, 2))
         val imgUri = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
             Uri.fromFile(imgFile)
@@ -299,9 +304,9 @@ class EasyMedia {
 //            putExtra(MediaStore.EXTRA_DURATION_LIMIT, 10000)
         }
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            takeFileInternal(imgFile, intent, activity)
+            takeFileInternal(imgFile, intent, activity,2)
         } else {
-            mainHandler.post { takeFileInternal(imgFile, intent, activity) }
+            mainHandler.post { takeFileInternal(imgFile, intent, activity,2) }
         }
 
     }
@@ -355,6 +360,7 @@ class EasyMedia {
      * 音频录制或选择
      */
     fun getAudio(activity: Activity) {
+        isCrop = false
         val imgFile = mFilePath ?: File(generateFilePath(activity))
 
         val imgUri = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
@@ -383,16 +389,17 @@ class EasyMedia {
         }
 
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            takeFileInternal(imgFile, intent, activity)
+            takeFileInternal(imgFile, intent, activity,1)
         } else {
-            mainHandler.post { takeFileInternal(imgFile, intent, activity) }
+            mainHandler.post { takeFileInternal(imgFile, intent, activity,1) }
         }
     }
 
     /**
      * 视频拍摄或选择
      */
     fun getVideo(activity: Activity) {
+        isCrop = false
         val imgFile = mFilePath ?: File(generateFilePath(activity, 2))
 
         val imgUri = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
@@ -423,21 +430,27 @@ class EasyMedia {
         }
 
         if (Looper.myLooper() == Looper.getMainLooper()) {
-            takeFileInternal(imgFile, intent, activity)
+            takeFileInternal(imgFile, intent, activity,2)
         } else {
-            mainHandler.post { takeFileInternal(imgFile, intent, activity) }
+            mainHandler.post { takeFileInternal(imgFile, intent, activity,2) }
         }
     }
 
     /**
      * 向系统发出指令
      */
-    private fun takeFileInternal(takePhotoPath: File, intent: Intent, activity: Activity) {
+    private fun takeFileInternal(takePhotoPath: File, intent: Intent, activity: Activity,type:Int = 0) {
         val fragment = PhotoFragment.findOrCreate(activity)
         fragment.start(intent, PhotoFragment.REQ_TAKE_FILE) { requestCode: Int, data: Intent? ->
             if (requestCode == PhotoFragment.REQ_TAKE_FILE) {
                 if(data?.data != null){
-                    mFilePath = File(data.data.path)
+                    mFilePath = when (type) {
+                        0 -> {
+                            uriToFile(activity,data.data)
+                        }
+                        else -> uriToFile(activity, data.data,type)
+                    }
+
 
                     if(isCrop){
                         zoomPhoto(takePhotoPath, mFilePath
@@ -458,6 +471,20 @@ class EasyMedia {
         }
     }
 
+    private fun uriToFile(activity: Activity, data: Uri,type:Int):File {
+        val cursor = activity.managedQuery(data, arrayOf(if(type == 1)MediaStore.Audio.Media.DATA else MediaStore.Video.Media.DATA), null,
+                null, null)
+        val path = if (cursor == null) {
+            data.path
+        } else {
+            val index = cursor.getColumnIndexOrThrow(if(type == 1) MediaStore.Audio.Media.DATA else MediaStore.Video.Media.DATA)
+            cursor.moveToFirst()
+            cursor.getString(index)
+        }
+        cursor.close()
+       return File(path)
+    }
+
     /***
      * 图片裁剪
      */