Skip to content

Commit b9c7daa

Browse files
BlankjBlankj
committed
see 04/08 log
1 parent 903051a commit b9c7daa

File tree

8 files changed

+48
-49
lines changed

8 files changed

+48
-49
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.13.7-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.8-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 project helps you a lot and you want to support the project's developmen
4141

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

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.7-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.8-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
@@ -57,7 +57,7 @@ dependencies {
5757
// LeakCanary
5858
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
5959
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
60-
// implementation 'com.blankj:utilcode:1.13.7'
60+
// implementation 'com.blankj:utilcode:1.13.8'
6161
}
6262

6363

‎build.gradle

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

36-
version_code = 1_013_007
37-
version_name = '1.13.7'// E.g 1.9.72 => 1,009,072
36+
version_code = 1_013_008
37+
version_name = '1.13.8'// E.g 1.9.72 => 1,009,072
3838

3939
// App dependencies
4040
support_version = '27.1.0'

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/04/08 修复获取栈顶 Activity 链表为空的异常，获取栈顶 Activity 放到 Utils 中，发布 1.13.8 版本
12
* 18/04/06 新增 GsonUtils 及单元测试
23
* 18/04/05 完善 README 文档
34
* 18/04/03 修复 LogUtils 在 Android Studio 3.1 版本日志丑陋的问题，发布 1.13.7 版本

‎utilcode/README-CN.md

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

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

88

‎utilcode/README.md

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

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

88

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

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

