see 08/09 log

Blankj · Aug 8, 2019 · 0edc62e · 0edc62e
1 parent 352054a
commit 0edc62e
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 59 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* `19/08/09` [fix] https://www.virustotal.com/gui/home/upload with ESET-NOD32. Publish v1.25.7.
 * `19/08/08` [add] BusUtils#post tag support one-to-many. Publish v1.25.6.
 * `19/08/04` [add] ThreadUtils#Task support timeout.
 * `19/08/01` [upd] EncryptUtils#rsa.

diff --git a/README-CN.md b/README-CN.md
@@ -51,7 +51,7 @@
 
 [frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.6-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.7-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -14,8 +14,8 @@ class Config {
     static compileSdkVersion = 28
     static minSdkVersion = 14
     static targetSdkVersion = 28
-    static versionCode = 1_025_006
-    static versionName = '1.25.6'// E.g. 1.9.72 => 1,009,072
+    static versionCode = 1_025_007
+    static versionName = '1.25.7'// E.g. 1.9.72 => 1,009,072
 
     // lib version
     static kotlin_version = '1.3.10'

diff --git a/feature/subutil/app/src/main/java/com/blankj/subutil/app/SubUtilApp.kt b/feature/subutil/app/src/main/java/com/blankj/subutil/app/SubUtilApp.kt
@@ -1,7 +1,7 @@
 package com.blankj.subutil.app
 
 import android.content.Context
-import com.blankj.lib.common.CommonApplication
+import com.blankj.common.CommonApplication
 
 
 /**

diff --git a/feature/subutil/pkg/src/main/assets/test_install_silent b/feature/subutil/pkg/src/main/assets/test_install_silent
diff --git a/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/Config.kt b/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/Config.kt
@@ -26,6 +26,6 @@ object Config {
         } else {
             Environment.getExternalStorageDirectory().absolutePath
         } + FILE_SEP
-        TEST_APK_PATH = CACHE_PATH + "test_install_silent.apk"
+        TEST_APK_PATH = CACHE_PATH + "test_install.apk"
     }
 }
diff --git a/...e/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt b/...e/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt
@@ -121,7 +121,7 @@ class DangerousActivity : CommonTitleActivity() {
 class ReleaseInstallApkTask(private val mListener: OnReleasedListener) : ThreadUtils.SimpleTask<Unit>() {
 
     override fun doInBackground() {
-        ResourceUtils.copyFileFromAssets("test_install_silent", Config.TEST_APK_PATH)
+        ResourceUtils.copyFileFromAssets("test_install", Config.TEST_APK_PATH)
     }
 
     override fun onSuccess(result: Unit) {

diff --git a/feature/utilcode/app/src/main/java/com/blankj/utilcode/app/UtilCodeApp.kt b/feature/utilcode/app/src/main/java/com/blankj/utilcode/app/UtilCodeApp.kt
@@ -1,6 +1,6 @@
 package com.blankj.utilcode.app
 
-import com.blankj.lib.common.CommonApplication
+import com.blankj.common.CommonApplication
 import com.blankj.utilcode.util.Utils
 
 

diff --git a/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/phone/PhoneActivity.kt b/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/phone/PhoneActivity.kt
@@ -58,7 +58,6 @@ class PhoneActivity : CommonTitleActivity() {
                 .appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())
                 .appendLine("getSimOperatorName: " + PhoneUtils.getSimOperatorName())
                 .appendLine("getSimOperatorByMnc: " + PhoneUtils.getSimOperatorByMnc())
-                .append("getPhoneStatus: " + PhoneUtils.getPhoneStatus())
                 .create()
 
         applyDebouncingClickListener(

diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@
 #org.gradle.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
 org.gradle.jvmargs=-Xmx8192m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 org.gradle.daemon=true
-org.gradle.configureondemand=true
-org.gradle.parallel=true
+#org.gradle.configureondemand=true
+#org.gradle.parallel=true
 
 #-Dorg.gradle.debug=true --no-daemon
diff --git a/...utilcode/pkg/src/main/assets/test_install → lib/common/src/main/assets/test_install b/...utilcode/pkg/src/main/assets/test_install → lib/common/src/main/assets/test_install
diff --git a/lib/utilcode/README-CN.md b/lib/utilcode/README-CN.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.25.6'
+implementation 'com.blankj:utilcode:1.25.7'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.25.6'
+implementation 'com.blankj:utilcodex:1.25.7'
 ```
 
 

diff --git a/lib/utilcode/README.md b/lib/utilcode/README.md
@@ -2,10 +2,10 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.25.6'
+implementation 'com.blankj:utilcode:1.25.7'
 
 // if u use AndroidX, use the following
-implementation 'com.blankj:utilcodex:1.25.6'
+implementation 'com.blankj:utilcodex:1.25.7'
 ```
 
 

diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
@@ -265,50 +265,6 @@ public static String getSimOperatorByMnc() {
         }
     }
 
-    /**
-     * Return the phone status.
-     * <p>Must hold {@code <uses-permission android:name="android.permission.READ_PHONE_STATE" />}</p>
-     *
-     * @return DeviceId = 99000311726612<br>
-     * DeviceSoftwareVersion = 00<br>
-     * Line1Number =<br>
-     * NetworkCountryIso = cn<br>
-     * NetworkOperator = 46003<br>
-     * NetworkOperatorName = 中国电信<br>
-     * NetworkType = 6<br>
-     * PhoneType = 2<br>
-     * SimCountryIso = cn<br>
-     * SimOperator = 46003<br>
-     * SimOperatorName = 中国电信<br>
-     * SimSerialNumber = 89860315045710604022<br>
-     * SimState = 5<br>
-     * SubscriberId(IMSI) = 460030419724900<br>
-     * VoiceMailNumber = *86<br>
-     */
-    @SuppressLint("HardwareIds")
-    @RequiresPermission(READ_PHONE_STATE)
-    public static String getPhoneStatus() {
-        TelephonyManager tm = getTelephonyManager();
-        String str = "";
-        //noinspection ConstantConditions
-        str += "DeviceId = " + tm.getDeviceId() + "\n";
-        str += "DeviceSoftwareVersion = " + tm.getDeviceSoftwareVersion() + "\n";
-        str += "Line1Number = " + tm.getLine1Number() + "\n";
-        str += "NetworkCountryIso = " + tm.getNetworkCountryIso() + "\n";
-        str += "NetworkOperator = " + tm.getNetworkOperator() + "\n";
-        str += "NetworkOperatorName = " + tm.getNetworkOperatorName() + "\n";
-        str += "NetworkType = " + tm.getNetworkType() + "\n";
-        str += "PhoneType = " + tm.getPhoneType() + "\n";
-        str += "SimCountryIso = " + tm.getSimCountryIso() + "\n";
-        str += "SimOperator = " + tm.getSimOperator() + "\n";
-        str += "SimOperatorName = " + tm.getSimOperatorName() + "\n";
-        str += "SimSerialNumber = " + tm.getSimSerialNumber() + "\n";
-        str += "SimState = " + tm.getSimState() + "\n";
-        str += "SubscriberId(IMSI) = " + tm.getSubscriberId() + "\n";
-        str += "VoiceMailNumber = " + tm.getVoiceMailNumber();
-        return str;
-    }
-
     /**
      * Skip to dial.
      *