Skip to content

Commit 468e5d2

Browse files
author
duyu
committed
修复获取文件类型时为null时处理(机型:宇飞来 KULIAO K10)
null---FileColumns.MIME_TYPE---
1 parent 4495172 commit 468e5d2

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

library/src/main/java/com/rain/library/loader/MediaStoreHelper.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,6 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
9696

9797
while (data.moveToNext()) {
9898
long media_duration;
99-
Log.e("Rain", data.getInt(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[1])) + "---FileColumns._WIDTH---");
100-
Log.e("Rain", data.getInt(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[2])) + "---FileColumns._HEIGHT---");
101-
Log.e("Rain", data.getLong(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[3])) + "---FileColumns._DURATION---");
102-
Log.e("Rain", data.getString(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[4])) + "---FileColumns._DATA---");
103-
Log.e("Rain", data.getString(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[5])) + "---FileColumns.MIME_TYPE---");
104-
Log.e("Rain", data.getLong(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[6])) + "---FileColumns.SIZE---");
105-
Log.e("Rain", data.getString(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[8])) + "---BUCKET_DISPLAY_NAME---");
106-
Log.e("Rain", "------------------------------------------------------");
107-
10899
int media_id = data.getInt(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[0]));
109100
int media_width = data.getInt(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[1]));
110101
int media_height = data.getInt(data.getColumnIndexOrThrow(LocalMediaLoader.FILE_PROJECTION[2]));

library/src/main/java/com/rain/library/utils/MimeType.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public static String getTitle(int type, Context context) {
5959
}
6060

6161
public static int isPictureType(String pictureType) {
62+
if (UtilsHelper.isEmptyOrNull(pictureType)) {
63+
return MimeType.TYPE_IMAGE;
64+
}
6265
switch (pictureType) {
6366
case "image/png":
6467
case "image/PNG":
@@ -94,6 +97,9 @@ public static int isPictureType(String pictureType) {
9497
* @return
9598
*/
9699
public static boolean isGif(String pictureType) {
100+
if (UtilsHelper.isEmptyOrNull(pictureType)) {
101+
return false;
102+
}
97103
switch (pictureType) {
98104
case "image/gif":
99105
case "image/GIF":
@@ -109,6 +115,9 @@ public static boolean isGif(String pictureType) {
109115
* @return
110116
*/
111117
public static boolean isVideo(String pictureType) {
118+
if (UtilsHelper.isEmptyOrNull(pictureType)) {
119+
return false;
120+
}
112121
switch (pictureType) {
113122
case "video/3gp":
114123
case "video/3gpp":

library/src/main/java/com/rain/library/utils/UtilsHelper.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,14 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) {
278278
public static String getString(int id) {
279279
return PhotoPick.getContext().getResources().getString(id);
280280
}
281+
282+
283+
public static boolean isEmptyOrNull(String content) {
284+
if (content == null || content.isEmpty()) {
285+
return true;
286+
}
287+
return false;
288+
}
281289
}
282290

283291
/*

0 commit comments

Comments
 (0)