33
import android.app.Activity;
4-
import android.app.ActivityManager;
54
import android.content.ComponentName;
65
import android.content.Context;
76
import android.content.Intent;
@@ -55,7 +54,7 @@ public static boolean isActivityExists(@NonNull final String pkg,
5554
* @param clz The activity class.
5655
*/
5756
public static void startActivity(@NonNull final Class<?> clz) {
58-
Context context = getActivityOrApp();
57+
Context context = Utils.getTopActivityOrApp();
5958
startActivity(context, null, context.getPackageName(), clz.getName(), null);
6059
}
6160

@@ -67,7 +66,7 @@ public static void startActivity(@NonNull final Class<?> clz) {
6766
*/
6867
public static void startActivity(@NonNull final Class<?> clz,
6968
@Nullable final Bundle options) {
70-
Context context = getActivityOrApp();
69+
Context context = Utils.getTopActivityOrApp();
7170
startActivity(context, null, context.getPackageName(), clz.getName(), options);
7271
}
7372

@@ -83,7 +82,7 @@ public static void startActivity(@NonNull final Class<?> clz,
8382
public static void startActivity(@NonNull final Class<?> clz,
8483
@AnimRes final int enterAnim,
8584
@AnimRes final int exitAnim) {
86-
Context context = getActivityOrApp();
85+
Context context = Utils.getTopActivityOrApp();
8786
startActivity(context, null, context.getPackageName(), clz.getName(),
8887
getOptionsBundle(context, enterAnim, exitAnim));
8988
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
@@ -144,7 +143,6 @@ public static void startActivity(@NonNull final Activity activity,
144143
@NonNull final Class<?> clz,
145144
@AnimRes final int enterAnim,
146145
@AnimRes final int exitAnim) {
147-
148146
startActivity(activity, null, activity.getPackageName(), clz.getName(),
149147
getOptionsBundle(activity, enterAnim, exitAnim));
150148
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
@@ -160,7 +158,7 @@ public static void startActivity(@NonNull final Activity activity,
160158
*/
161159
public static void startActivity(@NonNull final Bundle extras,
162160
@NonNull final Class<?> clz) {
163-
Context context = getActivityOrApp();
161+
Context context = Utils.getTopActivityOrApp();
164162
startActivity(context, extras, context.getPackageName(), clz.getName(), null);
165163
}
166164

@@ -174,7 +172,7 @@ public static void startActivity(@NonNull final Bundle extras,
174172
public static void startActivity(@NonNull final Bundle extras,
175173
@NonNull final Class<?> clz,
176174
@NonNull final Bundle options) {
177-
Context context = getActivityOrApp();
175+
Context context = Utils.getTopActivityOrApp();
178176
startActivity(context, extras, context.getPackageName(), clz.getName(), options);
179177
}
180178

@@ -192,7 +190,7 @@ public static void startActivity(@NonNull final Bundle extras,
192190
@NonNull final Class<?> clz,
193191
@AnimRes final int enterAnim,
194192
@AnimRes final int exitAnim) {
195-
Context context = getActivityOrApp();
193+
Context context = Utils.getTopActivityOrApp();
196194
startActivity(context, extras, context.getPackageName(), clz.getName(),
197195
getOptionsBundle(context, enterAnim, exitAnim));
198196
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
@@ -276,7 +274,7 @@ public static void startActivity(@NonNull final Bundle extras,
276274
*/
277275
public static void startActivity(@NonNull final String pkg,
278276
@NonNull final String cls) {
279-
startActivity(getActivityOrApp(), null, pkg, cls, null);
277+
startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, null);
280278
}
281279

282280
/**
@@ -289,7 +287,7 @@ public static void startActivity(@NonNull final String pkg,
289287
public static void startActivity(@NonNull final String pkg,
290288
@NonNull final String cls,
291289
@Nullable final Bundle options) {
292-
startActivity(getActivityOrApp(), null, pkg, cls, options);
290+
startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, options);
293291
}
294292

295293
/**
@@ -306,7 +304,7 @@ public static void startActivity(@NonNull final String pkg,
306304
@NonNull final String cls,
307305
@AnimRes final int enterAnim,
308306
@AnimRes final int exitAnim) {
309-
Context context = getActivityOrApp();
307+
Context context = Utils.getTopActivityOrApp();
310308
startActivity(context, null, pkg, cls, getOptionsBundle(context, enterAnim, exitAnim));
311309
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
312310
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -389,7 +387,7 @@ public static void startActivity(@NonNull final Activity activity,
389387
public static void startActivity(@NonNull final Bundle extras,
390388
@NonNull final String pkg,
391389
@NonNull final String cls) {
392-
startActivity(getActivityOrApp(), extras, pkg, cls, null);
390+
startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, null);
393391
}
394392

395393
/**
@@ -404,7 +402,7 @@ public static void startActivity(@NonNull final Bundle extras,
404402
@NonNull final String pkg,
405403
@NonNull final String cls,
406404
@NonNull final Bundle options) {
407-
startActivity(getActivityOrApp(), extras, pkg, cls, options);
405+
startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, options);
408406
}
409407

410408
/**
@@ -423,7 +421,7 @@ public static void startActivity(@NonNull final Bundle extras,
423421
@NonNull final String cls,
424422
@AnimRes final int enterAnim,
425423
@AnimRes final int exitAnim) {
426-
Context context = getActivityOrApp();
424+
Context context = Utils.getTopActivityOrApp();
427425
startActivity(context, extras, pkg, cls, getOptionsBundle(context, enterAnim, exitAnim));
428426
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
429427
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -509,7 +507,7 @@ public static void startActivity(@NonNull final Bundle extras,
509507
* @param intent The description of the activity to start.
510508
*/
511509
public static void startActivity(@NonNull final Intent intent) {
512-
startActivity(intent, getActivityOrApp(), null);
510+
startActivity(intent, Utils.getTopActivityOrApp(), null);
513511
}
514512

515513
/**
@@ -520,7 +518,7 @@ public static void startActivity(@NonNull final Intent intent) {
520518
*/
521519
public static void startActivity(@NonNull final Intent intent,
522520
@NonNull final Bundle options) {
523-
startActivity(intent, getActivityOrApp(), options);
521+
startActivity(intent, Utils.getTopActivityOrApp(), options);
524522
}
525523

526524
/**
@@ -535,7 +533,7 @@ public static void startActivity(@NonNull final Intent intent,
535533
public static void startActivity(@NonNull final Intent intent,
536534
@AnimRes final int enterAnim,
537535
@AnimRes final int exitAnim) {
538-
Context context = getActivityOrApp();
536+
Context context = Utils.getTopActivityOrApp();
539537
startActivity(intent, context, getOptionsBundle(context, enterAnim, exitAnim));
540538
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
541539
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -606,7 +604,7 @@ public static void startActivity(@NonNull final Activity activity,
606604
* @param intents The descriptions of the activities to start.
607605
*/
608606
public static void startActivities(@NonNull final Intent[] intents) {
609-
startActivities(intents, getActivityOrApp(), null);
607+
startActivities(intents, Utils.getTopActivityOrApp(), null);
610608
}
611609

612610
/**
@@ -617,7 +615,7 @@ public static void startActivities(@NonNull final Intent[] intents) {
617615
*/
618616
public static void startActivities(@NonNull final Intent[] intents,
619617
@Nullable final Bundle options) {
620-
startActivities(intents, getActivityOrApp(), options);
618+
startActivities(intents, Utils.getTopActivityOrApp(), options);
621619
}
622620

623621
/**
@@ -632,7 +630,7 @@ public static void startActivities(@NonNull final Intent[] intents,
632630
public static void startActivities(@NonNull final Intent[] intents,
633631
@AnimRes final int enterAnim,
634632
@AnimRes final int exitAnim) {
635-
Context context = getActivityOrApp();
633+
Context context = Utils.getTopActivityOrApp();
636634
startActivities(intents, context, getOptionsBundle(context, enterAnim, exitAnim));
637635
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN && context instanceof Activity) {
638636
((Activity) context).overridePendingTransition(enterAnim, exitAnim);
@@ -1161,28 +1159,28 @@ public static Drawable getActivityLogo(final ComponentName activityName) {
11611159
}
11621160
}
11631161

1164-
private static Context getActivityOrApp() {
1165-
if (isAppForeground()) {
1166-
Activity topActivity = getTopActivity();
1167-
return topActivity == null ? Utils.getApp() : topActivity;
1168-
} else {
1169-
return Utils.getApp();
1170-
}
1171-
}
1172-
1173-
private static boolean isAppForeground() {
1174-
ActivityManager am =
1175-
(ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
1176-
if (am == null) return false;
1177-
List<ActivityManager.RunningAppProcessInfo> info = am.getRunningAppProcesses();
1178-
if (info == null || info.size() == 0) return false;
1179-
for (ActivityManager.RunningAppProcessInfo aInfo : info) {
1180-
if (aInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
1181-
return aInfo.processName.equals(Utils.getApp().getPackageName());
1182-
}
1183-
}
1184-
return false;
1185-
}
1162+
// private static Context getTopActivityOrApp() {
1163+
// if (isAppForeground()) {
1164+
// Activity topActivity = getTopActivity();
1165+
// return topActivity == null ? Utils.getApp() : topActivity;
1166+
// } else {
1167+
// return Utils.getApp();
1168+
// }
1169+
// }
1170+
//
1171+
// private static boolean isAppForeground() {
1172+
// ActivityManager am =
1173+
// (ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
1174+
// if (am == null) return false;
1175+
// List<ActivityManager.RunningAppProcessInfo> info = am.getRunningAppProcesses();
1176+
// if (info == null || info.size() == 0) return false;
1177+
// for (ActivityManager.RunningAppProcessInfo aInfo : info) {
1178+
// if (aInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
1179+
// return aInfo.processName.equals(Utils.getApp().getPackageName());
1180+
// }
1181+
// }
1182+
// return false;
1183+
// }
11861184

11871185
private static void startActivity(final Context context,
11881186
final Bundle extras,

0 commit comments

Comments
 (0)