Skip to content

Commit 82d2d09

Browse files
author
Blankj
committed
see 12/11 log
1 parent 91dab27 commit 82d2d09

File tree

8 files changed

+75
-34
lines changed

8 files changed

+75
-34
lines changed

‎README-CN.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.10-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.11-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this ptoject helps you a lot, and you would like to support this ptoject's fu
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.10-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.9.11-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
6262
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
6363

64-
// implementation 'com.blankj:utilcode:1.9.10'
64+
// implementation 'com.blankj:utilcode:1.9.11'
6565
}
6666

6767

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ext {
3232
min_sdk_version = 14
3333
target_sdk_version = 22
3434

35-
version_code = 1009010
36-
version_name = '1.9.10'// E.g 1.9.72 == 1,009,072
35+
version_code = 1009011
36+
version_name = '1.9.11'// E.g 1.9.72 == 1,009,072
3737

3838
// App dependencies
3939
support_version = '26.1.0'

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 17/12/11 完善 ActivityUtils 的 finish 系列，发布1.9.11
12
* 17/12/04 LogUtils 边框改为单线清爽型
23
* 17/11/30 修复 ToastUtils 背景问题，发布 1.9.10
34
* 17/11/30 修复 ToastUtils 获取背景为空，发布 1.9.9

‎utilcode/README-CN.md‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
compile 'com.blankj:utilcode:1.9.10'
5+
compile 'com.blankj:utilcode:1.9.11'
66
```
77

88

@@ -27,18 +27,19 @@ Utils.init(application);
2727

2828
* ### Activity 相关 -> [ActivityUtils.java][activity.java] -> [Demo][activity.demo]
2929
```
30-
isActivityExists : 判断 Activity 是否存在
31-
startActivity : 启动 Activity
32-
startActivities : 启动多个 Activity
33-
startHomeActivity : 回到桌面
34-
getActivityList : 获取 Activity 栈链表
35-
getLauncherActivity : 获取启动项 Activity
36-
getTopActivity : 获取栈顶 Activity
37-
isActivityExistsInStack : 判断 Activity 是否存在栈中
38-
finishActivity : 结束 Activity
39-
finishToActivity : 结束到指定 Activity
40-
finishOtherActivitiesExceptNewest: 结束除最新之外的同类型 Activity
41-
finishAllActivities : 结束所有 Activity
30+
isActivityExists : 判断 Activity 是否存在
31+
startActivity : 启动 Activity
32+
startActivities : 启动多个 Activity
33+
startHomeActivity : 回到桌面
34+
getActivityList : 获取 Activity 栈链表
35+
getLauncherActivity : 获取启动项 Activity
36+
getTopActivity : 获取栈顶 Activity
37+
isActivityExistsInStack : 判断 Activity 是否存在栈中
38+
finishActivity : 结束 Activity
39+
finishToActivity : 结束到指定 Activity
40+
finishOtherActivities : 结束所有其他类型的 Activity
41+
finishAllActivities : 结束所有 Activity
42+
finishAllActivitiesExceptNewest: 结束除最新之外的所有 Activity
4243
```
4344

4445
* ### App 相关 -> [AppUtils.java][app.java] -> [Demo][app.demo]

‎utilcode/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
compile 'com.blankj:utilcode:1.9.10'
5+
compile 'com.blankj:utilcode:1.9.11'
66
```
77

88

@@ -37,8 +37,9 @@ getTopActivity
3737
isActivityExistsInStack
3838
finishActivity
3939
finishToActivity
40-
finishOtherActivitiesExceptNewest
40+
finishOtherActivities
4141
finishAllActivities
42+
finishAllActivitiesExceptNewest
4243
```
4344

4445
* ### About App -> [AppUtils.java][app.java] -> [Demo][app.demo]

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

Lines changed: 52 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -952,24 +952,23 @@ public static boolean finishToActivity(@NonNull final Class<?> clz,
952952
}
953953

954954
/**
955-
* 结束除最新之外的同类型 Activity
956-
* <p>也就是让栈中最多只剩下一种类型的 Activity</p>
955+
* 结束所有其他类型的 Activity
957956
*
958957
* @param clz Activity 类
959958
*/
960-
public static void finishOtherActivitiesExceptNewest(@NonNull final Class<?> clz) {
961-
finishOtherActivitiesExceptNewest(clz, false);
959+
public static void finishOtherActivities(@NonNull final Class<?> clz) {
960+
finishOtherActivities(clz, false);
962961
}
963962

963+
964964
/**
965-
* 结束除最新之外的同类型 Activity
966-
* <p>也就是让栈中最多只剩下一种类型的 Activity</p>
965+
* 结束所有其他类型的 Activity
967966
*
968967
* @param clz Activity 类
969968
* @param isLoadAnim 是否启动动画
970969
*/
971-
public static void finishOtherActivitiesExceptNewest(@NonNull final Class<?> clz,
972-
final boolean isLoadAnim) {
970+
public static void finishOtherActivities(@NonNull final Class<?> clz,
971+
final boolean isLoadAnim) {
973972
List<Activity> activities = Utils.sActivityList;
974973
boolean flag = false;
975974
for (int i = activities.size() - 1; i >= 0; i--) {
@@ -980,21 +979,22 @@ public static void finishOtherActivitiesExceptNewest(@NonNull final Class<?> clz
980979
} else {
981980
flag = true;
982981
}
982+
} else {
983+
finishActivity(activity, isLoadAnim);
983984
}
984985
}
985986
}
986987

987988
/**
988-
* 结束除最新之外的同类型 Activity
989-
* <p>也就是让栈中最多只剩下一种类型的 Activity</p>
989+
* 结束所有其他类型的 Activity
990990
*
991991
* @param clz Activity 类
992992
* @param enterAnim 入场动画
993993
* @param exitAnim 出场动画
994994
*/
995-
public static void finishOtherActivitiesExceptNewest(@NonNull final Class<?> clz,
996-
@AnimRes final int enterAnim,
997-
@AnimRes final int exitAnim) {
995+
public static void finishOtherActivities(@NonNull final Class<?> clz,
996+
@AnimRes final int enterAnim,
997+
@AnimRes final int exitAnim) {
998998
List<Activity> activities = Utils.sActivityList;
999999
boolean flag = false;
10001000
for (int i = activities.size() - 1; i >= 0; i--) {
@@ -1005,6 +1005,8 @@ public static void finishOtherActivitiesExceptNewest(@NonNull final Class<?> clz
10051005
} else {
10061006
flag = true;
10071007
}
1008+
} else {
1009+
finishActivity(activity, enterAnim, exitAnim);
10081010
}
10091011
}
10101012
}
@@ -1038,7 +1040,8 @@ public static void finishAllActivities(final boolean isLoadAnim) {
10381040
* @param enterAnim 入场动画
10391041
* @param exitAnim 出场动画
10401042
*/
1041-
public static void finishAllActivities(@AnimRes final int enterAnim, @AnimRes final int exitAnim) {
1043+
public static void finishAllActivities(@AnimRes final int enterAnim,
1044+
@AnimRes final int exitAnim) {
10421045
List<Activity> activityList = Utils.sActivityList;
10431046
for (int i = activityList.size() - 1; i >= 0; --i) {// 从栈顶开始移除
10441047
Activity activity = activityList.get(i);
@@ -1047,6 +1050,41 @@ public static void finishAllActivities(@AnimRes final int enterAnim, @AnimRes fi
10471050
}
10481051
}
10491052

1053+
/**
1054+
* 结束除最新之外的所有 Activity
1055+
*/
1056+
public static void finishAllActivitiesExceptNewest() {
1057+
finishAllActivitiesExceptNewest(false);
1058+
}
1059+
1060+
/**
1061+
* 结束除最新之外的所有 Activity
1062+
*
1063+
* @param isLoadAnim 是否启动动画
1064+
*/
1065+
public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
1066+
List<Activity> activities = Utils.sActivityList;
1067+
boolean flag = false;
1068+
for (int i = activities.size() - 2; i >= 0; i--) {
1069+
finishActivity(activities.get(i), isLoadAnim);
1070+
}
1071+
}
1072+
1073+
/**
1074+
* 结束除最新之外的所有 Activity
1075+
*
1076+
* @param enterAnim 入场动画
1077+
* @param exitAnim 出场动画
1078+
*/
1079+
public static void finishAllActivitiesExceptNewest(@AnimRes final int enterAnim,
1080+
@AnimRes final int exitAnim) {
1081+
List<Activity> activities = Utils.sActivityList;
1082+
boolean flag = false;
1083+
for (int i = activities.size() - 2; i >= 0; i--) {
1084+
finishActivity(activities.get(i), enterAnim, exitAnim);
1085+
}
1086+
}
1087+
10501088
private static Context getActivityOrApp() {
10511089
Activity topActivity = getTopActivity();
10521090
return topActivity == null ? Utils.getApp() : topActivity;

0 commit comments

Comments
 (0)