Skip to content

Commit 2ed78f7

Browse files
BlankjBlankj
committed
see 04/28 log
1 parent 8880b13 commit 2ed78f7

File tree

3 files changed

+27
-22
lines changed

3 files changed

+27
-22
lines changed

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import android.os.Bundle;
1313
import android.support.annotation.AnimRes;
1414
import android.support.annotation.NonNull;
15+
import android.support.annotation.Nullable;
1516
import android.support.v4.app.ActivityOptionsCompat;
1617
import android.support.v4.util.Pair;
1718
import android.util.Log;
@@ -92,7 +93,7 @@ public static void startActivity(@NonNull final Class<? extends Activity> clz) {
9293
* @param options Additional options for how the Activity should be started.
9394
*/
9495
public static void startActivity(@NonNull final Class<? extends Activity> clz,
95-
final Bundle options) {
96+
@Nullable final Bundle options) {
9697
Context context = Utils.getTopActivityOrApp();
9798
startActivity(context, null, context.getPackageName(), clz.getName(), options);
9899
}
@@ -137,7 +138,7 @@ public static void startActivity(@NonNull final Activity activity,
137138
*/
138139
public static void startActivity(@NonNull final Activity activity,
139140
@NonNull final Class<? extends Activity> clz,
140-
final Bundle options) {
141+
@Nullable final Bundle options) {
141142
startActivity(activity, null, activity.getPackageName(), clz.getName(), options);
142143
}
143144

@@ -198,7 +199,7 @@ public static void startActivity(@NonNull final Bundle extras,
198199
*/
199200
public static void startActivity(@NonNull final Bundle extras,
200201
@NonNull final Class<? extends Activity> clz,
201-
@NonNull final Bundle options) {
202+
@Nullable final Bundle options) {
202203
Context context = Utils.getTopActivityOrApp();
203204
startActivity(context, extras, context.getPackageName(), clz.getName(), options);
204205
}
@@ -249,7 +250,7 @@ public static void startActivity(@NonNull final Bundle extras,
249250
public static void startActivity(@NonNull final Bundle extras,
250251
@NonNull final Activity activity,
251252
@NonNull final Class<? extends Activity> clz,
252-
@NonNull final Bundle options) {
253+
@Nullable final Bundle options) {
253254
startActivity(activity, extras, activity.getPackageName(), clz.getName(), options);
254255
}
255256

@@ -313,7 +314,7 @@ public static void startActivity(@NonNull final String pkg,
313314
*/
314315
public static void startActivity(@NonNull final String pkg,
315316
@NonNull final String cls,
316-
final Bundle options) {
317+
@Nullable final Bundle options) {
317318
startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, options);
318319
}
319320

@@ -362,7 +363,7 @@ public static void startActivity(@NonNull final Activity activity,
362363
public static void startActivity(@NonNull final Activity activity,
363364
@NonNull final String pkg,
364365
@NonNull final String cls,
365-
final Bundle options) {
366+
@Nullable final Bundle options) {
366367
startActivity(activity, null, pkg, cls, options);
367368
}
368369

@@ -428,7 +429,7 @@ public static void startActivity(@NonNull final Bundle extras,
428429
public static void startActivity(@NonNull final Bundle extras,
429430
@NonNull final String pkg,
430431
@NonNull final String cls,
431-
final Bundle options) {
432+
@Nullable final Bundle options) {
432433
startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, options);
433434
}
434435

@@ -483,7 +484,7 @@ public static void startActivity(@NonNull final Bundle extras,
483484
@NonNull final Activity activity,
484485
@NonNull final String pkg,
485486
@NonNull final String cls,
486-
final Bundle options) {
487+
@Nullable final Bundle options) {
487488
startActivity(activity, extras, pkg, cls, options);
488489
}
489490

@@ -546,7 +547,7 @@ public static boolean startActivity(@NonNull final Intent intent) {
546547
* @return {@code true}: success<br>{@code false}: fail
547548
*/
548549
public static boolean startActivity(@NonNull final Intent intent,
549-
@NonNull final Bundle options) {
550+
@Nullable final Bundle options) {
550551
return startActivity(intent, Utils.getTopActivityOrApp(), options);
551552
}
552553

@@ -593,7 +594,7 @@ public static void startActivity(@NonNull final Activity activity,
593594
*/
594595
public static void startActivity(@NonNull final Activity activity,
595596
@NonNull final Intent intent,
596-
final Bundle options) {
597+
@Nullable final Bundle options) {
597598
startActivity(intent, activity, options);
598599
}
599600

@@ -658,7 +659,7 @@ public static void startActivityForResult(@NonNull final Activity activity,
658659
public static void startActivityForResult(@NonNull final Activity activity,
659660
@NonNull final Class<? extends Activity> clz,
660661
final int requestCode,
661-
final Bundle options) {
662+
@Nullable final Bundle options) {
662663
startActivityForResult(activity, null, activity.getPackageName(), clz.getName(),
663664
requestCode, options);
664665
}
@@ -736,7 +737,7 @@ public static void startActivityForResult(@NonNull final Bundle extras,
736737
@NonNull final Activity activity,
737738
@NonNull final Class<? extends Activity> clz,
738739
final int requestCode,
739-
@NonNull final Bundle options) {
740+
@Nullable final Bundle options) {
740741
startActivityForResult(activity, extras, activity.getPackageName(), clz.getName(),
741742
requestCode, options);
742743
}
@@ -821,7 +822,7 @@ public static void startActivityForResult(@NonNull final Bundle extras,
821822
@NonNull final String pkg,
822823
@NonNull final String cls,
823824
final int requestCode,
824-
final Bundle options) {
825+
@Nullable final Bundle options) {
825826
startActivityForResult(activity, extras, pkg, cls, requestCode, options);
826827
}
827828

@@ -900,7 +901,7 @@ public static void startActivityForResult(@NonNull final Activity activity,
900901
public static void startActivityForResult(@NonNull final Activity activity,
901902
@NonNull final Intent intent,
902903
final int requestCode,
903-
final Bundle options) {
904+
@Nullable final Bundle options) {
904905
startActivityForResult(intent, activity, requestCode, options);
905906
}
906907

@@ -962,7 +963,7 @@ public static void startActivities(@NonNull final Intent[] intents) {
962963
* @param options Additional options for how the Activity should be started.
963964
*/
964965
public static void startActivities(@NonNull final Intent[] intents,
965-
final Bundle options) {
966+
@Nullable final Bundle options) {
966967
startActivities(intents, Utils.getTopActivityOrApp(), options);
967968
}
968969

@@ -1005,7 +1006,7 @@ public static void startActivities(@NonNull final Activity activity,
10051006
*/
10061007
public static void startActivities(@NonNull final Activity activity,
10071008
@NonNull final Intent[] intents,
1008-
final Bundle options) {
1009+
@Nullable final Bundle options) {
10091010
startActivities(intents, activity, options);
10101011
}
10111012

@@ -1543,7 +1544,7 @@ private static void startActivity(final Context context,
15431544
final Bundle extras,
15441545
final String pkg,
15451546
final String cls,
1546-
final Bundle options) {
1547+
@Nullable final Bundle options) {
15471548
Intent intent = new Intent(Intent.ACTION_VIEW);
15481549
if (extras != null) intent.putExtras(extras);
15491550
intent.setComponent(new ComponentName(pkg, cls));
@@ -1580,7 +1581,7 @@ private static boolean startActivityForResult(final Activity activity,
15801581
final String pkg,
15811582
final String cls,
15821583
final int requestCode,
1583-
final Bundle options) {
1584+
@Nullable final Bundle options) {
15841585
Intent intent = new Intent(Intent.ACTION_VIEW);
15851586
if (extras != null) intent.putExtras(extras);
15861587
intent.setComponent(new ComponentName(pkg, cls));
@@ -1590,7 +1591,7 @@ private static boolean startActivityForResult(final Activity activity,
15901591
private static boolean startActivityForResult(final Intent intent,
15911592
final Activity activity,
15921593
final int requestCode,
1593-
final Bundle options) {
1594+
@Nullable final Bundle options) {
15941595
if (!isIntentAvailable(intent)) {
15951596
Log.e("ActivityUtils", "intent is unavailable");
15961597
return false;
@@ -1605,7 +1606,7 @@ private static boolean startActivityForResult(final Intent intent,
16051606

16061607
private static void startActivities(final Intent[] intents,
16071608
final Context context,
1608-
final Bundle options) {
1609+
@Nullable final Bundle options) {
16091610
if (!(context instanceof Activity)) {
16101611
for (Intent intent : intents) {
16111612
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,13 @@ public static File uri2File(@NonNull final Uri uri) {
5353
Log.d("UriUtils", uri.toString());
5454
String authority = uri.getAuthority();
5555
String scheme = uri.getScheme();
56+
String path = uri.getPath();
57+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
58+
&& path != null && path.startsWith("/external")) {
59+
return new File(Environment.getExternalStorageDirectory().getAbsolutePath()
60+
+ path.replace("/external", ""));
61+
}
5662
if (ContentResolver.SCHEME_FILE.equals(scheme)) {
57-
String path = uri.getPath();
5863
if (path != null) return new File(path);
5964
Log.d("UriUtils", uri.toString() + " parse failed. -> 0");
6065
return null;

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ class ActivityActivity : BaseTitleActivity() {
167167
}
168168

169169
private fun getOption(type: Int): Bundle? {
170-
LogUtils.d(type)
171170
when (type) {
172171
0 -> return ActivityOptionsCompat.makeCustomAnimation(this,
173172
R.anim.slide_in_right_1000,

0 commit comments

Comments
 (0)