Merge pull request Blankj#748 from Blankj/1.22.2

1.22.2

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,4 @@
+* `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.
 * `18/12/09` [add] Component for the project.
 * `18/12/04` [add] BusUtils. Publish v1.22.1.
 * `18/11/18` [fix] ToastUtils don't show in the devices grater than API 24 when close the permission of notification. Publish v1.22.0.

README-CN.md

@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

README.md

@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

bus-gradle-plugin/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.6
+修复 inject 时候 zip 操作不对导致混淆出错的问题
+
 ## v1.5
 升级 javassist 来修复 Kotlin 匿名类 NotFoundException
 

bus-gradle-plugin/build.gradle

@@ -7,11 +7,11 @@ apply {
     plugin "java-gradle-plugin"
     from "${rootDir.path}/gradle/pluginPublish.gradle"
     if (bus.isDebug) {
-        plugin 'maven'
+        plugin "maven"
         from "${rootDir.path}/gradle/localMavenUpload.gradle"
     } else {
-        plugin 'com.github.dcendents.android-maven'
-        plugin 'com.jfrog.bintray'
+        plugin "com.github.dcendents.android-maven"
+        plugin "com.jfrog.bintray"
         from "${rootDir.path}/gradle/bintrayUploadJava.gradle"
     }
 }
@@ -26,6 +26,7 @@ gradlePlugin {
 }
 
 dependencies {
+    implementation dep.plugin[0]
     implementation dep.javassist
     implementation dep.commons_io
     implementation gradleApi()

bus-gradle-plugin/src/main/java/com/blankj/bus/BusInject.groovy

@@ -25,9 +25,9 @@ class BusInject {
             callMethod.insertAfter(getInsertContent(bus, true));
         }
         busUtils.writeFile(decompressedJarPath)
-        busUtils.defrost();
+        busUtils.defrost()
         FileUtils.forceDelete(busJar)
-        ZipUtils.zipFile(decompressedJar, busJar)
+        ZipUtils.zipFiles(Arrays.asList(decompressedJar.listFiles()), busJar)
         FileUtils.forceDelete(decompressedJar)
     }
 

bus-gradle-plugin/src/main/java/com/blankj/bus/BusTransform.groovy

@@ -68,11 +68,10 @@ class BusTransform extends Transform {
                 )
                 FileUtils.copyDirectory(dir, dest)
 
-                LogUtils.l("scan dir: " + dirInput.name)
+                LogUtils.l("scan dir: $dir [$dest]")
 
                 busScan.scanDir(dir)
             }
-
             input.jarInputs.each { JarInput jarInput ->// 遍历 jar 文件
                 File jar = jarInput.file
                 JavassistUtils.getPool().appendClassPath(jarInput.file.absolutePath)
@@ -86,21 +85,22 @@ class BusTransform extends Transform {
                 )
                 FileUtils.copyFile(jar, dest)
 
-                if (jumpScan(jarName)) {
-                    LogUtils.l("jump jar: " + jarName)
-                    return
-                }
-
                 if (jarName.startsWith("com.blankj:utilcode:")
                         || jarName.contains("utilcode-lib")) {
                     busScan.busJar = dest
-                    LogUtils.l("bus jar: " + jarName)
+                    LogUtils.l("bus jar: $jarName [$dest]")
                     return
                 }
 
-                LogUtils.l("scan jar: " + jarName)
+                if (jumpScan(jarName)) {
+                    LogUtils.l("jump jar: $jarName [$dest]")
+                    return
+                }
+
+                LogUtils.l("scan jar: $jarName [$dest]")
                 busScan.scanJar(jar)
             }
+
         }
 
         if (busScan.busJar != null) {

bus-gradle-plugin/src/main/java/com/blankj/bus/Config.groovy

@@ -8,7 +8,10 @@ class Config {
             'com.android.support:',
             'com.android.support.constraint:',
             'android.arch.',
-            'com.blankj:'
+            'com.blankj:',
+            'org.jetbrains.kotlin:',
+            'org.jetbrains:',
+            'com.squareup.'
     ]
 
     public static final String FILE_SEP = System.getProperty("file.separator")

config.gradle

@@ -5,12 +5,12 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_001
-    versionName = '1.22.1'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_022_002
+    versionName = '1.22.2'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,
-            version: '1.5',
+            version: '1.6',
             group  : 'com.blankj'
     ]
 
@@ -41,7 +41,7 @@ ext {
                     android      : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
                     android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
             ],
-            free_proguard: "com.blankj:free-proguard:0.0.9",
+            free_proguard: "com.blankj:free-proguard:0.0.7",
             adapt_screen : "com.blankj:adapt-screen:0.0.3",
 
             gson         : "com.google.code.gson:gson:2.8.2",

config_app.gradle

@@ -21,9 +21,12 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled true
-            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -45,7 +48,7 @@ private String getSuffix() {
     String[] splits = project.name.split("-")
     String suffix = ""
     if (splits.length == 2) {
-        suffix = "." + splits[0]
+        suffix = "_" + splits[0]
     }
     return suffix
 }
@@ -61,7 +64,7 @@ def configSigning(Project pro) {
         properties.load(new FileInputStream(signPropertiesFile))
         signingConfigs {
             release {
-                storeFile file(properties['keystore'])
+                storeFile new File(signPropertiesFile.getParent(), properties['keystore'])
                 storePassword properties['storePassword']
                 keyAlias properties['keyAlias']
                 keyPassword properties['keyPassword']
@@ -75,9 +78,11 @@ def configSigning(Project pro) {
 def configApkName(Project pro) {
     pro.android.applicationVariants.all { variant ->
         if (variant.buildType.name != "debug") {
-            variant.getPackageApplication().outputDirectory = new File(project.rootDir.absolutePath + "/apk")
+            variant.getPackageApplication().outputDirectory = new File("${rootDir.path}/apk")
             variant.getPackageApplication().outputScope.apkDatas.forEach { apkData ->
-                apkData.outputFileName = "util_" + variant.versionName.replace(".", "_") + ".apk"
+                apkData.outputFileName = "util" + suffix +
+                                         "_" + variant.versionName.replace(".", "_") +
+                                         ".apk"
             }
         }
     }

config_lib.gradle

@@ -10,12 +10,12 @@ android {
         minSdkVersion rootProject.minSdkVersion
         versionCode rootProject.versionCode
         versionName rootProject.versionName
+        consumerProguardFiles 'proguard-rules.pro'
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

launcher/app/src/main/AndroidManifest.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.launcher">
+    package="com.blankj.launcher.app">
 
     <application
-        android:name=".app.UtilsApp"
+        android:name=".UtilsApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
 
         <activity
-            android:name=".pkg.MainActivity"
+            android:name="com.blankj.launcher.pkg.MainActivity"
             android:screenOrientation="user"
             android:windowSoftInputMode="stateHidden|adjustPan">
             <intent-filter>

launcher/app/src/main/java/com/blankj/launcher/app/UtilsApp.java

@@ -1,8 +1,11 @@
 package com.blankj.launcher.app;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.view.View;
 
-import com.blankj.base.BaseApplication;
+import com.blankj.lib.base.BaseApplication;
 
 /**
  * <pre>
@@ -30,6 +33,20 @@ public void onCreate() {
         super.onCreate();
         sInstance = this;
     }
+
+
+    private Bitmap getBitmapForView(View src) {
+        Bitmap bitmap = Bitmap.createBitmap(
+                src.getWidth(),
+                src.getHeight(),
+                Bitmap.Config.ARGB_8888
+        );
+
+        Canvas canvas = new Canvas(bitmap);
+        src.draw(canvas);
+
+        return bitmap;
+    }
 }
 
 

launcher/pkg/src/main/AndroidManifest.xml

@@ -1,9 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.launcher">
+    package="com.blankj.launcher.pkg">
 
     <application>
         <activity
-            android:name=".pkg.MainActivity"
+            android:name=".MainActivity"
             android:screenOrientation="user"
             android:windowSoftInputMode="stateHidden|adjustPan" />
     </application>

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

@@ -4,8 +4,9 @@ import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.app.ActionBarDrawerToggle
 import android.view.View
-import com.blankj.base.BaseDrawerActivity
-import com.blankj.launcher.R
+import android.widget.ImageView
+import com.blankj.launcher.pkg.R
+import com.blankj.lib.base.BaseDrawerActivity
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.BarUtils
 import com.blankj.utilcode.util.BusUtils
@@ -30,6 +31,8 @@ class MainActivity : BaseDrawerActivity() {
         return R.layout.activity_main
     }
 
+    private var view: ImageView? = null
+
     override fun initView(savedInstanceState: Bundle?, contentView: View) {
         launcherMainCtl.setExpandedTitleColor(Color.TRANSPARENT)
         setSupportActionBar(launcherMainToolbar)
@@ -51,6 +54,8 @@ class MainActivity : BaseDrawerActivity() {
         launcherMainSubUtilBtn.setOnClickListener {
             BusUtils.post<Any>("SubUtilActivity#start", this)
         }
+//        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+
     }
 
     override fun doBusiness() {

launcher/pkg/src/main/java/com/blankj/launcher/pkg/SplashActivity.kt

@@ -2,7 +2,7 @@ package com.blankj.launcher.pkg
 
 import android.os.Bundle
 import android.view.View
-import com.blankj.base.BaseActivity
+import com.blankj.lib.base.BaseActivity
 
 class SplashActivity : BaseActivity() {
     override fun initData(bundle: Bundle?) {

lib/base/build.gradle

@@ -4,8 +4,7 @@ apply {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api project(':lib-resource')
-    api project(':utilcode-lib')
+//    api project(':utilcode-lib')
     api project(':subutil-lib')
 
     api dep.support.appcompat_v7
@@ -16,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    implementation 'com.blankj:utilcode:1.22.1'
+    api 'com.blankj:utilcode:1.22.2'
 }

lib/base/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.base">
+    package="com.blankj.lib.base">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 </manifest>

lib/base/src/main/java/com/blankj/base/BaseActivity.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.app.Activity
 import android.os.Bundle

lib/base/src/main/java/com/blankj/base/BaseApplication.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseApplication.kt

@@ -1,8 +1,8 @@
-package com.blankj.base
+package com.blankj.lib.base
 
+import android.app.Application
 import android.content.Context
 import android.support.multidex.MultiDex
-import android.support.multidex.MultiDexApplication
 import com.blankj.utilcode.util.AppUtils
 import com.blankj.utilcode.util.CrashUtils
 import com.blankj.utilcode.util.LogUtils
@@ -16,7 +16,7 @@ import com.squareup.leakcanary.LeakCanary
  * desc  : base about application
  * ```
  */
-open class BaseApplication : MultiDexApplication() {
+open class BaseApplication : Application() {
 
     companion object {
         lateinit var instance: BaseApplication

lib/base/src/main/java/com/blankj/base/BaseBackActivity.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.support.annotation.StringRes
 import android.support.v4.content.ContextCompat

lib/base/src/main/java/com/blankj/base/BaseDrawerActivity.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.content.Intent
 import android.net.Uri

lib/base/src/main/java/com/blankj/base/BaseFragment.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.app.Activity
 import android.content.Context

lib/base/src/main/java/com/blankj/base/BaseLazyFragment.kt renamed to lib/base/src/main/java/com/blankj/lib/base/BaseLazyFragment.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.util.Log
 

lib/base/src/main/java/com/blankj/base/IBaseView.kt renamed to lib/base/src/main/java/com/blankj/lib/base/IBaseView.kt

@@ -1,4 +1,4 @@
-package com.blankj.base
+package com.blankj.lib.base
 
 import android.os.Bundle
 import android.view.View