Skip to content

Commit 538d76c

Browse files
BlankjBlankj
committed
see 10/25 log
1 parent f06baa3 commit 538d76c

File tree

81 files changed

+2500
-1460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2500
-1460
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
* `20/09/06` [add] DebouncingUtils.
1+
* `20/10/24` [add] Publish v1.30.0.
2+
* `20/10/23` [fix] LanguageUtils crash on some device.
3+
* `20/10/21` [add] LogUtils.Config#setOnConsoleOutputListener, setOnFileOutputListener, addFileExtraHead. LogUtils.getCurrentLogFilePath.
4+
* `20/10/20` [opt] ToastUtils.
5+
* `20/10/12` [add] PermissionUtils#explain.
6+
* `20/10/10` [add] ClipboardUtils.
7+
* `20/10/08` [add] VolumeUtils.
8+
* `20/09/06` [add] DebouncingUtils#isValid.
29
* `20/09/04` [fix] ToastUtils adapt SDK 30.
310
* `20/05/28` [fix] IntentUtils#getInstallAppIntent file exist wrong. Publish v1.29.0.
411
* `20/05/23` [fix] BusUtils#postSticky times not right. Publish v1.28.6.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 29
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 29
17-
static versionCode = 1_029_000
18-
static versionName = '1.29.0'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_030_000
18+
static versionName = '1.30.0'// E.g. 1.9.72 => 1,009,072
1919

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

‎feature/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.blankj.launcher.app;
22

3-
import android.content.Context;
4-
53
import com.blankj.common.CommonApplication;
6-
import com.blankj.utilcode.util.ResourceUtils;
74

