see 11/05 log

Blankj · Blankj · commit 7664f695b890 · 2018-11-05T19:04:30.000+08:00
diff --git a/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java b/app/src/main/java/com/blankj/androidutilcode/UtilsApp.java
@@ -7,7 +7,6 @@
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.CrashUtils;
 import com.blankj.utilcode.util.LogUtils;
-import com.blankj.utilcode.util.ToastUtils;
 import com.squareup.leakcanary.LeakCanary;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java
@@ -2,12 +2,15 @@
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 
+import com.blankj.utilcode.util.AdaptScreenUtils;
+
 /**
  * <pre>
  *     author: Blankj
@@ -29,11 +32,6 @@ public abstract class BaseActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-//        if (ScreenUtils.isPortrait()) {
-//            ScreenUtils.adaptScreen4VerticalSlide(this, 720);
-//        } else {
-//            ScreenUtils.adaptScreen4HorizontalSlide(this, 720);
-//        }
         super.onCreate(savedInstanceState);
         mActivity = this;
         Bundle bundle = getIntent().getExtras();
@@ -67,4 +65,9 @@ private boolean isFastClick() {
     public void onClick(final View view) {
         if (!isFastClick()) onWidgetClick(view);
     }
+
+    @Override
+    public Resources getResources() {
+        return AdaptScreenUtils.adapt(super.getResources(), 300);
+    }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,9 +7,9 @@ buildscript {
     }
 
     dependencies {
-        classpath depConfig.gradle
+        classpath dep.gradle
 //        classpath 'com.blankj:bus-gradle-plugin:1.3'
-        classpath depConfig.kotlin_gradle_plugin
+        classpath dep.kotlin_gradle_plugin
     }
 }
 
@@ -25,7 +25,7 @@ allprojects {
         resolutionStrategy.eachDependency {
             if (it.requested.group == 'com.android.support'
                     && !it.requested.name.contains('multidex')) {
-                it.useVersion versionConfig.support
+                it.useVersion support_version
             }
         }
     }
diff --git a/config.gradle b/config.gradle
@@ -1,55 +1,44 @@
 ext {
-    androidConfig = [
-            applicationId    : 'com.blankj.androidutilcode',
-            appName          : 'Util',
-
-            compileSdkVersion: 27,
-            minSdkVersion    : 14,
-            targetSdkVersion : 27,
-            versionCode      : 1_021_002,
-            versionName      : '1.21.2'// E.g. 1.9.72 => 1,009,072
-    ]
+    applicationId = 'com.blankj.androidutilcode'
+    appName = 'Util'
 
-    versionConfig = [
-            // plugin
-            gradle       : '3.2.1',
-            kotlin       : '1.2.71',
-            // lib
-            support      : '27.1.1',
-            constraint   : '1.0.2',
-            bus          : '1.0',
-            gson         : '2.8.2',
-            glide        : '4.7.1',
-            leakcanary   : '1.5.4',
-            retrofit     : '2.4.0',
-            free_proguard: '0.0.7',
-            // test
-            junit        : '4.12',
-            robolectric  : '3.1.2'
-    ]
+    compileSdkVersion = 27
+    minSdkVersion = 14
+    targetSdkVersion = 27
+    versionCode = 1_021_002
+    versionName = '1.21.2'// E.g. 1.9.72 => 1,009,072
+
+    // lib version
+    kotlin_version = '1.2.71'
+    support_version = '27.1.1'
+    leakcanary_version = '1.5.4'
 
-    depConfig = [
-            gradle              : "com.android.tools.build:gradle:$versionConfig.gradle",
-            kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$versionConfig.kotlin",
+    dep = [
+            // plugin
+            gradle              : "com.android.tools.build:gradle:3.2.1",
+            kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version",
 
+            // lib
             support             : [
-                    appcompat_v7: "com.android.support:appcompat-v7:$versionConfig.support",
-                    design      : "com.android.support:design:$versionConfig.support",
+                    appcompat_v7: "com.android.support:appcompat-v7:$support_version",
+                    design      : "com.android.support:design:$support_version",
             ],
-            constraint          : "com.android.support.constraint:constraint-layout:$versionConfig.constraint",
-            kotlin_stdlib_jdk7  : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versionConfig.kotlin",
+            constraint          : "com.android.support.constraint:constraint-layout:1.1.3",
+            kotlin_stdlib_jdk7  : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
             leakcanary          : [
-                    android      : "com.squareup.leakcanary:leakcanary-android:$versionConfig.leakcanary",
-                    android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$versionConfig.leakcanary",
+                    android      : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
+                    android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
             ],
-            bus                 : "com.blankj:bus:$versionConfig.bus",
-            gson                : "com.google.code.gson:gson:$versionConfig.gson",
-            glide               : "com.github.bumptech.glide:glide:$versionConfig.glide",
-            retrofit            : "com.squareup.retrofit2:retrofit:$versionConfig.retrofit",
-            free_proguard       : "com.blankj:free-proguard:$versionConfig.free_proguard",
-
-            junit               : "junit:junit:$versionConfig.junit",
-            robolectric         : "org.robolectric:robolectric:$versionConfig.robolectric",
+            free_proguard       : "com.blankj:free-proguard:0.0.7",
+            bus                 : "com.blankj:bus:1.0",
+            adapt_screen        : "com.blankj:adapt-screen:0.0.3",
+
+            gson                : "com.google.code.gson:gson:2.8.2",
+            glide               : "com.github.bumptech.glide:glide:4.7.1",
+            retrofit            : "com.squareup.retrofit2:retrofit:2.4.0",
+
+            junit               : "junit:junit:4.12",
+            robolectric         : "org.robolectric:robolectric:3.1.2",
     ]
 
     configAndroidDomain = this.&configAndroidDomain
@@ -71,13 +60,13 @@ def configAppAndroidDomain(Project pro) {
     configSigning(pro)
     configApkName(pro)
     pro.android {
-        compileSdkVersion androidConfig.compileSdkVersion
+        compileSdkVersion rootProject.compileSdkVersion
         defaultConfig {
-            applicationId androidConfig.applicationId
-            minSdkVersion androidConfig.minSdkVersion
-            targetSdkVersion androidConfig.targetSdkVersion
-            versionCode androidConfig.versionCode
-            versionName androidConfig.versionName
+            applicationId rootProject.applicationId
+            minSdkVersion rootProject.minSdkVersion
+            targetSdkVersion rootProject.targetSdkVersion
+            versionCode rootProject.versionCode
+            versionName rootProject.versionName
         }
 
         buildTypes {
@@ -100,7 +89,7 @@ def configAppAndroidDomain(Project pro) {
 
 def configField(Project pro) {
     pro.android.defaultConfig {
-        resValue "string", "app_name", androidConfig.appName
+        resValue "string", "app_name", rootProject.appName
     }
 }
 
@@ -135,11 +124,11 @@ def configApkName(Project pro) {
 
 def configLibAndroidDomain(Project pro) {
     pro.android {
-        compileSdkVersion androidConfig.compileSdkVersion
+        compileSdkVersion rootProject.compileSdkVersion
         defaultConfig {
-            minSdkVersion androidConfig.minSdkVersion
-            versionCode androidConfig.versionCode
-            versionName androidConfig.versionName
+            minSdkVersion rootProject.minSdkVersion
+            versionCode rootProject.versionCode
+            versionName rootProject.versionName
         }
 
         buildTypes {
@@ -161,8 +150,9 @@ def configLibAndroidDomain(Project pro) {
         }
     }
 
-    pro.afterEvaluate {
+    afterEvaluate {
         generateReleaseBuildConfig.enabled = false
+        generateDebugBuildConfig.enabled = false
     }
 }
 
@@ -173,44 +163,45 @@ def configAppDependencies(Project pro) {
         implementation project(':utilcode')
         implementation project(':subutil')
 
-        implementation depConfig.support.appcompat_v7
-        implementation depConfig.support.design
-        implementation depConfig.constraint
-        implementation depConfig.free_proguard
+        implementation dep.support.appcompat_v7
+        implementation dep.support.design
+        implementation dep.constraint
+        implementation dep.free_proguard
         implementation 'com.r0adkll:slidableactivity:2.0.5'
         // LeakCanary
-        debugImplementation depConfig.leakcanary.android
-        releaseImplementation depConfig.leakcanary.android_no_op
+        debugImplementation dep.leakcanary.android
+        releaseImplementation dep.leakcanary.android_no_op
 //        implementation 'com.blankj:utilcode:1.21.2'
     }
 }
 
 def configUtilCodeDependencies(Project pro) {
     pro.dependencies {
-        api depConfig.bus
+        api dep.bus
+        api dep.adapt_screen
 
-        compileOnly depConfig.support.appcompat_v7
-        compileOnly depConfig.support.design
+        compileOnly dep.support.appcompat_v7
+        compileOnly dep.support.design
 
-        testImplementation depConfig.junit
-        testImplementation depConfig.robolectric
-        testImplementation depConfig.support.appcompat_v7
+        testImplementation dep.junit
+        testImplementation dep.robolectric
+        testImplementation dep.support.appcompat_v7
     }
 }
 
 def configSubUtilDependencies(Project pro) {
     pro.dependencies {
-        compileOnly depConfig.support.appcompat_v7
-        compileOnly depConfig.support.design
-
-        api depConfig.gson
-        api(depConfig.glide) {
+        compileOnly dep.support.appcompat_v7
+        compileOnly dep.support.design
+        InetAddress
+        api dep.gson
+        api(dep.glide) {
             exclude group: "com.android.support"
         }
-        api depConfig.retrofit
+        api dep.retrofit
 
-        testImplementation depConfig.junit
-        testImplementation depConfig.robolectric
+        testImplementation dep.junit
+        testImplementation dep.robolectric
     }
 }
 //./gradlew bintrayUpload
diff --git a/utilcode-kotlin/build.gradle b/utilcode-kotlin/build.gradle
@@ -10,9 +10,7 @@ plugins {
 configAndroidDomain project
 configUtilCodeDependencies project
 
-dependencies {
-    api depConfig.kotlin_stdlib_jdk7
-}
+dependencies.add("implementation", dep.kotlin_stdlib_jdk7)
 
 readme {
     readmeFile file('README.md')
diff --git a/utilcode-kotlin/src/main/java/com/blankj/utilcode/util/Utils.kt b/utilcode-kotlin/src/main/java/com/blankj/utilcode/util/Utils.kt
@@ -18,6 +18,8 @@ import java.util.*
 private var sApplication: Application? = null
 
 private val ACTIVITY_LIFECYCLE = ActivityLifecycleImpl()
+private const val PERMISSION_ACTIVITY_CLASS_NAME =
+        "com.blankj.utilcode.util.PermissionUtils\$PermissionUtils.PermissionActivity"
 
 /**
  * Init utils.
@@ -190,6 +192,7 @@ internal class ActivityLifecycleImpl : ActivityLifecycleCallbacks {
             return topActivityByReflect
         }
         private set(activity) {
+            if (PERMISSION_ACTIVITY_CLASS_NAME == activity?.javaClass?.name) return;
             if (activity?.javaClass == PermissionUtils.PermissionActivity::class.java) return
             if (mActivityList.contains(activity)) {
                 if (!mActivityList.last.equals(activity)) {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SizeUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SizeUtils.java
@@ -1,7 +1,6 @@
 package com.blankj.utilcode.util;
 
-import android.content.Context;
-import android.support.annotation.NonNull;
+import android.content.res.Resources;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
@@ -28,7 +27,7 @@ private SizeUtils() {
      * @return value of px
      */
     public static int dp2px(final float dpValue) {
-        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
         return (int) (dpValue * scale + 0.5f);
     }
 
