Skip to content

Commit f5cda0e

Browse files
BlankjBlankj
committed
Merge branch '1.24.7'
2 parents 2187f06 + 96a3d02 commit f5cda0e

File tree

10 files changed

+60
-31
lines changed

10 files changed

+60
-31
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/06/30` [add] LanguageUtils support activity's class name. Publish v1.24.7.
12
* `19/06/29` [add] ClickUtils#OnMultiClickListener, and remove dangerous function. Publish v1.24.6.
23
* `19/06/28` [add] LanguageUtils. Publish v1.24.5.
34
* `19/06/20` [fix] BusUtils' permission. Publish v1.24.4.

‎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.24.6-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-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.24.6-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.7-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎gradle/config/config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gradle.ext {
88
compileSdkVersion = 27
99
minSdkVersion = 14
1010
targetSdkVersion = 27
11-
versionCode = 1_024_006
12-
versionName = '1.24.6'// E.g. 1.9.72 => 1,009,072
11+
versionCode = 1_024_007
12+
versionName = '1.24.7'// E.g. 1.9.72 => 1,009,072
1313

1414
// lib version
1515
kotlin_version = '1.3.10'

‎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.24.6'
5+
implementation 'com.blankj:utilcode:1.24.7'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.24.6'
8+
implementation 'com.blankj:utilcodex:1.24.7'
99
```
1010

1111

‎utilcode/README-STATIC-BUS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
2727
给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
2828

2929
```groovy
30-
api "com.blankj:utilcode:1.24.6"
30+
api "com.blankj:utilcode:1.24.7"
3131
```
3232

3333
比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

