Skip to content

Commit 4eee99f

Browse files
BlankjBlankj
committed
see 04/02 log
1 parent 5f588ea commit 4eee99f

File tree

10 files changed

+68
-84
lines changed

10 files changed

+68
-84
lines changed

‎.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
with:
1515
java-version: 1.8
1616
- name: Build with Gradle
17-
run: ./gradlew aR
17+
run: ./gradlew aR -x :lib:lib_utilcode:verifyReleaseResources

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `20/04/02` [fix] PathUtils sdcard enable state is wrong; ActivityUtils finish activity wrong; Publish v1.27.1.
12
* `20/03/31` [add] Publish v1.27.0.
23
* `20/03/30` [add] BatteryUtils in subutil.
34
* `20/03/27` [add] publish.gradle.

‎buildSrc/src/main/groovy/Config.groovy

Lines changed: 1 addition & 1 deletion
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.0'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.27.1'// E.g. 1.9.72 => 1,009,072
1919

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

‎lib/utilcode/README-CN.md

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

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

1111

‎lib/utilcode/README.md

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

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

1111

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

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,15 +1645,14 @@ public static boolean finishToActivity(@NonNull final Activity activity,
16451645
final boolean isIncludeSelf,
16461646
final boolean isLoadAnim) {
16471647
List<Activity> activities = UtilsBridge.getActivityList();
1648-
for (int i = activities.size() - 1; i >= 0; --i) {
1649-
Activity aActivity = activities.get(i);
1650-
if (aActivity.equals(activity)) {
1648+
for (Activity act : activities) {
1649+
if (act.equals(activity)) {
16511650
if (isIncludeSelf) {
1652-
finishActivity(aActivity, isLoadAnim);
1651+
finishActivity(act, isLoadAnim);
16531652
}
16541653
return true;
16551654
}
1656-
finishActivity(aActivity, isLoadAnim);
1655+
finishActivity(act, isLoadAnim);
16571656
}
16581657
return false;
16591658
}
@@ -1673,15 +1672,14 @@ public static boolean finishToActivity(@NonNull final Activity activity,
16731672
@AnimRes final int enterAnim,
16741673
@AnimRes final int exitAnim) {
16751674
List<Activity> activities = UtilsBridge.getActivityList();
1676-
for (int i = activities.size() - 1; i >= 0; --i) {
1677-
Activity aActivity = activities.get(i);
1678-
if (aActivity.equals(activity)) {
1675+
for (Activity act : activities) {
1676+
if (act.equals(activity)) {
16791677
if (isIncludeSelf) {
1680-
finishActivity(aActivity, enterAnim, exitAnim);
1678+
finishActivity(act, enterAnim, exitAnim);
16811679
}
16821680
return true;
16831681
}
1684-
finishActivity(aActivity, enterAnim, exitAnim);
1682+
finishActivity(act, enterAnim, exitAnim);
16851683
}
16861684
return false;
16871685
}
@@ -1708,15 +1706,14 @@ public static boolean finishToActivity(@NonNull final Class<? extends Activity>
17081706
final boolean isIncludeSelf,
17091707
final boolean isLoadAnim) {
17101708
List<Activity> activities = UtilsBridge.getActivityList();
1711-
for (int i = activities.size() - 1; i >= 0; --i) {
1712-
Activity aActivity = activities.get(i);
1713-
if (aActivity.getClass().equals(clz)) {
1709+
for (Activity act : activities) {
1710+
if (act.getClass().equals(clz)) {
17141711
if (isIncludeSelf) {
1715-
finishActivity(aActivity, isLoadAnim);
1712+
finishActivity(act, isLoadAnim);
17161713
}
17171714
return true;
17181715
}
1719-
finishActivity(aActivity, isLoadAnim);
1716+
finishActivity(act, isLoadAnim);
17201717
}
17211718
return false;
17221719
}
@@ -1736,15 +1733,14 @@ public static boolean finishToActivity(@NonNull final Class<? extends Activity>
17361733
@AnimRes final int enterAnim,
17371734
@AnimRes final int exitAnim) {
17381735
List<Activity> activities = UtilsBridge.getActivityList();
1739-
for (int i = activities.size() - 1; i >= 0; --i) {
1740-
Activity aActivity = activities.get(i);
1741-
if (aActivity.getClass().equals(clz)) {
1736+
for (Activity act : activities) {
1737+
if (act.getClass().equals(clz)) {
17421738
if (isIncludeSelf) {
1743-
finishActivity(aActivity, enterAnim, exitAnim);
1739+
finishActivity(act, enterAnim, exitAnim);
17441740
}
17451741
return true;
17461742
}
1747-
finishActivity(aActivity, enterAnim, exitAnim);
1743+
finishActivity(act, enterAnim, exitAnim);
17481744
}
17491745
return false;
17501746
}
@@ -1768,10 +1764,9 @@ public static void finishOtherActivities(@NonNull final Class<? extends Activity
17681764
public static void finishOtherActivities(@NonNull final Class<? extends Activity> clz,
17691765
final boolean isLoadAnim) {
17701766
List<Activity> activities = UtilsBridge.getActivityList();
1771-
for (int i = activities.size() - 1; i >= 0; i--) {
1772-
Activity activity = activities.get(i);
1773-
if (!activity.getClass().equals(clz)) {
1774-
finishActivity(activity, isLoadAnim);
1767+
for (Activity act : activities) {
1768+
if (!act.getClass().equals(clz)) {
1769+
finishActivity(act, isLoadAnim);
17751770
}
17761771
}
17771772
}
@@ -1789,10 +1784,9 @@ public static void finishOtherActivities(@NonNull final Class<? extends Activity
17891784
@AnimRes final int enterAnim,
17901785
@AnimRes final int exitAnim) {
17911786
List<Activity> activities = UtilsBridge.getActivityList();
1792-
for (int i = activities.size() - 1; i >= 0; i--) {
1793-
Activity activity = activities.get(i);
1794-
if (!activity.getClass().equals(clz)) {
1795-
finishActivity(activity, enterAnim, exitAnim);
1787+
for (Activity act : activities) {
1788+
if (!act.getClass().equals(clz)) {
1789+
finishActivity(act, enterAnim, exitAnim);
17961790
}
17971791
}
17981792
}
@@ -1811,12 +1805,11 @@ public static void finishAllActivities() {
18111805
*/
18121806
public static void finishAllActivities(final boolean isLoadAnim) {
18131807
List<Activity> activityList = UtilsBridge.getActivityList();
1814-
for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
1815-
Activity activity = activityList.get(i);
1808+
for (Activity act : activityList) {
18161809
// sActivityList remove the index activity at onActivityDestroyed
1817-
activity.finish();
1810+
act.finish();
18181811
if (!isLoadAnim) {
1819-
activity.overridePendingTransition(0, 0);
1812+
act.overridePendingTransition(0, 0);
18201813
}
18211814
}
18221815
}
@@ -1832,11 +1825,10 @@ public static void finishAllActivities(final boolean isLoadAnim) {
18321825
public static void finishAllActivities(@AnimRes final int enterAnim,
18331826
@AnimRes final int exitAnim) {
18341827
List<Activity> activityList = UtilsBridge.getActivityList();
1835-
for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
1836-
Activity activity = activityList.get(i);
1828+
for (Activity act : activityList) {
18371829
// sActivityList remove the index activity at onActivityDestroyed
1838-
activity.finish();
1839-
activity.overridePendingTransition(enterAnim, exitAnim);
1830+
act.finish();
1831+
act.overridePendingTransition(enterAnim, exitAnim);
18401832
}
18411833
}
18421834

@@ -1854,7 +1846,7 @@ public static void finishAllActivitiesExceptNewest() {
18541846
*/
18551847
public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
18561848
List<Activity> activities = UtilsBridge.getActivityList();
1857-
for (int i = activities.size() - 2; i >= 0; i--) {
1849+
for (int i = 1; i < activities.size() - 1; i++) {
18581850
finishActivity(activities.get(i), isLoadAnim);
18591851
}
18601852
}
@@ -1870,7 +1862,7 @@ public static void finishAllActivitiesExceptNewest(final boolean isLoadAnim) {
18701862
public static void finishAllActivitiesExceptNewest(@AnimRes final int enterAnim,
18711863
@AnimRes final int exitAnim) {
18721864
List<Activity> activities = UtilsBridge.getActivityList();
1873-
for (int i = activities.size() - 2; i >= 0; i--) {
1865+
for (int i = 1; i < activities.size() - 1; i++) {
18741866
finishActivity(activities.get(i), enterAnim, exitAnim);
18751867
}
18761868
}

‎lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.blankj.utilcode.util;
22

33
import android.annotation.SuppressLint;
4-
import android.app.Activity;
54
import android.app.ActivityManager;
65
import android.content.Context;
76
import android.content.Intent;
@@ -294,12 +293,7 @@ public static void launchAppDetailsSettings(final String packageName) {
294293
* Exit the application.
295294
*/
296295
public static void exitApp() {
297-
List<Activity> activityList = UtilsBridge.getActivityList();
298-
for (int i = activityList.size() - 1; i >= 0; --i) {// remove from top
299-
Activity activity = activityList.get(i);
300-
// sActivityList remove the index activity at onActivityDestroyed
301-
activity.finish();
302-
}
296+
UtilsBridge.finishAllActivities();
303297
System.exit(0);
304298
}
305299

0 commit comments

Comments
 (0)