diff --git a/app/src/main/java/com/yechaoa/yutils/ActivityUtil.java b/app/src/main/java/com/yechaoa/yutils/ActivityUtil.java index a18c343..04c842f 100644 --- a/app/src/main/java/com/yechaoa/yutils/ActivityUtil.java +++ b/app/src/main/java/com/yechaoa/yutils/ActivityUtil.java @@ -70,7 +70,7 @@ public static Application.ActivityLifecycleCallbacks getActivityLifecycleCallbac /** * 获得当前栈顶Activity */ - public static Activity currentActivity() { + public static Activity getCurrentActivity() { Activity activity = null; if (!activityStack.isEmpty()) activity = activityStack.peek(); @@ -81,7 +81,7 @@ public static Activity currentActivity() { * 获得当前Activity名字 */ public static String getCurrentActivityName() { - Activity activity = currentActivity(); + Activity activity = getCurrentActivity(); String name = ""; if (activity != null) { name = activity.getComponentName().getClassName(); @@ -92,7 +92,7 @@ public static String getCurrentActivityName() { /** * 关闭当前Activity */ - public static void closeActivity(Activity activity) { + public static void finishActivity(Activity activity) { if (activity != null) { activityStack.remove(activity); activity.finish(); @@ -103,11 +103,11 @@ public static void closeActivity(Activity activity) { */ public static void closeAllActivity() { while (true) { - Activity activity = currentActivity(); + Activity activity = getCurrentActivity(); if (null == activity) { break; } - closeActivity(activity); + finishActivity(activity); } } @@ -126,7 +126,7 @@ public static void closeActivityByName(String name) { } continue; } - closeActivity(activity); + finishActivity(activity); break; } }