Skip to content

Commit 0edc62e

Browse files
committed
see 08/09 log
1 parent 352054a commit 0edc62e

File tree

15 files changed

+15
-59
lines changed

15 files changed

+15
-59
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/08/09` [fix] https://www.virustotal.com/gui/home/upload with ESET-NOD32. Publish v1.25.7.
12
* `19/08/08` [add] BusUtils#post tag support one-to-many. Publish v1.25.6.
23
* `19/08/04` [add] ThreadUtils#Task support timeout.
34
* `19/08/01` [upd] EncryptUtils#rsa.

README-CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

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

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
5151

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

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

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

buildSrc/src/main/groovy/Config.groovy

+2-2
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_006
18-
static versionName = '1.25.6'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_007
18+
static versionName = '1.25.7'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'

feature/subutil/app/src/main/java/com/blankj/subutil/app/SubUtilApp.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.blankj.subutil.app
22

33
import android.content.Context
4-
import com.blankj.lib.common.CommonApplication
4+
import com.blankj.common.CommonApplication
55

66

77
/**
Binary file not shown.

feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/Config.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ object Config {
2626
} else {
2727
Environment.getExternalStorageDirectory().absolutePath
2828
} + FILE_SEP
29-
TEST_APK_PATH = CACHE_PATH + "test_install_silent.apk"
29+
TEST_APK_PATH = CACHE_PATH + "test_install.apk"
3030
}
3131
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class DangerousActivity : CommonTitleActivity() {
121121
class ReleaseInstallApkTask(private val mListener: OnReleasedListener) : ThreadUtils.SimpleTask<Unit>() {
122122

123123
override fun doInBackground() {
124-
ResourceUtils.copyFileFromAssets("test_install_silent", Config.TEST_APK_PATH)
124+
ResourceUtils.copyFileFromAssets("test_install", Config.TEST_APK_PATH)
125125
}
126126

127127
override fun onSuccess(result: Unit) {

feature/utilcode/app/src/main/java/com/blankj/utilcode/app/UtilCodeApp.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.blankj.utilcode.app
22

3-
import com.blankj.lib.common.CommonApplication
3+
import com.blankj.common.CommonApplication
44
import com.blankj.utilcode.util.Utils
55

66

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

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class PhoneActivity : CommonTitleActivity() {
5858
.appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())
5959
.appendLine("getSimOperatorName: " + PhoneUtils.getSimOperatorName())
6060
.appendLine("getSimOperatorByMnc: " + PhoneUtils.getSimOperatorByMnc())
61-
.append("getPhoneStatus: " + PhoneUtils.getPhoneStatus())
6261
.create()
6362

6463
applyDebouncingClickListener(

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#org.gradle.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
1616
org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
1717
org.gradle.daemon=true
18-
org.gradle.configureondemand=true
19-
org.gradle.parallel=true
18+
#org.gradle.configureondemand=true
19+
#org.gradle.parallel=true
2020

2121
#-Dorg.gradle.debug=true --no-daemon

lib/utilcode/README-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.25.6'
5+
implementation 'com.blankj:utilcode:1.25.7'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.25.6'
8+
implementation 'com.blankj:utilcodex:1.25.7'
99
```
1010

1111

lib/utilcode/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.25.6'
5+
implementation 'com.blankj:utilcode:1.25.7'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.25.6'
8+
implementation 'com.blankj:utilcodex:1.25.7'
99
```
1010

1111

lib/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java

-44
Original file line numberDiff line numberDiff line change
@@ -265,50 +265,6 @@ public static String getSimOperatorByMnc() {
265265
}
266266
}
267267

268-
/**
269-
* Return the phone status.
270-
* <p>Must hold {@code <uses-permission android:name="android.permission.READ_PHONE_STATE" />}</p>
271-
*
272-
* @return DeviceId = 99000311726612<br>
273-
* DeviceSoftwareVersion = 00<br>
274-
* Line1Number =<br>
275-
* NetworkCountryIso = cn<br>
276-
* NetworkOperator = 46003<br>
277-
* NetworkOperatorName = 中国电信<br>
278-
* NetworkType = 6<br>
279-
* PhoneType = 2<br>
280-
* SimCountryIso = cn<br>
281-
* SimOperator = 46003<br>
282-
* SimOperatorName = 中国电信<br>
283-
* SimSerialNumber = 89860315045710604022<br>
284-
* SimState = 5<br>
285-
* SubscriberId(IMSI) = 460030419724900<br>
286-
* VoiceMailNumber = *86<br>
287-
*/
288-
@SuppressLint("HardwareIds")
289-
@RequiresPermission(READ_PHONE_STATE)
290-
public static String getPhoneStatus() {
291-
TelephonyManager tm = getTelephonyManager();
292-
String str = "";
293-
//noinspection ConstantConditions
294-
str += "DeviceId = " + tm.getDeviceId() + "\n";
295-
str += "DeviceSoftwareVersion = " + tm.getDeviceSoftwareVersion() + "\n";
296-
str += "Line1Number = " + tm.getLine1Number() + "\n";
297-
str += "NetworkCountryIso = " + tm.getNetworkCountryIso() + "\n";
298-
str += "NetworkOperator = " + tm.getNetworkOperator() + "\n";
299-
str += "NetworkOperatorName = " + tm.getNetworkOperatorName() + "\n";
300-
str += "NetworkType = " + tm.getNetworkType() + "\n";
301-
str += "PhoneType = " + tm.getPhoneType() + "\n";
302-
str += "SimCountryIso = " + tm.getSimCountryIso() + "\n";
303-
str += "SimOperator = " + tm.getSimOperator() + "\n";
304-
str += "SimOperatorName = " + tm.getSimOperatorName() + "\n";
305-
str += "SimSerialNumber = " + tm.getSimSerialNumber() + "\n";
306-
str += "SimState = " + tm.getSimState() + "\n";
307-
str += "SubscriberId(IMSI) = " + tm.getSubscriberId() + "\n";
308-
str += "VoiceMailNumber = " + tm.getVoiceMailNumber();
309-
return str;
310-
}
311-
312268
/**
313269
* Skip to dial.
314270
*

0 commit comments

Comments
 (0)