Skip to content

Commit 7664f69

Browse files
author
Blankj
committed
see 11/05 log
1 parent 383851f commit 7664f69

8 files changed

Lines changed: 91 additions & 97 deletions

File tree

‎app/src/main/java/com/blankj/androidutilcode/UtilsApp.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.blankj.utilcode.util.AppUtils;
88
import com.blankj.utilcode.util.CrashUtils;
99
import com.blankj.utilcode.util.LogUtils;
10-
import com.blankj.utilcode.util.ToastUtils;
1110
import com.squareup.leakcanary.LeakCanary;
1211

1312
import java.util.ArrayList;

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import android.annotation.SuppressLint;
44
import android.app.Activity;
5+
import android.content.res.Resources;
56
import android.os.Bundle;
67
import android.support.annotation.LayoutRes;
78
import android.support.v7.app.AppCompatActivity;
89
import android.view.LayoutInflater;
910
import android.view.View;
1011

12+
import com.blankj.utilcode.util.AdaptScreenUtils;
13+
1114
/**
1215
* <pre>
1316
* author: Blankj
@@ -29,11 +32,6 @@ public abstract class BaseActivity extends AppCompatActivity
2932

3033
@Override
3134
protected void onCreate(Bundle savedInstanceState) {
32-
// if (ScreenUtils.isPortrait()) {
33-
// ScreenUtils.adaptScreen4VerticalSlide(this, 720);
34-
// } else {
35-
// ScreenUtils.adaptScreen4HorizontalSlide(this, 720);
36-
// }
3735
super.onCreate(savedInstanceState);
3836
mActivity = this;
3937
Bundle bundle = getIntent().getExtras();
@@ -67,4 +65,9 @@ private boolean isFastClick() {
6765
public void onClick(final View view) {
6866
if (!isFastClick()) onWidgetClick(view);
6967
}
68+
69+
@Override
70+
public Resources getResources() {
71+
return AdaptScreenUtils.adapt(super.getResources(), 300);
72+
}
7073
}

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath depConfig.gradle
10+
classpath dep.gradle
1111
// classpath 'com.blankj:bus-gradle-plugin:1.3'
12-
classpath depConfig.kotlin_gradle_plugin
12+
classpath dep.kotlin_gradle_plugin
1313
}
1414
}
1515

@@ -25,7 +25,7 @@ allprojects {
2525
resolutionStrategy.eachDependency {
2626
if (it.requested.group == 'com.android.support'
2727
&& !it.requested.name.contains('multidex')) {
28-
it.useVersion versionConfig.support
28+
it.useVersion support_version
2929
}
3030
}
3131
}

‎config.gradle‎

Lines changed: 67 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,44 @@
11
ext {
2-
androidConfig = [
3-
applicationId : 'com.blankj.androidutilcode',
4-
appName : 'Util',
5-
6-
compileSdkVersion: 27,
7-
minSdkVersion : 14,
8-
targetSdkVersion : 27,
9-
versionCode : 1_021_002,
10-
versionName : '1.21.2'// E.g. 1.9.72 => 1,009,072
11-
]
2+
applicationId = 'com.blankj.androidutilcode'
3+
appName = 'Util'
124

13-
versionConfig = [
14-
// plugin
15-
gradle : '3.2.1',
16-
kotlin : '1.2.71',
17-
// lib
18-
support : '27.1.1',
19-
constraint : '1.0.2',
20-
bus : '1.0',
21-
gson : '2.8.2',
22-
glide : '4.7.1',
23-
leakcanary : '1.5.4',
24-
retrofit : '2.4.0',
25-
free_proguard: '0.0.7',
26-
// test
27-
junit : '4.12',
28-
robolectric : '3.1.2'
29-
]
5+
compileSdkVersion = 27
6+
minSdkVersion = 14
7+
targetSdkVersion = 27
8+
versionCode = 1_021_002
9+
versionName = '1.21.2'// E.g. 1.9.72 => 1,009,072
10+
11+
// lib version
12+
kotlin_version = '1.2.71'
13+
support_version = '27.1.1'
14+
leakcanary_version = '1.5.4'
3015

31-
depConfig = [
32-
gradle : "com.android.tools.build:gradle:$versionConfig.gradle",
33-
kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$versionConfig.kotlin",
16+
dep = [
17+
// plugin
18+
gradle : "com.android.tools.build:gradle:3.2.1",
19+
kotlin_gradle_plugin: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version",
3420

21+
// lib
3522
support : [
36-
appcompat_v7: "com.android.support:appcompat-v7:$versionConfig.support",
37-
design : "com.android.support:design:$versionConfig.support",
23+
appcompat_v7: "com.android.support:appcompat-v7:$support_version",
24+
design : "com.android.support:design:$support_version",
3825
],
39-
constraint : "com.android.support.constraint:constraint-layout:$versionConfig.constraint",
40-
kotlin_stdlib_jdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versionConfig.kotlin",
26+
constraint : "com.android.support.constraint:constraint-layout:1.1.3",
27+
kotlin_stdlib_jdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version",
4128
leakcanary : [
42-
android : "com.squareup.leakcanary:leakcanary-android:$versionConfig.leakcanary",
43-
android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$versionConfig.leakcanary",
29+
android : "com.squareup.leakcanary:leakcanary-android:$leakcanary_version",
30+
android_no_op: "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version",
4431
],
45-
bus : "com.blankj:bus:$versionConfig.bus",
46-
gson : "com.google.code.gson:gson:$versionConfig.gson",
47-
glide : "com.github.bumptech.glide:glide:$versionConfig.glide",
48-
retrofit : "com.squareup.retrofit2:retrofit:$versionConfig.retrofit",
49-
free_proguard : "com.blankj:free-proguard:$versionConfig.free_proguard",
50-
51-
junit : "junit:junit:$versionConfig.junit",
52-
robolectric : "org.robolectric:robolectric:$versionConfig.robolectric",
32+
free_proguard : "com.blankj:free-proguard:0.0.7",
33+
bus : "com.blankj:bus:1.0",
34+
adapt_screen : "com.blankj:adapt-screen:0.0.3",
35+
36+
gson : "com.google.code.gson:gson:2.8.2",
37+
glide : "com.github.bumptech.glide:glide:4.7.1",
38+
retrofit : "com.squareup.retrofit2:retrofit:2.4.0",
39+
40+
junit : "junit:junit:4.12",
41+
robolectric : "org.robolectric:robolectric:3.1.2",
5342
]
5443

5544
configAndroidDomain = this.&configAndroidDomain
@@ -71,13 +60,13 @@ def configAppAndroidDomain(Project pro) {
7160
configSigning(pro)
7261
configApkName(pro)
7362
pro.android {
74-
compileSdkVersion androidConfig.compileSdkVersion
63+
compileSdkVersion rootProject.compileSdkVersion
7564
defaultConfig {
76-
applicationId androidConfig.applicationId
77-
minSdkVersion androidConfig.minSdkVersion
78-
targetSdkVersion androidConfig.targetSdkVersion
79-
versionCode androidConfig.versionCode
80-
versionName androidConfig.versionName
65+
applicationId rootProject.applicationId
66+
minSdkVersion rootProject.minSdkVersion
67+
targetSdkVersion rootProject.targetSdkVersion
68+
versionCode rootProject.versionCode
69+
versionName rootProject.versionName
8170
}
8271

8372
buildTypes {
@@ -100,7 +89,7 @@ def configAppAndroidDomain(Project pro) {
10089

10190
def configField(Project pro) {
10291
pro.android.defaultConfig {
103-
resValue "string", "app_name", androidConfig.appName
92+
resValue "string", "app_name", rootProject.appName
10493
}
10594
}
10695

@@ -135,11 +124,11 @@ def configApkName(Project pro) {
135124

136125
def configLibAndroidDomain(Project pro) {
137126
pro.android {
138-
compileSdkVersion androidConfig.compileSdkVersion
127+
compileSdkVersion rootProject.compileSdkVersion
139128
defaultConfig {
140-
minSdkVersion androidConfig.minSdkVersion
141-
versionCode androidConfig.versionCode
142-
versionName androidConfig.versionName
129+
minSdkVersion rootProject.minSdkVersion
130+
versionCode rootProject.versionCode
131+
versionName rootProject.versionName
143132
}
144133

145134
buildTypes {
@@ -161,8 +150,9 @@ def configLibAndroidDomain(Project pro) {
161150
}
162151
}
163152

164-
pro.afterEvaluate {
153+
afterEvaluate {
165154
generateReleaseBuildConfig.enabled = false
155+
generateDebugBuildConfig.enabled = false
166156
}
167157
}
168158

@@ -173,44 +163,45 @@ def configAppDependencies(Project pro) {
173163
implementation project(':utilcode')
174164
implementation project(':subutil')
175165

176-
implementation depConfig.support.appcompat_v7
177-
implementation depConfig.support.design
178-
implementation depConfig.constraint
179-
implementation depConfig.free_proguard
166+
implementation dep.support.appcompat_v7
167+
implementation dep.support.design
168+
implementation dep.constraint
169+
implementation dep.free_proguard
180170
implementation 'com.r0adkll:slidableactivity:2.0.5'
181171
// LeakCanary
182-
debugImplementation depConfig.leakcanary.android
183-
releaseImplementation depConfig.leakcanary.android_no_op
172+
debugImplementation dep.leakcanary.android
173+
releaseImplementation dep.leakcanary.android_no_op
184174
// implementation 'com.blankj:utilcode:1.21.2'
185175
}
186176
}
187177

188178
def configUtilCodeDependencies(Project pro) {
189179
pro.dependencies {
190-
api depConfig.bus
180+
api dep.bus
181+
api dep.adapt_screen
191182

192-
compileOnly depConfig.support.appcompat_v7
193-
compileOnly depConfig.support.design
183+
compileOnly dep.support.appcompat_v7
184+
compileOnly dep.support.design
194185

195-
testImplementation depConfig.junit
196-
testImplementation depConfig.robolectric
197-
testImplementation depConfig.support.appcompat_v7
186+
testImplementation dep.junit
187+
testImplementation dep.robolectric
188+
testImplementation dep.support.appcompat_v7
198189
}
199190
}
200191

201192
def configSubUtilDependencies(Project pro) {
202193
pro.dependencies {
203-
compileOnly depConfig.support.appcompat_v7
204-
compileOnly depConfig.support.design
205-
206-
api depConfig.gson
207-
api(depConfig.glide) {
194+
compileOnly dep.support.appcompat_v7
195+
compileOnly dep.support.design
196+
InetAddress
197+
api dep.gson
198+
api(dep.glide) {
208199
exclude group: "com.android.support"
209200
}
210-
api depConfig.retrofit
201+
api dep.retrofit
211202

212-
testImplementation depConfig.junit
213-
testImplementation depConfig.robolectric
203+
testImplementation dep.junit
204+
testImplementation dep.robolectric
214205
}
215206
}
216207
//./gradlew bintrayUpload

‎utilcode-kotlin/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ plugins {
1010
configAndroidDomain project
1111
configUtilCodeDependencies project
1212

13-
dependencies {
14-
api depConfig.kotlin_stdlib_jdk7
15-
}
13+
dependencies.add("implementation", dep.kotlin_stdlib_jdk7)
1614

1715
readme {
1816
readmeFile file('README.md')

‎utilcode-kotlin/src/main/java/com/blankj/utilcode/util/Utils.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import java.util.*
1818
private var sApplication: Application? = null
1919

2020
private val ACTIVITY_LIFECYCLE = ActivityLifecycleImpl()
21+
private const val PERMISSION_ACTIVITY_CLASS_NAME =
22+
"com.blankj.utilcode.util.PermissionUtils\$PermissionUtils.PermissionActivity"
2123

2224
/**
2325
* Init utils.
@@ -190,6 +192,7 @@ internal class ActivityLifecycleImpl : ActivityLifecycleCallbacks {
190192
return topActivityByReflect
191193
}
192194
private set(activity) {
195+
if (PERMISSION_ACTIVITY_CLASS_NAME == activity?.javaClass?.name) return;
193196
if (activity?.javaClass == PermissionUtils.PermissionActivity::class.java) return
194197
if (mActivityList.contains(activity)) {
195198
if (!mActivityList.last.equals(activity)) {

‎utilcode/src/main/java/com/blankj/utilcode/util/SizeUtils.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.blankj.utilcode.util;
22

3-
import android.content.Context;
4-
import android.support.annotation.NonNull;
3+
import android.content.res.Resources;
54
import android.util.DisplayMetrics;
65
import android.util.TypedValue;
76
import android.view.View;
@@ -28,7 +27,7 @@ private SizeUtils() {
2827
* @return value of px
2928
*/
3029
public static int dp2px(final float dpValue) {
31-
final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
30+
final float scale = Resources.getSystem().getDisplayMetrics().density;
3231
return (int) (dpValue * scale + 0.5f);
3332
}
3433