@@ -39,7 +38,7 @@ public static int dp2px(final float dpValue) {
      * @return value of dp
      */
     public static int px2dp(final float pxValue) {
-        final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
+        final float scale = Resources.getSystem().getDisplayMetrics().density;
         return (int) (pxValue / scale + 0.5f);
     }
 
@@ -50,7 +49,7 @@ public static int px2dp(final float pxValue) {
      * @return value of px
      */
     public static int sp2px(final float spValue) {
-        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
+        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
         return (int) (spValue * fontScale + 0.5f);
     }
 
@@ -61,7 +60,7 @@ public static int sp2px(final float spValue) {
      * @return value of sp
      */
     public static int px2sp(final float pxValue) {
-        final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
+        final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
         return (int) (pxValue / fontScale + 0.5f);
     }
 
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -8,8 +8,6 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v4.content.FileProvider;
 import android.util.DisplayMetrics;
 
@@ -46,6 +44,9 @@ public final class Utils {
 
     private static final ActivityLifecycleImpl ACTIVITY_LIFECYCLE = new ActivityLifecycleImpl();
 
+    private final static String PERMISSION_ACTIVITY_CLASS_NAME =
+            "com.blankj.utilcode.util.PermissionUtils$PermissionActivity";
+
     private Utils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }
@@ -277,7 +278,7 @@ private void postStatus(final boolean isForeground) {
         }
 
         private void setTopActivity(final Activity activity) {
-            if (activity.getClass() == PermissionUtils.PermissionActivity.class) return;
+            if (PERMISSION_ACTIVITY_CLASS_NAME.equals(activity.getClass().getName())) return;
             if (mActivityList.contains(activity)) {
                 if (!mActivityList.getLast().equals(activity)) {
                     mActivityList.remove(activity);

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- classpath depConfig.gradle`
	`10`	`+ classpath dep.gradle`
`11`	`11`	`// classpath 'com.blankj:bus-gradle-plugin:1.3'`
`12`		`- classpath depConfig.kotlin_gradle_plugin`
	`12`	`+ classpath dep.kotlin_gradle_plugin`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`@@ -25,7 +25,7 @@ allprojects {`
`25`	`25`	`resolutionStrategy.eachDependency {`
`26`	`26`	`if (it.requested.group == 'com.android.support'`
`27`	`27`	`&& !it.requested.name.contains('multidex')) {`
`28`		`- it.useVersion versionConfig.support`
	`28`	`+ it.useVersion support_version`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`