‎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.24.6'
5+
implementation 'com.blankj:utilcode:1.24.7'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.24.6'
8+
implementation 'com.blankj:utilcodex:1.24.7'
99
```
1010

1111

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

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,57 @@ private LanguageUtils() {
3636
/**
3737
* Apply the system language.
3838
*
39-
* @param mainActivityClz The class of activity will be started after apply system language.
39+
* @param activityClz The class of activity will be started after apply system language.
4040
*/
41-
public static void applySystemLanguage(final Class<? extends Activity> mainActivityClz) {
42-
applyLanguage(Resources.getSystem().getConfiguration().locale, mainActivityClz, true);
41+
public static void applySystemLanguage(final Class<? extends Activity> activityClz) {
42+
applyLanguage(Resources.getSystem().getConfiguration().locale, activityClz, true);
43+
}
44+
45+
/**
46+
* Apply the system language.
47+
*
48+
* @param activityClassName The full class name of activity will be started after apply system language.
49+
*/
50+
public static void applySystemLanguage(final String activityClassName) {
51+
applyLanguage(Resources.getSystem().getConfiguration().locale, activityClassName, true);
4352
}
4453

4554
/**
4655
* Apply the language.
4756
*
48-
* @param locale The language of locale.
49-
* @param mainActivityClz The class of activity will be started after apply system language.
50-
* It will start the launcher activity if the class is null.
57+
* @param locale The language of locale.
58+
* @param activityClz The class of activity will be started after apply system language.
59+
* It will start the launcher activity if the class is null.
5160
*/
5261
public static void applyLanguage(@NonNull final Locale locale,
53-
final Class<? extends Activity> mainActivityClz) {
54-
applyLanguage(locale, mainActivityClz, false);
62+
final Class<? extends Activity> activityClz) {
63+
applyLanguage(locale, activityClz, false);
64+
}
65+
66+
/**
67+
* Apply the language.
68+
*
69+
* @param locale The language of locale.
70+
* @param activityClassName The class of activity will be started after apply system language.
71+
* It will start the launcher activity if the class name is null.
72+
*/
73+
public static void applyLanguage(@NonNull final Locale locale,
74+
final String activityClassName) {
75+
applyLanguage(locale, activityClassName, false);
76+
}
77+
78+
private static void applyLanguage(@NonNull final Locale locale,
79+
final Class<? extends Activity> activityClz,
80+
final boolean isFollowSystem) {
81+
if (activityClz == null) {
82+
applyLanguage(locale, "", isFollowSystem);
83+
return;
84+
}
85+
applyLanguage(locale, activityClz.getName(), isFollowSystem);
5586
}
5687

5788
private static void applyLanguage(@NonNull final Locale locale,
58-
final Class<? extends Activity> mainActivityClz,
89+
final String activityClassName,
5990
final boolean isFollowSystem) {
6091
if (isFollowSystem) {
6192
SPUtils.getInstance().put(KEY_LOCALE, "");
@@ -67,13 +98,10 @@ private static void applyLanguage(@NonNull final Locale locale,
6798

6899
updateLanguage(Utils.getApp(), locale);
69100

70-
Intent intent;
71-
if (mainActivityClz == null) {
72-
intent = new Intent();
73-
intent.setComponent(new ComponentName(Utils.getApp(), getLauncherActivity()));
74-
} else {
75-
intent = new Intent(Utils.getApp(), mainActivityClz);
76-
}
101+
Intent intent = new Intent();
102+
String realActivityClassName
103+
= TextUtils.isEmpty(activityClassName) ? getLauncherActivity() : activityClassName;
104+
intent.setComponent(new ComponentName(Utils.getApp(), realActivityClassName));
77105
intent.addFlags(
78106
Intent.FLAG_ACTIVITY_NEW_TASK
79107
| Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK

‎utilcode/lib/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* desc : test TimeUtils
2424
* </pre>
2525
*/
26-
public class TimeUtilsTest {
26+
public class TimeUtilsTest {
2727

2828
private final DateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
2929
private final DateFormat mFormat = new SimpleDateFormat("yyyy MM dd HH:mm:ss", Locale.getDefault());
@@ -56,14 +56,14 @@ public void string2Millis() {
5656
public void string2Date() {
5757
assertEquals(timeDate, TimeUtils.string2Date(timeString));
5858
assertEquals(timeDate, TimeUtils.string2Date(timeStringFormat, mFormat));
59-
assertEquals(timeDate, TimeUtils.string2Date(timeStringFormat, "yyyy-MM-dd HH:mm:ss"));
59+
assertEquals(timeDate, TimeUtils.string2Date(timeStringFormat, "yyyy MM dd HH:mm:ss"));
6060
}
6161

6262
@Test
6363
public void date2String() {
6464
assertEquals(timeString, TimeUtils.date2String(timeDate));
6565
assertEquals(timeStringFormat, TimeUtils.date2String(timeDate, mFormat));
66-
assertEquals(timeStringFormat, TimeUtils.date2String(timeDate, "yyyy-MM-dd HH:mm:ss"));
66+
assertEquals(timeStringFormat, TimeUtils.date2String(timeDate, "yyyy MM dd HH:mm:ss"));
6767
}
6868

6969
@Test

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/language/LanguageActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class LanguageActivity : CommonTitleActivity() {
5454
when (view.id) {
5555
R.id.languageApp -> ToastUtils.showLong(R.string.language)
5656
R.id.languageActivity -> ToastUtils.showLong(getString(R.string.language))
57-
R.id.applySimpleChineseLanguage -> LanguageUtils.applyLanguage(Locale.SIMPLIFIED_CHINESE, null)
58-
R.id.applyAmericanLanguage -> LanguageUtils.applyLanguage(Locale.US, null)
59-
R.id.applySystemLanguage -> LanguageUtils.applySystemLanguage(null)
57+
R.id.applySimpleChineseLanguage -> LanguageUtils.applyLanguage(Locale.SIMPLIFIED_CHINESE, "com.blankj.launcher.pkg.MainActivity")
58+
R.id.applyAmericanLanguage -> LanguageUtils.applyLanguage(Locale.US, "")
59+
R.id.applySystemLanguage -> LanguageUtils.applySystemLanguage("")
6060
}
6161
}
6262
}

0 commit comments

Comments
 (0)