Skip to content

Commit 7f5f292

Browse files
committed
see 04/08 log
1 parent b05171d commit 7f5f292

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `20/04/08` [fix] ActivityUtils#finish bug. Publish v1.27.5.
12
* `20/04/08` [fix] CleanUtils clean dir not work. FileUtils#isFileExists. Publish v1.27.4.
23
* `20/04/08` [fix] CrashUtils DefaultUncaughtExceptionHandler is wrong; LogUtils write file failed; Utils#getApp failed run on remote process. Publish v1.27.3.
34
* `20/04/07` [mdf] GsonUtils#getGson() method public.

buildSrc/src/main/groovy/Config.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Config {
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
1717
static versionCode = 1_026_001
18-
static versionName = '1.27.4'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.27.5'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'

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

+4
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class ActivityActivity : CommonActivity() {
5353
CommonItemTitle("isActivityExists(${SubActivityActivity::class.java.name})", ActivityUtils.isActivityExists(AppUtils.getAppPackageName(), SubActivityActivity::class.java.name).toString()),
5454
CommonItemTitle("getLauncherActivity", ActivityUtils.getLauncherActivity(AppUtils.getAppPackageName())),
5555
CommonItemTitle("getMainActivities", ActivityUtils.getMainActivities().toString()),
56+
CommonItemTitle("getActivityList", CollectionUtils.collect(ActivityUtils.getActivityList()) { input -> input.javaClass.simpleName }.toString()),
5657
CommonItemTitle("getTopActivity", ActivityUtils.getTopActivity().toString()),
5758
CommonItemTitle("isActivityExistsInStack", ActivityUtils.isActivityExistsInStack(CoreUtilActivity::class.java).toString()),
5859
CommonItemImage("getActivityIcon") {
@@ -143,6 +144,9 @@ class ActivityActivity : CommonActivity() {
143144
CommonItemClick(R.string.activity_finish_to_activity, true) {
144145
ActivityUtils.finishToActivity(CoreUtilActivity::class.java, false, true)
145146
},
147+
CommonItemClick(R.string.activity_finish_all_activities_except_newest, true) {
148+
ActivityUtils.finishAllActivitiesExceptNewest()
149+
},
146150
CommonItemClick(R.string.activity_finish_all_activities, true) {
147151
ActivityUtils.finishAllActivities()
148152
}

feature/utilcode/pkg/src/main/res/values/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<string name="activity_start_launcher_activity">Start Launcher Activity</string>
7272
<string name="activity_finish_activity">Finish CoreUtilActivity</string>
7373
<string name="activity_finish_to_activity">Finish To CoreUtilActivity</string>
74+
<string name="activity_finish_all_activities_except_newest">Finish All Activities Except Newest</string>
7475
<string name="activity_finish_all_activities">Finish All Activities</string>
7576

7677
<!--Api 相关-->

lib/utilcode/README-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.27.4'
5+
implementation 'com.blankj:utilcode:1.27.5'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.27.4'
8+
implementation 'com.blankj:utilcodex:1.27.5'
99
```
1010

1111

lib/utilcode/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.27.4'
5+
implementation 'com.blankj:utilcode:1.27.5'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.27.4'
8+
implementation 'com.blankj:utilcodex:1.27.5'
99
```
1010

1111

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,7 @@ public static void finishAllActivitiesExceptNewest() {
18611861
*/
18621862
public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
18631863
List<Activity> activities = UtilsBridge.getActivityList();
1864-
for (int i = 1; i < activities.size() - 1; i++) {
1864+
for (int i = 1; i < activities.size(); i++) {
18651865
finishActivity(activities.get(i), isLoadAnim);
18661866
}
18671867
}
@@ -1877,7 +1877,7 @@ public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
18771877
public static void finishAllActivitiesExceptNewest(@AnimRes final int enterAnim,
18781878
@AnimRes final int exitAnim) {
18791879
List<Activity> activities = UtilsBridge.getActivityList();
1880-
for (int i = 1; i < activities.size() - 1; i++) {
1880+
for (int i = 1; i < activities.size(); i++) {
18811881
finishActivity(activities.get(i), enterAnim, exitAnim);
18821882
}
18831883
}

0 commit comments

Comments
 (0)