85
/**
96
* <pre>
@@ -21,11 +18,6 @@ public static LauncherApp getInstance() {
2118
return sInstance;
2219
}
2320

24-
@Override
25-
protected void attachBaseContext(Context base) {
26-
super.attachBaseContext(base);
27-
}
28-
2921
@Override
3022
public void onCreate() {
3123
super.onCreate();

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,15 @@ class DangerousActivity : CommonActivity() {
8787
CommonItemClick(R.string.dangerous_reboot_to_bootloader) {
8888
ToastUtils.showShort(DangerousUtils.reboot2Bootloader().toString())
8989
},
90-
CommonItemSwitch(R.string.dangerous_data_enabled, Utils.Supplier {
91-
NetworkUtils.getMobileDataEnabled()
92-
}, Utils.Consumer {
93-
if (AppUtils.isAppSystem()) {
94-
DangerousUtils.setMobileDataEnabled(it)
95-
}
96-
}),
90+
CommonItemSwitch(
91+
R.string.dangerous_data_enabled,
92+
{ NetworkUtils.getMobileDataEnabled() },
93+
{
94+
if (AppUtils.isAppSystem()) {
95+
DangerousUtils.setMobileDataEnabled(it)
96+
}
97+
}
98+
),
9799
CommonItemClick(R.string.dangerous_send_sms_silent) {
98100
DangerousUtils.sendSmsSilent("10000", "sendSmsSilent")
99101
}

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ import com.blankj.utilcode.util.PermissionUtils
2424
*/
2525
class LocationActivity : CommonActivity() {
2626

27+
private var lastLatitude: String = "unknown"
28+
private var lastLongitude: String = "unknown"
29+
private var latitude: String = "unknown"
30+
private var longitude: String = "unknown"
31+
private var country: String = "unknown"
32+
private var locality: String = "unknown"
33+
private var street: String = "unknown"
34+
2735
companion object {
2836
fun start(context: Context) {
2937
PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
@@ -48,18 +56,17 @@ class LocationActivity : CommonActivity() {
4856
mLocationService.setOnGetLocationListener(object : LocationService.OnGetLocationListener {
4957
override fun getLocation(lastLatitude: String, lastLongitude: String, latitude: String,
5058
longitude: String, country: String, locality: String, street: String) {
59+
this@LocationActivity.apply {
60+
this.lastLatitude = lastLatitude
61+
this.lastLongitude = lastLongitude
62+
this.latitude = latitude
63+
this.longitude = longitude
64+
this.country = country
65+
this.locality = locality
66+
this.street = street
67+
}
5168
runOnUiThread {
52-
itemsView.updateItems(
53-
CollectionUtils.newArrayList<CommonItem<*>>(
54-
CommonItemTitle("lastLatitude", lastLatitude),
55-
CommonItemTitle("lastLongitude", lastLongitude),
56-
CommonItemTitle("latitude", latitude),
57-
CommonItemTitle("longitude", longitude),
58-
CommonItemTitle("getCountryName", country),
59-
CommonItemTitle("getLocality", locality),
60-
CommonItemTitle("getStreet", street)
61-
)
62-
)
69+
itemsView.updateItems(bindItems())
6370
}
6471
}
6572
})
@@ -72,13 +79,13 @@ class LocationActivity : CommonActivity() {
7279

7380
override fun bindItems(): MutableList<CommonItem<*>> {
7481
return CollectionUtils.newArrayList(
75-
CommonItemTitle("lastLatitude", "unknown"),
76-
CommonItemTitle("lastLongitude", "unknown"),
77-
CommonItemTitle("latitude", "unknown"),
78-
CommonItemTitle("longitude", "unknown"),
79-
CommonItemTitle("getCountryName", "unknown"),
80-
CommonItemTitle("getLocality", "unknown"),
81-
CommonItemTitle("getStreet", "unknown")
82+
CommonItemTitle("lastLatitude", lastLatitude),
83+
CommonItemTitle("lastLongitude", lastLongitude),
84+
CommonItemTitle("latitude", latitude),
85+
CommonItemTitle("longitude", longitude),
86+
CommonItemTitle("getCountryName", country),
87+
CommonItemTitle("getLocality", locality),
88+
CommonItemTitle("getStreet", street)
8289
)
8390
}
8491

‎feature/utilcode/pkg/src/main/AndroidManifest.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@
139139
android:name=".feature.click.ClickActivity"
140140
android:configChanges="orientation|keyboardHidden|screenSize"
141141
android:launchMode="singleTop" />
142+
<activity
143+
android:name=".feature.clipboard.ClipboardActivity"
144+
android:configChanges="orientation|keyboardHidden|screenSize"
145+
android:launchMode="singleTop" />
142146
<activity
143147
android:name=".feature.device.DeviceActivity"
144148
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -190,7 +194,7 @@
190194
android:launchMode="singleTop">
191195
<meta-data
192196
android:name="activity_meta_data"
193-
android:value="ActivityMetaData" />
197+
android:value="D1234567890123456789012345678901234567890" />
194198
</activity>
195199
<activity
196200
android:name=".feature.mvp.MvpActivity"
@@ -257,8 +261,7 @@
257261
android:launchMode="singleTop" />
258262
<activity
259263
android:name=".feature.toast.ToastActivity"
260-
android:configChanges="orientation|keyboardHidden|screenSize"
261-
android:launchMode="singleTop" />
264+
android:configChanges="orientation|keyboardHidden|screenSize" />
262265
<activity
263266
android:name=".feature.uiMessage.UiMessageActivity"
264267
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -267,6 +270,10 @@
267270
android:name=".feature.vibrate.VibrateActivity"
268271
android:configChanges="orientation|keyboardHidden|screenSize"
269272
android:launchMode="singleTop" />
273+
<activity
274+
android:name=".feature.volume.VolumeActivity"
275+
android:configChanges="orientation|keyboardHidden|screenSize"
276+
android:launchMode="singleTop" />
270277

271278
<meta-data
272279
android:name="app_meta_data"

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.blankj.utilcode.pkg.feature.brightness.BrightnessActivity
1717
import com.blankj.utilcode.pkg.feature.bus.BusActivity
1818
import com.blankj.utilcode.pkg.feature.clean.CleanActivity
1919
import com.blankj.utilcode.pkg.feature.click.ClickActivity
20+
import com.blankj.utilcode.pkg.feature.clipboard.ClipboardActivity
2021
import com.blankj.utilcode.pkg.feature.device.DeviceActivity
2122
import com.blankj.utilcode.pkg.feature.file.FileActivity
2223
import com.blankj.utilcode.pkg.feature.flashlight.FlashlightActivity
@@ -47,8 +48,11 @@ import com.blankj.utilcode.pkg.feature.span.SpanActivity
4748
import com.blankj.utilcode.pkg.feature.toast.ToastActivity
4849
import com.blankj.utilcode.pkg.feature.uiMessage.UiMessageActivity
4950
import com.blankj.utilcode.pkg.feature.vibrate.VibrateActivity
51+
import com.blankj.utilcode.pkg.feature.volume.VolumeActivity
52+
import com.blankj.utilcode.pkg.helper.DialogHelper
5053
import com.blankj.utilcode.util.CollectionUtils
5154
import com.blankj.utilcode.util.LogUtils
55+
import com.blankj.utilcode.util.ThreadUtils
5256
import com.blankj.utilcode.util.UtilsTransActivity
5357

5458
/**
@@ -76,6 +80,9 @@ class CoreUtilActivity : CommonActivity() {
7680
return CollectionUtils.newArrayList(
7781
CommonItemClick(R.string.demo_activity, true) {
7882
ActivityActivity.start(this)
83+
ThreadUtils.runOnUiThreadDelayed(Runnable {
84+
85+
}, 2000)
7986
},
8087
CommonItemClick(R.string.demo_adapt_screen, true) {
8188
AdaptScreenActivity.start(this)
@@ -101,6 +108,9 @@ class CoreUtilActivity : CommonActivity() {
101108
CommonItemClick(R.string.demo_click, true) {
102109
ClickActivity.start(this)
103110
},
111+
CommonItemClick(R.string.demo_clipboard, true) {
112+
ClipboardActivity.start(this)
113+
},
104114
CommonItemClick(R.string.demo_crash) {
105115
throw NullPointerException("crash test")
106116
},
@@ -202,6 +212,9 @@ class CoreUtilActivity : CommonActivity() {
202212
},
203213
CommonItemClick(R.string.demo_vibrate, true) {
204214
VibrateActivity.start(this)
215+
},
216+
CommonItemClick(R.string.demo_volume, true) {
217+
VolumeActivity.start(this)
205218
}
206219
)
207220
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/api/ApiActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package com.blankj.utilcode.pkg.feature.api
33
import android.content.Context
44
import android.content.Intent
55
import com.blankj.common.activity.CommonActivity
6-
import com.blankj.common.activity.CommonActivityItemsView
7-
import com.blankj.common.activity.CommonActivityTitleView
86
import com.blankj.common.item.CommonItem
97
import com.blankj.common.item.CommonItemClick
108
import com.blankj.utilcode.pkg.R
@@ -34,7 +32,7 @@ class ApiActivity : CommonActivity() {
3432
return R.string.demo_api
3533
}
3634

37-
override fun bindItems(): List<CommonItem<*>> {
35+
override fun bindItems(): MutableList<CommonItem<*>> {
3836
return CollectionUtils.newArrayList(
3937
CommonItemClick(R.string.api_invoke_with_params) {
4038
ApiUtils.getApi(OtherModuleApi::class.java).invokeWithParams(OtherModuleApi.ApiBean("params"))

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AppActivity : CommonActivity() {
5252
LogUtils.e(requestCode, resultCode)
5353
}
5454

55-
override fun bindItems(): List<CommonItem<*>> {
55+
override fun bindItems(): MutableList<CommonItem<*>> {
5656
return CollectionUtils.newArrayList(
5757
CommonItemTitle("isAppRoot", AppUtils.isAppRoot().toString()),
5858
CommonItemTitle("isAppDebug", AppUtils.isAppDebug().toString()),

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/nav/BarNavActivity.kt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,14 @@ class BarNavActivity : CommonActivity() {
4242
if (BarUtils.isSupportNavBar()) {
4343
add(CommonItemSwitch(
4444
R.string.bar_nav_visibility,
45-
Utils.Supplier {
46-
BarUtils.isNavBarVisible(this@BarNavActivity)
47-
},
48-
Utils.Consumer {
49-
BarUtils.setNavBarVisibility(this@BarNavActivity, it)
50-
}
45+
{ BarUtils.isNavBarVisible(this@BarNavActivity) },
46+
{ BarUtils.setNavBarVisibility(this@BarNavActivity, it) }
5147
))
5248

5349
add(CommonItemSwitch(
5450
R.string.bar_nav_light_mode,
55-
Utils.Supplier {
56-
BarUtils.isNavBarLightMode(this@BarNavActivity)
57-
},
58-
Utils.Consumer {
59-
BarUtils.setNavBarLightMode(this@BarNavActivity, it)
60-
}
51+
{ BarUtils.isNavBarLightMode(this@BarNavActivity) },
52+
{ BarUtils.setNavBarLightMode(this@BarNavActivity, it) }
6153
))
6254

6355
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

0 commit comments

Comments
 (0)