Skip to content

Commit 5991b5e

Browse files
BlankjBlankj
authored
Merge pull request #766 from Blankj/1.22.5
1.22.5
2 parents a13e3f7 + fd16511 commit 5991b5e

File tree

3 files changed

+80
-17
lines changed

3 files changed

+80
-17
lines changed

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ public final class AdaptScreenUtils {
1212
private static boolean isInitMiui = false;
1313
private static Field mTmpMetrics;
1414

15-
private static DisplayMetrics appDm;
16-
1715
/**
1816
* Adapt for the horizontal screen, and call it in [android.app.Activity.getResources].
1917
*/
@@ -68,10 +66,7 @@ public static int px2Pt(float pxValue) {
6866
}
6967

7068
private static void setAppDmXdpi(final float xdpi) {
71-
if (appDm == null) {
72-
appDm = Utils.getApp().getResources().getDisplayMetrics();
73-
}
74-
appDm.xdpi = xdpi;
69+
Utils.getApp().getResources().getDisplayMetrics().xdpi = xdpi;
7570
}
7671

7772
private static DisplayMetrics getDisplayMetrics(Resources resources) {

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java‎

Lines changed: 76 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
package com.blankj.utilcode.util;
22

33
import android.content.ContentResolver;
4+
import android.content.ContentUris;
45
import android.content.CursorLoader;
56
import android.database.Cursor;
67
import android.net.Uri;
78
import android.os.Build;
9+
import android.os.Environment;
10+
import android.os.ParcelFileDescriptor;
11+
import android.provider.DocumentsContract;
812
import android.provider.MediaStore;
913
import android.support.annotation.NonNull;
14+
import android.support.annotation.Nullable;
1015
import android.support.v4.content.FileProvider;
16+
import android.util.Log;
1117

1218
import java.io.File;
19+
import java.io.FileDescriptor;
1320

1421
/**
1522
* <pre>
@@ -43,24 +50,85 @@ public static Uri file2Uri(@NonNull final File file) {
4350
/**
4451
* Uri to file.
4552
*
46-
* @param uri The uri.
47-
* @param columnName The name of the target column.
48-
* <p>e.g. {@link MediaStore.Images.Media#DATA}</p>
53+
* @param uri The uri.
4954
* @return file
5055
*/
51-
public static File uri2File(@NonNull final Uri uri, final String columnName) {
52-
if (ContentResolver.SCHEME_FILE.equals(uri.getScheme())) {
53-
return new File(uri.getPath());
56+
public static File uri2File(@NonNull final Uri uri) {
57+
Log.d("UriUtils", uri.toString());
58+
String authority = uri.getAuthority();
59+
String scheme = uri.getScheme();
60+
if (ContentResolver.SCHEME_FILE.equals(scheme)) {
61+
String path = uri.getPath();
62+
if (path != null) return new File(path);
63+
Log.d("UriUtils", uri.toString() + " parse failed. -> 0");
64+
return null;
65+
} else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
66+
return getFileFromUri(uri, null, null);
67+
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
68+
&& DocumentsContract.isDocumentUri(Utils.getApp(), uri)) {
69+
if ("com.android.externalstorage.documents".equals(authority)) {
70+
final String docId = DocumentsContract.getDocumentId(uri);
71+
final String[] split = docId.split(":");
72+
final String type = split[0];
73+
if ("primary".equalsIgnoreCase(type)) {
74+
return new File(Environment.getExternalStorageDirectory() + "/" + split[1]);
75+
}
76+
Log.d("UriUtils", uri.toString() + " parse failed. -> 2");
77+
return null;
78+
} else if ("com.android.providers.downloads.documents".equals(authority)) {
79+
final String id = DocumentsContract.getDocumentId(uri);
80+
final Uri contentUri = ContentUris.withAppendedId(
81+
Uri.parse("content://downloads/public_downloads"),
82+
Long.valueOf(id)
83+
);
84+
return getFileFromUri(contentUri, null, null);
85+
} else if ("com.android.providers.media.documents".equals(authority)) {
86+
final String docId = DocumentsContract.getDocumentId(uri);
87+
final String[] split = docId.split(":");
88+
final String type = split[0];
89+
Uri contentUri;
90+
if ("image".equals(type)) {
91+
contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
92+
} else if ("video".equals(type)) {
93+
contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
94+
} else if ("audio".equals(type)) {
95+
contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
96+
} else {
97+
Log.d("UriUtils", uri.toString() + " parse failed. -> 3");
98+
return null;
99+
}
100+
final String selection = "_id=?";
101+
final String[] selectionArgs = new String[]{split[1]};
102+
return getFileFromUri(contentUri, selection, selectionArgs);
103+
} else {
104+
Log.d("UriUtils", uri.toString() + " parse failed. -> 4");
105+
return null;
106+
}
107+
} else {
108+
Log.d("UriUtils", uri.toString() + " parse failed. -> 5");
109+
return null;
54110
}
111+
}
112+
113+
private static File getFileFromUri(@NonNull final Uri uri) {
114+
return getFileFromUri(uri, null, null);
115+
}
116+
117+
private static File getFileFromUri(@NonNull final Uri uri,
118+
final String selection,
119+
final String[] selectionArgs) {
55120
CursorLoader cl = new CursorLoader(Utils.getApp());
56121
cl.setUri(uri);
57-
cl.setProjection(new String[]{columnName});
122+
cl.setProjection(new String[]{"_data"});
58123
Cursor cursor = null;
59124
try {
60125
cursor = cl.loadInBackground();
61-
int columnIndex = cursor.getColumnIndexOrThrow(columnName);
126+
int columnIndex = cursor.getColumnIndexOrThrow("_data");
62127
cursor.moveToFirst();
63128
return new File(cursor.getString(columnIndex));
129+
} catch (Exception e) {
130+
Log.d("UriUtils", uri.toString() + " parse failed. -> 1");
131+
return null;
64132
} finally {
65133
if (cursor != null) {
66134
cursor.close();

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
import java.lang.reflect.Field;
1313
import java.lang.reflect.InvocationTargetException;
14-
import java.util.HashMap;
1514
import java.util.HashSet;
1615
import java.util.LinkedList;
1716
import java.util.List;
1817
import java.util.Map;
1918
import java.util.Set;
19+
import java.util.concurrent.ConcurrentHashMap;
2020

2121
/**
2222
* <pre>
@@ -158,9 +158,9 @@ static boolean isAppForeground() {
158158
static class ActivityLifecycleImpl implements ActivityLifecycleCallbacks {
159159

160160
final LinkedList<Activity> mActivityList = new LinkedList<>();
161-
final HashMap<Object, OnAppStatusChangedListener> mStatusListenerMap = new HashMap<>();
161+
final Map<Object, OnAppStatusChangedListener> mStatusListenerMap = new ConcurrentHashMap<>();
162162

163-
final HashMap<Activity, Set<OnActivityDestroyedListener>> mDestroyedListenerMap = new HashMap<>();
163+
final Map<Activity, Set<OnActivityDestroyedListener>> mDestroyedListenerMap = new ConcurrentHashMap<>();
164164

165165
private int mForegroundCount = 0;
166166
private int mConfigCount = 0;

0 commit comments

Comments
 (0)