@@ -39,7 +38,7 @@ public static int dp2px(final float dpValue) {
3938
* @return value of dp
4039
*/
4140
public static int px2dp(final float pxValue) {
42-
final float scale = Utils.getApp().getResources().getDisplayMetrics().density;
41+
final float scale = Resources.getSystem().getDisplayMetrics().density;
4342
return (int) (pxValue / scale + 0.5f);
4443
}
4544

@@ -50,7 +49,7 @@ public static int px2dp(final float pxValue) {
5049
* @return value of px
5150
*/
5251
public static int sp2px(final float spValue) {
53-
final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
52+
final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
5453
return (int) (spValue * fontScale + 0.5f);
5554
}
5655

@@ -61,7 +60,7 @@ public static int sp2px(final float spValue) {
6160
* @return value of sp
6261
*/
6362
public static int px2sp(final float pxValue) {
64-
final float fontScale = Utils.getApp().getResources().getDisplayMetrics().scaledDensity;
63+
final float fontScale = Resources.getSystem().getDisplayMetrics().scaledDensity;
6564
return (int) (pxValue / fontScale + 0.5f);
6665
}
6766

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import android.content.Context;
99
import android.content.res.Resources;
1010
import android.os.Bundle;
11-
import android.support.annotation.NonNull;
12-
import android.support.annotation.Nullable;
1311
import android.support.v4.content.FileProvider;
1412
import android.util.DisplayMetrics;
1513

@@ -46,6 +44,9 @@ public final class Utils {
4644

4745
private static final ActivityLifecycleImpl ACTIVITY_LIFECYCLE = new ActivityLifecycleImpl();
4846

47+
private final static String PERMISSION_ACTIVITY_CLASS_NAME =
48+
"com.blankj.utilcode.util.PermissionUtils$PermissionActivity";
49+
4950
private Utils() {
5051
throw new UnsupportedOperationException("u can't instantiate me...");
5152
}
@@ -277,7 +278,7 @@ private void postStatus(final boolean isForeground) {
277278
}
278279

279280
private void setTopActivity(final Activity activity) {
280-
if (activity.getClass() == PermissionUtils.PermissionActivity.class) return;
281+
if (PERMISSION_ACTIVITY_CLASS_NAME.equals(activity.getClass().getName())) return;
281282
if (mActivityList.contains(activity)) {
282283
if (!mActivityList.getLast().equals(activity)) {
283284
mActivityList.remove(activity);

0 commit comments

Comments
 (0)