Skip to content

Commit c0dd366

Browse files
author
Blankj
committed
see 08/08 log
1 parent 632a5a9 commit c0dd366

File tree

41 files changed

+535
-273
lines changed

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

+535
-273
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
* `19/08/08` [add] BusUtils#post tag support one-to-many. Publish v1.25.6.
2+
* `19/08/04` [add] ThreadUtils#Task support timeout.
3+
* `19/08/01` [upd] EncryptUtils#rsa.
14
* `19/07/31` [add] DeviceUtils#getUniqueDeviceId, DeviceUtils#isSameDevice. Publish v1.25.5.
25
* `19/07/30` [fix] ThreadUtils's task can only be executed once. PhoneUtils#getIMEI wrong.
36
* `19/07/29` [fix] BusUtils post father class useless. KeyboardUtils#hideSoft bug. Publish v1.25.4.

README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.5-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

5151
[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
@@ -45,7 +45,7 @@ If this project helps you a lot and you want to support the project's developmen
4545

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.5-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

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

buildApp.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ android {
2929
debug {
3030
minifyEnabled false
3131
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
32+
applicationIdSuffix ".debug"
3233
}
3334
release {
3435
minifyEnabled true

buildSrc/src/main/groovy/Config.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 28
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 28
17-
static versionCode = 1_025_005
18-
static versionName = '1.25.5'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_006
18+
static versionName = '1.25.6'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'
@@ -29,17 +29,17 @@ class Config {
2929

3030
static depConfig = [
3131
plugin : [
32-
gradle : new DepConfig("com.android.tools.build:gradle:3.3.0"),
32+
gradle : new DepConfig("com.android.tools.build:gradle:3.4.0"),
3333
kotlin : new DepConfig("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"),
3434
maven : new DepConfig("com.github.dcendents:android-maven-gradle-plugin:2.1"),// 上传到 maven
3535
bintray: new DepConfig("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"),// 上传到 bintray
3636
traute : new DepConfig("tech.harmonysoft:traute-gradle:1.1.10"),// 注解转非空判断
3737

3838
// 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
3939
// 本地上传成功之后 isApply = true 即可应用插件来调试,后续版本更新无需设置 isApply = false
40-
// 发布版本的话把 useLocal = false, isApply = false,发布成功后 isApply = true 即可使用远程库版本
40+
// 发布版本的话把 useLocal = false, isApply = false,更新版本号,发布成功后 isApply = true 即可使用远程库版本
4141
api : new DepConfig(false/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
42-
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
42+
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.1", true/*是否使用插件*/),
4343
],
4444

4545
api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", false),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
88
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
9+
<uses-permission android:name="android.permission.SEND_SMS" />
910

1011
<uses-permission android:name="android.permission.INSTALL_PACKAGES" /><!--installAppSilent-->
1112
<uses-permission android:name="android.permission.DELETE_PACKAGES" /><!--uninstallAppSilent-->

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DangerousActivity : CommonTitleActivity() {
2424

2525
companion object {
2626
fun start(context: Context) {
27-
PermissionHelper.requestStorage(object : PermissionHelper.OnPermissionGrantedListener {
27+
PermissionHelper.requestStorageAndSms(object : PermissionHelper.OnPermissionGrantedListener {
2828
override fun onPermissionGranted() {
2929
val starter = Intent(context, DangerousActivity::class.java)
3030
context.startActivity(starter)
@@ -64,7 +64,8 @@ class DangerousActivity : CommonTitleActivity() {
6464
dangerousShutdownBtn,
6565
dangerousRebootBtn,
6666
dangerousReboot2RecoveryBtn,
67-
dangerousReboot2BootloaderBtn
67+
dangerousReboot2BootloaderBtn,
68+
dangerousSendSmsSilentBtn
6869
)
6970

7071
if (AppUtils.isAppSystem()) {
@@ -111,6 +112,8 @@ class DangerousActivity : CommonTitleActivity() {
111112
R.id.dangerousRebootBtn -> DangerousUtils.reboot()
112113
R.id.dangerousReboot2RecoveryBtn -> DangerousUtils.reboot2Recovery()
113114
R.id.dangerousReboot2BootloaderBtn -> DangerousUtils.reboot2Bootloader()
115+
R.id.dangerousReboot2BootloaderBtn -> DangerousUtils.reboot2Bootloader()
116+
R.id.dangerousSendSmsSilentBtn -> DangerousUtils.sendSmsSilent("10000", "sendSmsSilent")
114117
}
115118
}
116119
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import com.blankj.utilcode.util.PermissionUtils
1414
*/
1515
object PermissionHelper {
1616

17-
fun requestStorage(listener: OnPermissionGrantedListener,
18-
deniedListener: OnPermissionDeniedListener) {
19-
request(listener, deniedListener, PermissionConstants.STORAGE)
17+
fun requestStorageAndSms(listener: OnPermissionGrantedListener,
18+
deniedListener: OnPermissionDeniedListener) {
19+
request(listener, deniedListener, PermissionConstants.STORAGE, PermissionConstants.SMS)
2020
}
2121

2222
fun requestLocation(listener: OnPermissionGrantedListener,

feature/subutil/pkg/src/main/res/layout/activity_dangerous.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,18 @@
5555
android:layout_height="wrap_content"
5656
android:text="@string/dangerous_reboot_to_bootloader" />
5757

58+
<Button
59+
android:id="@+id/dangerousSendSmsSilentBtn"
60+
style="@style/WideBtnStyle"
61+
android:layout_width="match_parent"
62+
android:layout_height="wrap_content"
63+
android:text="@string/dangerous_reboot_to_bootloader" />
64+
5865
<CheckBox
5966
android:id="@+id/dangerousMobileDataEnabledCb"
6067
style="@style/CbStyle"
6168
android:layout_width="wrap_content"
6269
android:layout_height="wrap_content"
63-
android:text="@string/dangerous_data_enabled" />
70+
android:text="@string/dangerous_send_sms_silent" />
6471

6572
</LinearLayout>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
<string name="dangerous_reboot">Reboot</string>
2222
<string name="dangerous_reboot_to_recovery">Reboot To Recovery</string>
2323
<string name="dangerous_reboot_to_bootloader">Reboot To Bootloader</string>
24+
<string name="dangerous_send_sms_silent">Send SMS Silent</string>
2425
<string name="dangerous_data_enabled">Mobile Data Enabled</string>
2526
</resources>

0 commit comments

Comments
 (0)