Skip to content

Commit e3842d2

Browse files
BlankjBlankj
committed
see 05/21 log
1 parent 0c5a614 commit e3842d2

Some content is hidden

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

41 files changed

+632
-331
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* `20/05/21` [add] Publish bus plugin v2.6. Publish api plugin v1.4. Publish. Publish 1.28.5.
2+
* `20/05/19` [fix] FileUtils#copyOrMoveDird NPE.
3+
* `20/05/18` [add] IntentUtils#getLaunchAppDetailsSettingsIntent support isNewTask.
4+
* `20/05/17` [add] ImageUtils#save2Album, NetworkUtils#getSSID, UtilsTransActivity4MainProcess.
15
* `20/05/03` [add] Publish bus plugin v2.5. Publish api plugin v1.3. Publish. Publish 1.28.4.
26
* `20/04/30` [add] BaseItem support partialUpdate.
37
* `20/04/29` [add] Publish plugin lib com.blankj:base-transform:1.0.

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

+12-12
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_028_002
18-
static versionName = '1.28.4'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_028_005
18+
static versionName = '1.28.5'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static gradlePluginVersion = '3.5.0'
@@ -25,9 +25,9 @@ class Config {
2525
static depConfig = [
2626
/*Never delete this line*/
2727
/*Generated by "config.json"*/
28-
plugin_api_gradle_plugin : new DepConfig(false, true , ":plugin:api-gradle-plugin"),
29-
plugin_bus_gradle_plugin : new DepConfig(false, true , ":plugin:bus-gradle-plugin"),
30-
plugin_lib_base_transform : new DepConfig(false, true , ":plugin:lib:base-transform", "com.blankj:base-transform:1.0"),
28+
plugin_api_gradle_plugin : new DepConfig(true , true , ":plugin:api-gradle-plugin"),
29+
plugin_bus_gradle_plugin : new DepConfig(true , true , ":plugin:bus-gradle-plugin"),
30+
plugin_lib_base_transform : new DepConfig(true , false, ":plugin:lib:base-transform", "com.blankj:base-transform:1.0"),
3131
feature_mock : new DepConfig(false, true , ":feature:mock"),
3232
feature_launcher_app : new DepConfig(true , true , ":feature:launcher:app"),
3333
feature_main_app : new DepConfig(false, true , ":feature:main:app"),
@@ -53,12 +53,12 @@ class Config {
5353

5454
// 上传新版本插件更新 pluginPath 中的版本号，并设置 isApply = false
5555
// 通过 mavenLocal 上传本地版本，设置 isApply = true 即可应用插件来调试，最后通过 bintrayUpload 来发布插件
56-
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.3", pluginId: "com.blankj.api"),
57-
//./gradlew clean plugin:plugin_api-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
58-
//./gradlew clean plugin:plugin_api-gradle-plugin:bintrayUpload // 上传到 jcenter
59-
plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.5", pluginId: "com.blankj.bus"),
60-
//./gradlew clean plugin:plugin_bus-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
61-
//./gradlew clean plugin:plugin_bus-gradle-plugin:bintrayUpload // 上传到 jcenter
56+
plugin_api : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.4", pluginId: "com.blankj.api"),
57+
//./gradlew clean :plugin_api-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
58+
//./gradlew clean :plugin_api-gradle-plugin:bintrayUpload // 上传到 jcenter
59+
plugin_bus : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.6", pluginId: "com.blankj.bus"),
60+
//./gradlew clean :plugin_bus-gradle-plugin:mavenLocal // 上传到本地 mavenLocal
61+
//./gradlew clean :plugin_bus-gradle-plugin:bintrayUpload // 上传到 jcenter
6262

6363
support_appcompat_v7 : new DepConfig("com.android.support:appcompat-v7:$supportVersion"),
6464
support_design : new DepConfig("com.android.support:design:$supportVersion"),
@@ -86,4 +86,4 @@ class Config {
8686
test_robolectric : new DepConfig("org.robolectric:robolectric:4.3.1"),
8787
]
8888
}
89-
//./gradlew clean lib:lib_utilcode:bintrayUpload
89+
//./gradlew clean :lib_utilcode:bintrayUpload

‎buildSrc/src/main/groovy/DepConfig.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class DepConfig {
7676
}
7777

7878
String getProjectPath() {
79-
return localPath.substring(0, localPath.lastIndexOf(":")) + ":" + localPath.substring(1).replace(":", "_")
79+
return ":" + localPath.substring(1).replace(":", "_")
8080
}
8181

8282
@Override

‎config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"pkgConfig": [],
66
"proConfigDesc": "proConfig 配置的是使用本地还是仓库，优先级低于 appConfig 和 pkgConfig",
77
"proConfig": [
8-
{"isApply": false, "useLocal": true, "localPath": ":plugin:api-gradle-plugin"},
9-
{"isApply": false, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
10-
{"isApply": false, "useLocal": true, "localPath": ":plugin:lib:base-transform", "remotePath": "com.blankj:base-transform:1.0"},
8+
{"isApply": true, "useLocal": true, "localPath": ":plugin:api-gradle-plugin"},
9+
{"isApply": true, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
10+
{"isApply": true, "useLocal": false, "localPath": ":plugin:lib:base-transform", "remotePath": "com.blankj:base-transform:1.0"},
1111
{"isApply": true, "useLocal": true, "localPath": ":feature:mock"},
1212
{"isApply": true, "useLocal": true, "localPath": ":feature:launcher:app"},
1313
{"isApply": true, "useLocal": true, "localPath": ":feature:main:app"},

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package com.blankj.subutil.pkg.feature.dangerous
33
import android.content.Context
44
import android.content.Intent
55
import com.blankj.common.activity.CommonActivity
6+
import com.blankj.common.helper.PermissionHelper
67
import com.blankj.common.item.CommonItem
78
import com.blankj.common.item.CommonItemClick
89
import com.blankj.common.item.CommonItemSwitch
910
import com.blankj.subutil.pkg.Config
1011
import com.blankj.subutil.pkg.R
11-
import com.blankj.subutil.pkg.helper.PermissionHelper
1212
import com.blankj.subutil.util.DangerousUtils
13+
import com.blankj.utilcode.constant.PermissionConstants
1314
import com.blankj.utilcode.util.*
1415

1516
/**
@@ -24,16 +25,15 @@ class DangerousActivity : CommonActivity() {
2425

2526
companion object {
2627
fun start(context: Context) {
27-
PermissionHelper.requestStorageAndSms(context, object : PermissionHelper.OnPermissionGrantedListener {
28-
override fun onPermissionGranted() {
28+
PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
29+
override fun onGranted() {
2930
val starter = Intent(context, DangerousActivity::class.java)
3031
context.startActivity(starter)
3132
}
32-
}, object : PermissionHelper.OnPermissionDeniedListener {
33-
override fun onPermissionDenied() {
34-
start(context)
33+
34+
override fun onDenied() {
3535
}
36-
})
36+
}, PermissionConstants.STORAGE, PermissionConstants.SMS)
3737
}
3838
}
3939

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

+8-7
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import android.content.Intent
66
import android.content.ServiceConnection
77
import android.os.IBinder
88
import com.blankj.common.activity.CommonActivity
9+
import com.blankj.common.helper.PermissionHelper
910
import com.blankj.common.item.CommonItem
1011
import com.blankj.common.item.CommonItemTitle
1112
import com.blankj.subutil.pkg.R
12-
import com.blankj.subutil.pkg.helper.PermissionHelper
13+
import com.blankj.utilcode.constant.PermissionConstants
1314
import com.blankj.utilcode.util.CollectionUtils
15+
import com.blankj.utilcode.util.PermissionUtils
1416

1517
/**
1618
* ```
@@ -24,16 +26,15 @@ class LocationActivity : CommonActivity() {
2426

2527
companion object {
2628
fun start(context: Context) {
27-
PermissionHelper.requestLocation(context, object : PermissionHelper.OnPermissionGrantedListener {
28-
override fun onPermissionGranted() {
29+
PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
30+
override fun onGranted() {
2931
val starter = Intent(context, LocationActivity::class.java)
3032
context.startActivity(starter)
3133
}
32-
}, object : PermissionHelper.OnPermissionDeniedListener {
33-
override fun onPermissionDenied() {
34-
start(context)
34+
35+
override fun onDenied() {
3536
}
36-
})
37+
}, PermissionConstants.LOCATION)
3738
}
3839
}
3940

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

-46
This file was deleted.

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

-59
This file was deleted.

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

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import com.blankj.utilcode.pkg.feature.toast.ToastActivity
4747
import com.blankj.utilcode.pkg.feature.uiMessage.UiMessageActivity
4848
import com.blankj.utilcode.pkg.feature.vibrate.VibrateActivity
4949
import com.blankj.utilcode.util.CollectionUtils
50+
import com.blankj.utilcode.util.LogUtils
5051
import com.blankj.utilcode.util.UtilsTransActivity
5152

5253
/**
@@ -200,4 +201,9 @@ class CoreUtilActivity : CommonActivity() {
200201
}
201202
)
202203
}
204+
205+
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
206+
super.onActivityResult(requestCode, resultCode, data)
207+
LogUtils.e(requestCode, requestCode)
208+
}
203209
}

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ 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.helper.PermissionHelper
67
import com.blankj.common.item.CommonItem
78
import com.blankj.common.item.CommonItemClick
89
import com.blankj.common.item.CommonItemImage
910
import com.blankj.common.item.CommonItemTitle
11+
import com.blankj.utilcode.constant.PermissionConstants
1012
import com.blankj.utilcode.pkg.Config
1113
import com.blankj.utilcode.pkg.R
12-
import com.blankj.utilcode.pkg.helper.PermissionHelper
1314
import com.blankj.utilcode.util.*
1415

1516
/**
@@ -24,16 +25,15 @@ class AppActivity : CommonActivity() {
2425

2526
companion object {
2627
fun start(context: Context) {
27-
PermissionHelper.requestStorage(context, object : PermissionHelper.OnPermissionGrantedListener {
28-
override fun onPermissionGranted() {
28+
PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
29+
override fun onGranted() {
2930
val starter = Intent(context, AppActivity::class.java)
3031
context.startActivity(starter)
3132
}
32-
}, object : PermissionHelper.OnPermissionDeniedListener {
33-
override fun onPermissionDenied() {
34-
start(context)
33+
34+
override fun onDenied() {
3535
}
36-
})
36+
}, PermissionConstants.STORAGE)
3737
}
3838
}
3939

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

+9-11
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@ package com.blankj.utilcode.pkg.feature.flashlight
33
import android.content.Context
44
import android.content.Intent
55
import com.blankj.common.activity.CommonActivity
6+
import com.blankj.common.helper.PermissionHelper
67
import com.blankj.common.item.CommonItem
78
import com.blankj.common.item.CommonItemSwitch
89
import com.blankj.common.item.CommonItemTitle
10+
import com.blankj.utilcode.constant.PermissionConstants
911
import com.blankj.utilcode.pkg.R
10-
import com.blankj.utilcode.pkg.helper.PermissionHelper
11-
import com.blankj.utilcode.util.CollectionUtils
12-
import com.blankj.utilcode.util.FlashlightUtils
13-
import com.blankj.utilcode.util.ToastUtils
14-
import com.blankj.utilcode.util.Utils
12+
import com.blankj.utilcode.util.*
1513

1614
/**
1715
* ```
@@ -29,16 +27,16 @@ class FlashlightActivity : CommonActivity() {
2927
ToastUtils.showLong("Didn't support flashlight.")
3028
return
3129
}
32-
PermissionHelper.requestCamera(context, object : PermissionHelper.OnPermissionGrantedListener {
33-
override fun onPermissionGranted() {
30+
PermissionHelper.request(context, object : PermissionUtils.SimpleCallback {
31+
override fun onGranted() {
3432
val starter = Intent(context, FlashlightActivity::class.java)
3533
context.startActivity(starter)
3634
}
37-
}, object : PermissionHelper.OnPermissionDeniedListener {
38-
override fun onPermissionDenied() {
39-
start(context)
35+
36+
override fun onDenied() {
37+
LogUtils.e("permission denied")
4038
}
41-
})
39+
}, PermissionConstants.CAMERA)
4240
}
4341
}
4442

0 commit comments

Comments
 (0)