Skip to content

A
AndroidUtilCode

mmm-rain / AndroidUtilCode
与 Fork 源项目一致

从无法访问的项目Fork

通知 4
Star 0
Fork 0
A
AndroidUtilCode

体验新版 GitCode，发现更多精彩内容 >>

提交 2ed78f77 编写于 作者: B Blankj
浏览文件
操作

see 04/28 log

上级 8880b13c
隐藏空白更改
内联 并排
Showing with 27 addition and 22 deletion
utilcode/lib/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
浏览文件 @ 2ed78f77
......@@ -12,6 +12,7 @@ import android.os.Build;
import android.os.Bundle;
import android.support.annotation.AnimRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.util.Pair;
import android.util.Log;
......@@ -92,7 +93,7 @@ public final class ActivityUtils {
* @param options Additional options for how the Activity should be started.
*/
public static void startActivity(@NonNull final Class<? extends Activity> clz,
final Bundle options) {
@Nullable final Bundle options) {
Context context = Utils.getTopActivityOrApp();
startActivity(context, null, context.getPackageName(), clz.getName(), options);
}
......@@ -137,7 +138,7 @@ public final class ActivityUtils {
*/
public static void startActivity(@NonNull final Activity activity,
@NonNull final Class<? extends Activity> clz,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(activity, null, activity.getPackageName(), clz.getName(), options);
}
......@@ -198,7 +199,7 @@ public final class ActivityUtils {
*/
public static void startActivity(@NonNull final Bundle extras,
@NonNull final Class<? extends Activity> clz,
@NonNull final Bundle options) {
@Nullable final Bundle options) {
Context context = Utils.getTopActivityOrApp();
startActivity(context, extras, context.getPackageName(), clz.getName(), options);
}
......@@ -249,7 +250,7 @@ public final class ActivityUtils {
public static void startActivity(@NonNull final Bundle extras,
@NonNull final Activity activity,
@NonNull final Class<? extends Activity> clz,
@NonNull final Bundle options) {
@Nullable final Bundle options) {
startActivity(activity, extras, activity.getPackageName(), clz.getName(), options);
}
......@@ -313,7 +314,7 @@ public final class ActivityUtils {
*/
public static void startActivity(@NonNull final String pkg,
@NonNull final String cls,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, options);
}
......@@ -362,7 +363,7 @@ public final class ActivityUtils {
public static void startActivity(@NonNull final Activity activity,
@NonNull final String pkg,
@NonNull final String cls,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(activity, null, pkg, cls, options);
}
......@@ -428,7 +429,7 @@ public final class ActivityUtils {
public static void startActivity(@NonNull final Bundle extras,
@NonNull final String pkg,
@NonNull final String cls,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, options);
}
......@@ -483,7 +484,7 @@ public final class ActivityUtils {
@NonNull final Activity activity,
@NonNull final String pkg,
@NonNull final String cls,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(activity, extras, pkg, cls, options);
}
......@@ -546,7 +547,7 @@ public final class ActivityUtils {
* @return {@code true}: success<br>{@code false}: fail
*/
public static boolean startActivity(@NonNull final Intent intent,
@NonNull final Bundle options) {
@Nullable final Bundle options) {
return startActivity(intent, Utils.getTopActivityOrApp(), options);
}
......@@ -593,7 +594,7 @@ public final class ActivityUtils {
*/
public static void startActivity(@NonNull final Activity activity,
@NonNull final Intent intent,
final Bundle options) {
@Nullable final Bundle options) {
startActivity(intent, activity, options);
}
......@@ -658,7 +659,7 @@ public final class ActivityUtils {
public static void startActivityForResult(@NonNull final Activity activity,
@NonNull final Class<? extends Activity> clz,
final int requestCode,
final Bundle options) {
@Nullable final Bundle options) {
startActivityForResult(activity, null, activity.getPackageName(), clz.getName(),
requestCode, options);
}
......@@ -736,7 +737,7 @@ public final class ActivityUtils {
@NonNull final Activity activity,
@NonNull final Class<? extends Activity> clz,
final int requestCode,
@NonNull final Bundle options) {
@Nullable final Bundle options) {
startActivityForResult(activity, extras, activity.getPackageName(), clz.getName(),
requestCode, options);
}
......@@ -821,7 +822,7 @@ public final class ActivityUtils {
@NonNull final String pkg,
@NonNull final String cls,
final int requestCode,
final Bundle options) {
@Nullable final Bundle options) {
startActivityForResult(activity, extras, pkg, cls, requestCode, options);
}
......@@ -900,7 +901,7 @@ public final class ActivityUtils {
public static void startActivityForResult(@NonNull final Activity activity,
@NonNull final Intent intent,
final int requestCode,
final Bundle options) {
@Nullable final Bundle options) {
startActivityForResult(intent, activity, requestCode, options);
}
......@@ -962,7 +963,7 @@ public final class ActivityUtils {
* @param options Additional options for how the Activity should be started.
*/
public static void startActivities(@NonNull final Intent[] intents,
final Bundle options) {
@Nullable final Bundle options) {
startActivities(intents, Utils.getTopActivityOrApp(), options);
}
......@@ -1005,7 +1006,7 @@ public final class ActivityUtils {
*/
public static void startActivities(@NonNull final Activity activity,
@NonNull final Intent[] intents,
final Bundle options) {
@Nullable final Bundle options) {
startActivities(intents, activity, options);
}
......@@ -1543,7 +1544,7 @@ public final class ActivityUtils {
final Bundle extras,
final String pkg,
final String cls,
final Bundle options) {
@Nullable final Bundle options) {
Intent intent = new Intent(Intent.ACTION_VIEW);
if (extras != null) intent.putExtras(extras);
intent.setComponent(new ComponentName(pkg, cls));
......@@ -1580,7 +1581,7 @@ public final class ActivityUtils {
final String pkg,
final String cls,
final int requestCode,
final Bundle options) {
@Nullable final Bundle options) {
Intent intent = new Intent(Intent.ACTION_VIEW);
if (extras != null) intent.putExtras(extras);
intent.setComponent(new ComponentName(pkg, cls));
......@@ -1590,7 +1591,7 @@ public final class ActivityUtils {
private static boolean startActivityForResult(final Intent intent,
final Activity activity,
final int requestCode,
final Bundle options) {
@Nullable final Bundle options) {
if (!isIntentAvailable(intent)) {
Log.e("ActivityUtils", "intent is unavailable");
return false;
......@@ -1605,7 +1606,7 @@ public final class ActivityUtils {
private static void startActivities(final Intent[] intents,
final Context context,
final Bundle options) {
@Nullable final Bundle options) {
if (!(context instanceof Activity)) {
for (Intent intent : intents) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
......
utilcode/lib/src/main/java/com/blankj/utilcode/util/UriUtils.java
浏览文件 @ 2ed78f77
......@@ -53,8 +53,13 @@ public final class UriUtils {
Log.d("UriUtils", uri.toString());
String authority = uri.getAuthority();
String scheme = uri.getScheme();
String path = uri.getPath();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
&& path != null && path.startsWith("/external")) {
return new File(Environment.getExternalStorageDirectory().getAbsolutePath()
+ path.replace("/external", ""));
}
if (ContentResolver.SCHEME_FILE.equals(scheme)) {
String path = uri.getPath();
if (path != null) return new File(path);
Log.d("UriUtils", uri.toString() + " parse failed. -> 0");
return null;
......
utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt
浏览文件 @ 2ed78f77
......@@ -167,7 +167,6 @@ class ActivityActivity : BaseTitleActivity() {
}
private fun getOption(type: Int): Bundle? {
LogUtils.d(type)
when (type) {
0 -> return ActivityOptionsCompat.makeCustomAnimation(this,
R.anim.slide_in_right_1000,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或