Skip to content

Commit

Permalink
ActivityUtil
Browse files Browse the repository at this point in the history
  • Loading branch information
yechaoa committed Sep 12, 2017
1 parent 44e74a8 commit 73d27dd
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions app/src/main/java/com/yechaoa/yutils/ActivityUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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);
}
}

Expand All @@ -126,7 +126,7 @@ public static void closeActivityByName(String name) {
}
continue;
}
closeActivity(activity);
finishActivity(activity);
break;
}
}
Expand Down

0 comments on commit 73d27dd

Please sign in to comment.