Skip to content

Commit 9bafcbf

Browse files
BlankjBlankj
committed
see 04/18 log
1 parent 54c0f2f commit 9bafcbf

File tree

12 files changed

+73
-97
lines changed

12 files changed

+73
-97
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.12-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.13-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.12-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.13.13-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.12'
60+
// implementation 'com.blankj:utilcode:1.13.13'
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_012
37-
version_name = '1.13.12'// E.g 1.9.72 => 1,009,072
36+
version_code = 1_013_013
37+
version_name = '1.13.13'// 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/18 修复 LogUtils 头部空指针异常，SPUtils、CacheUtils 存储空值异常，发布 1.13.13 版本
12
* 18/04/17 修复 ToastUtils 内存泄漏问题，感谢 [LambertCoding](https://github.com/LambertCoding)，发布 1.13.12 版本
23
* 18/04/16 完善 AppUtils#installAppSilent 路径包含空格问题，发布 1.13.11 版本
34
* 18/04/10 完善 OnCrashListener 回调崩溃信息，发布 1.13.10 版本

‎utilcode/README-CN.md

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

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.13.12'
5+
implementation 'com.blankj:utilcode:1.13.13'
66
```
77

88

99
## How to use
1010

11-
```
11+
```java
1212
// init it in the function of onCreate in ur Application
1313
Utils.init(application);
1414
```

‎utilcode/README.md

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

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.13.12'
5+
implementation 'com.blankj:utilcode:1.13.13'
66
```
77

88

99
## How to use
1010

11-
```
11+
```java
1212
// init it in the function of onCreate in ur Application
1313
Utils.init(application);
1414
```

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

Lines changed: 23 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.os.Bundle;
1212
import android.support.annotation.AnimRes;
1313
import android.support.annotation.NonNull;
14-
import android.support.annotation.Nullable;
1514
import android.support.v4.app.ActivityOptionsCompat;
1615
import android.support.v4.util.Pair;
1716
import android.view.View;
@@ -65,7 +64,7 @@ public static void startActivity(@NonNull final Class<?> clz) {
6564
* @param options Additional options for how the Activity should be started.
6665
*/
6766
public static void startActivity(@NonNull final Class<?> clz,
68-
@Nullable final Bundle options) {
67+
final Bundle options) {
6968
Context context = Utils.getTopActivityOrApp();
7069
startActivity(context, null, context.getPackageName(), clz.getName(), options);
7170
}
@@ -110,7 +109,7 @@ public static void startActivity(@NonNull final Activity activity,
110109
*/
111110
public static void startActivity(@NonNull final Activity activity,
112111
@NonNull final Class<?> clz,
113-
@Nullable final Bundle options) {
112+
final Bundle options) {
114113
startActivity(activity, null, activity.getPackageName(), clz.getName(), options);
115114
}
116115

@@ -124,7 +123,7 @@ public static void startActivity(@NonNull final Activity activity,
124123
*/
125124
public static void startActivity(@NonNull final Activity activity,
126125
@NonNull final Class<?> clz,
127-
@NonNull final View... sharedElements) {
126+
final View... sharedElements) {
128127
startActivity(activity, null, activity.getPackageName(), clz.getName(),
129128
getOptionsBundle(activity, sharedElements));
130129
}
@@ -238,7 +237,7 @@ public static void startActivity(@NonNull final Bundle extras,
238237
public static void startActivity(@NonNull final Bundle extras,
239238
@NonNull final Activity activity,
240239
@NonNull final Class<?> clz,
241-
@NonNull final View... sharedElements) {
240+
final View... sharedElements) {
242241
startActivity(activity, extras, activity.getPackageName(), clz.getName(),
243242
getOptionsBundle(activity, sharedElements));
244243
}
@@ -286,7 +285,7 @@ public static void startActivity(@NonNull final String pkg,
286285
*/
287286
public static void startActivity(@NonNull final String pkg,
288287
@NonNull final String cls,
289-
@Nullable final Bundle options) {
288+
final Bundle options) {
290289
startActivity(Utils.getTopActivityOrApp(), null, pkg, cls, options);
291290
}
292291

@@ -335,7 +334,7 @@ public static void startActivity(@NonNull final Activity activity,
335334
public static void startActivity(@NonNull final Activity activity,
336335
@NonNull final String pkg,
337336
@NonNull final String cls,
338-
@Nullable final Bundle options) {
337+
final Bundle options) {
339338
startActivity(activity, null, pkg, cls, options);
340339
}
341340

@@ -351,7 +350,7 @@ public static void startActivity(@NonNull final Activity activity,
351350
public static void startActivity(@NonNull final Activity activity,
352351
@NonNull final String pkg,
353352
@NonNull final String cls,
354-
@NonNull final View... sharedElements) {
353+
final View... sharedElements) {
355354
startActivity(activity, null, pkg, cls, getOptionsBundle(activity, sharedElements));
356355
}
357356

@@ -401,7 +400,7 @@ public static void startActivity(@NonNull final Bundle extras,
401400
public static void startActivity(@NonNull final Bundle extras,
402401
@NonNull final String pkg,
403402
@NonNull final String cls,
404-
@NonNull final Bundle options) {
403+
final Bundle options) {
405404
startActivity(Utils.getTopActivityOrApp(), extras, pkg, cls, options);
406405
}
407406

@@ -456,7 +455,7 @@ public static void startActivity(@NonNull final Bundle extras,
456455
@NonNull final Activity activity,
457456
@NonNull final String pkg,
458457
@NonNull final String cls,
459-
@NonNull final Bundle options) {
458+
final Bundle options) {
460459
startActivity(activity, extras, pkg, cls, options);
461460
}
462461

@@ -474,7 +473,7 @@ public static void startActivity(@NonNull final Bundle extras,
474473
@NonNull final Activity activity,
475474
@NonNull final String pkg,
476475
@NonNull final String cls,
477-
@NonNull final View... sharedElements) {
476+
final View... sharedElements) {
478477
startActivity(activity, extras, pkg, cls, getOptionsBundle(activity, sharedElements));
479478
}
480479

@@ -560,7 +559,7 @@ public static void startActivity(@NonNull final Activity activity,
560559
*/
561560
public static void startActivity(@NonNull final Activity activity,
562561
@NonNull final Intent intent,
563-
@Nullable final Bundle options) {
562+
final Bundle options) {
564563
startActivity(intent, activity, options);
565564
}
566565

@@ -574,7 +573,7 @@ public static void startActivity(@NonNull final Activity activity,
574573
*/
575574
public static void startActivity(@NonNull final Activity activity,
576575
@NonNull final Intent intent,
577-
@NonNull final View... sharedElements) {
576+
final View... sharedElements) {
578577
startActivity(intent, activity, getOptionsBundle(activity, sharedElements));
579578
}
580579

@@ -614,7 +613,7 @@ public static void startActivities(@NonNull final Intent[] intents) {
614613
* @param options Additional options for how the Activity should be started.
615614
*/
616615
public static void startActivities(@NonNull final Intent[] intents,
617-
@Nullable final Bundle options) {
616+
final Bundle options) {
618617
startActivities(intents, Utils.getTopActivityOrApp(), options);
619618
}
620619

@@ -657,7 +656,7 @@ public static void startActivities(@NonNull final Activity activity,
657656
*/
658657
public static void startActivities(@NonNull final Activity activity,
659658
@NonNull final Intent[] intents,
660-
@Nullable final Bundle options) {
659+
final Bundle options) {
661660
startActivities(intents, activity, options);
662661
}
663662

@@ -1159,29 +1158,6 @@ public static Drawable getActivityLogo(final ComponentName activityName) {
11591158
}
11601159
}
11611160

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-
// }
1184-
11851161
private static void startActivity(final Context context,
11861162
final Bundle extras,
11871163
final String pkg,
@@ -1229,15 +1205,15 @@ private static Bundle getOptionsBundle(final Context context,
12291205

12301206
private static Bundle getOptionsBundle(final Activity activity,
12311207
final View[] sharedElements) {
1232-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
1233-
int len = sharedElements.length;
1234-
@SuppressWarnings("unchecked")
1235-
Pair<View, String>[] pairs = new Pair[len];
1236-
for (int i = 0; i < len; i++) {
1237-
pairs[i] = Pair.create(sharedElements[i], sharedElements[i].getTransitionName());
1238-
}
1239-
return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, pairs).toBundle();
1208+
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) return null;
1209+
if (sharedElements == null) return null;
1210+
int len = sharedElements.length;
1211+
if (len <= 0) return null;
1212+
@SuppressWarnings("unchecked")
1213+
Pair<View, String>[] pairs = new Pair[len];
1214+
for (int i = 0; i < len; i++) {
1215+
pairs[i] = Pair.create(sharedElements[i], sharedElements[i].getTransitionName());
12401216
}
1241-
return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, null, null).toBundle();
1217+
return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, pairs).toBundle();
12421218
}
12431219
}

0 commit comments

Comments
 (0)