Skip to content

Commit 96f4758

Browse files
BlankjBlankj
committed
see 03/31 log
1 parent 480447d commit 96f4758

File tree

81 files changed

+1360
-1089
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

+1360
-1089
lines changed

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

Lines changed: 2 additions & 2 deletions
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.26.1-r5'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.26.1-release0'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'
@@ -52,7 +52,7 @@ class Config {
5252

5353
// 上传新版本插件更新 pluginPath 中的版本号，并设置 isApply = false
5454
// 通过 mavenLocal 上传本地版本，设置 isApply = true 即可应用插件来调试，最后通过 bintrayUpload 来发布插件
55-
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.2-r0", pluginId: "com.blankj.api"),
55+
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.2", pluginId: "com.blankj.api"),
5656
//./gradlew plugin:plugin_api-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
5757
//./gradlew plugin:plugin_api-gradle-plugin:bintrayUpload // 上传到 jcenter
5858
plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.4", pluginId: "com.blankj.bus"),

‎buildSrc/src/main/java/com/blankj/plugin/readme/FormatUtils.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.blankj.plugin.readme
33
class FormatUtils {
44

55
static def LINE_SEP = System.getProperty("line.separator")
6-
static def LONG_SPACE = " "
6+
static def LONG_SPACE = " "
77

88
static def format(File readmeCN) {
99
def sb = new StringBuilder(),

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828
android:name=".feature.appStore.AppStoreActivity"
2929
android:configChanges="orientation|keyboardHidden|screenSize"
3030
android:launchMode="singleTop" />
31+
<activity
32+
android:name=".feature.battery.BatteryActivity"
33+
android:configChanges="orientation|keyboardHidden|screenSize"
34+
android:launchMode="singleTop" />
3135
<activity
3236
android:name=".feature.country.CountryActivity"
3337
android:configChanges="orientation|keyboardHidden|screenSize"

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ package com.blankj.subutil.pkg.feature
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.subutil.pkg.R
119
import com.blankj.subutil.pkg.feature.appStore.AppStoreActivity
10+
import com.blankj.subutil.pkg.feature.battery.BatteryActivity
1211
import com.blankj.subutil.pkg.feature.country.CountryActivity
1312
import com.blankj.subutil.pkg.feature.dangerous.DangerousActivity
1413
import com.blankj.subutil.pkg.feature.location.LocationActivity
@@ -42,6 +41,9 @@ class SubUtilActivity : CommonActivity() {
4241
CommonItemClick(R.string.demo_app_store, true) {
4342
AppStoreActivity.start(this)
4443
},
44+
CommonItemClick(R.string.demo_battery, true) {
45+
BatteryActivity.start(this)
46+
},
4547
CommonItemClick(R.string.demo_country, true) {
4648
CountryActivity.start(this)
4749
},

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/battery/BatteryActivity.kt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package com.blankj.subutil.pkg.feature.battery
2+
3+
import android.content.Context
4+
import android.content.Intent
5+
import android.os.Bundle
6+
import android.view.View
7+
import com.blankj.common.activity.CommonActivity
8+
import com.blankj.common.item.CommonItem
9+
import com.blankj.common.item.CommonItemTitle
10+
import com.blankj.subutil.pkg.R
11+
import com.blankj.subutil.util.BatteryUtils
12+
import com.blankj.utilcode.util.CollectionUtils
13+
import com.blankj.utilcode.util.ToastUtils
14+
15+
/**
16+
* ```
17+
* author: Blankj
18+
* blog : http://blankj.com
19+
* time : 20/03/31
20+
* desc : demo about Battery
21+
* ```
22+
*/
23+
class BatteryActivity : CommonActivity(), BatteryUtils.OnBatteryStatusChangedListener {
24+
25+
private val titleItem: CommonItemTitle = CommonItemTitle("", true);
26+
27+
companion object {
28+
fun start(context: Context) {
29+
val starter = Intent(context, BatteryActivity::class.java)
30+
context.startActivity(starter)
31+
}
32+
}
33+
34+
override fun bindTitleRes(): Int {
35+
return R.string.demo_battery
36+
}
37+
38+
override fun bindItems(): MutableList<CommonItem<*>> {
39+
return CollectionUtils.newArrayList(titleItem)
40+
}
41+
42+
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
43+
super.initView(savedInstanceState, contentView)
44+
BatteryUtils.registerBatteryStatusChangedListener(this)
45+
}
46+
47+
override fun onBatteryStatusChanged(status: BatteryUtils.Status) {
48+
titleItem.title = status.toString()
49+
ToastUtils.showShort(status.toString())
50+
}
51+
52+
override fun onDestroy() {
53+
super.onDestroy()
54+
BatteryUtils.unregisterBatteryStatusChangedListener(this)
55+
}
56+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DangerousActivity : CommonActivity() {
2424

2525
companion object {
2626
fun start(context: Context) {
27-
PermissionHelper.requestStorageAndSms(object : PermissionHelper.OnPermissionGrantedListener {
27+
PermissionHelper.requestStorageAndSms(context, object : PermissionHelper.OnPermissionGrantedListener {
2828
override fun onPermissionGranted() {
2929
val starter = Intent(context, DangerousActivity::class.java)
3030
context.startActivity(starter)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LocationActivity : CommonActivity() {
2424

2525
companion object {
2626
fun start(context: Context) {
27-
PermissionHelper.requestLocation(object : PermissionHelper.OnPermissionGrantedListener {
27+
PermissionHelper.requestLocation(context, object : PermissionHelper.OnPermissionGrantedListener {
2828
override fun onPermissionGranted() {
2929
val starter = Intent(context, LocationActivity::class.java)
3030
context.startActivity(starter)

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.blankj.subutil.pkg.helper
22

3-
import android.support.v4.app.FragmentActivity
3+
import android.content.Context
44
import android.util.Pair
55
import android.view.View
66
import com.blankj.common.dialog.CommonDialogContent
77
import com.blankj.subutil.pkg.R
8-
import com.blankj.utilcode.util.ActivityUtils
98
import com.blankj.utilcode.util.PermissionUtils
109
import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldRequest
1110
import com.blankj.utilcode.util.StringUtils
@@ -20,9 +19,8 @@ import com.blankj.utilcode.util.StringUtils
2019
*/
2120
object DialogHelper {
2221

23-
fun showRationaleDialog(shouldRequest: ShouldRequest) {
24-
val topActivity = ActivityUtils.getTopActivity() ?: return
25-
CommonDialogContent().init(topActivity as FragmentActivity?,
22+
fun showRationaleDialog(context: Context, shouldRequest: ShouldRequest) {
23+
CommonDialogContent().init(context,
2624
StringUtils.getString(android.R.string.dialog_alert_title),
2725
StringUtils.getString(R.string.permission_rationale_message),
2826
Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
@@ -34,9 +32,8 @@ object DialogHelper {
3432
.show()
3533
}
3634

37-
fun showOpenAppSettingDialog() {
38-
val topActivity = ActivityUtils.getTopActivity() ?: return
39-
CommonDialogContent().init(topActivity as FragmentActivity?,
35+
fun showOpenAppSettingDialog(context: Context) {
36+
CommonDialogContent().init(context,
4037
StringUtils.getString(android.R.string.dialog_alert_title),
4138
StringUtils.getString(R.string.permission_denied_forever_message),
4239
Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/PermissionHelper.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.blankj.subutil.pkg.helper
22

3+
import android.content.Context
34
import com.blankj.utilcode.constant.PermissionConstants
45
import com.blankj.utilcode.util.LogUtils
56
import com.blankj.utilcode.util.PermissionUtils
@@ -14,21 +15,22 @@ import com.blankj.utilcode.util.PermissionUtils
1415
*/
1516
object PermissionHelper {
1617

17-
fun requestStorageAndSms(listener: OnPermissionGrantedListener,
18+
fun requestStorageAndSms(context: Context, listener: OnPermissionGrantedListener,
1819
deniedListener: OnPermissionDeniedListener) {
19-
request(listener, deniedListener, PermissionConstants.STORAGE, PermissionConstants.SMS)
20+
request(context, listener, deniedListener, PermissionConstants.STORAGE, PermissionConstants.SMS)
2021
}
2122

22-
fun requestLocation(listener: OnPermissionGrantedListener,
23+
fun requestLocation(context: Context, listener: OnPermissionGrantedListener,
2324
deniedListener: OnPermissionDeniedListener) {
24-
request(listener, deniedListener, PermissionConstants.LOCATION)
25+
request(context, listener, deniedListener, PermissionConstants.LOCATION)
2526
}
2627

27-
private fun request(grantedListener: OnPermissionGrantedListener?,
28+
private fun request(context: Context,
29+
grantedListener: OnPermissionGrantedListener?,
2830
deniedListener: OnPermissionDeniedListener?,
2931
@PermissionConstants.Permission vararg permissions: String) {
3032
PermissionUtils.permission(*permissions)
31-
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
33+
.rationale { activity, shouldRequest -> DialogHelper.showRationaleDialog(activity, shouldRequest) }
3234
.callback(object : PermissionUtils.FullCallback {
3335
override fun onGranted(permissionsGranted: List<String>) {
3436
LogUtils.d(permissionsGranted)
@@ -38,7 +40,7 @@ object PermissionHelper {
3840
override fun onDenied(permissionsDeniedForever: List<String>, permissionsDenied: List<String>) {
3941
LogUtils.d(permissionsDeniedForever, permissionsDenied)
4042
if (!permissionsDeniedForever.isEmpty()) {
41-
DialogHelper.showOpenAppSettingDialog()
43+
DialogHelper.showOpenAppSettingDialog(context)
4244
return
4345
}
4446
deniedListener?.onPermissionDenied()

‎feature/subutil/pkg/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="demo_app_store">App Store Demo</string>
4+
<string name="demo_battery">Battery Demo</string>
45
<string name="demo_country">Country Demo</string>
56
<string name="demo_dangerous">Dangerous Demo</string>
67
<string name="demo_location">LocationUtils Demo</string>

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.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.app
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.common.item.CommonItemImage
@@ -26,7 +24,7 @@ class AppActivity : CommonActivity() {
2624

2725
companion object {
2826
fun start(context: Context) {
29-
PermissionHelper.requestStorage(object : PermissionHelper.OnPermissionGrantedListener {
27+
PermissionHelper.requestStorage(context, object : PermissionHelper.OnPermissionGrantedListener {
3028
override fun onPermissionGranted() {
3129
val starter = Intent(context, AppActivity::class.java)
3230
context.startActivity(starter)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class FlashlightActivity : CommonActivity() {
2929
ToastUtils.showLong("Didn't support flashlight.")
3030
return
3131
}
32-
PermissionHelper.requestCamera(object : PermissionHelper.OnPermissionGrantedListener {
32+
PermissionHelper.requestCamera(context, object : PermissionHelper.OnPermissionGrantedListener {
3333
override fun onPermissionGranted() {
3434
val starter = Intent(context, FlashlightActivity::class.java)
3535
context.startActivity(starter)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class KeyboardActivity : CommonActivity() {
6767
},
6868
CommonItemClick(R.string.keyboard_show_dialog) {
6969
keyboardEt.clearFocus()
70-
DialogHelper.showKeyboardDialog()
70+
DialogHelper.showKeyboardDialog(this)
7171
}
7272
)
7373
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class NetworkActivity : CommonActivity(), NetworkUtils.OnNetworkStatusChangedLis
5656
CommonItemTitle("getMobileDataEnabled", NetworkUtils.getMobileDataEnabled().toString()),
5757
CommonItemTitle("isMobileData", NetworkUtils.isMobileData().toString()),
5858
CommonItemTitle("is4G", NetworkUtils.is4G().toString()),
59+
CommonItemTitle("is5G", NetworkUtils.is5G().toString()),
5960
CommonItemTitle("isWifiConnected", NetworkUtils.isWifiConnected().toString()),
6061
CommonItemTitle("getNetworkOperatorName", NetworkUtils.getNetworkOperatorName()),
6162
CommonItemTitle("getNetworkTypeName", NetworkUtils.getNetworkType().toString()),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class PermissionActivity : CommonActivity() {
106106

107107
private fun requestCalendar() {
108108
PermissionUtils.permission(PermissionConstants.CALENDAR)
109-
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
109+
.rationale { activity, shouldRequest -> DialogHelper.showRationaleDialog(activity, shouldRequest) }
110110
.callback(object : PermissionUtils.FullCallback {
111111
override fun onGranted(permissionsGranted: List<String>) {
112112
LogUtils.d(permissionsGranted)
@@ -131,7 +131,7 @@ class PermissionActivity : CommonActivity() {
131131

132132
private fun requestRecordAudio() {
133133
PermissionUtils.permission(PermissionConstants.MICROPHONE)
134-
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
134+
.rationale { activity, shouldRequest -> DialogHelper.showRationaleDialog(activity, shouldRequest) }
135135
.callback(object : PermissionUtils.FullCallback {
136136
override fun onGranted(permissionsGranted: List<String>) {
137137
LogUtils.d(permissionsGranted)
@@ -155,7 +155,7 @@ class PermissionActivity : CommonActivity() {
155155

156156
private fun requestCalendarAndRecordAudio() {
157157
PermissionUtils.permission(PermissionConstants.CALENDAR, PermissionConstants.MICROPHONE)
158-
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
158+
.rationale { activity, shouldRequest -> DialogHelper.showRationaleDialog(activity, shouldRequest) }
159159
.callback(object : PermissionUtils.FullCallback {
160160
override fun onGranted(permissionsGranted: List<String>) {
161161
LogUtils.d(permissionsGranted)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class PhoneActivity : CommonActivity() {
2323

2424
companion object {
2525
fun start(context: Context) {
26-
PermissionHelper.requestPhone(object : PermissionHelper.OnPermissionGrantedListener {
26+
PermissionHelper.requestPhone(context, object : PermissionHelper.OnPermissionGrantedListener {
2727
override fun onPermissionGranted() {
2828
val starter = Intent(context, PhoneActivity::class.java)
2929
context.startActivity(starter)

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.blankj.common.item.CommonItem
77
import com.blankj.common.item.CommonItemTitle
88
import com.blankj.utilcode.pkg.R
99
import com.blankj.utilcode.util.CollectionUtils
10+
import com.blankj.utilcode.util.ConvertUtils
1011
import com.blankj.utilcode.util.SDCardUtils
1112

1213
/**
@@ -31,11 +32,19 @@ class SDCardActivity : CommonActivity() {
3132
}
3233

3334
override fun bindItems(): MutableList<CommonItem<*>> {
34-
return CollectionUtils.newArrayList(
35+
val mountedSDCardPath = SDCardUtils.getMountedSDCardPath()
36+
val sizeItems = CollectionUtils.collect(mountedSDCardPath) { input ->
37+
val totalInfo = "total: " + ConvertUtils.byte2FitMemorySize(SDCardUtils.getTotalSize(input))
38+
val availableInfo = "available: " + ConvertUtils.byte2FitMemorySize(SDCardUtils.getAvailableSize(input))
39+
CommonItemTitle(input, "$totalInfo, $availableInfo")
40+
}
41+
val result: ArrayList<CommonItem<*>> = CollectionUtils.newArrayList(
3542
CommonItemTitle("isSDCardEnableByEnvironment", SDCardUtils.isSDCardEnableByEnvironment().toString()),
3643
CommonItemTitle("getSDCardPathByEnvironment", SDCardUtils.getSDCardPathByEnvironment()),
3744
CommonItemTitle("getSDCardInfo", SDCardUtils.getSDCardInfo().toString()),
38-
CommonItemTitle("getMountedSDCardPath", SDCardUtils.getMountedSDCardPath().toString())
45+
CommonItemTitle("getMountedSDCardPath", mountedSDCardPath.toString())
3946
)
47+
result.addAll(sizeItems)
48+
return result
4049
}
4150
}

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.blankj.utilcode.pkg.helper
22

3+
import android.content.Context
34
import android.content.DialogInterface
45
import android.graphics.Bitmap
56
import android.graphics.drawable.ColorDrawable
@@ -30,9 +31,8 @@ import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldReques
3031
*/
3132
object DialogHelper {
3233

33-
fun showRationaleDialog(shouldRequest: ShouldRequest) {
34-
val topActivity = ActivityUtils.getTopActivity() ?: return
35-
CommonDialogContent().init(topActivity as FragmentActivity,
34+
fun showRationaleDialog(context: Context, shouldRequest: ShouldRequest) {
35+
CommonDialogContent().init(context,
3636
StringUtils.getString(android.R.string.dialog_alert_title),
3737
StringUtils.getString(R.string.permission_rationale_message),
3838
Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
@@ -43,9 +43,8 @@ object DialogHelper {
4343
})).show()
4444
}
4545

46-
fun showOpenAppSettingDialog() {
47-
val topActivity = ActivityUtils.getTopActivity() ?: return
48-
CommonDialogContent().init(topActivity as FragmentActivity,
46+
fun showOpenAppSettingDialog(context: Context) {
47+
CommonDialogContent().init(context,
4948
StringUtils.getString(android.R.string.dialog_alert_title),
5049
StringUtils.getString(R.string.permission_denied_forever_message),
5150
Pair(StringUtils.getString(android.R.string.ok), View.OnClickListener {
@@ -56,9 +55,8 @@ object DialogHelper {
5655
.show()
5756
}
5857

59-
fun showKeyboardDialog() {
60-
val topActivity = ActivityUtils.getTopActivity() ?: return
61-
BaseDialogFragment().init(topActivity as FragmentActivity, object : DialogLayoutCallback {
58+
fun showKeyboardDialog(context: Context) {
59+
BaseDialogFragment().init(context, object : DialogLayoutCallback {
6260
override fun bindTheme(): Int {
6361
return View.NO_ID
6462
}

0 commit comments

Comments
 (0)