see 12/16 log

bus-gradle-plugin/CHANGELOG.md

 # 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,14 +21,10 @@ android {
     }
 
     buildTypes {
-//        debug {
-//            minifyEnabled true
-//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-//            for (int i = 0; i < consumerProguardFiles.size(); i++) {
-//                println consumerProguardFiles[i].getAbsolutePath() + "<111"
-//            }
-////             consumerProguardFiles[0] + ",111 " + consumerProguardFiles[1].getAbsolutePath()
-//        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -52,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
 }
@@ -82,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/__bus__.json

 {
-  "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
-  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)",
-  "showDialog": "void com.blankj.launcher.app.UtilsApp.showDialog()"
+  "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"
 }
\ No newline at end of file

launcher/app/src/main/AndroidManifest.xml

 <?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

@@ -5,12 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.view.View;
 
-import com.blankj.base.BaseApplication;
-import com.blankj.subutil.pkg.helper.DialogHelper;
-import com.blankj.utilcode.util.AppUtils;
-import com.blankj.utilcode.util.BusUtils;
-import com.blankj.utilcode.util.LogUtils;
-import com.blankj.utilcode.util.Utils;
+import com.blankj.lib.base.BaseApplication;
 
 /**
  * <pre>

launcher/pkg/src/main/AndroidManifest.xml

 <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

 package com.blankj.launcher.pkg
 
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
 import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.app.ActionBarDrawerToggle
-import android.view.KeyEvent
 import android.view.View
 import android.widget.ImageView
-import com.blankj.base.BaseDrawerActivity
-import com.blankj.launcher.R
-import com.blankj.utilcode.util.*
+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
 import kotlinx.android.synthetic.main.activity_main.*
 
 
-
-
 /**
  * ```
  * author: Blankj

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

@@ -5,6 +5,7 @@ apply {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     api project(':utilcode-lib')
+    api project(':subutil-lib')
 
     api dep.support.appcompat_v7
     api dep.support.design
@@ -14,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.1'
 }
\ No newline at end of file

lib/base/src/main/AndroidManifest.xml

 <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>
\ No newline at end of file

lib/base/src/main/java/com/blankj/base/BaseActivity.kt → lib/base/src/main/java/com/blankj/lib/base/BaseActivity.kt

-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 → lib/base/src/main/java/com/blankj/lib/base/BaseApplication.kt

-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 → lib/base/src/main/java/com/blankj/lib/base/BaseBackActivity.kt

-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 → lib/base/src/main/java/com/blankj/lib/base/BaseDrawerActivity.kt

-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 → lib/base/src/main/java/com/blankj/lib/base/BaseFragment.kt

-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 → lib/base/src/main/java/com/blankj/lib/base/BaseLazyFragment.kt

-package com.blankj.base
+package com.blankj.lib.base
 
 import android.util.Log
 

lib/base/src/main/java/com/blankj/base/IBaseView.kt → lib/base/src/main/java/com/blankj/lib/base/IBaseView.kt

-package com.blankj.base
+package com.blankj.lib.base
 
 import android.os.Bundle
 import android.view.View

lib/base/src/main/java/com/blankj/base/rv/BaseViewHolder.java → lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java

-package com.blankj.base.rv;
+package com.blankj.lib.base.rv;
 
 import android.support.annotation.IdRes;
 import android.support.v7.widget.RecyclerView;

lib/base/src/main/java/com/blankj/base/rv/RecycleViewDivider.java → lib/base/src/main/java/com/blankj/lib/base/rv/RecycleViewDivider.java

-package com.blankj.base.rv;
+package com.blankj.lib.base.rv;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

lib/base/src/main/java/com/blankj/base/rv/adapter/BaseAdapter.java → lib/base/src/main/java/com/blankj/lib/base/rv/adapter/BaseAdapter.java

-package com.blankj.base.rv.adapter;
+package com.blankj.lib.base.rv.adapter;
 
 import android.content.Context;
 import android.support.annotation.LayoutRes;
@@ -9,9 +9,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.blankj.base.rv.BaseViewHolder;
-import com.blankj.base.rv.listener.OnItemClickListener;
-import com.blankj.base.rv.listener.OnItemLongClickListener;
+import com.blankj.lib.base.rv.BaseViewHolder;
+import com.blankj.lib.base.rv.listener.OnItemClickListener;
+import com.blankj.lib.base.rv.listener.OnItemLongClickListener;
 
 import java.util.List;
 

lib/base/src/main/java/com/blankj/base/rv/adapter/SingleAdapter.java → lib/base/src/main/java/com/blankj/lib/base/rv/adapter/SingleAdapter.java

-package com.blankj.base.rv.adapter;
+package com.blankj.lib.base.rv.adapter;
 
 import android.support.annotation.LayoutRes;
 

lib/base/src/main/java/com/blankj/base/rv/listener/OnItemClickListener.java → lib/base/src/main/java/com/blankj/lib/base/rv/listener/OnItemClickListener.java

-package com.blankj.base.rv.listener;
+package com.blankj.lib.base.rv.listener;
 
 import android.view.View;
 

lib/base/src/main/java/com/blankj/base/rv/listener/OnItemLongClickListener.java → lib/base/src/main/java/com/blankj/lib/base/rv/listener/OnItemLongClickListener.java

-package com.blankj.base.rv.listener;
+package com.blankj.lib.base.rv.listener;
 
 import android.view.View;
 

settings.gradle

 includeModule\
         ':buildSrc',
         ':bus-gradle-plugin',
-        ':-launcher',
+        ':launcher',
         ':lib',
-        ':-subutil',
+        ':subutil',
         ':utilcode'
 
 // 如果 name 以 '-' 开头，则剔除在外

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

@@ -2,7 +2,7 @@ package com.blankj.subutil.app;
 
 import android.content.Context;
 
-import com.blankj.base.BaseApplication;
+import com.blankj.lib.base.BaseApplication;
 
 
 /**

subutil/pkg/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.subutil">
+    package="com.blankj.subutil.pkg">
 
     <!-- brightness -->
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -15,24 +15,24 @@
     <application>
 
         <activity
-            android:name=".pkg.feature.SubUtilActivity"
+            android:name=".feature.SubUtilActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.brightness.BrightnessActivity"
+            android:name=".feature.brightness.BrightnessActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.flashlight.FlashlightActivity"
+            android:name=".feature.flashlight.FlashlightActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.location.LocationActivity"
+            android:name=".feature.location.LocationActivity"
             android:launchMode="singleTop" />
 
         <service
-            android:name=".pkg.feature.location.LocationService"
+            android:name=".feature.location.LocationService"
             android:launchMode="singleTop" />
 
         <activity
-            android:name=".pkg.feature.pinyin.PinyinActivity"
+            android:name=".feature.pinyin.PinyinActivity"
             android:launchMode="singleTop" />
     </application>
 

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/SubUtilActivity.java

@@ -6,8 +6,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.subutil.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.subutil.pkg.R;
 import com.blankj.subutil.pkg.feature.brightness.BrightnessActivity;
 import com.blankj.subutil.pkg.feature.flashlight.FlashlightActivity;
 import com.blankj.subutil.pkg.feature.location.LocationActivity;

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/brightness/BrightnessActivity.java

@@ -13,11 +13,11 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
-import com.blankj.base.BaseActivity;
-import com.blankj.subutil.R;
+import com.blankj.lib.base.BaseActivity;
+import com.blankj.subutil.pkg.R;
 import com.blankj.subutil.util.BrightnessUtils;
-import com.blankj.subutil.util.Utils;
 import com.blankj.utilcode.util.SpanUtils;
+import com.blankj.utilcode.util.Utils;
 
 /**
  * <pre>

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/flashlight/FlashlightActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.subutil.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.subutil.pkg.R;
 import com.blankj.subutil.pkg.helper.PermissionHelper;
 import com.blankj.subutil.util.FlashlightUtils;
 import com.blankj.utilcode.util.SpanUtils;

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

@@ -10,8 +10,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.subutil.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.subutil.pkg.R;
 import com.blankj.utilcode.util.SpanUtils;
 
 /**

subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.subutil.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.subutil.pkg.R;
 import com.blankj.subutil.util.PinyinUtils;
 
 /**

subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 
-import com.blankj.subutil.R;
+import com.blankj.subutil.R.pkg;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.PermissionUtils;
 import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldRequest;

utilcode/README-STATIC-BUS.md

@@ -13,7 +13,7 @@
 buildscript {
     dependencies {
         ...
-        classpath 'com.blankj:bus-gradle-plugin:1.5'
+        classpath 'com.blankj:bus-gradle-plugin:1.6'
     }
 }
 ```

utilcode/app/build.gradle

@@ -4,6 +4,5 @@ apply {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation project(':utilcode-pkg')
-    api dep.free_proguard
+    api project(':utilcode-pkg')
 }
\ No newline at end of file

utilcode/app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.utilcode">
+    package="com.blankj.utilcode.app">
 
     <application
-        android:name=".app.UtilCodeApp"
+        android:name=".UtilCodeApp"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -20,7 +20,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -2,7 +2,8 @@ package com.blankj.utilcode.app;
 
 import android.content.Context;
 
-import com.blankj.base.BaseApplication;
+import com.blankj.lib.base.BaseApplication;
+import com.blankj.utilcode.util.Utils;
 
 
 /**
@@ -28,6 +29,7 @@ public class UtilCodeApp extends BaseApplication {
 
     @Override
     public void onCreate() {
+        Utils.init(this);
         super.onCreate();
         sInstance = this;
     }

utilcode/lib/build.gradle

@@ -12,7 +12,7 @@ readme {
     readmeCnFile file('../README-CN.md')
 }
 
-apply from: "../../gradle/bintrayUploadAndroid.gradle"
+apply from: "${rootDir.path}/gradle/bintrayUploadAndroid.gradle"
 
 dependencies {
     compileOnly dep.support.appcompat_v7

utilcode/lib/proguard-rules.pro

@@ -15,7 +15,4 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class com.blankj.utilcode.** { *; }
--keepclassmembers class com.blankj.utilcode.** { *; }
 -dontwarn com.blankj.utilcode.**
\ No newline at end of file

utilcode/lib/src/main/AndroidManifest.xml

@@ -9,15 +9,15 @@
             android:theme="@style/ActivityTranslucent"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
 
-        <provider
-            android:name=".util.Utils$FileProvider4UtilCode"
-            android:authorities="${applicationId}.utilcode.provider"
-            android:exported="false"
-            android:grantUriPermissions="true"
-            android:multiprocess="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/util_code_provider_paths" />
-        </provider>
+        <!--<provider-->
+            <!--android:name=".util.Utils$FileProvider4UtilCode"-->
+            <!--android:authorities="${applicationId}.utilcode.provider"-->
+            <!--android:exported="false"-->
+            <!--android:grantUriPermissions="true"-->
+            <!--android:multiprocess="true">-->
+            <!--<meta-data-->
+                <!--android:name="android.support.FILE_PROVIDER_PATHS"-->
+                <!--android:resource="@xml/util_code_provider_paths" />-->
+        <!--</provider>-->
     </application>
 </manifest>
\ No newline at end of file

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

@@ -7,7 +7,6 @@ import android.app.Application;
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.content.FileProvider;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -307,15 +306,14 @@ public final class Utils {
         }
     }
 
-
-    public static final class FileProvider4UtilCode extends FileProvider {
-
-        @Override
-        public boolean onCreate() {
-            Utils.init(getContext());
-            return true;
-        }
-    }
+//    public static final class FileProvider4UtilCode extends FileProvider {
+//
+//        @Override
+//        public boolean onCreate() {
+//            Utils.init(getContext());
+//            return true;
+//        }
+//    }
 
     ///////////////////////////////////////////////////////////////////////////
     // interface

utilcode/pkg/build.gradle

@@ -5,5 +5,4 @@ apply {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(':lib-base')
-    api 'com.jaredrummler:android-processes:1.1.1'
-}
+}
\ No newline at end of file

utilcode/pkg/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.blankj.utilcode">
+    package="com.blankj.utilcode.pkg">
 
     <!-- app -->
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -33,131 +33,131 @@
 
     <application>
         <activity
-            android:name=".pkg.feature.CoreUtilActivity"
+            android:name=".feature.CoreUtilActivity"
             android:launchMode="singleTop" />
 
         <activity
-            android:name=".pkg.feature.activity.ActivityActivity"
+            android:name=".feature.activity.ActivityActivity"
             android:icon="@drawable/activity_activity_icon"
             android:launchMode="singleTop"
             android:logo="@drawable/activity_activity_logo" />
         <activity
-            android:name=".pkg.feature.activity.SubActivityActivity"
+            android:name=".feature.activity.SubActivityActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.adaptScreen.AdaptScreenActivity"
+            android:name=".feature.adaptScreen.AdaptScreenActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.adaptScreen.CloseAdaptActivity"
+            android:name=".feature.adaptScreen.CloseAdaptActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.adaptScreen.HeightActivity"
+            android:name=".feature.adaptScreen.HeightActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.adaptScreen.WidthActivity"
+            android:name=".feature.adaptScreen.WidthActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.app.AppActivity"
+            android:name=".feature.app.AppActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarActivity"
+            android:name=".feature.bar.BarActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusActivity"
+            android:name=".feature.bar.BarStatusActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarNotificationActivity"
+            android:name=".feature.bar.BarNotificationActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarNavActivity"
+            android:name=".feature.bar.BarNavActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusAlphaActivity"
+            android:name=".feature.bar.BarStatusAlphaActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusColorActivity"
+            android:name=".feature.bar.BarStatusColorActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusDrawerActivity"
+            android:name=".feature.bar.BarStatusDrawerActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusFragmentActivity"
+            android:name=".feature.bar.BarStatusFragmentActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusImageViewActivity"
+            android:name=".feature.bar.BarStatusImageViewActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.bar.BarStatusSwipeBackActivity"
+            android:name=".feature.bar.BarStatusSwipeBackActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.blur.BlurActivity"
+            android:name=".feature.blur.BlurActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.blur.TransparentActivity"
+            android:name=".feature.blur.TransparentActivity"
             android:theme="@style/ActivityTranslucent"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.clean.CleanActivity"
+            android:name=".feature.clean.CleanActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.device.DeviceActivity"
+            android:name=".feature.device.DeviceActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.fragment.FragmentActivity"
+            android:name=".feature.fragment.FragmentActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.image.ImageActivity"
+            android:name=".feature.image.ImageActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.keyboard.KeyboardActivity"
+            android:name=".feature.keyboard.KeyboardActivity"
             android:launchMode="singleTop"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name=".pkg.feature.log.LogActivity"
+            android:name=".feature.log.LogActivity"
             android:launchMode="singleTop" />
 
         <activity
-            android:name=".pkg.feature.metaData.MetaDataActivity"
+            android:name=".feature.metaData.MetaDataActivity"
             android:launchMode="singleTop">
             <meta-data
                 android:name="activity_meta_data"
                 android:value="ActivityMetaData" />
         </activity>
         <activity
-            android:name=".pkg.feature.network.NetworkActivity"
+            android:name=".feature.network.NetworkActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.path.PathActivity"
+            android:name=".feature.path.PathActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.permission.PermissionActivity"
+            android:name=".feature.permission.PermissionActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.phone.PhoneActivity"
+            android:name=".feature.phone.PhoneActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.process.ProcessActivity"
+            android:name=".feature.process.ProcessActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.reflect.ReflectActivity"
+            android:name=".feature.reflect.ReflectActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.resource.ResourceActivity"
+            android:name=".feature.resource.ResourceActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.sdcard.SDCardActivity"
+            android:name=".feature.sdcard.SDCardActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.snackbar.SnackbarActivity"
+            android:name=".feature.snackbar.SnackbarActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.sp.SPActivity"
+            android:name=".feature.sp.SPActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.span.SpanActivity"
+            android:name=".feature.span.SpanActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".pkg.feature.toast.ToastActivity"
+            android:name=".feature.toast.ToastActivity"
             android:launchMode="singleTop" />
 
         <meta-data

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

@@ -6,8 +6,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.feature.activity.ActivityActivity;
 import com.blankj.utilcode.pkg.feature.adaptScreen.AdaptScreenActivity;
 import com.blankj.utilcode.pkg.feature.app.AppActivity;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.java

@@ -13,9 +13,9 @@ import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.pkg.Config;
-import com.blankj.utilcode.R;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.feature.CoreUtilActivity;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.java

@@ -8,8 +8,8 @@ import android.support.v4.app.ActivityCompat;
 import android.view.View;
 import android.view.Window;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 
 import java.util.Random;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import com.blankj.base.BaseBackActivity
-import com.blankj.utilcode.R
+import com.blankj.lib.base.BaseBackActivity
+import com.blankj.utilcode.pkg.R
 import kotlinx.android.synthetic.main.activity_adapt_screen.*
 
 class AdaptScreenActivity : BaseBackActivity() {

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/CloseAdaptActivity.kt

@@ -6,7 +6,7 @@ import android.content.res.Resources
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.WindowManager
-import com.blankj.utilcode.R
+import com.blankj.utilcode.pkg.R
 import com.blankj.utilcode.util.AdaptScreenUtils
 
 class CloseAdaptActivity : AppCompatActivity() {

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/HeightActivity.kt

@@ -7,7 +7,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.WindowManager
-import com.blankj.utilcode.R
+import com.blankj.utilcode.pkg.R
 import com.blankj.utilcode.util.AdaptScreenUtils
 import kotlinx.android.synthetic.main.activity_adapt_height.*
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/WidthActivity.kt

@@ -7,7 +7,7 @@ import android.graphics.Color
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.WindowManager
-import com.blankj.utilcode.R
+import com.blankj.utilcode.pkg.R
 import com.blankj.utilcode.util.AdaptScreenUtils
 import kotlinx.android.synthetic.main.activity_adapt_width.*
 

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

@@ -7,9 +7,9 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.pkg.Config;
-import com.blankj.utilcode.R;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.helper.PermissionHelper;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.FileUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 
 /**
  * <pre>

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarNavActivity.java

@@ -10,8 +10,8 @@ import android.support.annotation.RequiresApi;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarNotificationActivity.java

@@ -7,8 +7,8 @@ import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.BarUtils;
 
 /**

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusAlphaActivity.java

@@ -8,8 +8,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.base.BaseActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.BarUtils;
 
 /**

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusAlphaFragment.java

@@ -6,8 +6,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.base.BaseLazyFragment;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseLazyFragment;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.LogUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusColorActivity.java

@@ -9,8 +9,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.base.BaseActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.Utils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusColorFragment.java

@@ -7,8 +7,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.base.BaseLazyFragment;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseLazyFragment;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.Utils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusCustomFragment.java

@@ -4,8 +4,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseLazyFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseLazyFragment;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.LogUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusDrawerActivity.java

@@ -13,8 +13,8 @@ import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseDrawerActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseDrawerActivity;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.Utils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusFragmentActivity.java

@@ -12,8 +12,8 @@ import android.support.v4.view.ViewPager;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseActivity;
 
 import java.util.ArrayList;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusImageViewActivity.java

@@ -8,8 +8,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseActivity;
 import com.blankj.utilcode.util.BarUtils;
 
 /**

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusImageViewFragment.java

@@ -6,8 +6,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseLazyFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseLazyFragment;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.LogUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusSwipeBackActivity.java

@@ -14,8 +14,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseActivity;
 import com.blankj.utilcode.util.BarUtils;
 import com.blankj.utilcode.util.Utils;
 import com.r0adkll.slidr.Slidr;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/blur/BlurActivity.java

@@ -7,12 +7,10 @@ import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.ImageView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
-import com.blankj.utilcode.pkg.helper.DialogHelper;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.ImageUtils;
@@ -109,7 +107,7 @@ public class BlurActivity extends BaseBackActivity {
             if (isBlur) {
                 Bitmap bitmapForView = ImageUtils.view2Bitmap(decorView);
 
-                Bitmap bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true, true);
+                Bitmap bitmap = ImageUtils.fastBlur(bitmapForView, 0.125f, 2f, true);
 
                 ImageView view = new ImageView(topActivity);
                 view.setImageBitmap(bitmap);

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/clean/CleanActivity.java

@@ -7,8 +7,8 @@ import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.CleanUtils;
 import com.blankj.utilcode.util.SnackbarUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/device/DeviceActivity.java

@@ -8,8 +8,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.DeviceUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/ChildFragment.java

@@ -6,8 +6,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseFragment;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.LogUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/FragmentActivity.java

@@ -11,8 +11,8 @@ import android.support.v4.app.Fragment;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseActivity;
 import com.blankj.utilcode.util.FragmentUtils;
 
 /**

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/Root0Fragment.java

@@ -10,8 +10,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseFragment;
 import com.blankj.utilcode.util.FragmentUtils;
 
 import java.util.Random;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/Root1Fragment.java

@@ -10,8 +10,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseFragment;
 import com.blankj.utilcode.util.FragmentUtils;
 
 import java.util.Random;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/fragment/Root2Fragment.java

@@ -10,8 +10,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseFragment;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseFragment;
 import com.blankj.utilcode.util.FragmentUtils;
 
 import java.util.Random;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.java

@@ -12,8 +12,8 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import com.blankj.utilcode.pkg.Config;
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseActivity;
 import com.blankj.utilcode.util.ImageUtils;
 import com.blankj.utilcode.util.ToastUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageAdapter.java

@@ -4,9 +4,9 @@ import android.support.annotation.LayoutRes;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.rv.BaseViewHolder;
-import com.blankj.base.rv.adapter.SingleAdapter;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.rv.BaseViewHolder;
+import com.blankj.lib.base.rv.adapter.SingleAdapter;
 
 import java.util.List;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/keyboard/KeyboardActivity.java

@@ -9,8 +9,8 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.helper.DialogHelper;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.SpanUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/log/LogActivity.java

@@ -10,10 +10,10 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseApplication;
+import com.blankj.lib.base.BaseApplication;
 import com.blankj.utilcode.pkg.Config;
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.LogUtils;
 
 import java.util.ArrayList;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/metaData/MetaDataActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.MetaDataUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/network/NetworkActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.NetworkUtils;
 import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ThreadUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/path/PathActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.PathUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.java

@@ -9,9 +9,9 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.constant.PermissionConstants;
-import com.blankj.utilcode.R;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.helper.DialogHelper;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.PermissionUtils;

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

@@ -8,8 +8,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.helper.PermissionHelper;
 import com.blankj.utilcode.util.PhoneUtils;
 import com.blankj.utilcode.util.SpanUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/process/ProcessActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.ProcessUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/reflect/ReflectActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.ReflectUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/resource/ResourceActivity.java

@@ -8,8 +8,8 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.blankj.utilcode.pkg.Config;
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.ResourceUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/sdcard/SDCardActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.SDCardUtils;
 import com.blankj.utilcode.util.SpanUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.java

@@ -11,8 +11,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.SnackbarUtils;
 import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/sp/SPActivity.java

@@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
 
-import com.blankj.base.BaseBackActivity;
-import com.blankj.utilcode.R;
+import com.blankj.lib.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.pkg.data.DataManager;
 
 /**

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.java

@@ -18,8 +18,8 @@ import android.view.View;
 import android.view.animation.LinearInterpolator;
 import android.widget.TextView;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/CustomToast.java

@@ -7,7 +7,7 @@ import android.support.annotation.StringRes;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.blankj.utilcode.R;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.ToastUtils;
 import com.blankj.utilcode.util.Utils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.java

@@ -9,8 +9,8 @@ import android.support.v4.content.ContextCompat;
 import android.view.Gravity;
 import android.view.View;
 
-import com.blankj.utilcode.R;
-import com.blankj.base.BaseBackActivity;
+import com.blankj.utilcode.pkg.R;
+import com.blankj.lib.base.BaseBackActivity;
 import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;
 

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/DialogHelper.java

@@ -7,7 +7,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 
-import com.blankj.utilcode.R;
+import com.blankj.utilcode.pkg.R;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.PermissionUtils;